diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm new file mode 100644 index 000000000000..05a42738c499 --- /dev/null +++ b/code/__DEFINES/ARES.dm @@ -0,0 +1,54 @@ +/// Generic access for 1:1 conversations with ARES and unrestricted commands. +#define ARES_ACCESS_BASIC 0 +/// Secure Access, can read ARES Announcements and Bioscans. +#define ARES_ACCESS_COMMAND 1 +#define ARES_ACCESS_JOE 2 +/// CL, can read Apollo Log and also Delete Announcements. +#define ARES_ACCESS_CORPORATE 3 +/// Senior Command, can Delete Bioscans. +#define ARES_ACCESS_SENIOR 4 +/// Synth, CE & Commanding Officer, can read the access log. +#define ARES_ACCESS_CE 5 +#define ARES_ACCESS_SYNTH 6 +#define ARES_ACCESS_CO 7 +/// High Command, can read the deletion log. +#define ARES_ACCESS_HIGH 8 +#define ARES_ACCESS_WY_COMMAND 9 +/// Debugging. Allows me to view everything without using a high command rank. Unlikely to stay in a full merge. +#define ARES_ACCESS_DEBUG 10 + +#define ARES_RECORD_ANNOUNCE "Announcement Record" +#define ARES_RECORD_ANTIAIR "AntiAir Control Log" +#define ARES_RECORD_ASRS "Requisition Record" +#define ARES_RECORD_BIOSCAN "Bioscan Record" +#define ARES_RECORD_BOMB "Orbital Bombardment Record" +#define ARES_RECORD_DELETED "Deleted Record" +#define ARES_RECORD_SECURITY "Security Update" +#define ARES_RECORD_MAINTENANCE "Maintenance Ticket" +#define ARES_RECORD_ACCESS "Access Ticket" + +/// Not by ARES logged through marine_announcement() +#define ARES_LOG_NONE 0 +/// Logged with all announcements +#define ARES_LOG_MAIN 1 +/// Logged in the security updates +#define ARES_LOG_SECURITY 2 + +/// Access levels specifically for Working Joe management console +#define APOLLO_ACCESS_REQUEST 0 +#define APOLLO_ACCESS_REPORTER 1 +#define APOLLO_ACCESS_TEMP 2 +#define APOLLO_ACCESS_AUTHED 3 +#define APOLLO_ACCESS_JOE 4 +#define APOLLO_ACCESS_DEBUG 5 + +/// Ticket statuses, both for Access and Maintenance +#define TICKET_PENDING "pending" +#define TICKET_ASSIGNED "assigned" +#define TICKET_REJECTED "rejected" +#define TICKET_CANCELLED "cancelled" +#define TICKET_COMPLETED "complete" + +/// Cooldowns +#define COOLDOWN_ARES_SENSOR 60 SECONDS +#define COOLDOWN_ARES_ACCESS_CONTROL 20 SECONDS diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm index 100a45ff6a94..3116d7f19555 100644 --- a/code/__DEFINES/__game.dm +++ b/code/__DEFINES/__game.dm @@ -106,6 +106,7 @@ block( \ #define SOUND_REBOOT (1<<5) #define SOUND_ADMIN_MEME (1<<6) #define SOUND_ADMIN_ATMOSPHERIC (1<<7) +#define SOUND_ARES_MESSAGE (1<<8) //toggles_chat #define CHAT_OOC (1<<0) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index bbad90a6bdc3..a40675e0560e 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -35,7 +35,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_MARINE_RESEARCH 28 #define ACCESS_MARINE_SEA 29 #define ACCESS_MARINE_KITCHEN 30 -#define ACCESS_MARINE_CAPTAIN 31 +#define ACCESS_MARINE_CO 31 #define ACCESS_MARINE_TL_PREP 32 #define ACCESS_MARINE_MAINT 34 @@ -43,6 +43,14 @@ most of them are tied into map-placed objects. This should be reworked in the fu #define ACCESS_MARINE_SYNTH 36 +// AI Core Accesses +/// Used in temporary passes +#define ACCESS_MARINE_AI_TEMP 90 +/// Used as dedicated access to ARES Core. +#define ACCESS_MARINE_AI 91 +/// Used to access Maintenance Protocols on ARES Interface. +#define ACCESS_ARES_DEBUG 92 + //Surface access levels #define ACCESS_CIVILIAN_PUBLIC 100 #define ACCESS_CIVILIAN_LOGISTICS 101 diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 95b98646c616..9702d51004ad 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -48,6 +48,8 @@ var/global/list/note_categories = list("Admin", "Merit", "Commanding Officer", " #define CC_MARK(user) "(MARK)" #define CC_REPLY(user) "(RPLY)" #define OBSERVER_JMP(observer, atom) atom ? "(JMP)" : "" +#define ARES_MARK(user) "(MARK)" +#define ARES_REPLY(user, ref) "(RPLY)" /atom/proc/Admin_Coordinates_Readable(area_name, admin_jump_ref) var/turf/T = get_turf(src) diff --git a/code/__DEFINES/camera.dm b/code/__DEFINES/camera.dm index 58b1b8acbd84..9d797b964d61 100644 --- a/code/__DEFINES/camera.dm +++ b/code/__DEFINES/camera.dm @@ -6,6 +6,7 @@ #define CAMERA_NET_ALAMO "Alamo" #define CAMERA_NET_NORMANDY "Normandy" #define CAMERA_NET_COLONY "Colony" +#define CAMERA_NET_ARES "ARES" #define CAMERA_NET_MILITARY "Military" #define CAMERA_NET_OVERWATCH "Overwatch" diff --git a/code/__DEFINES/chat.dm b/code/__DEFINES/chat.dm index c21cb94b0140..85966e4032e2 100644 --- a/code/__DEFINES/chat.dm +++ b/code/__DEFINES/chat.dm @@ -15,6 +15,7 @@ #define MESSAGE_TYPE_ADMINCHAT "adminchat" #define MESSAGE_TYPE_MODCHAT "modchat" #define MESSAGE_TYPE_MENTOR "mentor" +#define MESSAGE_TYPE_STAFF_IC "staff_ic" #define MESSAGE_TYPE_EVENTCHAT "eventchat" #define MESSAGE_TYPE_ADMINLOG "adminlog" #define MESSAGE_TYPE_ATTACKLOG "attacklog" diff --git a/code/__DEFINES/client_prefs.dm b/code/__DEFINES/client_prefs.dm new file mode 100644 index 000000000000..ef5ff00e4ed6 --- /dev/null +++ b/code/__DEFINES/client_prefs.dm @@ -0,0 +1,33 @@ +#define BE_ALIEN_AFTER_DEATH (1<<0) +#define BE_AGENT (1<<1) + +#define TOGGLE_IGNORE_SELF (1<<0) // Determines whether you will not hurt yourself when clicking yourself +#define TOGGLE_HELP_INTENT_SAFETY (1<<1) // Determines whether help intent will be completely harmless +#define TOGGLE_MIDDLE_MOUSE_CLICK (1<<2) // This toggles whether selected ability for xeno uses middle mouse clicking or shift clicking +#define TOGGLE_DIRECTIONAL_ATTACK (1<<3) // This toggles whether attacks for xeno use directional attacks +#define TOGGLE_AUTO_EJECT_MAGAZINE_OFF (1<<4) // This toggles whether guns with auto ejectors will not auto eject their magazines + // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND +#define TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND (1<<5) // This toggles whether guns with auto ejectors will cause you to unwield your gun and put the empty magazine in your hand + // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE +#define TOGGLE_EJECT_MAGAZINE_TO_HAND (1<<6) // This toggles whether manuallye jecting magazines from guns will cause you to unwield your gun + // and put the empty magazine in your hand +#define TOGGLE_AUTOMATIC_PUNCTUATION (1<<7) // Whether your sentences will automatically be punctuated with a period +#define TOGGLE_COMBAT_CLICKDRAG_OVERRIDE (1<<8) // Whether disarm/harm intents cause clicks to trigger immediately when the mouse button is depressed. +#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them. +#define TOGGLE_FULLSCREEN (1<<10) // See /client/proc/toggle_fullscreen in client_procs.dm +#define TOGGLE_MEMBER_PUBLIC (1<<11) //determines if you get a byond logo by your name in ooc if you're a member or not +#define TOGGLE_OOC_FLAG (1<<12) // determines if your country flag appears by your name in ooc chat +#define TOGGLE_MIDDLE_MOUSE_SWAP_HANDS (1<<13) //Toggle whether middle click swaps your hands +#define TOGGLE_AMBIENT_OCCLUSION (1<<14) // toggles if ambient occlusion is turned on or off +#define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand. +#define TOGGLE_START_JOIN_CURRENT_SLOT (1<<16) // Whether joining at roundstart ignores assigned character slot for the job and uses currently selected slot. +#define TOGGLE_LATE_JOIN_CURRENT_SLOT (1<<17) //Whether joining during the round ignores assigned character slot for the job and uses currently selected slot. + +#define JOB_SLOT_RANDOMISED_SLOT -1 +#define JOB_SLOT_CURRENT_SLOT 0 +#define JOB_SLOT_RANDOMISED_TEXT "Randomise name and appearance" +#define JOB_SLOT_CURRENT_TEXT "Current character" + +#define AGE_MIN 19 //youngest a character can be +#define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160. +#define MAX_GEAR_COST 7 //Used in chargen for loadout limit. diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 65511df13beb..e1f221dccbde 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -1,6 +1,7 @@ #define COOLDOWN_MOB_AUDIO "mob_audio_cooldown" #define COOLDOWN_IDLOCK_TEXTALERT "mob_idlock_textalert" #define COOLDOWN_HIJACK_BARRAGE "gamemode_explosive_barrage" +#define COOLDOWN_HIJACK_GROUND_CHECK "gamemode_ground_check" #define COOLDOWN_ITEM_HOOD_SOUND "item_hood_sound" //Define for ship alt diff --git a/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm b/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm index d5a8885293fb..b38339d1af17 100644 --- a/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm +++ b/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm @@ -52,5 +52,14 @@ //from /mob/living/carbon/human/equip_to_slot() #define COMSIG_HUMAN_EQUIPPED_ITEM "human_equipped_item" +/// From /mob/proc/equip_to_slot_if_possible() +#define COMSIG_HUMAN_ATTEMPTING_EQUIP "human_attempting_equip" + #define COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP (1<<0) + //from /mob/living/carbon/human/Life() #define COMSIG_HUMAN_SET_UNDEFIBBABLE "human_set_undefibbable" + +/// from /datum/surgery_step/proc/attempt_step() +#define COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS "human_surgery_apply_modifiers" +/// From /mob/living/carbon/human/proc/get_flags_cold_protection() +#define COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS "human_cold_protection_apply_modifiers" diff --git a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm index bdae2114ff23..347623798b74 100644 --- a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm +++ b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm @@ -43,6 +43,9 @@ #define COMSIG_MOB_DRAGGED "mob_dragged" /// From /obj/item/proc/unequipped() #define COMSIG_MOB_ITEM_UNEQUIPPED "mob_item_unequipped" +/// From /mob/proc/equip_to_slot_if_possible() +#define COMSIG_MOB_ATTEMPTING_EQUIP "mob_attempting_equip" + #define COMPONENT_MOB_CANCEL_ATTEMPT_EQUIP (1<<0) /// For when a mob is devoured by a Xeno #define COMSIG_MOB_DEVOURED "mob_devoured" @@ -105,3 +108,5 @@ #define COMSIG_MOB_STAT_SET_ALIVE "mob_stat_set_alive" //from /mob/living/set_stat() #define COMSIG_MOB_STAT_SET_DEAD "mob_stat_set_dead" + +#define COMSIG_GHOST_MOVED "ghost_moved" diff --git a/code/__DEFINES/dcs/signals/atom/signals_item.dm b/code/__DEFINES/dcs/signals/atom/signals_item.dm index 676bf3580821..9c2f3b92ba05 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_item.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_item.dm @@ -2,6 +2,8 @@ #define COMSIG_ITEM_ATTEMPT_ATTACK "item_attempt_attack" //Triggered on the target mob. #define COMPONENT_CANCEL_ATTACK (1<<0) +#define COMSIG_ITEM_ATTACK_AIRLOCK "item_attack_airlocK" + #define COMPONENT_CANCEL_AIRLOCK_ATTACK (1<<0) /// from /obj/item/attackby() : (obj/item, mob/user) #define COMSIG_ITEM_ATTACKED "item_attacked" diff --git a/code/__DEFINES/dcs/signals/atom/signals_obj.dm b/code/__DEFINES/dcs/signals/atom/signals_obj.dm index f52ec6eccf52..df53558834f6 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_obj.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_obj.dm @@ -22,3 +22,5 @@ /// from /obj/structure/transmitter/update_icon() #define COMSIG_TRANSMITTER_UPDATE_ICON "transmitter_update_icon" + +#define COMSIG_TENT_COLLAPSING "tent_collapsing" diff --git a/code/__DEFINES/dcs/signals/atom/signals_turf.dm b/code/__DEFINES/dcs/signals/atom/signals_turf.dm index f76abcda681a..6a0788bcf871 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_turf.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_turf.dm @@ -4,6 +4,7 @@ #define COMSIG_TURF_ENTER "turf_enter" #define COMPONENT_TURF_ALLOW_MOVEMENT (1<<0) #define COMPONENT_TURF_DENY_MOVEMENT (1<<1) +#define COMSIG_TURF_ENTERED "turf_entered" /// Called when a bullet hits a turf #define COMSIG_TURF_BULLET_ACT "turf_bullet_act" diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index c3d51b2d65cd..90a50fad138c 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -48,5 +48,8 @@ // Used for smothering fires upon weather event start/stop #define COMSIG_GLOB_WEATHER_CHANGE "!weather_event_changed" +/// From /obj/structure/machinery/telecomms/proc/tcomms_shutdown(), called when the relay turns off +#define COMSIG_GLOB_GROUNDSIDE_TELECOMM_TURNED_OFF "!groundside_telecomm_turned_off" + /// From /datum/admins/proc/force_predator_round() #define COMSIG_GLOB_PREDATOR_ROUND_TOGGLED "!predator_round_toglged" diff --git a/code/__DEFINES/defenses.dm b/code/__DEFINES/defenses.dm index 57eb0c86f939..db615c2a0c78 100644 --- a/code/__DEFINES/defenses.dm +++ b/code/__DEFINES/defenses.dm @@ -8,7 +8,7 @@ // Defines for barricade upgrades #define BARRICADE_UPGRADE_BURN "Biohazard Upgrade (+Burn)" #define BARRICADE_UPGRADE_BRUTE "Reinforced Upgrade (+Brute)" -#define BARRICADE_UPGRADE_EXPLOSIVE "Explosive Upgrade (+Explosive)" +#define BARRICADE_UPGRADE_ANTIFF "Composite Upgrade (++Explosive, ++Projectile, ++Fire)" // Defines for defense stats #define DEFENSE_FUNCTIONAL 0 diff --git a/code/__DEFINES/human.dm b/code/__DEFINES/human.dm index 6e2d82d5cc4f..846119d6b55d 100644 --- a/code/__DEFINES/human.dm +++ b/code/__DEFINES/human.dm @@ -213,8 +213,3 @@ #define RELIGION_AGNOSTICISM "Agnostic" #define MAXIMUM_DROPPED_OBJECTS_REMEMBERED 2 - -///////////////////MISC HUMAN FLAGS (LINKED TO VAR: FLAGS_HUMAN_MISC)/////////////////// - -#define HUMAN_FLAG_CHANGED (1<<0) - diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index c2429d2fad4c..cede518e8db0 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -163,24 +163,25 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST //------------------------------------ //-------- PMC --------// -#define JOB_PMC "PMC Standard" +#define JOB_PMC_STANDARD "Weyland-Yutani PMC (Standard)" #define JOB_PMC_ENGINEER "PMC Corporate Technician" #define JOB_PMC_MEDIC "PMC Corporate Medic" #define JOB_PMC_DOCTOR "PMC Trauma Surgeon" #define JOB_PMC_INVESTIGATOR "PMC Medical Investigator" +#define JOB_PMC_DETAINER "Weyland-Yutani PMC (Detainer)" #define JOB_PMC_ELITE "PMC Elite" #define JOB_PMC_GUNNER "PMC Support Weapons Specialist" //Renamed from Specialist to Support Specialist as it only has SG skills. #define JOB_PMC_SNIPER "PMC Weapons Specialist" //Renamed from Sharpshooter to specialist as it uses specialist skills. -#define JOB_PMC_CREWMAN "PMC Crewman" +#define JOB_PMC_CREWMAN "Weyland-Yutani PMC (Crewman)" #define JOB_PMC_NINJA "PMC Ninja" #define JOB_PMC_XENO_HANDLER "PMC Xeno Handler" #define JOB_PMC_COMMANDO "PMC Commando" #define JOB_PMC_LEADER "PMC Leader" #define JOB_PMC_LEAD_INVEST "PMC Lead Investigator" #define JOB_PMC_DIRECTOR "PMC Site Director" -#define JOB_PMC_SYNTH "PMC Support Synthetic" +#define JOB_PMC_SYNTH "PMC Support Synthetic" -#define JOB_PMC_GRUNT_LIST list(JOB_PMC, JOB_PMC_ENGINEER, JOB_PMC_MEDIC, JOB_PMC_INVESTIGATOR, JOB_PMC_ELITE, JOB_PMC_GUNNER, JOB_PMC_SNIPER, JOB_PMC_CREWMAN, JOB_PMC_NINJA, JOB_PMC_XENO_HANDLER, JOB_PMC_COMMANDO, JOB_PMC_LEADER, JOB_PMC_LEAD_INVEST) +#define JOB_PMC_GRUNT_LIST list(JOB_PMC_STANDARD, JOB_PMC_ENGINEER, JOB_PMC_MEDIC, JOB_PMC_INVESTIGATOR, JOB_PMC_DETAINER, JOB_PMC_ELITE, JOB_PMC_GUNNER, JOB_PMC_SNIPER, JOB_PMC_CREWMAN, JOB_PMC_NINJA, JOB_PMC_XENO_HANDLER, JOB_PMC_COMMANDO, JOB_PMC_LEADER, JOB_PMC_LEAD_INVEST) //-------- WY --------// diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm index 8cac90defb26..557f8e6a3f68 100644 --- a/code/__DEFINES/language.dm +++ b/code/__DEFINES/language.dm @@ -12,7 +12,7 @@ #define LANGUAGE_XENOMORPH "Xenomorph" #define LANGUAGE_HIVEMIND "Hivemind" -#define LANGUAGE_APOLLO "Apollo Link" +#define LANGUAGE_APOLLO "APOLLO Link" #define LANGUAGE_TELEPATH "Telepath Implant" diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 40023dcd9ec1..3cbd0d6dac44 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -124,12 +124,15 @@ #define FACEHUGGER_LAYER 4.13 /// For WEATHER #define WEATHER_LAYER 4.14 -#define INTERIOR_WALL_SOUTH_LAYER 5.2 -#define INTERIOR_DOOR_LAYER 5.21 //#define FLY_LAYER 5 #define RIPPLE_LAYER 5.1 +#define INTERIOR_DOOR_INSIDE_LAYER 5.19 +#define INTERIOR_WALL_SOUTH_LAYER 5.2 +#define INTERIOR_DOOR_LAYER 5.21 +#define INTERIOR_WALLMOUNT_LAYER 5.3 +#define INTERIOR_ROOF_LAYER 5.5 #define ABOVE_FLY_LAYER 6 @@ -174,9 +177,12 @@ /// NEVER HAVE ANYTHING BELOW THIS PLANE ADJUST IF YOU NEED MORE SPACE #define LOWEST_EVER_PLANE -200 +/// Floor plane, self explanatory. Used for Ambient Occlusion filter #define FLOOR_PLANE -7 +/// Game Plane, where most of the game objects reside #define GAME_PLANE -6 -#define ABOVE_GAME_PLANE -5 +/// Roof plane, disappearing when entering buildings +#define ROOF_PLANE -4 /// To keep from conflicts with SEE_BLACKNESS internals #define BLACKNESS_PLANE 0 diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 053dd58cabca..3f6a4a44ee07 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -104,8 +104,10 @@ require only minor tweaks. #define GROUND_MAP "ground_map" #define SHIP_MAP "ship_map" #define ALL_MAPTYPES list(GROUND_MAP, SHIP_MAP) +#define OVERRIDE_MAPS_TO_FILENAME list(GROUND_MAP = "next_map_override.dmm", SHIP_MAP = "next_ship_override.dmm") #define MAP_TO_FILENAME list(GROUND_MAP = "data/next_map.json", SHIP_MAP = "data/next_ship.json") #define HUNTERSHIPS_TEMPLATE_PATH "maps/predship/huntership.dmm" +#define OVERRIDE_DEFAULT_MAP_CONFIG list(GROUND_MAP = "maps/override_ground.json", SHIP_MAP = "maps/override_ship.json") // traity things #define MAP_COLD "COLD" diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index b2936248c3ba..bed2ceeced7d 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -44,6 +44,8 @@ #define AREA_ALLOW_XENO_JOIN (1<<2) /// Flags the area as a containment area #define AREA_CONTAINMENT (1<<3) +/// Flags the area as permanently unweedable. Still requires is_resin_allowed = FALSE +#define AREA_UNWEEDABLE (1<<4) /// Default number of ticks for do_after #define DA_DEFAULT_NUM_TICKS 5 diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm index e6e8212e0826..2704e52d2f85 100644 --- a/code/__DEFINES/mob_hud.dm +++ b/code/__DEFINES/mob_hud.dm @@ -63,3 +63,5 @@ //for tracking the queen/hivecore on xeno locator huds #define TRACKER_QUEEN "Queen" #define TRACKER_HIVE "Hive Core" +#define TRACKER_LEADER "Leader" +#define TRACKER_TUNNEL "Tunnel" diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 495b5fb472c5..ba928e202cf0 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -11,8 +11,6 @@ #define OVEREAT_TIME 200 //================================================= -#define ALIEN_SELECT_AFK_BUFFER 1 // How many minutes that a person can be AFK before not being allowed to be an alien. - #define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point #define HEAT_DAMAGE_LEVEL_2 4 //Amount of damage applied when your body temperature passes the 400K point #define HEAT_DAMAGE_LEVEL_3 8 //Amount of damage applied when your body temperature passes the 1000K point diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 7736d2f51d8d..ab58df78abcc 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -14,6 +14,7 @@ #define EVACUATION_STATUS_IN_PROGRESS 2 #define EVACUATION_STATUS_COMPLETE 3 +#define NUCLEAR_TIME_LOCK 90 MINUTES #define NUKE_EXPLOSION_INACTIVE 0 #define NUKE_EXPLOSION_ACTIVE 1 #define NUKE_EXPLOSION_IN_PROGRESS 2 @@ -75,29 +76,6 @@ #define LATEJOIN_MARINES_PER_LATEJOIN_LARVA 3 -#define BE_ALIEN_AFTER_DEATH 1 -#define BE_AGENT 2 - -#define TOGGLE_IGNORE_SELF (1<<0) // Determines whether you will not hurt yourself when clicking yourself -#define TOGGLE_HELP_INTENT_SAFETY (1<<1) // Determines whether help intent will be completely harmless -#define TOGGLE_MIDDLE_MOUSE_CLICK (1<<2) // This toggles whether selected ability for xeno uses middle mouse clicking or shift clicking -#define TOGGLE_DIRECTIONAL_ATTACK (1<<3) // This toggles whether attacks for xeno use directional attacks -#define TOGGLE_AUTO_EJECT_MAGAZINE_OFF (1<<4) // This toggles whether guns with auto ejectors will not auto eject their magazines - // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND -#define TOGGLE_AUTO_EJECT_MAGAZINE_TO_HAND (1<<5) // This toggles whether guns with auto ejectors will cause you to unwield your gun and put the empty magazine in your hand - // MUTUALLY EXCLUSIVE TO TOGGLE_AUTO_EJECT_MAGAZINE -#define TOGGLE_EJECT_MAGAZINE_TO_HAND (1<<6) // This toggles whether manuallyejecting magazines from guns will cause you to unwield your gun - // and put the empty magazine in your hand -#define TOGGLE_AUTOMATIC_PUNCTUATION (1<<7) // Whether your sentences will automatically be punctuated with a period -#define TOGGLE_COMBAT_CLICKDRAG_OVERRIDE (1<<8) // Whether disarm/harm intents cause clicks to trigger immediately when the mouse button is depressed. -#define TOGGLE_ALTERNATING_DUAL_WIELD (1<<9) // Whether dual-wielding fires both guns at once or swaps between them. -#define TOGGLE_FULLSCREEN (1<<10) // See /client/proc/toggle_fullscreen in client_procs.dm -#define TOGGLE_MEMBER_PUBLIC (1<<11) //determines if you get a byond logo by your name in ooc if you're a member or not -#define TOGGLE_OOC_FLAG (1<<12) // determines if your country flag appears by your name in ooc chat -#define TOGGLE_MIDDLE_MOUSE_SWAP_HANDS (1<<13) //Toggle whether middle click swaps your hands -#define TOGGLE_AMBIENT_OCCLUSION (1<<14) // toggles if ambient occlusion is turned on or off -#define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand. - //================================================= #define SHOW_ITEM_ANIMATIONS_NONE 0 //Do not show any item pickup animations #define SHOW_ITEM_ANIMATIONS_HALF 1 //Toggles tg-style item animations on and off, default on. @@ -111,16 +89,8 @@ //================================================= -var/list/be_special_flags = list( - "Xenomorph after unrevivable death" = BE_ALIEN_AFTER_DEATH, - "Agent" = BE_AGENT, -) - -#define AGE_MIN 19 //youngest a character can be -#define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160. //Number of marine players against which the Marine's gear scales #define MARINE_GEAR_SCALING_NORMAL 30 -#define MAX_GEAR_COST 7 //Used in chargen for loadout limit. #define RESOURCE_NODE_SCALE 95 //How many players minimum per extra set of resource nodes #define RESOURCE_NODE_QUANTITY_PER_POP 11 //How many resources total per pop diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm index 6a3e32e743c6..0a34ac9d6fe9 100644 --- a/code/__DEFINES/objects.dm +++ b/code/__DEFINES/objects.dm @@ -108,7 +108,6 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define IS_PRY_CAPABLE_CROWBAR 2 //actual crowbar #define IS_PRY_CAPABLE_FORCE 3 //can force open even powered airlocks - #define SELF_DESTRUCT_MACHINE_INACTIVE 0 #define SELF_DESTRUCT_MACHINE_ACTIVE 1 #define SELF_DESTRUCT_MACHINE_ARMED 2 @@ -137,11 +136,16 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define CLEANABLE_MISC "misc" //Anything else //For nuke announcements -#define NUKE_SHOW_TIMER_TEN_SEC 1 -#define NUKE_SHOW_TIMER_MINUTE 2 -#define NUKE_SHOW_TIMER_HALF 4 +#define NUKE_SHOW_TIMER_TEN_SEC (1<<0) +#define NUKE_SHOW_TIMER_MINUTE (1<<1) +#define NUKE_SHOW_TIMER_HALF (1<<2) #define NUKE_SHOW_TIMER_ALL (NUKE_SHOW_TIMER_TEN_SEC|NUKE_SHOW_TIMER_MINUTE|NUKE_SHOW_TIMER_HALF) +#define NUKE_DECRYPT_SHOW_TIMER_COMPLETE (1<<3) +#define NUKE_DECRYPT_SHOW_TIMER_MINUTE (1<<4) +#define NUKE_DECRYPT_SHOW_TIMER_HALF (1<<5) +#define NUKE_DECRYPT_SHOW_TIMER_ALL (NUKE_SHOW_TIMER_TEN_SEC|NUKE_SHOW_TIMER_HALF|NUKE_DECRYPT_SHOW_TIMER_COMPLETE|NUKE_DECRYPT_SHOW_TIMER_MINUTE|NUKE_DECRYPT_SHOW_TIMER_HALF) + //For recipes #define ONE_TYPE_PER_TURF 1 #define ONE_TYPE_PER_BORDER 2 diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index fc9ac3327c20..8e1bde82c839 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -152,8 +152,8 @@ //pilot skill, hidden #define SKILL_PILOT_DEFAULT 0 -#define SKILL_PILOT_TRAINED 1 // DCC, Synth -#define SKILL_PILOT_EXPERT 2 // Pilot +#define SKILL_PILOT_TRAINED 1 // DCC +#define SKILL_PILOT_EXPERT 2 // Pilot, Synth #define SKILL_PILOT_MAX 2 //Navigations skill - for seting orbital alt diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index ab2d56599136..89976c498422 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.4.4" +#define TGS_DMAPI_VERSION "6.5.0" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -12,8 +12,8 @@ // Comment this out once you've filled in the below. #error TGS API unconfigured -// Uncomment this if you wish to allow the game to interact with TGS 3. -// This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()() +// Uncomment this if you wish to allow the game to interact with TGS 3.. +// This will raise the minimum required security level of your game to TGS_SECURITY_TRUSTED due to it utilizing call()(). //#define TGS_V3_API // Required interfaces (fill in with your codebase equivalent): @@ -52,44 +52,46 @@ // EVENT CODES -/// Before a reboot mode change, extras parameters are the current and new reboot mode enums +/// Before a reboot mode change, extras parameters are the current and new reboot mode enums. #define TGS_EVENT_REBOOT_MODE_CHANGE -1 -/// Before a port change is about to happen, extra parameters is new port +/// Before a port change is about to happen, extra parameters is new port. #define TGS_EVENT_PORT_SWAP -2 -/// Before the instance is renamed, extra parameter is the new name +/// Before the instance is renamed, extra parameter is the new name. #define TGS_EVENT_INSTANCE_RENAMED -3 -/// After the watchdog reattaches to DD, extra parameter is the new [/datum/tgs_version] of the server +/// After the watchdog reattaches to DD, extra parameter is the new [/datum/tgs_version] of the server. #define TGS_EVENT_WATCHDOG_REATTACH -4 +/// When the watchdog sends a health check to DD. No parameters. +#define TGS_EVENT_HEALTH_CHECK -5 -/// When the repository is reset to its origin reference. Parameters: Reference name, Commit SHA +/// When the repository is reset to its origin reference. Parameters: Reference name, Commit SHA. #define TGS_EVENT_REPO_RESET_ORIGIN 0 -/// When the repository performs a checkout. Parameters: Checkout git object +/// When the repository performs a checkout. Parameters: Checkout git object. #define TGS_EVENT_REPO_CHECKOUT 1 -/// When the repository performs a fetch operation. No parameters +/// When the repository performs a fetch operation. No parameters. #define TGS_EVENT_REPO_FETCH 2 -/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user +/// When the repository test merges. Parameters: PR Number, PR Sha, (Nullable) Comment made by TGS user. #define TGS_EVENT_REPO_MERGE_PULL_REQUEST 3 -/// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path +/// Before the repository makes a sychronize operation. Parameters: Absolute repostiory path. #define TGS_EVENT_REPO_PRE_SYNCHRONIZE 4 -/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND +/// Before a BYOND install operation begins. Parameters: [/datum/tgs_version] of the installing BYOND. #define TGS_EVENT_BYOND_INSTALL_START 5 /// When a BYOND install operation fails. Parameters: Error message #define TGS_EVENT_BYOND_INSTALL_FAIL 6 -/// When the active BYOND version changes. Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND +/// When the active BYOND version changes. Parameters: (Nullable) [/datum/tgs_version] of the current BYOND, [/datum/tgs_version] of the new BYOND. #define TGS_EVENT_BYOND_ACTIVE_VERSION_CHANGE 7 -/// When the compiler starts running. Parameters: Game directory path, origin commit SHA +/// When the compiler starts running. Parameters: Game directory path, origin commit SHA. #define TGS_EVENT_COMPILE_START 8 -/// When a compile is cancelled. No parameters +/// When a compile is cancelled. No parameters. #define TGS_EVENT_COMPILE_CANCELLED 9 -/// When a compile fails. Parameters: Game directory path, [TRUE]/[FALSE] based on if the cause for failure was DMAPI validation +/// When a compile fails. Parameters: Game directory path, [TRUE]/[FALSE] based on if the cause for failure was DMAPI validation. #define TGS_EVENT_COMPILE_FAILURE 10 -/// When a compile operation completes. Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the [TGS_EVENT_DEPLOYMENT_COMPLETE] instead. Parameters: Game directory path +/// When a compile operation completes. Note, this event fires before the new .dmb is loaded into the watchdog. Consider using the [TGS_EVENT_DEPLOYMENT_COMPLETE] instead. Parameters: Game directory path. #define TGS_EVENT_COMPILE_COMPLETE 11 -/// When an automatic update for the current instance begins. No parameters +/// When an automatic update for the current instance begins. No parameters. #define TGS_EVENT_INSTANCE_AUTO_UPDATE_START 12 -/// When the repository encounters a merge conflict: Parameters: Base SHA, target SHA, base reference, target reference +/// When the repository encounters a merge conflict: Parameters: Base SHA, target SHA, base reference, target reference. #define TGS_EVENT_REPO_MERGE_CONFLICT 13 -/// When a deployment completes. No Parameters +/// When a deployment completes. No Parameters. #define TGS_EVENT_DEPLOYMENT_COMPLETE 14 /// Before the watchdog shuts down. Not sent for graceful shutdowns. No parameters. #define TGS_EVENT_WATCHDOG_SHUTDOWN 15 @@ -104,11 +106,11 @@ #define TGS_EVENT_WORLD_PRIME 21 // DMAPI also doesnt implement this // #define TGS_EVENT_DREAM_DAEMON_LAUNCH 22 -/// After a single submodule update is performed. Parameters: Updated submodule name +/// After a single submodule update is performed. Parameters: Updated submodule name. #define TGS_EVENT_REPO_SUBMODULE_UPDATE 23 -/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, byond version +/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, byond version. #define TGS_EVENT_PRE_DREAM_MAKER 24 -/// Whenever a deployment folder is deleted from disk. Parameters: Game directory path +/// Whenever a deployment folder is deleted from disk. Parameters: Game directory path. #define TGS_EVENT_DEPLOYMENT_CLEANUP 25 // OTHER ENUMS @@ -164,28 +166,28 @@ /datum/tgs_revision_information /// Full SHA of the commit. var/commit - /// ISO 8601 timestamp of when the commit was created + /// ISO 8601 timestamp of when the commit was created. var/timestamp /// Full sha of last known remote commit. This may be null if the TGS repository is not currently tracking a remote branch. var/origin_commit /// Represents a version. /datum/tgs_version - /// The suite/major version number + /// The suite/major version number. var/suite - // This group of variables can be null to represent a wild card - /// The minor version number. null for wildcards + // This group of variables can be null to represent a wild card. + /// The minor version number. null for wildcards. var/minor - /// The patch version number. null for wildcards + /// The patch version number. null for wildcards. var/patch - /// Legacy version number. Generally null + /// Legacy version number. Generally null. var/deprecated_patch - /// Unparsed string value + /// Unparsed string value. var/raw_parameter - /// String value minus prefix + /// String value minus prefix. var/deprefixed_parameter /** @@ -231,38 +233,43 @@ var/is_admin_channel /// [TRUE]/[FALSE] if the channel is a private message channel for a [/datum/tgs_chat_user]. var/is_private_channel - /// Tag string associated with the channel in TGS + /// Tag string associated with the channel in TGS. var/custom_tag - /// [TRUE]/[FALSE] if the channel supports embeds + /// [TRUE]/[FALSE] if the channel supports embeds. var/embeds_supported // Represents a chat user /datum/tgs_chat_user /// TGS internal user ID. var/id - // The user's display name. + /// The user's display name. var/friendly_name - // The string to use to ping this user in a message. + /// The string to use to ping this user in a message. var/mention - /// The [/datum/tgs_chat_channel] the user was from + /// The [/datum/tgs_chat_channel] the user was from. var/datum/tgs_chat_channel/channel +/// User definable handler for TGS events. +/datum/tgs_event_handler + /// If the handler receieves [TGS_EVENT_HEALTH_CHECK] events. + var/receive_health_checks = FALSE + /** * User definable callback for handling TGS events. * - * event_code - One of the TGS_EVENT_ defines. Extra parameters will be documented in each + * event_code - One of the TGS_EVENT_ defines. Extra parameters will be documented in each. */ /datum/tgs_event_handler/proc/HandleEvent(event_code, ...) set waitfor = FALSE return -/// User definable chat command +/// User definable chat command. /datum/tgs_chat_command - /// The string to trigger this command on a chat bot. e.g `@bot name ...` or `!tgs name ...` + /// The string to trigger this command on a chat bot. e.g `@bot name ...` or `!tgs name ...`. var/name = "" - /// The help text displayed for this command + /// The help text displayed for this command. var/help_text = "" - /// If this command should be available to game administrators only + /// If this command should be available to game administrators only. var/admin_only = FALSE /// A subtype of [/datum/tgs_chat_command] that is ignored when enumerating available commands. Use this to create shared base /datums for commands. var/ignore_type @@ -276,7 +283,7 @@ /datum/tgs_chat_command/proc/Run(datum/tgs_chat_user/sender, params) CRASH("[type] has no implementation for Run()") -/// User definable chat message +/// User definable chat message. /datum/tgs_message_content /// The tring content of the message. Must be provided in New(). var/text @@ -300,7 +307,7 @@ /// Timestamp must be encoded as: time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss"). Use the active timezone. var/timestamp - /// Colour must be #AARRGGBB or #RRGGBB hex string + /// Colour must be #AARRGGBB or #RRGGBB hex string. var/colour /// See https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure for details. @@ -318,7 +325,7 @@ var/list/datum/tgs_chat_embed/field/fields -/// Common datum for similar discord embed medias +/// Common datum for similar discord embed medias. /datum/tgs_chat_embed/media /// Must be set in New(). var/url @@ -396,16 +403,16 @@ // No function below this succeeds if it TgsAvailable() returns FALSE or if TgsNew() has yet to be called. /** - * Forces a hard reboot of DreamDaemon by ending the process. + * Forces a hard reboot of DreamDaemon by ending the process. This function may sleep! * * Unlike del(world) clients will try to reconnect. - * If TGS has not requested a [TGS_REBOOT_MODE_SHUTDOWN] DreamDaemon will be launched again + * If TGS has not requested a [TGS_REBOOT_MODE_SHUTDOWN] DreamDaemon will be launched again. */ /world/proc/TgsEndProcess() return /** - * Send a message to connected chats. + * Send a message to connected chats. This function may sleep! * * message - The [/datum/tgs_message_content] to send. * admin_only: If [TRUE], message will be sent to admin connected chats. Vice-versa applies. @@ -414,7 +421,7 @@ return /** - * Send a private message to a specific user. + * Send a private message to a specific user. This function may sleep! * * message - The [/datum/tgs_message_content] to send. * user: The [/datum/tgs_chat_user] to PM. @@ -422,10 +429,8 @@ /world/proc/TgsChatPrivateMessage(datum/tgs_message_content/message, datum/tgs_chat_user/user) return -// The following functions will sleep if a call to TgsNew() is sleeping - /** - * Send a message to connected chats that are flagged as game-related in TGS. + * Send a message to connected chats that are flagged as game-related in TGS. This function may sleep! * * message - The [/datum/tgs_message_content] to send. * channels - Optional list of [/datum/tgs_chat_channel]s to restrict the message to. @@ -433,38 +438,38 @@ /world/proc/TgsChatBroadcast(datum/tgs_message_content/message, list/channels = null) return -/// Returns the current [/datum/tgs_version] of TGS if it is running the server, null otherwise. +/// Returns the current [/datum/tgs_version] of TGS if it is running the server, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsVersion() return -/// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. +/// Returns the current [/datum/tgs_version] of the DMAPI being used if it was activated, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsApiVersion() return -/// Returns the name of the TGS instance running the game if TGS is present, null otherwise. +/// Returns the name of the TGS instance running the game if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsInstanceName() return -/// Return the current [/datum/tgs_revision_information] of the running server if TGS is present, null otherwise. +/// Return the current [/datum/tgs_revision_information] of the running server if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsRevision() return -/// Returns the current BYOND security level as a TGS_SECURITY_ define if TGS is present, null otherwise. +/// Returns the current BYOND security level as a TGS_SECURITY_ define if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsSecurityLevel() return -/// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise. +/// Returns a list of active [/datum/tgs_revision_information/test_merge]s if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsTestMerges() return -/// Returns a list of connected [/datum/tgs_chat_channel]s if TGS is present, null otherwise. +/// Returns a list of connected [/datum/tgs_chat_channel]s if TGS is present, null otherwise. This function may sleep if the call to [/world/proc/TgsNew] is sleeping! /world/proc/TgsChatChannelInfo() return /* The MIT License -Copyright (c) 2017 Jordan Brown +Copyright (c) 2017-2023 Jordan Brown Permission is hereby granted, free of charge, to any person obtaining a copy of this software and diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index 98b8b409ae6a..e12ec1079589 100644 --- a/code/__DEFINES/urls.dm +++ b/code/__DEFINES/urls.dm @@ -50,6 +50,7 @@ #define URL_WIKI_MST_GUIDE "https://cm-ss13.com/wiki/Mess_Technician" #define URL_WIKI_CL_GUIDE "https://cm-ss13.com/wiki/Corporate_Liaison" // Misc // #define URL_WIKI_SURV_GUIDE "https://cm-ss13.com/wiki/Survivor" +#define URL_WIKI_WJ_GUIDE "https://cm-ss13.com/wiki/Seegson_Working_Joe_Manual" // ------ FORUM LINKS ------ // #define URL_FORUM "https://forum.cm-ss13.com/" diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm index 1011bad11a58..04ee5ffef2b6 100644 --- a/code/__DEFINES/vendors.dm +++ b/code/__DEFINES/vendors.dm @@ -1,30 +1,26 @@ -#define MARINE_CAN_BUY_UNIFORM (1<<0) -#define MARINE_CAN_BUY_SHOES (1<<1) -#define MARINE_CAN_BUY_HELMET (1<<2) -#define MARINE_CAN_BUY_ARMOR (1<<3) -#define MARINE_CAN_BUY_GLOVES (1<<4) -#define MARINE_CAN_BUY_EAR (1<<5) -#define MARINE_CAN_BUY_BACKPACK (1<<6) -#define MARINE_CAN_BUY_R_POUCH (1<<7) -#define MARINE_CAN_BUY_L_POUCH (1<<8) -#define MARINE_CAN_BUY_BELT (1<<9) -#define MARINE_CAN_BUY_GLASSES (1<<10) -#define MARINE_CAN_BUY_MASK (1<<11) -#define MARINE_CAN_BUY_ESSENTIALS (1<<12) -#define MARINE_CAN_BUY_SECONDARY (1<<13) -#define MARINE_CAN_BUY_ATTACHMENT (1<<14) -#define MARINE_CAN_BUY_MRE (1<<15) -#define MARINE_CAN_BUY_ACCESSORY (1<<16) +#define MARINE_CAN_BUY_UNIFORM "uniform" +#define MARINE_CAN_BUY_SHOES "shoes" +#define MARINE_CAN_BUY_HELMET "helmet" +#define MARINE_CAN_BUY_ARMOR "armor" +#define MARINE_CAN_BUY_GLOVES "gloves" +#define MARINE_CAN_BUY_EAR "ear" +#define MARINE_CAN_BUY_BACKPACK "backpack" +#define MARINE_CAN_BUY_POUCH "pouch" +#define MARINE_CAN_BUY_BELT "belt" +#define MARINE_CAN_BUY_GLASSES "glasses" +#define MARINE_CAN_BUY_MASK "mask" +#define MARINE_CAN_BUY_ESSENTIALS "essentials" +#define MARINE_CAN_BUY_SECONDARY "secondary" +#define MARINE_CAN_BUY_ATTACHMENT "attachment" +#define MARINE_CAN_BUY_MRE "mre" +#define MARINE_CAN_BUY_ACCESSORY "accessory" +#define MARINE_CAN_BUY_COMBAT_SHOES "combat_shoes" +#define MARINE_CAN_BUY_COMBAT_HELMET "combat_helmet" +#define MARINE_CAN_BUY_COMBAT_ARMOR "combat_armor" +#define MARINE_CAN_BUY_KIT "kit" +#define MARINE_CAN_BUY_DRESS "dress" -#define MARINE_CAN_BUY_COMBAT_SHOES (1<<17) -#define MARINE_CAN_BUY_COMBAT_HELMET (1<<18) -#define MARINE_CAN_BUY_COMBAT_ARMOR (1<<19) -#define MARINE_CAN_BUY_COMBAT_R_POUCH (1<<20) -#define MARINE_CAN_BUY_COMBAT_L_POUCH (1<<21) - -#define MARINE_CAN_BUY_KIT (1<<22) - -#define MARINE_CAN_BUY_ALL ((1<<23) - 1) +#define MARINE_CAN_BUY_ALL list(MARINE_CAN_BUY_UNIFORM = 1, MARINE_CAN_BUY_SHOES = 1, MARINE_CAN_BUY_HELMET = 1, MARINE_CAN_BUY_ARMOR = 1, MARINE_CAN_BUY_GLOVES = 1, MARINE_CAN_BUY_EAR = 1, MARINE_CAN_BUY_BACKPACK = 1, MARINE_CAN_BUY_POUCH = 2, MARINE_CAN_BUY_BELT = 1, MARINE_CAN_BUY_GLASSES = 1, MARINE_CAN_BUY_MASK = 1, MARINE_CAN_BUY_ESSENTIALS = 1, MARINE_CAN_BUY_SECONDARY = 1, MARINE_CAN_BUY_ATTACHMENT = 1, MARINE_CAN_BUY_MRE = 1, MARINE_CAN_BUY_ACCESSORY = 1, MARINE_CAN_BUY_COMBAT_SHOES = 1, MARINE_CAN_BUY_COMBAT_HELMET = 1, MARINE_CAN_BUY_COMBAT_ARMOR = 1, MARINE_CAN_BUY_KIT = 1, MARINE_CAN_BUY_DRESS = 99) #define MARINE_TOTAL_BUY_POINTS 45 #define MARINE_TOTAL_SNOWFLAKE_POINTS 120 diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index 6d6bd64ea918..7741beecedef 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -154,6 +154,22 @@ #define WEED_BASE_GROW_SPEED (5 SECONDS) #define WEED_BASE_DECAY_SPEED (10 SECONDS) +/// The time you must be dead to join as a xeno larva +#define XENO_JOIN_DEAD_LARVA_TIME (2.5 MINUTES) +/// The time you must be dead to join as xeno (not larva) +#define XENO_JOIN_DEAD_TIME (5 MINUTES) +/// The time of inactivity you cannot exceed to join as a xeno +#define XENO_JOIN_AFK_TIME_LIMIT (5 MINUTES) +/// The amount of time after round start before buried larva spawns are disallowed +#define XENO_BURIED_LARVA_TIME_LIMIT (30 MINUTES) + +/// The time against away_timer when an AFK xeno larva can be replaced +#define XENO_LEAVE_TIMER_LARVA 80 //80 seconds +/// The time against away_timer when an AFK xeno (not larva) can be replaced +#define XENO_LEAVE_TIMER 300 //300 seconds +/// The time against away_timer when an AFK xeno gets listed in the available list so ghosts can get ready +#define XENO_AVAILABLE_TIMER 60 //60 seconds + /// Between 2% to 10% of explosion severity #define WEED_EXPLOSION_DAMAGEMULT rand(2, 10)*0.01 diff --git a/code/__HELPERS/_time.dm b/code/__HELPERS/_time.dm index 85acafa0e2f6..b929ae8636b3 100644 --- a/code/__HELPERS/_time.dm +++ b/code/__HELPERS/_time.dm @@ -15,10 +15,6 @@ #define DECISECONDS_TO_HOURS /36000 -#define XENO_LEAVE_TIMER_LARVA 80 //80 seconds -#define XENO_LEAVE_TIMER 300 //300 seconds -#define XENO_AVAILABLE_TIMER 60 //60 seconds, when to add a xeno to the avaliable list so ghosts can get ready - var/midnight_rollovers = 0 var/rollovercheck_last_timeofday = 0 diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index 4ca0edcf43d0..888e3c2ce657 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -57,3 +57,12 @@ var/atom/cmp_dist_origin=null /proc/cmp_typepaths_asc(A, B) return sorttext("[B]","[A]") + +/// Compares mobs based on their timeofdeath value in ascending order +/proc/cmp_mob_deathtime_asc(mob/A, mob/B) + return A.timeofdeath - B.timeofdeath + +/// Compares observers based on their larva_queue_time value in ascending order +/// Assumes the client on the observer is not null +/proc/cmp_obs_larvaqueuetime_asc(mob/dead/observer/A, mob/dead/observer/B) + return A.client.larva_queue_time - B.client.larva_queue_time diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 717a2ed5347b..f88fe7168f8d 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -12,11 +12,6 @@ return text -//Sends resource files to client cache -/client/proc/getFiles() - for(var/file in args) - src << browse_rsc(file) - /client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list(".txt",".log",".htm")) var/path = root diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index a0bb9dd98423..61976f4dc903 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -241,35 +241,70 @@ else return get_step(start, EAST) -// Same as above but for alien candidates. -/proc/get_alien_candidates() +/// Get a list of observers that can be alien candidates, optionally sorted by larva_queue_time +/proc/get_alien_candidates(sorted = TRUE) var/list/candidates = list() - for(var/i in GLOB.observer_list) - var/mob/dead/observer/O = i + for(var/mob/dead/observer/cur_obs as anything in GLOB.observer_list) + // Preference check + if(!cur_obs.client || !cur_obs.client.prefs || !(cur_obs.client.prefs.be_special & BE_ALIEN_AFTER_DEATH)) + continue + // Jobban check - if(!O.client || !O.client.prefs || !(O.client.prefs.be_special & BE_ALIEN_AFTER_DEATH) || jobban_isbanned(O, JOB_XENOMORPH)) + if(jobban_isbanned(cur_obs, JOB_XENOMORPH)) continue //players that can still be revived are skipped - if(O.mind && O.mind.original && ishuman(O.mind.original)) - var/mob/living/carbon/human/H = O.mind.original - if (H.check_tod() && H.is_revivable()) + if(cur_obs.mind && cur_obs.mind.original && ishuman(cur_obs.mind.original)) + var/mob/living/carbon/human/cur_human = cur_obs.mind.original + if(cur_human.check_tod() && cur_human.is_revivable()) continue // copied from join as xeno - var/deathtime = world.time - O.timeofdeath - if(deathtime < 3000 && ( !O.client.admin_holder || !(O.client.admin_holder.rights & R_ADMIN)) ) + var/deathtime = world.time - cur_obs.timeofdeath + if(deathtime < XENO_JOIN_DEAD_TIME && ( !cur_obs.client.admin_holder || !(cur_obs.client.admin_holder.rights & R_ADMIN)) ) continue - // Admins and AFK players cannot be drafted - if(O.client.inactivity / 600 > ALIEN_SELECT_AFK_BUFFER + 5 || (O.client.admin_holder && (O.client.admin_holder.rights & R_MOD)) && O.adminlarva == 0) + // AFK players cannot be drafted + if(cur_obs.client.inactivity > XENO_JOIN_AFK_TIME_LIMIT) continue - candidates += O + // Mods with larva protection cannot be drafted + if((cur_obs.client.admin_holder && (cur_obs.client.admin_holder.rights & R_MOD)) && !cur_obs.adminlarva) + continue + + candidates += cur_obs + + // Optionally sort by larva_queue_time + if(sorted && length(candidates)) + candidates = sort_list(candidates, GLOBAL_PROC_REF(cmp_obs_larvaqueuetime_asc)) return candidates +/** + * Messages observers that are currently candidates an update on the queue. + * + * Arguments: + * * candidates - The list of observers from get_alien_candidates() + * * dequeued - How many candidates to skip messaging because they were dequeued + * * cache_only - Whether to not actually send a to_chat message and instead only update larva_queue_cached_message + */ +/proc/message_alien_candidates(list/candidates, dequeued, cache_only = FALSE) + var/new_players = 0 + for(var/i in (1 + dequeued) to candidates.len) + var/mob/dead/observer/cur_obs = candidates[i] + + // Generate the messages + var/cached_message = SPAN_XENONOTICE("You are currently [i-dequeued]\th in the larva queue. There are [new_players] ahead of you that have yet to play this round.") + cur_obs.larva_queue_cached_message = cached_message + if(!cache_only) + var/chat_message = dequeued ? replacetext(cached_message, "currently", "now") : cached_message + to_chat(candidates[i], chat_message) + + // Count how many are prioritized + if(cur_obs.client.larva_queue_time < 2) // 0 and 1 because facehuggers/t-domers are slightly deprioritized + new_players++ + /proc/convert_k2c(temp) return ((temp - T0C)) diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 7d16e437087b..121d1e305e43 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -328,6 +328,7 @@ DEFINE_BITFIELD(flags_area, list( "AREA_NOTUNNEL" = AREA_NOTUNNEL, "AREA_ALLOW_XENO_JOIN" = AREA_ALLOW_XENO_JOIN, "AREA_CONTAINMENT" = AREA_CONTAINMENT, + "ARES_UNWEEDABLE" = AREA_UNWEEDABLE, )) DEFINE_BITFIELD(disabilities, list( diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 12776aebc46b..f0279907f635 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -197,6 +197,9 @@ GLOBAL_REFERENCE_LIST_INDEXED(yautja_hair_styles_list, /datum/sprite_accessory/y //Backpacks var/global/list/backbaglist = list("Backpack", "Satchel") + //Armor styles +GLOBAL_LIST_INIT(armor_style_list, list("Padded" = 1, "Padless" = 2, "Ridged" = 3, "Carrier" = 4, "Skull" = 5, "Smooth" = 6, "Random")) + // var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg) var/global/round_should_check_for_win = TRUE diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 187f179094b2..e2203aadce0c 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -23,6 +23,7 @@ GLOBAL_LIST_EMPTY_TYPED(alive_human_list, /mob/living/carbon/human) // list of a GLOBAL_LIST_EMPTY_TYPED(xeno_mob_list, /mob/living/carbon/xenomorph) GLOBAL_LIST_EMPTY_TYPED(living_xeno_list, /mob/living/carbon/xenomorph) GLOBAL_LIST_EMPTY_TYPED(xeno_cultists, /mob/living/carbon/human) +GLOBAL_LIST_EMPTY_TYPED(player_embryo_list, /obj/item/alien_embryo) GLOBAL_LIST_EMPTY_TYPED(hellhound_list, /mob/living/carbon/xenomorph/hellhound) GLOBAL_LIST_EMPTY_TYPED(zombie_list, /mob/living/carbon/human) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index f24804b22f42..affbc28cdd45 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -71,7 +71,9 @@ return // Click handled elsewhere. (These clicks are not affected by the next_move cooldown) - if (click(A, mods) | A.clicked(src, mods, location, params)) + if(click(A, mods)) + return + if(A.clicked(src, mods, location, params)) return // Default click functions from here on. @@ -80,7 +82,8 @@ return face_atom(A) - + if(mods["middle"]) + return // Special type of click. if (is_mob_restrained()) RestrainedClickOn(A) @@ -328,9 +331,29 @@ apply_clickcatcher() mob.reload_fullscreens() - if(prefs.auto_fit_viewport) + if(prefs.adaptive_zoom) + INVOKE_ASYNC(src, PROC_REF(adaptive_zoom)) + else if(prefs.auto_fit_viewport) INVOKE_ASYNC(src, .verb/fit_viewport) +/client/proc/get_adaptive_zoom_factor() + if(!prefs.adaptive_zoom) + return 0 + var/zoom = prefs.adaptive_zoom + if(view <= 8) + return zoom * 2 + else if(view <= 15) + return zoom * 1 + else + return 0 + +/// Attempts to scale client zoom automatically to fill 1080p multiples. Best used with auto fit viewport. +/client/proc/adaptive_zoom() + var/icon_size = world.icon_size * get_adaptive_zoom_factor() + winset(src, "mapwindow.map", "icon-size=[icon_size]") + if(prefs.auto_fit_viewport) + fit_viewport() + /client/proc/create_clickcatcher() if(!void) void = new() diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm index 9e6ff21aac18..d29228f4c16e 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/plane_master.dm @@ -56,6 +56,13 @@ blend_mode = BLEND_OVERLAY render_relay_plane = RENDER_PLANE_NON_GAME +/// Plane master handling display of building roofs. They're meant to become invisible when inside a building. +/atom/movable/screen/plane_master/roof + name = "roof plane master" + plane = ROOF_PLANE + appearance_flags = PLANE_MASTER + blend_mode = BLEND_OVERLAY + /** * Plane master handling byond internal blackness * vars are set as to replicate behavior when rendering to other planes diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 0366486ff995..9643d0f652ae 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -518,7 +518,7 @@ name = "queen locator" icon = 'icons/mob/hud/alien_standard.dmi' icon_state = "trackoff" - var/track_state = TRACKER_QUEEN + var/list/track_state = list(TRACKER_QUEEN, 0) /atom/movable/screen/queen_locator/clicked(mob/living/carbon/xenomorph/user, mods) if(!istype(user)) @@ -533,15 +533,23 @@ if(mods["alt"]) var/list/options = list() if(user.hive.living_xeno_queen) - options["Queen"] = TRACKER_QUEEN + options["Queen"] = list(TRACKER_QUEEN, 0) + if(user.hive.hive_location) - options["Hive Core"] = TRACKER_HIVE + options["Hive Core"] = list(TRACKER_HIVE, 0) + var/xeno_leader_index = 1 for(var/xeno in user.hive.xeno_leader_list) var/mob/living/carbon/xenomorph/xeno_lead = user.hive.xeno_leader_list[xeno_leader_index] if(xeno_lead) - options["Xeno Leader [xeno_lead]"] = "[xeno_leader_index]" + options["Xeno Leader [xeno_lead]"] = list(TRACKER_LEADER, xeno_leader_index) xeno_leader_index++ + + var/tunnel_index = 1 + for(var/obj/structure/tunnel/tracked_tunnel in user.hive.tunnels) + options["Tunnel [tracked_tunnel.tunnel_desc]"] = list(TRACKER_TUNNEL, tunnel_index) + tunnel_index++ + var/selected = tgui_input_list(user, "Select what you want the locator to track.", "Locator Options", options) if(selected) track_state = options[selected] diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index ce942c81aa52..5acfe74f2965 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -10,72 +10,73 @@ else to_chat(src, SPAN_NOTICE(" You will no longer examine things you click on.")) -/mob/dead/observer/click(atom/A, list/mods) +/mob/dead/observer/click(atom/target, list/mods) if(..()) - return 1 + return TRUE if (mods["shift"] && mods["middle"]) - point_to(A) + point_to(target) return TRUE if(mods["ctrl"]) - if(A == src) + if(target == src) if(!can_reenter_corpse || !mind || !mind.current) return if(alert(src, "Are you sure you want to re-enter your corpse?", "Confirm", "Yes", "No") == "Yes") reenter_corpse() return TRUE - if(ismob(A) || isVehicle(A)) - if(isxeno(A) && SSticker.mode.check_xeno_late_join(src)) //if it's a xeno and all checks are alright, we are gonna try to take their body - var/mob/living/carbon/xenomorph/X = A - if(X.stat == DEAD || is_admin_level(X.z) || X.aghosted) - to_chat(src, SPAN_WARNING("You cannot join as [X].")) - ManualFollow(X) - return + if(ismob(target) || isVehicle(target)) + if(isxeno(target) && SSticker.mode.check_xeno_late_join(src)) //if it's a xeno and all checks are alright, we are gonna try to take their body + var/mob/living/carbon/xenomorph/xeno = target + if(xeno.stat == DEAD || is_admin_level(xeno.z) || xeno.aghosted) + to_chat(src, SPAN_WARNING("You cannot join as [xeno].")) + ManualFollow(xeno) + return FALSE if(!SSticker.mode.xeno_bypass_timer) - if((!islarva(X) && X.away_timer < XENO_LEAVE_TIMER) || (islarva(X) && X.away_timer < XENO_LEAVE_TIMER_LARVA)) - var/to_wait = XENO_LEAVE_TIMER - X.away_timer - if(islarva(X)) - to_wait = XENO_LEAVE_TIMER_LARVA - X.away_timer + if((!islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER) || (islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER_LARVA)) + var/to_wait = XENO_LEAVE_TIMER - xeno.away_timer + if(islarva(xeno)) + to_wait = XENO_LEAVE_TIMER_LARVA - xeno.away_timer if(to_wait > 60 SECONDS) // don't spam for clearly non-AFK xenos to_chat(src, SPAN_WARNING("That player hasn't been away long enough. Please wait [to_wait] second\s longer.")) - ManualFollow(A) + ManualFollow(target) return FALSE var/deathtime = world.time - timeofdeath - if(deathtime < 2.5 MINUTES) + if(deathtime < XENO_JOIN_DEAD_LARVA_TIME) var/message = "You have been dead for [DisplayTimeText(deathtime)]." message = SPAN_WARNING("[message]") to_chat(src, message) - to_chat(src, SPAN_WARNING("You must wait 2.5 minutes before rejoining the game!")) - ManualFollow(A) + to_chat(src, SPAN_WARNING("You must wait atleast 2.5 minutes before rejoining the game!")) + ManualFollow(target) return FALSE - if(alert(src, "Are you sure you want to transfer yourself into [X]?", "Confirm Transfer", "Yes", "No") != "Yes") + if(alert(src, "Are you sure you want to transfer yourself into [xeno]?", "Confirm Transfer", "Yes", "No") != "Yes") return FALSE - if(((!islarva(X) && X.away_timer < XENO_LEAVE_TIMER) || (islarva(X) && X.away_timer < XENO_LEAVE_TIMER_LARVA)) || X.stat == DEAD) // Do it again, just in case + if(((!islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER) || (islarva(xeno) && xeno.away_timer < XENO_LEAVE_TIMER_LARVA)) || xeno.stat == DEAD) // Do it again, just in case to_chat(src, SPAN_WARNING("That xenomorph can no longer be controlled. Please try another.")) return FALSE - SSticker.mode.transfer_xeno(src, X) + SSticker.mode.transfer_xeno(src, xeno) return TRUE - ManualFollow(A) + ManualFollow(target) return TRUE - following = null - abstract_move(get_turf(A)) - return 1 + if(!istype(target, /atom/movable/screen)) + following = null + abstract_move(get_turf(target)) + return TRUE if(world.time <= next_move) - return 1 + return TRUE next_move = world.time + 8 // You are responsible for checking config.ghost_interaction when you override this function // Not all of them require checking, see below if(!mods["shift"]) - A.attack_ghost(src) - return 1 + target.attack_ghost(src) + return FALSE // Oh by the way this didn't work with old click code which is why clicking shit didn't spam you /atom/proc/attack_ghost(mob/dead/observer/user) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index c53d58185753..9c9784286d09 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -12,9 +12,10 @@ if (isStructure(A) && get_dist(src, A) <= 1) var/obj/structure/S = A S.do_climb(src, mods) + return TRUE else if(!(isitem(A) && get_dist(src, A) <= 1) && client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_SWAP_HANDS) swap_hand() - return TRUE + return TRUE return ..() @@ -33,4 +34,4 @@ Have no reason to click on anything at all. */ /mob/new_player/click() - return 1 + return diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm index 54e18349b13d..62d612790930 100644 --- a/code/_onclick/xeno.dm +++ b/code/_onclick/xeno.dm @@ -99,43 +99,35 @@ so that it doesn't double up on the delays) so that it applies the delay immedia /atom/proc/attack_alien(mob/user as mob) return -/mob/living/carbon/xenomorph/click(atom/A, list/mods) - if (queued_action) - handle_queued_action(A) +/mob/living/carbon/xenomorph/click(atom/target, list/mods) + if(queued_action) + handle_queued_action(target) return TRUE - if (mods["alt"] && mods["shift"]) - if (istype(A, /mob/living/carbon/xenomorph)) - var/mob/living/carbon/xenomorph/X = A - - if (X && !QDELETED(X) && X != observed_xeno && X.stat != DEAD && !is_admin_level(X.z) && X.check_state(1) && X.hivenumber == hivenumber) - if (caste && istype(caste, /datum/caste_datum/queen)) - var/mob/living/carbon/xenomorph/oldXeno = observed_xeno - overwatch(X, FALSE) - - if (oldXeno) - oldXeno.hud_set_queen_overwatch() - if (X && !QDELETED(X)) - X.hud_set_queen_overwatch() - - else - overwatch(X) + var/alt_pressed = mods["alt"] == "1" + var/shift_pressed = mods["shift"] == "1" + var/middle_pressed = mods["middle"] == "1" + if(alt_pressed && shift_pressed) + if(istype(target, /mob/living/carbon/xenomorph)) + var/mob/living/carbon/xenomorph/xeno = target + if(!QDELETED(xeno) && xeno.stat != DEAD && !is_admin_level(xeno.z) && xeno.check_state(TRUE) && xeno.hivenumber == hivenumber) + overwatch(xeno) next_move = world.time + 3 // Some minimal delay so this isn't crazy spammy - return 1 - - if(mods["shift"] && !mods["middle"]) - if(selected_ability && client && client.prefs && !(client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK)) - selected_ability.use_ability_wrapper(A, mods) - return TRUE - - if(mods["middle"] && !mods["shift"]) - if(selected_ability && client && client.prefs && client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK) - selected_ability.use_ability_wrapper(A, mods) + return TRUE + + var/middle_pref = client.prefs && (client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK) != 0 // client is already tested to be non-null by caller + if(selected_ability && shift_pressed == !middle_pref && middle_pressed == middle_pref) + if(istype(target, /atom/movable/screen)) + // Click through the UI: Currently this won't attempt to sprite click any mob there, just the turf + var/turf/turf = params2turf(mods["screen-loc"], get_turf(client.eye), client) + if(turf) + target = turf + if(selected_ability.use_ability_wrapper(target, mods)) return TRUE if(next_move >= world.time) - return TRUE + return FALSE return ..() diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index ba3f0b2609b6..29dd0a88d3e0 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -263,7 +263,7 @@ Voting // Gamemode to auto-switch to at the start of the round /datum/config_entry/string/gamemode_default - config_entry_value = "extended" + config_entry_value = "Extended" // Rounds needed for gamemode vote /datum/config_entry/number/gamemode_rounds_needed diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm index 283fe79cfead..38e57df93cef 100644 --- a/code/controllers/subsystem/assets.dm +++ b/code/controllers/subsystem/assets.dm @@ -7,6 +7,20 @@ SUBSYSTEM_DEF(assets) var/list/preload = list() var/datum/asset_transport/transport = new() +/datum/controller/subsystem/assets/OnConfigLoad() + var/newtransporttype = /datum/asset_transport + switch (CONFIG_GET(string/asset_transport)) + if ("webroot") + newtransporttype = /datum/asset_transport/webroot + + if (newtransporttype == transport.type) + return + + var/datum/asset_transport/newtransport = new newtransporttype () + if (newtransport.validate_config()) + transport = newtransport + transport.Load() + /datum/controller/subsystem/assets/Initialize() for(var/type in typesof(/datum/asset)) var/datum/asset/A = type diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 1fbc92f73d84..a98eaa0f7876 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -216,6 +216,7 @@ var/const/RADIO_DEFAULT = "radio_default" var/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms var/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in receiving signals from air alarms var/const/RADIO_CHAT = "radio_telecoms" +var/const/RADIO_SIGNALS = "radio_signals" var/const/RADIO_ATMOSIA = "radio_atmos" var/const/RADIO_NAVBEACONS = "radio_navbeacon" var/const/RADIO_AIRLOCK = "radio_airlock" @@ -368,6 +369,9 @@ SUBSYSTEM_DEF(radio) for(var/datum/weakref/device_ref as anything in devices[filter]) var/obj/device = device_ref.resolve() + if(!device) + continue + if(device == source) continue @@ -400,12 +404,9 @@ SUBSYSTEM_DEF(radio) /datum/radio_frequency/proc/remove_listener(obj/device) for (var/devices_filter in devices) var/list/devices_line = devices[devices_filter] - devices_line -= WEAKREF(device) - while (null in devices_line) - devices_line -= null - if (devices_line.len==0) + devices_line -= device.weak_reference + if (!length(devices_line)) devices -= devices_filter - qdel(devices_line) /datum/signal var/obj/source diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index e958740c43ce..e94d6b1aff1d 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -278,7 +278,7 @@ SUBSYSTEM_DEF(garbage) #endif var/static/uid = 0 - uid = WRAP(uid+1, 1, (2**24)-1) + uid = WRAP(uid+1, 1, SHORT_REAL_LIMIT - 1) if (D.gc_destroyed <= 0) D.gc_destroyed = uid diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index b05863b418b7..ed6e3cda15f5 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -85,7 +85,7 @@ SUBSYSTEM_DEF(mapping) z_list = SSmapping.z_list #define INIT_ANNOUNCE(X) to_chat(world, "[X]"); log_world(X) -/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) +/datum/controller/subsystem/mapping/proc/LoadGroup(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/") . = list() var/start_time = REALTIMEOFDAY @@ -96,7 +96,7 @@ SUBSYSTEM_DEF(mapping) var/total_z = 0 var/list/parsed_maps = list() for (var/file in files) - var/full_path = "maps/[path]/[file]" + var/full_path = "[override_map_path]/[path]/[file]" var/datum/parsed_map/pm = new(file(full_path)) var/bounds = pm?.bounds if (!bounds) @@ -131,11 +131,11 @@ SUBSYSTEM_DEF(mapping) INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!") return parsed_maps -/datum/controller/subsystem/mapping/proc/Loadship(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) - LoadGroup(errorList, name, path, files, traits, default_traits, silent) +/datum/controller/subsystem/mapping/proc/Loadship(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/") + LoadGroup(errorList, name, path, files, traits, default_traits, silent, override_map_path = override_map_path) -/datum/controller/subsystem/mapping/proc/Loadground(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE) - LoadGroup(errorList, name, path, files, traits, default_traits, silent) +/datum/controller/subsystem/mapping/proc/Loadground(list/errorList, name, path, files, list/traits, list/default_traits, silent = FALSE, override_map_path = "maps/") + LoadGroup(errorList, name, path, files, traits, default_traits, silent, override_map_path = override_map_path) /datum/controller/subsystem/mapping/proc/loadWorld() //if any of these fail, something has gone horribly, HORRIBLY, wrong @@ -149,12 +149,18 @@ SUBSYSTEM_DEF(mapping) var/datum/map_config/ground_map = configs[GROUND_MAP] INIT_ANNOUNCE("Loading [ground_map.map_name]...") - Loadground(FailedZs, ground_map.map_name, ground_map.map_path, ground_map.map_file, ground_map.traits, ZTRAITS_GROUND) + var/ground_base_path = "maps/" + if(ground_map.override_map) + ground_base_path = "data/" + Loadground(FailedZs, ground_map.map_name, ground_map.map_path, ground_map.map_file, ground_map.traits, ZTRAITS_GROUND, override_map_path = ground_base_path) if(!ground_map.disable_ship_map) var/datum/map_config/ship_map = configs[SHIP_MAP] + var/ship_base_path = "maps/" + if(ship_map.override_map) + ship_base_path = "data/" INIT_ANNOUNCE("Loading [ship_map.map_name]...") - Loadship(FailedZs, ship_map.map_name, ship_map.map_path, ship_map.map_file, ship_map.traits, ZTRAITS_MAIN_SHIP) + Loadship(FailedZs, ship_map.map_name, ship_map.map_path, ship_map.map_file, ship_map.traits, ZTRAITS_MAIN_SHIP, override_map_path = ship_base_path) if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen var/msg = "RED ALERT! The following map files failed to load: [FailedZs[1]]" diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 58910c45af75..0e23b99a9cc2 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -424,7 +424,7 @@ SUBSYSTEM_DEF(ticker) for(var/mob/living/carbon/human/player in GLOB.human_mob_list) if(player.mind) - if(player.job == "Commanding Officers") + if(player.job == JOB_CO) captainless = FALSE if(player.job) RoleAuthority.equip_role(player, RoleAuthority.roles_by_name[player.job], late_join = FALSE) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 312a133f8724..b60b20bc9026 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -305,8 +305,14 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) S.fields["criminal"] = "None" S.fields["incident"] = "" S.fields["ref"] = WEAKREF(H) + + if(H.sec_record && !jobban_isbanned(H, "Records")) + var/new_comment = list("entry" = H.sec_record, "created_by" = list("name" = "\[REDACTED\]", "rank" = "Military Police"), "deleted_by" = null, "deleted_at" = null, "created_at" = "Pre-Deployment") + S.fields["comments"] = list("1" = new_comment) + S.fields["notes"] = H.sec_record security += S + //Locked Record var/datum/data/record/L = new() L.fields["id"] = md5("[H.real_name][H.job]") diff --git a/code/datums/effects/neurotoxin.dm b/code/datums/effects/neurotoxin.dm index 0405c87bec8b..836fccf49ca3 100644 --- a/code/datums/effects/neurotoxin.dm +++ b/code/datums/effects/neurotoxin.dm @@ -21,9 +21,8 @@ /// Stamina damage per tick. Major balance number. var/stam_dam = 7 -/datum/effects/neurotoxin/New(atom/thing) - ..(thing) - cause_data = create_cause_data("neurotoxic gas") +/datum/effects/neurotoxin/New(atom/thing, mob/from = null) + ..(thing, from, effect_name) /datum/effects/neurotoxin/validate_atom(atom/thing) if(isxeno(thing) || isobj(thing)) @@ -36,9 +35,10 @@ var/mob/living/carbon/affected_mob = affected_atom if(!.) return FALSE - if(affected_mob.stat) + if(affected_mob.stat == DEAD) return // General effects + affected_mob.last_damage_data = cause_data affected_mob.apply_stamina_damage(stam_dam) affected_mob.make_dizzy(12) diff --git a/code/datums/elements/bloody_feet.dm b/code/datums/elements/bloody_feet.dm index 6a5a8a23ac6b..3bcccd8377c6 100644 --- a/code/datums/elements/bloody_feet.dm +++ b/code/datums/elements/bloody_feet.dm @@ -24,12 +24,12 @@ H.bloody_footsteps = steps_to_take LAZYADD(entered_bloody_turf, target) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) - RegisterSignal(target, COMSIG_HUMAN_BLOOD_CROSSED, PROC_REF(blood_crossed)) - RegisterSignal(target, COMSIG_HUMAN_CLEAR_BLOODY_FEET, PROC_REF(clear_blood)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved), override = TRUE) + RegisterSignal(target, COMSIG_HUMAN_BLOOD_CROSSED, PROC_REF(blood_crossed), override = TRUE) + RegisterSignal(target, COMSIG_HUMAN_CLEAR_BLOODY_FEET, PROC_REF(clear_blood), override = TRUE) if(shoes) LAZYSET(target_shoes, target, shoes) - RegisterSignal(shoes, COMSIG_ITEM_DROPPED, PROC_REF(on_shoes_removed)) + RegisterSignal(shoes, COMSIG_ITEM_DROPPED, PROC_REF(on_shoes_removed), override = TRUE) if(dry_time) addtimer(CALLBACK(src, PROC_REF(clear_blood), target), dry_time) diff --git a/code/datums/emergency_calls/big_game_hunter.dm b/code/datums/emergency_calls/big_game_hunter.dm index 16a0b0b5da6a..e749b6654355 100644 --- a/code/datums/emergency_calls/big_game_hunter.dm +++ b/code/datums/emergency_calls/big_game_hunter.dm @@ -10,7 +10,7 @@ /datum/emergency_call/van_bandolier/New() . = ..() - arrival_message = "Incoming Transmission: 'Heard your distress call, [MAIN_SHIP_NAME]. It had best be something which will look good on my wall, eh? Tally ho!'" + arrival_message = "'Heard your distress call, [MAIN_SHIP_NAME]. It had best be something which will look good on my wall, eh? Tally ho!'" /datum/emergency_call/van_bandolier/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() diff --git a/code/datums/emergency_calls/clf.dm b/code/datums/emergency_calls/clf.dm index 75ce93a4f680..0a5f09e2a2f2 100644 --- a/code/datums/emergency_calls/clf.dm +++ b/code/datums/emergency_calls/clf.dm @@ -4,7 +4,7 @@ /datum/emergency_call/clf name = "Colonial Liberation Front (Squad)" mob_max = 10 - arrival_message = "Incoming Transmission: 'Attention, you are tresspassing on our soverign territory. Expect no forgiveness.'" + arrival_message = "'Attention, you are tresspassing on our soverign territory. Expect no forgiveness.'" objectives = "Assault the USCM, and sabotage as much as you can. Ensure any survivors escape in your custody." probability = 20 hostility = TRUE diff --git a/code/datums/emergency_calls/cmb.dm b/code/datums/emergency_calls/cmb.dm index 5cb89756fff1..52da1c967a00 100644 --- a/code/datums/emergency_calls/cmb.dm +++ b/code/datums/emergency_calls/cmb.dm @@ -112,7 +112,7 @@ /datum/emergency_call/cmb/anchorpoint/New() ..() - arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], this is Anchorpoint Station. Be advised, a QRF Team of our Colonial Marines is currently attempting to board you. Open your ports, transmitting docking codes now. Standby." + arrival_message = "[MAIN_SHIP_NAME], this is Anchorpoint Station. Be advised, a QRF Team of our Colonial Marines is currently attempting to board you. Open your ports, transmitting docking codes now. Standby." objectives = "QRF Team. You are here to reinforce the cmb team we deployed earlier. Make contact and work with the CMB Marshal and their deputies. Facilitate their protection and evacuation if necessary. Secondary Objective: Investigate the reason for distress aboard the [MAIN_SHIP_NAME], and assist the crew if possible." /datum/emergency_call/cmb/anchorpoint/create_member(datum/mind/M, turf/override_spawn_loc) @@ -154,7 +154,7 @@ to_chat(M, SPAN_BOLD("You are the Anchorpoint QRF Fireteam Leader, originally from [pick(70;"The United Americas", 20;"Sol", 10;"a colony on the frontier")].")) to_chat(M, SPAN_BOLD("You've served on The Station for [pick(50; "a Sol year, and a tour of duty", 40;"a couple months", 10;"six years, three tours")].")) to_chat(M, SPAN_BOLD("Living, training and working alongside Colonial Marshals at Anchorpoint Station has kept you well disciplined, and you've always felt proud to be the cavalry.")) - to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the USS Almayer, and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) + to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the [MAIN_SHIP_NAME], and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) to_chat(M, SPAN_BOLD("Working on conjunction with the Colonial Marshals on many incidents has created a comradery between your organizations. The Marshals handle investigations and policing, while you come in to get the job done during riots or incursions. Any job where heavy lifting was required, you were there.")) to_chat(M, SPAN_BOLD("You were activated as a part of a Quick Reaction Force to reinforce Colonial Marshals in distress.")) to_chat(M, SPAN_BOLD("You weren't sure if it was a false alarm or not. Turns out it isn't...")) @@ -163,7 +163,7 @@ to_chat(M, SPAN_BOLD("You are the Anchorpoint QRF Team Smartgunner, originally from [pick(70;"The United Americas", 20;"Sol", 10;"a colony on the frontier")].")) to_chat(M, SPAN_BOLD("You've served on The Station for [pick(45; "a Sol year, and a tour of duty", 20;"a couple months", 5;"six long years, three consecutive tours")].")) to_chat(M, SPAN_BOLD("Living, training and working alongside Colonial Marshals at Anchorpoint Station has kept you well disciplined, and you've always felt proud to be the cavalry.")) - to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the USS Almayer, and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) + to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the [MAIN_SHIP_NAME], and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) to_chat(M, SPAN_BOLD("Working on conjunction with the Colonial Marshals on many incidents has created a comradery between your organizations. The Marshals handle investigations and policing, while you come in to get the job done during riots or incursions. Any job where heavy lifting was required, you were there.")) to_chat(M, SPAN_BOLD("You were activated as a part of a Quick Reaction Force to reinforce Colonial Marshals in distress.")) to_chat(M, SPAN_BOLD("You weren't sure if it was a false alarm or not. Turns out it isn't... But you've been waiting for an excuse to let loose that M56.")) @@ -172,7 +172,7 @@ to_chat(M, SPAN_BOLD("You are the Anchorpoint QRF Team Corpsman, originally from [pick(70;"The United Americas", 20;"Sol", 10;"a colony on the frontier")].")) to_chat(M, SPAN_BOLD("You've served on The Station for [pick(45; "a Sol year, and a tour of duty", 20;"a couple months", 5;"six long years, three consecutive tours")].")) to_chat(M, SPAN_BOLD("Living, training and working alongside Colonial Marshals at Anchorpoint Station has kept you well disciplined, and you've always felt proud to be the cavalry.")) - to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the USS Almayer, and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) + to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the [MAIN_SHIP_NAME], and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) to_chat(M, SPAN_BOLD("Working on conjunction with the Colonial Marshals on many incidents has created a comradery between your organizations. The Marshals handle investigations and policing, while you come in to get the job done during riots or incursions. Any job where heavy lifting was required, you were there.")) to_chat(M, SPAN_BOLD("You were activated as a part of a Quick Reaction Force to reinforce Colonial Marshals in distress.")) to_chat(M, SPAN_BOLD("You weren't sure if it was a false alarm or not. Turns out it isn't...")) @@ -181,7 +181,7 @@ to_chat(M, SPAN_BOLD("You are the Anchorpoint QRF Team Technical Specialist, originally from [pick(70;"The United Americas", 20;"Sol", 10;"a colony on the frontier")].")) to_chat(M, SPAN_BOLD("You've served on The Station for [pick(45; "a Sol year, and a tour of duty", 20;"a couple months", 5;"six long years, three consecutive tours")].")) to_chat(M, SPAN_BOLD("Living, training and working alongside Colonial Marshals at Anchorpoint Station has kept you well disciplined, and you've always felt proud to be the cavalry.")) - to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the USS Almayer, and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) + to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the [MAIN_SHIP_NAME], and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) to_chat(M, SPAN_BOLD("Working on conjunction with the Colonial Marshals on many incidents has created a comradery between your organizations. The Marshals handle investigations and policing, while you come in to get the job done during riots or incursions. Any job where heavy lifting was required, you were there.")) to_chat(M, SPAN_BOLD("You were activated as a part of a Quick Reaction Force to reinforce Colonial Marshals in distress.")) to_chat(M, SPAN_BOLD("You weren't sure if it was a false alarm or not. Turns out it isn't...")) @@ -190,7 +190,7 @@ to_chat(M, SPAN_BOLD("You are a Rifleman of the Anchorpoint Team QRF, originally from [pick(70;"The United Americas", 20;"Sol", 10;"a colony on the frontier")].")) to_chat(M, SPAN_BOLD("You've served on The Station for [pick(45; "a Sol year, and a tour of duty", 20;"a couple months", 5;"six long years, three consecutive tours")].")) to_chat(M, SPAN_BOLD("Living, training and working alongside Colonial Marshals at Anchorpoint Station has kept you well disciplined, and you've always felt proud to be the cavalry.")) - to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the USS Almayer, and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) + to_chat(M, SPAN_BOLD("During your time at Anchorpoint, you [pick(20; "had your life saved by a Colonial Marshal", 20;"quelled a corporate riot", 10; "defended the station against a UPP incursion", 10;"experienced a pathogenic outbreak", 10;"assisted the Colonial Marshals during an enacted martial law", 10;"were deployed to the [MAIN_SHIP_NAME], and understand its layout", 10;"assisted the Colonial Marshals with barricaded fugitive situation", 5;"helped the ICC take down a suspected smuggling ring", 5;"helped take down a human trafficking scheme alongside the Colonial Marshals" )].")) to_chat(M, SPAN_BOLD("Working on conjunction with the Colonial Marshals on many incidents has created a comradery between your organizations. The Marshals handle investigations and policing, while you come in to get the job done during riots or incursions. Any job where heavy lifting was required, you were there.")) to_chat(M, SPAN_BOLD("You were activated as a part of a Quick Reaction Force to reinforce Colonial Marshals in distress.")) to_chat(M, SPAN_BOLD("You weren't sure if it was a false alarm or not. Turns out it isn't...")) diff --git a/code/datums/emergency_calls/colonist.dm b/code/datums/emergency_calls/colonist.dm index 7430cf6c6bc5..8b39ca12a01e 100644 --- a/code/datums/emergency_calls/colonist.dm +++ b/code/datums/emergency_calls/colonist.dm @@ -5,7 +5,7 @@ name = "Colonists" mob_max = 8 mob_min = 1 - arrival_message = "Incoming Transmission: 'This is the *static*. We are *static*.'" + arrival_message = "'This is the *static*. We are *static*.'" objectives = "Follow the orders given to you." probability = 0 var/preset = /datum/equipment_preset/colonist diff --git a/code/datums/emergency_calls/deathsquad.dm b/code/datums/emergency_calls/deathsquad.dm index 10d1e7e12c35..0bfab8fbf2b7 100644 --- a/code/datums/emergency_calls/deathsquad.dm +++ b/code/datums/emergency_calls/deathsquad.dm @@ -6,7 +6,7 @@ name = "Weyland Whiteout Operators" mob_max = 8 mob_min = 5 - arrival_message = "Intercepted Transmission: '!`2*%slau#*jer t*h$em a!l%. le&*ve n(o^ w&*nes%6es.*v$e %#d ou^'" + arrival_message = "'!`2*%slau#*jer t*h$em a!l%. le&*ve n(o^ w&*nes%6es.*v$e %#d ou^'" objectives = "Whiteout protocol is in effect for the target. Ensure there are no traces of the infestation or any witnesses." probability = 0 shuttle_id = "Distress_PMC" diff --git a/code/datums/emergency_calls/deus_vult.dm b/code/datums/emergency_calls/deus_vult.dm index eddf2f5468c4..a5ba948c767e 100644 --- a/code/datums/emergency_calls/deus_vult.dm +++ b/code/datums/emergency_calls/deus_vult.dm @@ -5,7 +5,7 @@ mob_max = 35 mob_min = 10 max_heavies = 10 - arrival_message = "Intercepted Transmission: 'Deus le volt. Deus le volt! DEUS LE VOLT!!'" + arrival_message = "'Deus le volt. Deus le volt! DEUS LE VOLT!!'" objectives = "Clense the place of all that is unholy! Die in glory!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/dutch.dm b/code/datums/emergency_calls/dutch.dm index e6e8632c4155..32620fa43014 100644 --- a/code/datums/emergency_calls/dutch.dm +++ b/code/datums/emergency_calls/dutch.dm @@ -9,7 +9,7 @@ max_heavies = 1 max_medics = 1 - arrival_message = "Intercepted Transmission: 'We're here to kick ass and kill Yautja. Mainly kill Yautja." + arrival_message = "'We're here to kick ass and kill Yautja. Mainly kill Yautja." objectives = "Hunt down and kill all Yautja without mercy. Retrieve the gear and leave." probability = 0 @@ -44,6 +44,6 @@ mob_min = 8 max_heavies = 2 max_medics = 2 - arrival_message = "Intercepted Transmission: 'We're here to kick ass and kill Yautja. Mainly kill Yautja." + arrival_message = "'We're here to kick ass and kill Yautja. Mainly kill Yautja." objectives = "Hunt down and kill all Yautja without mercy. Retrieve the gear and leave." probability = 0 diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index d4eaa5c780fc..2a305dcc4342 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -79,12 +79,12 @@ else return chosen_call -/datum/game_mode/proc/get_specific_call(call_name, announce = TRUE, is_emergency = TRUE, info = "") +/datum/game_mode/proc/get_specific_call(call_name, announce = TRUE, is_emergency = TRUE, info = "", announce_dispatch_message = TRUE) for(var/datum/emergency_call/E in all_calls) //Loop through all potential candidates if(E.name == call_name) var/datum/emergency_call/em_call = new E.type() em_call.objective_info = info - em_call.activate(announce, is_emergency) + em_call.activate(announce, is_emergency, announce_dispatch_message) return error("get_specific_call could not find emergency call '[call_name]'") return @@ -180,7 +180,7 @@ else to_chat(src, SPAN_WARNING("You did not get enlisted in the response team. Better luck next time!")) -/datum/emergency_call/proc/activate(announce = TRUE, turf/override_spawn_loc) +/datum/emergency_call/proc/activate(announce = TRUE, turf/override_spawn_loc, announce_dispatch_message = TRUE) set waitfor = 0 if(!SSticker.mode) //Something horribly wrong with the gamemode ticker return @@ -191,11 +191,11 @@ message_admins("Distress beacon: '[name]' activated [src.hostility? "[SPAN_WARNING("(THEY ARE HOSTILE)")]":"(they are friendly)"]. Looking for candidates.") if(announce) - marine_announcement("A distress beacon has been launched from the [MAIN_SHIP_NAME].", "Priority Alert", 'sound/AI/distressbeacon.ogg') + marine_announcement("A distress beacon has been launched from the [MAIN_SHIP_NAME].", "Priority Alert", 'sound/AI/distressbeacon.ogg', logging = ARES_LOG_SECURITY) - addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/emergency_call, spawn_candidates), announce, override_spawn_loc), 30 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/emergency_call, spawn_candidates), announce, override_spawn_loc, announce_dispatch_message), 30 SECONDS) -/datum/emergency_call/proc/spawn_candidates(announce = TRUE, override_spawn_loc) +/datum/emergency_call/proc/spawn_candidates(announce = TRUE, override_spawn_loc, announce_dispatch_message = TRUE) if(SSticker.mode) SSticker.mode.picked_calls -= src @@ -207,7 +207,7 @@ candidates = list() if(announce) - marine_announcement("The distress signal has not received a response, the launch tubes are now recalibrating.", "Distress Beacon") + marine_announcement("The distress signal has not received a response, the launch tubes are now recalibrating.", "Distress Beacon", logging = ARES_LOG_SECURITY) return //We've got enough! @@ -237,7 +237,7 @@ to_chat(I.current, SPAN_WARNING("You didn't get selected to join the distress team. Better luck next time!")) if(announce) - marine_announcement(dispatch_message, "Distress Beacon", 'sound/AI/distressreceived.ogg') //Announcement that the Distress Beacon has been answered, does not hint towards the chosen ERT + marine_announcement(dispatch_message, "Distress Beacon", 'sound/AI/distressreceived.ogg', logging = ARES_LOG_SECURITY) //Announcement that the Distress Beacon has been answered, does not hint towards the chosen ERT message_admins("Distress beacon: [src.name] finalized, setting up candidates.") @@ -292,6 +292,8 @@ create_member(null, override_spawn_loc) candidates = list() + if(arrival_message && announce) + marine_announcement(arrival_message, "Intercepted Tranmission:") /datum/emergency_call/proc/add_candidate(mob/M) if(!M.client || (M.mind && (M.mind in candidates)) || istype(M, /mob/living/carbon/xenomorph)) diff --git a/code/datums/emergency_calls/forsaken_xenos.dm b/code/datums/emergency_calls/forsaken_xenos.dm new file mode 100644 index 000000000000..d089830658d9 --- /dev/null +++ b/code/datums/emergency_calls/forsaken_xenos.dm @@ -0,0 +1,26 @@ +/datum/emergency_call/forsaken_xenos + name = "Xenomorphs Groundside (Forsaken)" + mob_min = 1 + mob_max = 4 + hostility = TRUE + name_of_spawn = /obj/effect/landmark/ert_spawns/groundside_xeno + objectives = "You have been left behind to safeguard the abandoned colony. Do not allow trespassers." + +/datum/emergency_call/forsaken_xenos/create_member(datum/mind/new_member, turf/override_spawn_loc) + var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() + + if(!istype(spawn_loc)) + return //Didn't find a useable spawn point. + + var/mob/current_mob = new_member.current + + var/picked = pick_weight(list(/mob/living/carbon/xenomorph/warrior = 2, /mob/living/carbon/xenomorph/lurker = 2, /mob/living/carbon/xenomorph/spitter = 2, /mob/living/carbon/xenomorph/drone = 5, /mob/living/carbon/xenomorph/runner = 5)) + + var/mob/living/carbon/xenomorph/new_xeno = new picked(spawn_loc) + + new_member.transfer_to(new_xeno, TRUE) + + new_xeno.set_hive_and_update(XENO_HIVE_FORSAKEN) + new_xeno.lock_evolve = TRUE + + QDEL_NULL(current_mob) diff --git a/code/datums/emergency_calls/hefa_knight.dm b/code/datums/emergency_calls/hefa_knight.dm index 5109db2f99fb..2af2f99f443e 100644 --- a/code/datums/emergency_calls/hefa_knight.dm +++ b/code/datums/emergency_calls/hefa_knight.dm @@ -3,7 +3,7 @@ name = "HEFA knights" mob_max = 15 mob_min = 3 - arrival_message = "Intercepted Transmission: 'Prepaerth to surrender thine HEFAs unto the order!'" + arrival_message = "'Prepaerth to surrender thine HEFAs unto the order!'" objectives = "You are a Brother of the Order of HEFA! You and your fellow brothers must retrieve as many HEFAs as possible!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/inspection.dm b/code/datums/emergency_calls/inspection.dm index 1224818d40e4..72926666ace5 100644 --- a/code/datums/emergency_calls/inspection.dm +++ b/code/datums/emergency_calls/inspection.dm @@ -183,7 +183,7 @@ /datum/emergency_call/inspection_cmb/New() ..() - arrival_message = "Incoming Transmission: [MAIN_SHIP_NAME], This is Anchorpoint Station with the Colonial Marshal Bureau. Be advised, a CMB transport vessel is preparing to board you, submitting Federal docking clearances now. Standby." + arrival_message = "[MAIN_SHIP_NAME], This is Anchorpoint Station with the Colonial Marshal Bureau. Be advised, a CMB transport vessel is preparing to board you, submitting Federal docking clearances now. Standby." objectives = "Get your instructions from the CMB Office at Anchorpoint Station, and carry out your orders. Ensure that Colonial assets are safe and in your custody. Do not enforce or override Marine Law on a Marine Ship unless requested, as it's outside of your juristiction." will_spawn_icc_liaison = prob(90) diff --git a/code/datums/emergency_calls/pirates.dm b/code/datums/emergency_calls/pirates.dm index bb88261c9be5..7a9d333de970 100644 --- a/code/datums/emergency_calls/pirates.dm +++ b/code/datums/emergency_calls/pirates.dm @@ -4,7 +4,7 @@ name = "Fun - Pirates" mob_max = 35 mob_min = 10 - arrival_message = "Intercepted Transmission: 'What shall we do with a drunken sailor? What shall we do with a drunken sailor? What shall we do with a drunken sailor early in the morning?'" + arrival_message = "'What shall we do with a drunken sailor? What shall we do with a drunken sailor? What shall we do with a drunken sailor early in the morning?'" objectives = "Pirate! Loot! Ransom!" probability = 0 hostility = TRUE diff --git a/code/datums/emergency_calls/pizza.dm b/code/datums/emergency_calls/pizza.dm index ea5065dafc29..a35ce584c68d 100644 --- a/code/datums/emergency_calls/pizza.dm +++ b/code/datums/emergency_calls/pizza.dm @@ -4,7 +4,7 @@ name = "Pizza Delivery" mob_max = 1 mob_min = 1 - arrival_message = "Incoming Transmission: 'That'll be... sixteen orders of cheesy fries, eight large double topping pizzas, nine bottles of Four Loko... hello? Is anyone on this ship? Your pizzas are getting cold.'" + arrival_message = "'That'll be... sixteen orders of cheesy fries, eight large double topping pizzas, nine bottles of Four Loko... hello? Is anyone on this ship? Your pizzas are getting cold.'" objectives = "Make sure you get a tip!" shuttle_id = "Distress_Small" name_of_spawn = /obj/effect/landmark/ert_spawns/distress_pizza diff --git a/code/datums/emergency_calls/provost.dm b/code/datums/emergency_calls/provost.dm index 65bbb9753da7..92c33706c178 100644 --- a/code/datums/emergency_calls/provost.dm +++ b/code/datums/emergency_calls/provost.dm @@ -4,9 +4,11 @@ name = "USCM Provost Enforcers" mob_max = 5 mob_min = 5 - objectives = "Deploy to the USS Almayer and enforce Marine Law." probability = 0 +/datum/emergency_call/provost_enforcer/New() + objectives = "Deploy to the [MAIN_SHIP_NAME] and enforce Marine Law." + return ..() /datum/emergency_call/provost_enforcer/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/T = override_spawn_loc ? override_spawn_loc : get_spawn_point() diff --git a/code/datums/emergency_calls/souto.dm b/code/datums/emergency_calls/souto.dm index c41049624bf2..44aa5284b862 100644 --- a/code/datums/emergency_calls/souto.dm +++ b/code/datums/emergency_calls/souto.dm @@ -4,10 +4,13 @@ name = "Souto Man" mob_max = 1 mob_min = 1 - arrival_message = "Incoming Transmission: Give a round of applause for the marine who sent in ten-thousand Souto tabs to get me here! USS Almayer, Souto Man's here to party with YOU!" objectives = "Party like it's 1999!" probability = 0 +/datum/emergency_call/souto/New() + arrival_message = "Give a round of applause for the marine who sent in ten-thousand Souto tabs to get me here! [MAIN_SHIP_NAME], Souto Man's here to party with YOU!" + return ..() + /datum/emergency_call/souto/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() diff --git a/code/datums/emergency_calls/xeno_cultists.dm b/code/datums/emergency_calls/xeno_cultists.dm index 247b6b3a1881..e5ebf089a9c2 100644 --- a/code/datums/emergency_calls/xeno_cultists.dm +++ b/code/datums/emergency_calls/xeno_cultists.dm @@ -2,7 +2,7 @@ /datum/emergency_call/xeno_cult name = "Xeno Cultists" mob_max = 6 - arrival_message = "Incoming Transmission: 'Ia! Ia!'" + arrival_message = "'Ia! Ia!'" objectives = "Support the Xenomorphs in any way, up to and including giving your life for them!" probability = 0 hostility = TRUE diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index 6dd8cd590860..f7083541dd5a 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -93,9 +93,9 @@ /datum/fluff_email/almayer/themajor title = "The Major?" entry_text = {" - I keep forgetting what the new Major's name is. I got quizzed by one of the jackass staff officers last week about the captain's name, - and I absolutely spilled my marbles. PCF Mable was watching too, and she probably thinks I've got rocks in my head. I know it's been weeks - since the new captain took over, but for some reason the name keeps escaping me when it matters. Either the cryo-sleepers are juicing my + I keep forgetting what the new Major's name is. I got quizzed by one of the jackass staff officers last week about the Major's name, + and I absolutely spilled my marbles. PFC Mable was watching too, and she probably thinks I've got rocks in my head. I know it's been weeks + since the new Major took over, but for some reason the name keeps escaping me when it matters. Either the cryo-sleepers are juicing my memory capacity or the CO keeps changing their name and not telling anybody. Maybe next jump I'll scrawl it on a sticky note and plaster it to the inside of my sleeper pod. I can't be the only one having this problem. @@ -105,7 +105,8 @@ /datum/fluff_email/almayer/tunes title = "RE: Tunes" entry_text = {" - Cryosleep is killing me, man. Inside and outside. I mean really, they expect us to sit in that tube for god only knows how long, and when we wake up? It's all 'grab a crappy protein bar and grab your gear, you're going to war, Marine!' Bullshit. + Cryosleep is killing me, man. Inside and outside. I mean really, they expect us to sit in that tube for god only knows how long, and when we wake up? + It's all 'grab a crappy protein bar and grab your gear, you're going to war, Marine!' Bullshit.

Anywho, I've been thinking how to make the whole thing more bearable. Tried to take a plush from the bunks with me inside. That dickwad MP took it away from me though, said it was against Operating Procedure. Like I care. Can't do anything fun around here, right? @@ -113,82 +114,81 @@ I don't usually use these things, and frankly that vendor near Medbay has waaay too many cassettes to choose from. Not that I know most songs on them anywho.

- I saw you with a Walkman from time to time, so... any chances you could recommend a tape to me? Or two, I'm not gonna be picky. Just anything to start out with, I just want some nice sounds. Please, I'm gonna go mad if I don't do something about my cryophobia or whatever. This might just help with that. + I saw you with a Walkman from time to time, so... any chances you could recommend a tape to me? Or two, I'm not gonna be picky. + Just anything to start out with, I just want some nice sounds. Please, I'm gonna go mad if I don't do something about my cryophobia or whatever. + This might just help with that. "} -/datum/fluff_email/almayer/lasergun - title = "RE: Lasergun" +/datum/fluff_email/almayer/lasergun1 + title = "Prototype Weapon" entry_text = {" - Hey REDACTED. Thanks for letting me test out the laser gun. That thing is a factual blast to use. It literally set the targets down range on fire! Those cooling coils work wonders. Used it a good few times and the barrel didn't explode! + This thing is an absolute blast to use. + It disintegrated some of the targets down range but you're going to need to work on those cooling coils. + I used it a few times and I'm seeing the front barrel glow red.

- Hell, it's even pretty accurate too. I know there's like, a couple of prototypes issued to some USCM detachments but we got to have this shit in production one day. It's just good. Now, I don't think it's gonna replace the old Mark two's but it would be a nice addition for some of our grunts that prefer the high tech approach. You know the ones, all nerdy and gadget loving geeks in the corps. Hell I can already hear them glossing over this thing in their sleep. + Surprisingly accurate too despite being a prototype. + I know there's like, a couple of prototypes issued to some USCM detachments, but we got to have this shit in production one day.

- Anyway, I've already attached the weapon report you wanted on this thing back to the email. Hopefully you guys in R&D will get some useful info out of it. + Even as a prototype, it's leagues better than some of the junk we're issued. + Now, I don't think it's going to replace the old Mark Twos, but it would be a nice addition for some of our grunts that prefer the high-tech approach.
- Alright see you when I see you - REDACTED
-
- RE:RE: The Plasma Gun (It's called the XM99 Phased Plasma Pulse Rifle) - Hey REDACTED, REDACTED here. Thanks for the report but I'm going to need you to send the Phased Plasma Pulse Rifle back to me. Apparently we're not allowed to ship them out for testing... I guess I must've missed that memo. The memo came three days after I shipped it out to you. Sorry for the inconvenience. You know where to send it back to and how to. I did tell you how right? There was a small pamphlet in the casing if you forgot. -
-
- Don't think this is going to be issued en masse for a while, it's still going under trials and when I got the weapon report you sent me, they sent in a new updated design for the gun which invalidated most of the things in the report, shame. Looks more promising than the last one though. -
-
- Okay, I'll hopefully be seeing the XM99 Phased Plasma Pulse Rifle in the lab soon. -
-
- REDACTED RE:RE:RE: The Plasma Gun (It's called the XM99 Phased Plasma Pulse Rifle) -
- Holy shit, what the fuck did you do to the damned thing? When I opened the case, I could see fractures and scratches everywhere! Did you give this to the entire platoon to try out? And from the data I'm reading, you fired over 178 shots with this. I only gave you two batteries for the thing. -
-
- How the hell did you recharge it?! The prototype can't take any other forms of power other than those two batteries. And even then, you can't recharge those specially made batteries either without the equipment back in the lab here. And the inside of the barrel is all messed up man. The cooling coils expired and there're bits of the barrel loose inside of it. How the hell did you not notice bits of the inside of the barrel spewing out from the muzzle man?! -
-
- Right. They've threatened to drop me from the project if something like this happens again. In the rare case that I send another prototype out, it had better come back in one piece. And I mean in pristine condition, you got that? -
-
Regards, -
REDACTED + You know the ones, all nerdy and gadget loving geeks in the corps. Hell, I can already hear them glossing over this thing in their sleep. + My report has been sent back to you and I'm really excited to see how this turns out. + + "} + + +/datum/fluff_email/almayer/lasergun2 + title = "New Prototype Design" + entry_text = {" + Thanks for sending the report in, we've been mulling over the data you sent over. + We've updated the design for the prototype which solves most of the problems everyone has encountered. + This one looks more promising than the last one. + And as much as everyone wants this done and shippped, I don't think this is going to be issued en masse for a good while. "} /datum/fluff_email/almayer/beatup - title = "RE: Beat Up" + title = "Beat Up" entry_text = {" - Yo. -
-
- Man, last mission was an absolute shit show. The USS Heyst got their shit kicked in with a missile and we got our cargo hold set on fire by that damn suicide craft. They even blew up most of our good ammo too! Now we're left with the soft point backup munitions. Shit, most of 1st platoon is pretty much out of action. Lotta folks are in sickbay and the rest of us are heading off to cryosleep, well what's left of us. -
-
- When the comms got cut and we were cut off from command; Squad Foxtrot was immediately ambushed on the logistics route to get supplies in and out of the combat zone. I suspect they were taping into your comms to find the literal perfect moment to fuck with our logistics. Thankfully those trucks of ours had their engines tricked out by the techies back on LV-176 in the civilian garage. Those guys hosted rally races around their colony and Sergeant DATA EXPUNGED won a few races for us. Instead of taking their trophy, he pulled a few favors to get our trucks pimped out with better engines. We owe our lives to Sarge for winning one for the corps. -
-
- Hell, at least we're all going back to Chinook Station to get resupplied. Hopefully the wounded wake up to the docs on station rather than our poor and cramped excuse for a medical bay. The number of times the medbay has been packed with wounded where even the damn front lobby had bodies lining up on the sides of the walls waiting for treatment; it still amazes. Worse still was the stench from all the blood and guts, it made it hell for the maint. techs to clean up afterwards. -
- I'm still surprised those doctors we had on hand took care of most of them so quickly, even if most of them are still injured heading to the fridge. -
-
- I read the After-Action Report which the Heyst's XO did, and they're leaving out a few details. When it came to that city, they left out how we had to DATA EXPUNGED. The entire building collapsed with them in it too. Damn shame we couldn't save them. -
-
- The only damn silver lining i see in this shit is that the AI is going to cycle cryo again and we ain't waking to deal with whatever bullshit is happening next time. 2nd Platoon is dealing with that, cause 1st platoon is undermanned as is with our casualties. I heard they have a few screws loose, not that ours are entirely in either! But I don't care, it's their problem now y'know? -
-
- Worst case scenario, we don't wake up at all. -
- Right, see you back on station friend. -
-
- Regards, -
- REDACTED + Man last mission was an absolute shit show. +
+ The USS Heyst got their shit kicked in with a missile and we got our cargo hold set on fire. And most of our good ammo is gone too! + Now we're left with the FMJs and the older AP munitions. What's worse is that most of 1st platoon is pretty much out of action. + Lotta folks are in the sickbay and the rest of us are heading off to cryosleep, well what's left of us. There's not many of the old guard left I'm afraid. + Until we get reinforced with more bodies, command has given the go ahead to merge 2nd platoon into 1st for the time being. + + "} + + +/datum/fluff_email/almayer/rallyrace + title = "Rally Racing" + entry_text = {" + Hey, remember last shore leave on LV-179? Man, that was one crazy night. The folks at the colony had setup a rally race with their tractors all stripped of non-essentials. + LCPL Millard got pretty friendly with the locals and got himself into the competition. + We all put in a little wager to see if he'd even get close to first place or even survive to the finish line. + Now most of the boys bet a fair amount against him since he was pretty new to our outfit, yet I've been out on detail with the guy. +
+
+ Millard grew up on one of those shake and bake colonies and used to drive the big daisies around. + He knew the ins and outs of what made them tick. The few of us who had faith in him reaped everyone else's + paycheck for the week with Millard finishing first place by a near country mile. "} + +/datum/fluff_email/almayer/missing + title = "Missing Personnel" + entry_text = {" + Has anyone seen Mendoza around? He owes me half of his paycheck from last month's poker game. + Everyone's payday was a week ago and we're all set to head back to Chinook station. + Could have sworn I saw him near the cargo elevator yesterday. + I'll catch him back at base once we've docked because I need that money to pay off my tab at the bar. + + "} + diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 65133a93d155..c37bf802f12b 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -23,9 +23,10 @@ var/traits = null var/space_empty_levels = 1 var/list/environment_traits = list() - var/armor_style = "default" var/list/gamemodes = list() + var/camouflage_type = "classic" + var/allow_custom_shuttles = TRUE var/shuttles = list() @@ -63,6 +64,9 @@ var/nightmare_path + /// If truthy this is config for a round overriden map: search for override maps in data/, instead of using a path in maps/ + var/override_map + /datum/map_config/New() survivor_types = list( /datum/equipment_preset/survivor/scientist, @@ -147,24 +151,35 @@ config_filename = filename + override_map = json["override_map"] + CHECK_EXISTS("map_name") map_name = json["map_name"] - CHECK_EXISTS("map_path") - map_path = json["map_path"] webmap_url = json["webmap_url"] short_name = json["short_name"] map_file = json["map_file"] + + var/dirpath = "maps/" + if(override_map) + dirpath = "data/" + map_path = "/" + map_file = OVERRIDE_MAPS_TO_FILENAME[maptype] + else + CHECK_EXISTS("map_path") + map_path = json["map_path"] + dirpath = "[dirpath]/[map_path]" + // "map_file": "BoxStation.dmm" if (istext(map_file)) - if (!fexists("maps/[map_path]/[map_file]")) + if (!fexists("[dirpath]/[map_file]")) log_world("Map file ([map_file]) does not exist!") return // "map_file": ["Lower.dmm", "Upper.dmm"] else if (islist(map_file)) for (var/file in map_file) - if (!fexists("maps/[map_path]/[file]")) + if (!fexists("[dirpath]/[file]")) log_world("Map file ([file]) does not exist!") return else @@ -303,8 +318,8 @@ allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE - if(json["armor"]) - armor_style = json["armor"] + if(json["camouflage"]) + camouflage_type = json["camouflage"] if(json["survivor_message"]) survivor_message = json["survivor_message"] @@ -372,11 +387,14 @@ #undef CHECK_EXISTS /datum/map_config/proc/GetFullMapPaths() + var/dirpath = "maps/[map_path]" + if(override_map) + dirpath = "data/[map_path]" if (istext(map_file)) - return list("maps/[map_path]/[map_file]") + return list("[dirpath]/[map_file]") . = list() for (var/file in map_file) - . += "maps/[map_path]/[file]" + . += "[dirpath]/[file]" /datum/map_config/proc/MakeNextMap(maptype = GROUND_MAP) diff --git a/code/datums/paygrades/factions/uscm/marine.dm b/code/datums/paygrades/factions/uscm/marine.dm index 298be5fb089f..e351311e65ee 100644 --- a/code/datums/paygrades/factions/uscm/marine.dm +++ b/code/datums/paygrades/factions/uscm/marine.dm @@ -1,7 +1,7 @@ /datum/paygrade/marine name = "Marine Paygrade" rank_pin = /obj/item/clothing/accessory/ranks/marine - pay_multiplier = 1 + pay_multiplier = 1.6 // ENLISTED PAYGRADES @@ -11,7 +11,7 @@ prefix = "PVT" rank_pin = /obj/item/clothing/accessory/ranks/marine/e1 ranking = 0 - pay_multiplier = 0.8 + pay_multiplier = 1.6 /datum/paygrade/marine/e2 paygrade = "ME2" @@ -19,7 +19,7 @@ prefix = "PFC" rank_pin = /obj/item/clothing/accessory/ranks/marine/e2 ranking = 1 - pay_multiplier = 1 // the default. + pay_multiplier = 1.7 /datum/paygrade/marine/e3 paygrade = "ME3" @@ -27,7 +27,7 @@ prefix = "LCpl" rank_pin = /obj/item/clothing/accessory/ranks/marine/e3 ranking = 2 - pay_multiplier = 1.4 + pay_multiplier = 1.9 /datum/paygrade/marine/e4 paygrade = "ME4" @@ -35,7 +35,7 @@ prefix = "Cpl" rank_pin = /obj/item/clothing/accessory/ranks/marine/e4 ranking = 3 - pay_multiplier = 1.6 + pay_multiplier = 2.1 /datum/paygrade/marine/e5 paygrade = "ME5" @@ -43,7 +43,7 @@ prefix = "Sgt" rank_pin = /obj/item/clothing/accessory/ranks/marine/e5 ranking = 4 - pay_multiplier = 1.8 + pay_multiplier = 2.2 /datum/paygrade/marine/e6 paygrade = "ME6" @@ -51,7 +51,7 @@ prefix = "SSgt" rank_pin = /obj/item/clothing/accessory/ranks/marine/e6 ranking = 5 - pay_multiplier = 2 + pay_multiplier = 2.4 /datum/paygrade/marine/e7 paygrade = "ME7" diff --git a/code/datums/paygrades/paygrade.dm b/code/datums/paygrades/paygrade.dm index b15071c882b7..bb0a3aa84bfa 100644 --- a/code/datums/paygrades/paygrade.dm +++ b/code/datums/paygrades/paygrade.dm @@ -25,6 +25,7 @@ GLOBAL_LIST_INIT_TYPED(paygrades, /datum/paygrade, setup_paygrades()) .[pg_id] = new PG GLOBAL_LIST_INIT(highcom_paygrades, list( + "PvI", "NO7", "MO7", "NO8", @@ -52,3 +53,9 @@ GLOBAL_LIST_INIT(co_paygrades, list( "MO5", "MO4" )) + +GLOBAL_LIST_INIT(wy_paygrades, list( + "WYC8", + "WYC9", + "WYC10" +)) diff --git a/code/datums/skills.dm b/code/datums/skills.dm index 986b449f5ea9..ef86b726a3c1 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -873,7 +873,7 @@ SYNTHETIC /datum/skills/working_joe name = SYNTH_WORKING_JOE skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_CQC = SKILL_CQC_EXPERT, SKILL_ENGINEER = SKILL_ENGINEER_MASTER, //So they can fully use the Maintenance Jack SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_POLICE = SKILL_POLICE_SKILLED, diff --git a/code/datums/statistics/entities/death_stats.dm b/code/datums/statistics/entities/death_stats.dm index cba83968a9d6..7e26e92ae135 100644 --- a/code/datums/statistics/entities/death_stats.dm +++ b/code/datums/statistics/entities/death_stats.dm @@ -19,6 +19,7 @@ var/time_of_death var/total_time_alive var/total_damage_taken + var/total_revives_done = 0 var/total_brute = 0 var/total_burn = 0 @@ -51,6 +52,7 @@ "time_of_death" = DB_FIELDTYPE_BIGINT, "total_time_alive" = DB_FIELDTYPE_BIGINT, "total_damage_taken" = DB_FIELDTYPE_INT, + "total_revives_done" = DB_FIELDTYPE_INT, "total_brute" = DB_FIELDTYPE_INT, "total_burn" = DB_FIELDTYPE_INT, @@ -117,6 +119,7 @@ new_death.total_kills = life_kills_total new_death.total_time_alive = life_time_total new_death.total_damage_taken = life_damage_taken_total + new_death.total_revives_done = life_revives_total handle_observer_message(cause_data, cause_mob, death_loc, A) diff --git a/code/datums/statistics/random_facts/damage_fact.dm b/code/datums/statistics/random_facts/damage_fact.dm index def2d74f66c1..2fa8a5d06491 100644 --- a/code/datums/statistics/random_facts/damage_fact.dm +++ b/code/datums/statistics/random_facts/damage_fact.dm @@ -1,57 +1,9 @@ -/datum/random_fact/damage/announce() - var/death_damage_taken = 0 - var/living_damage_taken = 0 - var/datum/entity/statistic/death/death_to_report = null - var/mob/mob_to_report = null +/datum/random_fact/damage + statistic_name = "damage" + statistic_verb = "took" - if(round_statistics && length(round_statistics.death_stats_list)) - for(var/datum/entity/statistic/death/death in round_statistics.death_stats_list) - if(!check_human && !death.is_xeno) - continue - if(!check_xeno && death.is_xeno) - continue - if(death_damage_taken < death.total_damage_taken) - death_to_report = death - death_damage_taken = death.total_damage_taken +/datum/random_fact/damage/life_grab_stat(mob/fact_mob) + return fact_mob.life_damage_taken_total - var/list/list_to_check = list() - if(check_human) list_to_check += GLOB.alive_human_list - if(check_xeno) list_to_check += GLOB.living_xeno_list - for(var/mob/M as anything in list_to_check) - if(living_damage_taken < M.life_damage_taken_total) - mob_to_report = M - living_damage_taken = M.life_damage_taken_total - - if(!death_to_report && !mob_to_report) - return - - var/name = "" - var/damage_taken = 0 - var/additional_message = "" - if(death_to_report && mob_to_report) - if(living_damage_taken > death_damage_taken) - name = mob_to_report.real_name - damage_taken = living_damage_taken - additional_message = "and survived! Great work!" - else - name = death_to_report.mob_name - damage_taken = death_damage_taken - additional_message = "before dying" - if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" - else if(death_to_report) - name = death_to_report.mob_name - damage_taken = death_damage_taken - additional_message = "before dying" - if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" - else - name = mob_to_report.real_name - damage_taken = living_damage_taken - additional_message = "and survived! Great work!" - - message = "[name] took a whopping [damage_taken] damage [additional_message]" - - return ..() +/datum/random_fact/damage/death_grab_stat(datum/entity/statistic/death/fact_death) + return fact_death.total_damage_taken diff --git a/code/datums/statistics/random_facts/kills_fact.dm b/code/datums/statistics/random_facts/kills_fact.dm index 22ad0ba27b01..7ef1c2b238de 100644 --- a/code/datums/statistics/random_facts/kills_fact.dm +++ b/code/datums/statistics/random_facts/kills_fact.dm @@ -1,56 +1,9 @@ -/datum/random_fact/kills/announce() - var/death_kills_gotten = 0 - var/living_kills_gotten = 0 - var/datum/entity/statistic/death/death_to_report = null - var/mob/mob_to_report = null +/datum/random_fact/kills + statistic_name = "kills" + statistic_verb = "earned" - if(round_statistics && length(round_statistics.death_stats_list)) - for(var/datum/entity/statistic/death/death in round_statistics.death_stats_list) - if(!check_human && !death.is_xeno) - continue - if(!check_xeno && death.is_xeno) - continue - if(death_kills_gotten < death.total_kills) - death_to_report = death - death_kills_gotten = death.total_kills +/datum/random_fact/kills/life_grab_stat(mob/fact_mob) + return fact_mob.life_kills_total - var/list/list_to_check = list() - if(check_human) list_to_check += GLOB.alive_human_list - if(check_xeno) list_to_check += GLOB.living_xeno_list - for(var/mob/M as anything in list_to_check) - if(living_kills_gotten < M.life_kills_total) - mob_to_report = M - living_kills_gotten = M.life_kills_total - - if(!death_to_report && !mob_to_report) - return - - var/name = "" - var/kills_gotten = 0 - var/additional_message = "" - if(death_to_report && mob_to_report) - if(living_kills_gotten > death_kills_gotten) - name = mob_to_report.real_name - kills_gotten = living_kills_gotten - additional_message = "and survived! Great work!" - else - name = death_to_report.mob_name - kills_gotten = death_kills_gotten - additional_message = "before dying" - if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" - else if(death_to_report) - name = death_to_report.mob_name - kills_gotten = death_kills_gotten - additional_message = "before dying" - if(death_to_report.cause_name) - additional_message += " to [death_to_report.cause_name]" - additional_message += ". Good work!" - else - name = mob_to_report.real_name - kills_gotten = living_kills_gotten - additional_message = "and survived! Great work!" - - message = "[name] earned [kills_gotten] kill\s [additional_message]" - . = ..() +/datum/random_fact/kills/death_grab_stat(datum/entity/statistic/death/fact_death) + return fact_death.total_kills diff --git a/code/datums/statistics/random_facts/random_fact.dm b/code/datums/statistics/random_facts/random_fact.dm index f5f166c367a7..2a83c7b2c1ad 100644 --- a/code/datums/statistics/random_facts/random_fact.dm +++ b/code/datums/statistics/random_facts/random_fact.dm @@ -1,5 +1,7 @@ /datum/random_fact var/message = null + var/statistic_name = null + var/statistic_verb = null var/check_human = TRUE var/check_xeno = TRUE @@ -10,7 +12,73 @@ check_xeno = set_check_xeno /datum/random_fact/proc/announce() + calculate_announcement_message() if(message) to_world(SPAN_CENTERBOLD(message)) return TRUE return FALSE + +/datum/random_fact/proc/calculate_announcement_message() + var/death_stat_gotten = 0 + var/living_stat_gotten = 0 + var/datum/entity/statistic/death/death_to_report = null + var/mob/mob_to_report = null + + if(round_statistics && length(round_statistics.death_stats_list)) + for(var/datum/entity/statistic/death/death in round_statistics.death_stats_list) + if(!check_human && !death.is_xeno) + continue + if(!check_xeno && death.is_xeno) + continue + if(death_stat_gotten < death_grab_stat(death)) + death_to_report = death + death_stat_gotten = death_grab_stat(death) + + var/list/list_to_check = list() + if(check_human) + list_to_check += GLOB.alive_human_list + if(check_xeno) + list_to_check += GLOB.living_xeno_list + + for(var/mob/checked_mob as anything in list_to_check) + if(living_stat_gotten < life_grab_stat(checked_mob)) + mob_to_report = checked_mob + living_stat_gotten = life_grab_stat(checked_mob) + + if(!death_to_report && !mob_to_report) + return + + var/name = "" + var/stat_gotten = 0 + var/additional_message = "" + if(death_to_report && mob_to_report) + if(living_stat_gotten > death_stat_gotten) + name = mob_to_report.real_name + stat_gotten = living_stat_gotten + additional_message = "and survived! Great work!" + else + name = death_to_report.mob_name + stat_gotten = death_stat_gotten + additional_message = "before dying" + if(death_to_report.cause_name) + additional_message += " to [death_to_report.cause_name]" + additional_message += ". Good work!" + else if(death_to_report) + name = death_to_report.mob_name + stat_gotten = death_stat_gotten + additional_message = "before dying" + if(death_to_report.cause_name) + additional_message += " to [death_to_report.cause_name]" + additional_message += ". Good work!" + else + name = mob_to_report.real_name + stat_gotten = living_stat_gotten + additional_message = "and survived! Great work!" + + message = "[name] [statistic_verb] [stat_gotten] [statistic_name] [additional_message]" + +/datum/random_fact/proc/life_grab_stat(mob/fact_mob) + return 0 + +/datum/random_fact/proc/death_grab_stat(datum/entity/statistic/death/fact_death) + return 0 diff --git a/code/datums/statistics/random_facts/revives_fact.dm b/code/datums/statistics/random_facts/revives_fact.dm new file mode 100644 index 000000000000..60b6daa896d2 --- /dev/null +++ b/code/datums/statistics/random_facts/revives_fact.dm @@ -0,0 +1,9 @@ +/datum/random_fact/revives + statistic_name = "people" + statistic_verb = "revived" + +/datum/random_fact/revives/life_grab_stat(mob/fact_mob) + return fact_mob.life_revives_total + +/datum/random_fact/revives/death_grab_stat(datum/entity/statistic/death/fact_death) + return fact_death.total_revives_done diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index bd0e57f4017b..e598a11be5e0 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -308,15 +308,17 @@ //------------------------Smartgunner stuff---------------- -/datum/supply_packs/ammo_smartgun_powerpack - name = "M56 smartgun powerpack crate (x2)" +/datum/supply_packs/ammo_smartgun_battery_pack + name = "M56 smartgun battery crate (x4)" contains = list( - /obj/item/smartgun_powerpack, - /obj/item/smartgun_powerpack, + /obj/item/smartgun_battery, + /obj/item/smartgun_battery, + /obj/item/smartgun_battery, + /obj/item/smartgun_battery, ) cost = 40 containertype = /obj/structure/closet/crate/ammo - containername = "\improper smartgun powerpacks crate" + containername = "\improper smartgun battery crate" group = "Ammo" /datum/supply_packs/ammo_smartgun diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 747aaee9e23d..65b15997d1b4 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -257,16 +257,6 @@ Additionally, weapons that are way too good to put in the basically-flavor black containertype = /obj/structure/largecrate/black_market // Shotguns - -/datum/supply_packs/contraband/seized/sawny - name = "Sawn-off Spearhead Rival 78 crate (x1 ammo box included)" - contains = list( - /obj/item/weapon/gun/shotgun/double/damaged, //its not actually sawed off........... get fuked - /obj/item/ammo_magazine/shotgun/buckshot, - ) - dollar_cost = 45 - containertype = /obj/structure/largecrate/black_market - /datum/supply_packs/contraband/seized/custom name = "custom-built shotgun crate (x1 ammo box included)" contains = list( @@ -550,7 +540,6 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat /obj/item/reagent_container/food/drinks/flask/weylandyutani/poison, /obj/item/reagent_container/food/drinks/bottle/holywater/bong, /obj/item/storage/pill_bottle/paracetamol, - /obj/item/storage/pill_bottle/zombie_powder, ) dollar_cost = 25 containertype = /obj/structure/largecrate/black_market @@ -1162,7 +1151,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro new /obj/effect/essentials_set/random/clf_bonus_item(loc) new /obj/effect/essentials_set/random/clf_bonus_item(loc) loot_message = SPAN_NOTICE("It's a bunch of random junk...") - if(51 to 60) + if(51 to 70) new /obj/effect/spawner/random/bomb_supply(loc) new /obj/effect/spawner/random/bomb_supply(loc) new /obj/effect/spawner/random/toolbox(loc) @@ -1174,15 +1163,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro else new /obj/effect/spawner/random/attachment(loc) loot_message = SPAN_NOTICE("Just some old equipment and parts.") - if(61 to 65) - // backpacks - for(var/i in 1 to rand(3, 6)) - var/pack_type = pick(subtypesof(/obj/item/storage/backpack)) - var/obj/item/storage/backpack/pack = new pack_type(loc) - if(pack.max_storage_space > 15) - pack.max_storage_space = 15 - loot_message = SPAN_NOTICE("Some backpacks. They all look empty though...") - if(66 to 70) + if(71 to 75) // CLF corpse!! Why is this here? Don't ask. var/mob/living/carbon/human/corpse = new (loc) corpse.create_hud() //Need to generate hud before we can equip anything apparently... @@ -1191,12 +1172,6 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro arm_equipment(corpse, corpse_type, TRUE, FALSE) // I didn't choose the shitcode life, the shitcode life chose me loot_message = SPAN_HIGHDANGER("IT'S A CORPSE!!") - if(71 to 75) - // Costumes. - new /obj/effect/landmark/costume/random(loc) - new /obj/effect/landmark/costume/random(loc) - new /obj/effect/landmark/costume/random(loc) - loot_message = SPAN_NOTICE("What the hell is this..?") if(76 to 90) // Random supply garbage. new /obj/effect/spawner/random/tool(loc) diff --git a/code/datums/supply_packs/operations.dm b/code/datums/supply_packs/operations.dm index cc4408659d09..610503d6c25d 100644 --- a/code/datums/supply_packs/operations.dm +++ b/code/datums/supply_packs/operations.dm @@ -101,6 +101,14 @@ group = "Operations" iteration_needed = null +/datum/supply_packs/technuclearbomb + name = "Intel Operational Nuke" + cost = 0 + containertype = /obj/structure/machinery/nuclearbomb/tech + buyable = 0 + group = "Operations" + iteration_needed = null + /datum/supply_packs/spec_kits name = "Weapons Specialist Kits" contains = list( diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm index 5ee8c573d0e3..323fb526d527 100644 --- a/code/defines/procs/announcement.dm +++ b/code/defines/procs/announcement.dm @@ -30,7 +30,7 @@ //general marine announcement -/proc/marine_announcement(message, title = COMMAND_ANNOUNCE, sound_to_play = sound('sound/misc/notice2.ogg'), faction_to_display = FACTION_MARINE, add_PMCs = TRUE, signature) +/proc/marine_announcement(message, title = COMMAND_ANNOUNCE, sound_to_play = sound('sound/misc/notice2.ogg'), faction_to_display = FACTION_MARINE, add_PMCs = TRUE, signature, logging = ARES_LOG_MAIN) var/list/targets = GLOB.human_mob_list + GLOB.dead_mob_list if(faction_to_display == FACTION_MARINE) for(var/mob/M in targets) @@ -45,6 +45,14 @@ if((H.faction != faction_to_display && !add_PMCs) || (H.faction != faction_to_display && add_PMCs && !(H.faction in FACTION_LIST_WY)) && !(faction_to_display in H.faction_group)) //faction checks targets.Remove(H) + var/datum/ares_link/link = GLOB.ares_link + if(link.interface && !(link.interface.inoperable())) + switch(logging) + if(ARES_LOG_MAIN) + link.log_ares_announcement(title, message) + if(ARES_LOG_SECURITY) + link.log_ares_security(title, message) + else if(faction_to_display == "Everyone (-Yautja)") for(var/mob/M in targets) if(isobserver(M)) //observers see everything @@ -82,7 +90,7 @@ announcement_helper(message, title, targets, sound_to_play) //AI announcement that uses talking into comms -/proc/ai_announcement(message, sound_to_play = sound('sound/misc/interference.ogg')) +/proc/ai_announcement(message, sound_to_play = sound('sound/misc/interference.ogg'), logging = ARES_LOG_MAIN) for(var/mob/M in (GLOB.human_mob_list + GLOB.dead_mob_list)) if(isobserver(M) || ishuman(M) && is_mainship_level(M.z)) playsound_client(M.client, sound_to_play, M, vol = 45) @@ -90,6 +98,14 @@ for(var/mob/living/silicon/decoy/ship_ai/AI in ai_mob_list) INVOKE_ASYNC(AI, TYPE_PROC_REF(/mob/living/silicon/decoy/ship_ai, say), message) + var/datum/ares_link/link = GLOB.ares_link + if(link.interface && !(link.interface.inoperable())) + switch(logging) + if(ARES_LOG_MAIN) + link.log_ares_announcement("[MAIN_AI_SYSTEM] Comms Update", message) + if(ARES_LOG_SECURITY) + link.log_ares_security("[MAIN_AI_SYSTEM] Security Update", message) + /proc/ai_silent_announcement(message, channel_prefix, bypass_cooldown = FALSE) if(!message) return @@ -119,10 +135,14 @@ if(!isnull(signature)) message += "

Signed by,
[signature]
" + var/datum/ares_link/link = GLOB.ares_link + if(link.interface && !(link.interface.inoperable())) + link.log_ares_announcement(title, message) announcement_helper(message, title, targets, sound_to_play) + //Subtype of AI shipside announcement for "All Hands On Deck" alerts (COs and SEAs joining the game) -/proc/all_hands_on_deck(message, title = MAIN_AI_SYSTEM, sound_to_play = sound('sound/misc/sound_misc_boatswain.ogg'), signature) +/proc/all_hands_on_deck(message, title = MAIN_AI_SYSTEM, sound_to_play = sound('sound/misc/sound_misc_boatswain.ogg')) var/list/targets = GLOB.human_mob_list + GLOB.dead_mob_list for(var/mob/T in targets) if(isobserver(T)) @@ -130,6 +150,10 @@ if(!ishuman(T) || isyautja(T) || !is_mainship_level(T.z)) targets.Remove(T) + var/datum/ares_link/link = GLOB.ares_link + if(link.interface && !(link.interface.inoperable())) + link.log_ares_announcement("[title] Shipwide Update", message) + announcement_helper(message, title, targets, sound_to_play) //the announcement proc that handles announcing for each mob in targets list diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index cf1b235842cb..59d7c40cd56f 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -325,6 +325,9 @@ is_resin_allowed = FALSE soundscape_playlist = SCAPE_PL_DESERT_STORM +/area/bigredv2/outside/nw/ceiling + ceiling = CEILING_GLASS + /area/bigredv2/outside/c name = "\improper Central Colony Grounds" icon_state = "purple" @@ -485,7 +488,7 @@ /area/bigredv2/outside/space_port name = "\improper Space Port" icon_state = "green" - ceiling = CEILING_NONE + ceiling = CEILING_GLASS is_resin_allowed = FALSE is_landing_zone = TRUE diff --git a/code/game/area/IceColony.dm b/code/game/area/IceColony.dm index 2582bf3a0350..2c7bbee2969c 100644 --- a/code/game/area/IceColony.dm +++ b/code/game/area/IceColony.dm @@ -46,7 +46,6 @@ /area/ice_colony/exterior/surface name = "\improper Ice Colony - Exterior Surface" - fake_zlevel = 1 // above ground soundscape_playlist = SCAPE_PL_WIND //Equivalent of space. None of this area should be accessible. If these are valleys, make separate areas @@ -153,7 +152,6 @@ name = "\improper Ice Colony - Exterior Underground" icon_state = "cave" ceiling = CEILING_DEEP_UNDERGROUND - fake_zlevel = 2 // underground ambience_exterior = null // // Caves @@ -189,7 +187,6 @@ name = "\improper Ice Colony - Built Surface" icon_state = "clear" ceiling = CEILING_METAL - fake_zlevel = 1 // above ground /* * Surface - Bar @@ -485,7 +482,6 @@ name = "\improper Ice Colony - Built Underground" icon_state = "explored" ceiling = CEILING_DEEP_UNDERGROUND_METAL - fake_zlevel = 2 // underground ambience_exterior = AMBIENCE_ALMAYER ceiling_muffle = FALSE sound_environment = SOUND_ENVIRONMENT_ROOM diff --git a/code/game/area/LV522_Chances_Claim.dm b/code/game/area/LV522_Chances_Claim.dm index f2838f6ffb3b..8a424148d3b5 100644 --- a/code/game/area/LV522_Chances_Claim.dm +++ b/code/game/area/LV522_Chances_Claim.dm @@ -28,6 +28,10 @@ is_resin_allowed = FALSE flags_area = AREA_NOTUNNEL +/area/lv522/oob/w_y_vault + name = "LV522 - Weyland Secure Vault" + icon_state = "blue" + //Landing Zone 1 /area/lv522/landing_zone_1 @@ -409,10 +413,12 @@ /area/lv522/atmos/east_reactor/north name = "Atmospheric Processor - Outer East Reactor - North" icon_state = "yellow" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/lv522/atmos/east_reactor/south name = "Atmospheric Processor - Outer East Reactor - south" icon_state = "red" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/lv522/atmos/east_reactor/south/cas ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS @@ -420,10 +426,13 @@ /area/lv522/atmos/east_reactor/east name = "Atmospheric Processor - Outer East Reactor - east" icon_state = "green" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/lv522/atmos/east_reactor/west name = "Atmospheric Processor - Outer East Reactor - west" icon_state = "purple" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS + /area/lv522/atmos/west_reactor name = "Atmospheric Processor - Western Reactor" icon_state = "blue" @@ -441,6 +450,7 @@ /area/lv522/atmos/north_command_centre name = "Atmospheric Processor - North Command Centre Checkpoint" icon_state = "green" + ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS /area/lv522/atmos/filt name = "Atmospheric Processor - Filtration System" diff --git a/code/game/area/LV624.dm b/code/game/area/LV624.dm index 0b839bca98a3..505387f8e52b 100644 --- a/code/game/area/LV624.dm +++ b/code/game/area/LV624.dm @@ -30,11 +30,17 @@ icon_state = "southwest" //ambience = list('sound/ambience/jungle_amb1.ogg') +/area/lv624/ground/jungle/south_west_jungle/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/jungle/west_jungle name ="\improper Western Jungle" icon_state = "west" //ambience = list('sound/ambience/jungle_amb1.ogg') +/area/lv624/ground/jungle/west_jungle/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/jungle/east_jungle name ="\improper Eastern Jungle" icon_state = "east" @@ -82,11 +88,17 @@ icon_state = "west" //ambience = list('sound/ambience/ambimine.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambisin4.ogg') +/area/lv624/ground/barrens/west_barrens/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/barrens/east_barrens name = "\improper Eastern Barrens" icon_state = "east" //ambience = list('sound/ambience/ambimine.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambisin4.ogg') +/area/lv624/ground/barrens/east_barrens/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/barrens/containers name = "\improper Containers" icon_state = "blue-red" @@ -97,6 +109,9 @@ icon_state = "northeast" //ambience = list('sound/ambience/ambimine.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambisin4.ogg') +/area/lv624/ground/barrens/north_east_barrens/ceiling + ceiling = CEILING_GLASS + /area/lv624/ground/barrens/south_west_barrens name = "\improper South Western Barrens" icon_state = "southwest" diff --git a/code/game/area/admin_level.dm b/code/game/area/admin_level.dm index 3a79546d177d..501047c46d08 100644 --- a/code/game/area/admin_level.dm +++ b/code/game/area/admin_level.dm @@ -110,9 +110,25 @@ /area/adminlevel/ert_station name = "ERT Station" icon_state = "green" - requires_power = 0 + requires_power = FALSE flags_area = AREA_NOTUNNEL +/area/adminlevel/ert_station/upp_station + name = "UPP Station" + icon_state = "green" + +/area/adminlevel/ert_station/clf_station + name = "CLF Station" + icon_state = "white" + +/area/adminlevel/ert_station/weyland_station + name = "Weyland-Yutani Station" + icon_state = "red" + +/area/adminlevel/ert_station/freelancer_station + name = "Freelancer Station" + icon_state = "yellow" + /area/adminlevel/ert_station/shuttle_dispatch name = "Shuttle Dispatch Station" soundscape_playlist = SCAPE_PL_ELEVATOR_MUSIC diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index a23f84323301..d19cbd3a6dec 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -77,17 +77,20 @@ fake_zlevel = 1 // upperdeck soundscape_playlist = SCAPE_PL_ARES soundscape_interval = 120 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE + can_build_special = FALSE + is_resin_allowed = FALSE + resin_construction_allowed = FALSE /area/almayer/command/securestorage name = "\improper Secure Storage" icon_state = "corporatespace" - fake_zlevel = 1 // upperdeck + fake_zlevel = 2 // lowerdeck /area/almayer/command/computerlab name = "\improper Computer Lab" icon_state = "ceroom" - fake_zlevel = 1 // upperdeck + fake_zlevel = 2 // lowerdeck /area/almayer/command/telecomms name = "\improper Telecommunications" @@ -181,6 +184,11 @@ icon_state = "astronavigation" fake_zlevel = 2 // lowerdeck +/area/almayer/shipboard/panic + name = "\improper Hangar Panic Room" + icon_state = "brig" + fake_zlevel = 2 // lowerdeck + /area/almayer/shipboard/starboard_missiles name = "\improper Missile Tubes Starboard" icon_state = "starboardmissile" diff --git a/code/game/area/strata.dm b/code/game/area/strata.dm index 3049a28c15aa..91bdff277c3d 100644 --- a/code/game/area/strata.dm +++ b/code/game/area/strata.dm @@ -27,16 +27,9 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed lighting_use_dynamic = 0 minimap_color = MINIMAP_AREA_LZ - -/*A WHOLE BUNCH OF PARENT ENTITIES -fake_zlevel = 1 or 2. 1 is 'above' 2 is 'below', however ladders are flipped and think that 1 is below, and 2 is above. -But, players don't actually care where they are so long as the ladders look correct going up and down. They shouldn't notice. -However, this might break the tacmap. This entire system might be replaced by Slywater's fake-Z smooth transition anyway.*/ - /area/strata/ag name = "Above Ground Area" icon_state = "ag" - fake_zlevel = 1 //'Above' ground fake Z /area/strata/ag/exterior name = "Exterior Above Ground Area" @@ -67,7 +60,6 @@ However, this might break the tacmap. This entire system might be replaced by Sl /area/strata/ug name = "Under Ground Area" icon_state = "ug" - fake_zlevel = 2 //'Underground', because numbers are fun ceiling = CEILING_UNDERGROUND_ALLOW_CAS /area/strata/ug/interior diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 52346847728d..937c19b4512b 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -660,7 +660,7 @@ Parameters are passed from New. SEND_SIGNAL(src, COMSIG_ATOM_VV_MODIFY_TRANSFORM) if(href_list[VV_HK_AUTO_RENAME] && check_rights(R_VAREDIT)) - var/newname = tgui_input_text(usr, "What do you want to rename this to?", "Automatic Rename", name) + var/newname = tgui_input_text(usr, "What do you want to rename this to?", "Automatic Rename", name, encode = FALSE) if(newname) name = newname diff --git a/code/game/bioscans.dm b/code/game/bioscans.dm index 474786e1ffae..55422ad3b878 100644 --- a/code/game/bioscans.dm +++ b/code/game/bioscans.dm @@ -107,7 +107,12 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new) /// This will do something after Project ARES. /datum/bioscan_data/proc/can_ares_bioscan() - return TRUE + var/datum/ares_link/link = GLOB.ares_link + if(!istype(link)) + return FALSE + if(link.p_bioscan && !link.p_bioscan.inoperable()) + return TRUE + return FALSE /// The announcement to all Humans. Slightly off for the planet and elsewhere, accurate for the ship. /datum/bioscan_data/proc/ares_bioscan(forced = FALSE, variance = 2) @@ -120,7 +125,11 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new) var/name = "[MAIN_AI_SYSTEM] Bioscan Status" var/input = "Bioscan complete.\n\nSensors indicate [xenos_on_ship_uncontained ? "[xenos_on_ship_uncontained]" : "no"] unknown lifeform signature[!xenos_on_ship_uncontained || xenos_on_ship_uncontained > 1 ? "s":""] present on the ship[xenos_on_ship_uncontained && xenos_ship_location ? ", including one in [xenos_ship_location]," : ""] and [fake_xenos_on_planet ? "approximately [fake_xenos_on_planet]" : "no"] signature[!fake_xenos_on_planet || fake_xenos_on_planet > 1 ? "s":""] located elsewhere[fake_xenos_on_planet && xenos_planet_location ? ", including one in [xenos_planet_location]":""]." - marine_announcement(input, name, 'sound/AI/bioscan.ogg') + + var/datum/ares_link/link = GLOB.ares_link + link.log_ares_bioscan(name, input) + if(forced || (link.p_interface && !link.p_interface.inoperable())) + marine_announcement(input, name, 'sound/AI/bioscan.ogg', logging = ARES_LOG_NONE) /// The announcement to all Xenos. Slightly off for the human ship, accurate otherwise. /datum/bioscan_data/proc/qm_bioscan(variance = 2) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index e0464be1250e..2f6dc6e38118 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -214,6 +214,8 @@ Additional game mode variables. log_debug("Null client attempted to transform_predator") return + pred_candidate.client.prefs.find_assigned_slot(JOB_PREDATOR) // Probably does not do anything relevant, predator preferences are not tied to specific slot. + var/clan_id = CLAN_SHIP_PUBLIC var/datum/entity/clan_player/clan_info = pred_candidate?.client?.clan_info clan_info?.sync() @@ -352,7 +354,7 @@ Additional game mode variables. var/datum/hive_status/hive for(var/hivenumber in GLOB.hive_datum) hive = GLOB.hive_datum[hivenumber] - if(!hive.hardcore && hive.stored_larva && (hive.hive_location || (world.time < 30 MINUTES + SSticker.round_start_time))) + if(!hive.hardcore && hive.stored_larva && (hive.hive_location || (world.time < XENO_BURIED_LARVA_TIME_LIMIT + SSticker.round_start_time))) if(SSticker.mode && (SSticker.mode.flags_round_type & MODE_RANDOM_HIVE)) available_xenos |= "any buried larva" LAZYADD(available_xenos["any buried larva"], hive) @@ -362,7 +364,27 @@ Additional game mode variables. available_xenos[larva_option] = list(hive) if(!available_xenos.len || (instant_join && !available_xenos_non_ssd.len)) - to_chat(xeno_candidate, SPAN_WARNING("There aren't any available xenomorphs or burrowed larvae. You can try getting spawned as a chestburster larva by toggling your Xenomorph candidacy in Preferences -> Toggle SpecialRole Candidacy.")) + if(!xeno_candidate.client || !xeno_candidate.client.prefs || !(xeno_candidate.client.prefs.be_special & BE_ALIEN_AFTER_DEATH)) + to_chat(xeno_candidate, SPAN_WARNING("There aren't any available xenomorphs or burrowed larvae. You can try getting spawned as a chestburster larva by toggling your Xenomorph candidacy in Preferences -> Toggle SpecialRole Candidacy.")) + return FALSE + to_chat(xeno_candidate, SPAN_WARNING("There aren't any available xenomorphs or burrowed larvae.")) + + // Give the player a cached message of their queue status if they are an observer + var/mob/dead/observer/candidate_observer = xeno_candidate + if(istype(candidate_observer)) + if(candidate_observer.larva_queue_cached_message) + to_chat(xeno_candidate, candidate_observer.larva_queue_cached_message) + return FALSE + + // No cache, lets check now then + message_alien_candidates(get_alien_candidates(), dequeued = 0, cache_only = TRUE) + if(candidate_observer.larva_queue_cached_message) + to_chat(xeno_candidate, candidate_observer.larva_queue_cached_message) + return FALSE + + // We aren't in queue yet, lets teach them about the queue then + candidate_observer.larva_queue_cached_message = SPAN_XENONOTICE("You are currently still awaiting assignment in the larva queue. Priority is given to players who have yet to play in the round, but otherwise the ordering is based on your time of death. When you have been dead long enough and are not inactive, you will periodically receive messages where you are in the queue relative to other currently valid xeno candidates. Note: Playing as a facehugger or in the thunderdome will not alter your time of death. This means you won't lose your relative place in queue if you step away, disconnect, play as a facehugger, or play in the thunderdome.") + to_chat(xeno_candidate, candidate_observer.larva_queue_cached_message) return FALSE var/mob/living/carbon/xenomorph/new_xeno @@ -375,11 +397,11 @@ Additional game mode variables. if(!xeno_bypass_timer) var/deathtime = world.time - xeno_candidate.timeofdeath if(isnewplayer(xeno_candidate)) - deathtime = 2.5 MINUTES //so new players don't have to wait to latejoin as xeno in the round's first 5 mins. - if(deathtime < 2.5 MINUTES && !check_client_rights(xeno_candidate.client, R_ADMIN, FALSE)) + deathtime = XENO_JOIN_DEAD_LARVA_TIME //so new players don't have to wait to latejoin as xeno in the round's first 5 mins. + if(deathtime < XENO_JOIN_DEAD_LARVA_TIME && !check_client_rights(xeno_candidate.client, R_ADMIN, FALSE)) var/message = SPAN_WARNING("You have been dead for [DisplayTimeText(deathtime)].") to_chat(xeno_candidate, message) - to_chat(xeno_candidate, SPAN_WARNING("You must wait 2.5 minutes before rejoining the game as a buried larva!")) + to_chat(xeno_candidate, SPAN_WARNING("You must wait 2 minutes and 30 seconds before rejoining the game as a buried larva!")) return FALSE for(var/mob_name in picked_hive.banished_ckeys) @@ -391,7 +413,7 @@ Additional game mode variables. noob.close_spawn_windows() if(picked_hive.hive_location) picked_hive.hive_location.spawn_burrowed_larva(xeno_candidate) - else if((world.time < 30 MINUTES + SSticker.round_start_time)) + else if((world.time < XENO_BURIED_LARVA_TIME_LIMIT + SSticker.round_start_time)) picked_hive.do_buried_larva_spawn(xeno_candidate) else to_chat(xeno_candidate, SPAN_WARNING("Seems like something went wrong. Try again?")) @@ -415,8 +437,8 @@ Additional game mode variables. if(!xeno_bypass_timer) var/deathtime = world.time - xeno_candidate.timeofdeath if(istype(xeno_candidate, /mob/new_player)) - deathtime = 5 MINUTES //so new players don't have to wait to latejoin as xeno in the round's first 5 mins. - if(deathtime < 5 MINUTES && !check_client_rights(xeno_candidate.client, R_ADMIN, FALSE)) + deathtime = XENO_JOIN_DEAD_TIME //so new players don't have to wait to latejoin as xeno in the round's first 5 mins. + if(deathtime < XENO_JOIN_DEAD_TIME && !check_client_rights(xeno_candidate.client, R_ADMIN, FALSE)) var/message = "You have been dead for [DisplayTimeText(deathtime)]." message = SPAN_WARNING("[message]") to_chat(xeno_candidate, message) diff --git a/code/game/gamemodes/cm_self_destruct.dm b/code/game/gamemodes/cm_self_destruct.dm index 59ed5b66b12f..8c022fd0d916 100644 --- a/code/game/gamemodes/cm_self_destruct.dm +++ b/code/game/gamemodes/cm_self_destruct.dm @@ -256,17 +256,18 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi ship_status = 0 //Destroyed. break - var/L1[] = new //Everyone who will be destroyed on the zlevel(s). - var/L2[] = new //Everyone who only needs to see the cinematic. - var/mob/M - var/turf/T - for(M in GLOB.player_list) //This only does something cool for the people about to die, but should prove pretty interesting. - if(!M || !M.loc) continue //In case something changes when we sleep(). - if(M.stat == DEAD) - L2 |= M - else if(M.z in z_levels) - L1 |= M - shake_camera(M, 110, 4) + var/list/alive_mobs = list() //Everyone who will be destroyed on the zlevel(s). + var/list/dead_mobs = list() //Everyone who only needs to see the cinematic. + for(var/mob/current_mob as anything in GLOB.mob_list) //This only does something cool for the people about to die, but should prove pretty interesting. + if(!current_mob || !current_mob.loc) + continue //In case something changes when we sleep(). + if(current_mob.stat == DEAD) + dead_mobs |= current_mob + continue + var/turf/current_turf = get_turf(current_mob) + if(current_turf.z in z_levels) + alive_mobs |= current_mob + shake_camera(current_mob, 110, 4) sleep(100) @@ -275,23 +276,23 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi var/atom/movable/screen/cinematic/explosion/C = new if(play_anim) - for(M in L1 + L2) - if(M && M.loc && M.client) - M.client.screen |= C //They may have disconnected in the mean time. + for(var/mob/current_mob as anything in alive_mobs + dead_mobs) + if(current_mob && current_mob.loc && current_mob.client) + current_mob.client.screen |= C //They may have disconnected in the mean time. sleep(15) //Extra 1.5 seconds to look at the ship. flick(override ? "intro_override" : "intro_nuke", C) sleep(35) - for(M in L1) - if(M && M.loc) //Who knows, maybe they escaped, or don't exist anymore. - T = get_turf(M) - if(T.z in z_levels) - if(istype(M.loc, /obj/structure/closet/secure_closet/freezer/fridge)) + for(var/mob/current_mob in alive_mobs) + if(current_mob && current_mob.loc) //Who knows, maybe they escaped, or don't exist anymore. + var/turf/current_mob_turf = get_turf(current_mob) + if(current_mob_turf.z in z_levels) + if(istype(current_mob.loc, /obj/structure/closet/secure_closet/freezer/fridge)) continue - M.death(create_cause_data("nuclear explosion")) + current_mob.death(create_cause_data("nuclear explosion")) else if(play_anim) - M.client.screen -= C //those who managed to escape the z level at last second shouldn't have their view obstructed. + current_mob.client.screen -= C //those who managed to escape the z level at last second shouldn't have their view obstructed. if(play_anim) flick(ship_status ? "ship_spared" : "ship_destroyed", C) C.icon_state = ship_status ? "summary_spared" : "summary_destroyed" @@ -369,7 +370,7 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi name = "self-destruct control panel" icon_state = "console_1" base_icon_state = "console" - req_one_access = list(ACCESS_MARINE_CAPTAIN, ACCESS_MARINE_SENIOR) + req_one_access = list(ACCESS_MARINE_CO, ACCESS_MARINE_SENIOR) /obj/structure/machinery/self_destruct/console/Destroy() . = ..() diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 874f72240600..65dc2666070d 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -153,6 +153,11 @@ var/rendered_announce_text = replacetext(SSmapping.configs[GROUND_MAP].announce_text, "###SHIPNAME###", MAIN_SHIP_NAME) marine_announcement(rendered_announce_text, "[MAIN_SHIP_NAME]") +/datum/game_mode/colonialmarines/proc/ares_conclude() + ai_silent_announcement("Bioscan complete. No unknown lifeform signature detected.", ".V") + ai_silent_announcement("Saving operational report to archive.", ".V") + ai_silent_announcement("Commencing final systems scan in 3 minutes.", ".V") + //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -166,6 +171,7 @@ if(is_in_endgame) check_hijack_explosions() + check_ground_humans() if(next_research_allocation < world.time) chemical_data.update_credits(chemical_data.research_allocation_amount) @@ -243,6 +249,35 @@ addtimer(CALLBACK(src, PROC_REF(shake_ship)), 5 SECONDS) TIMER_COOLDOWN_START(src, COOLDOWN_HIJACK_BARRAGE, 15 SECONDS) +#define GROUNDSIDE_XENO_MULTIPLIER 1.0 + +///Checks for humans groundside after hijack, spawns forsaken if requirements met +/datum/game_mode/colonialmarines/proc/check_ground_humans() + if(TIMER_COOLDOWN_CHECK(src, COOLDOWN_HIJACK_GROUND_CHECK)) + return + + var/groundside_humans = 0 + var/groundside_xenos = 0 + + for(var/mob/current_mob in GLOB.player_list) + if(!is_ground_level(current_mob.z) || !current_mob.client || current_mob.stat == DEAD) + continue + + if(ishuman_strict(current_mob)) + groundside_humans++ + continue + + if(isxeno(current_mob)) + groundside_xenos++ + continue + + if(groundside_humans > (groundside_xenos * GROUNDSIDE_XENO_MULTIPLIER)) + SSticker.mode.get_specific_call("Xenomorphs Groundside (Forsaken)", FALSE, FALSE, announce_dispatch_message = FALSE) + + TIMER_COOLDOWN_START(src, COOLDOWN_HIJACK_GROUND_CHECK, 1 MINUTES) + +#undef GROUNDSIDE_XENO_MULTIPLIER + /** * Makes the mainship shake, along with playing a klaxon sound effect. */ @@ -288,6 +323,7 @@ else SSticker.roundend_check_paused = TRUE round_finished = MODE_INFESTATION_M_MAJOR //Humans destroyed the xenomorphs. + ares_conclude() addtimer(VARSET_CALLBACK(SSticker, roundend_check_paused, FALSE), MARINE_MAJOR_ROUND_END_DELAY) else if(!num_humans && !num_xenos) round_finished = MODE_INFESTATION_DRAW_DEATH //Both were somehow destroyed. @@ -347,7 +383,7 @@ round_statistics.current_map.total_marine_victories++ if(MODE_INFESTATION_DRAW_DEATH) end_icon = "draw" - musical_track = pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg') + musical_track = 'sound/theme/neutral_hopeful2.ogg' if(round_statistics && round_statistics.current_map) round_statistics.current_map.total_draws++ var/sound/S = sound(musical_track, channel = SOUND_CHANNEL_LOBBY) diff --git a/code/game/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm index f9bf3f779b24..a0d555acd2fb 100644 --- a/code/game/gamemodes/colonialmarines/xenovsxeno.dm +++ b/code/game/gamemodes/colonialmarines/xenovsxeno.dm @@ -261,7 +261,7 @@ /datum/game_mode/xenovs/declare_completion() announce_ending() var/musical_track - musical_track = pick('sound/theme/nuclear_detonation1.ogg','sound/theme/nuclear_detonation2.ogg') + musical_track = pick('sound/theme/neutral_melancholy1.ogg', 'sound/theme/neutral_melancholy2.ogg') var/sound/S = sound(musical_track, channel = SOUND_CHANNEL_LOBBY) S.status = SOUND_STREAM diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index a03a1aef1031..8017056c682d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -82,7 +82,7 @@ var/global/cas_tracking_id_increment = 0 //this var used to assign unique tracki return ///Triggered when the dropship first lands. -/datum/game_mode/proc/ds_first_landed(obj/docking_port/mobile/marine_dropship) +/datum/game_mode/proc/ds_first_landed(obj/docking_port/stationary/marine_dropship) SHOULD_CALL_PARENT(TRUE) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_DS_FIRST_LANDED) return diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 272d3b264040..55eee2e521bf 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -82,13 +82,14 @@ return return 1 -/proc/get_centcom_access(job) - return get_all_centcom_access() +///Grants access to EVERYWHERE +/proc/get_global_access() + return get_all_marine_access() + get_all_main_access() +///Grants standard access for all factions, does not include high restrictions like COs office. +/proc/get_all_main_access() + return get_antagonist_access() + get_all_civilian_access() + get_all_weyland_access() -/proc/get_all_accesses() - return get_all_marine_access() + get_all_civilian_accesses() - -/proc/get_all_civilian_accesses() +/proc/get_all_civilian_access() return list( ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, @@ -99,9 +100,17 @@ ACCESS_CIVILIAN_COMMAND, ) +///Includes restricted accesses /proc/get_all_marine_access() return list( - ACCESS_MARINE_CAPTAIN, + ACCESS_MARINE_CO, + ACCESS_MARINE_AI, + ACCESS_MARINE_AI_TEMP, + ) + get_main_marine_access() + +///All Almayer accesses other than the highly restricted ones, such as CO's office. +/proc/get_main_marine_access() + return list( ACCESS_MARINE_SENIOR, ACCESS_MARINE_DATABASE, ACCESS_MARINE_COMMAND, @@ -138,25 +147,29 @@ ACCESS_PRESS, ) -/proc/get_all_centcom_access() +/proc/get_all_weyland_access() return list(ACCESS_WY_PMC_GREEN, ACCESS_WY_PMC_ORANGE, ACCESS_WY_PMC_RED, ACCESS_WY_PMC_BLACK, ACCESS_WY_PMC_WHITE, ACCESS_WY_CORPORATE) -/proc/get_all_syndicate_access() - return list(ACCESS_ILLEGAL_PIRATE) - +///CLF & UPP, UPP Commandos have global. /proc/get_antagonist_access() - return get_all_accesses() + get_all_syndicate_access() + return get_main_marine_access() + list(ACCESS_ILLEGAL_PIRATE) + +///Used by PMCs and elite mercs. +/proc/get_weyland_pmc_access() + return get_all_main_access() -/proc/get_antagonist_pmc_access() - return get_antagonist_access() +///This is only used by USCM ERTs at present +/proc/get_friendly_ert_access() + return get_main_marine_access() + get_all_civilian_access() -/proc/get_freelancer_access() +///Pizza and Souto +/proc/get_civil_ert_access() return list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_CARGO, ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS) /proc/get_region_accesses(code) switch(code) if(0) - return get_all_accesses() + return get_all_main_access() if(1) return list(ACCESS_MARINE_CMP, ACCESS_MARINE_BRIG, ACCESS_MARINE_ARMORY) // Security if(2) @@ -166,7 +179,7 @@ if(4) return list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_OT, ACCESS_MARINE_MAINT) // Engineering if(5) - return list(ACCESS_MARINE_CAPTAIN, ACCESS_MARINE_SENIOR, ACCESS_MARINE_DATABASE, ACCESS_MARINE_COMMAND, ACCESS_MARINE_RO, ACCESS_MARINE_CARGO, ACCESS_MARINE_SEA, ACCESS_MARINE_SYNTH) // Command + return list(ACCESS_MARINE_CO, ACCESS_MARINE_SENIOR, ACCESS_MARINE_DATABASE, ACCESS_MARINE_COMMAND, ACCESS_MARINE_RO, ACCESS_MARINE_CARGO, ACCESS_MARINE_SEA, ACCESS_MARINE_SYNTH) // Command if(6) return list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_ENGPREP, ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_SPECPREP, ACCESS_MARINE_TL_PREP, ACCESS_MARINE_KITCHEN)//spess mahreens if(7) @@ -218,7 +231,7 @@ if(ACCESS_MARINE_ENGINEERING) return "[MAIN_SHIP_NAME] Engineering" if(ACCESS_MARINE_OT) return "[MAIN_SHIP_NAME] Ordnance Workshop" if(ACCESS_MARINE_SENIOR) return "[MAIN_SHIP_NAME] Senior Command" - if(ACCESS_MARINE_CAPTAIN) return "Commander's Quarters" + if(ACCESS_MARINE_CO) return "Commander's Quarters" if(ACCESS_MARINE_DATABASE) return "[MAIN_SHIP_NAME]'s Database" if(ACCESS_MARINE_COMMAND) return "[MAIN_SHIP_NAME] Command" if(ACCESS_MARINE_CREWMAN) return "Vehicle Crewman" @@ -247,8 +260,9 @@ if(ACCESS_MARINE_SEA) return "SEA's Office" if(ACCESS_MARINE_KITCHEN) return "Kitchen" if(ACCESS_MARINE_SYNTH) return "Synthetic Storage" + if(ACCESS_MARINE_AI) return "AI Core" -/proc/get_centcom_access_desc(A) +/proc/get_weyland_access_desc(A) switch(A) if(ACCESS_WY_PMC_GREEN) return "Wey-Yu PMC Green" if(ACCESS_WY_PMC_ORANGE) return "Wey-Yu PMC Orange" diff --git a/code/game/jobs/job/civilians/other/reporter.dm b/code/game/jobs/job/civilians/other/reporter.dm index c1cedbb3ecd2..c681768f93bc 100644 --- a/code/game/jobs/job/civilians/other/reporter.dm +++ b/code/game/jobs/job/civilians/other/reporter.dm @@ -25,9 +25,9 @@ /datum/job/civilian/reporter/generate_entry_message(mob/living/carbon/human/H) if(military) - . = {"The USCM has assigned you to the USS Almayer to better handle messaging on how things run in the Neroid Sector. Get out there and show the universe that the USCM is doing great things!"} + . = {"The USCM has assigned you to the [MAIN_SHIP_NAME] to better handle messaging on how things run in the Neroid Sector. Get out there and show the universe that the USCM is doing great things!"} else - . = {"What a scoop! You've been assigned to the USS Almayer to see what kinda mischief they'd get into and it seems trouble is here! + . = {"What a scoop! You've been assigned to the [MAIN_SHIP_NAME] to see what kinda mischief they'd get into and it seems trouble is here! This could be the story of the sector! 'Brave Marines responding to dangerous distress signal!' It'd surely get Mr. Parkerson to notice you in the office if you brought him a story like this!"} /obj/effect/landmark/start/reporter diff --git a/code/game/jobs/job/civilians/support/nurse.dm b/code/game/jobs/job/civilians/support/nurse.dm index f510548c8a95..034421d799aa 100644 --- a/code/game/jobs/job/civilians/support/nurse.dm +++ b/code/game/jobs/job/civilians/support/nurse.dm @@ -6,7 +6,7 @@ selection_class = "job_doctor" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/nurse - entry_message_body = "You are tasked with keeping the Marines healthy and strong. You are also an expert when it comes to medication and treatment, but you do not know anything about surgery. Focus on assisting doctors and triaging wounded marines." + entry_message_body = "You are tasked with keeping the Marines healthy and strong. You are also an expert when it comes to medication and treatment, and can do minor surgical procedures. Focus on assisting doctors and triaging wounded marines." /obj/effect/landmark/start/nurse name = JOB_NURSE diff --git a/code/game/jobs/job/civilians/support/working_joe.dm b/code/game/jobs/job/civilians/support/working_joe.dm index 78c6ad2fcca4..d4b575f324f2 100644 --- a/code/game/jobs/job/civilians/support/working_joe.dm +++ b/code/game/jobs/job/civilians/support/working_joe.dm @@ -1,17 +1,53 @@ +#define STANDARD_VARIANT "Working Joe" +#define HAZMAT_VARIANT "Hazmat Joe" + /datum/job/civilian/working_joe title = JOB_WORKING_JOE - total_positions = 3 - spawn_positions = 3 - allow_additional = 1 - supervisors = "ARES and the acting commanding officer" + total_positions = 6 + spawn_positions = 6 + allow_additional = TRUE + scaled = TRUE + supervisors = "ARES and APOLLO" selection_class = "job_working_joe" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN flags_whitelist = WHITELIST_JOE gear_preset = /datum/equipment_preset/synth/working_joe - entry_message_body = "You are a Working Joe! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to maintain the cleanliness of the ship, putting things in their proper place. Your capacities are limited, but you have all the equipment you need, and the central AI has a plan!" + + job_options = list(STANDARD_VARIANT = "JOE", HAZMAT_VARIANT = "HAZ") + var/standard = TRUE + +/datum/job/civilian/working_joe/handle_job_options(option) + if(option != HAZMAT_VARIANT) + standard = TRUE + gear_preset = /datum/equipment_preset/synth/working_joe + else + standard = FALSE + gear_preset = /datum/equipment_preset/synth/working_joe/engi + +/datum/job/civilian/working_joe/set_spawn_positions(count) + spawn_positions = working_joe_slot_formula(count) + +/datum/job/civilian/working_joe/get_total_positions(latejoin = 0) + var/positions = spawn_positions + if(latejoin) + positions = working_joe_slot_formula(get_total_marines()) + if(positions <= total_positions_so_far) + positions = total_positions_so_far + else + total_positions_so_far = positions + else + total_positions_so_far = positions + return positions + +/datum/job/civilian/working_joe/generate_entry_message(mob/living/carbon/human/H) + if(standard) + . = {"You are a Working Joe. You are held to a higher standard and are required to obey not only the Server Rules but Marine Law, Roleplay Expectations and Synthetic Rules. Your primary task is to maintain the cleanliness of the ship, putting things in their proper place. Alternatively, your primary task may be to assist with manual labor in limited capacity, or clerical duties. Your capacities are limited, but you have all the equipment you need, and the central AI has a plan! Stay in character at all times. Use the APOLLO link to communicate with your uplink!"} + else + . = {"You are a Working Joe for Hazardous Environments! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law, Roleplay Expectations and Synthetic Rules. You are a variant of the Working Joe built for tougher environments and fulfill the specific duty of dangerous repairs or maintenance. Your primary task is to maintain the reactor, SMES and AI Core. Your secondary task is to respond to hazardous environments, such as an atmospheric breach or biohazard spill, and assist with repairs when ordered to by either an AI Mainframe, or a Commisioned Officer. You should not be seen outside of emergencies besides in Engineering and the AI Core! Stay in character at all times. Use the APOLLO link to communicate with your uplink!"} + /datum/job/civilian/working_joe/announce_entry_message(mob/living/carbon/human/H) - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ai_announcement), "[H.real_name] has been deployed to help with operations."), 1.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ai_announcement), "[H.real_name] has been activated."), 1.5 SECONDS) return ..() /obj/effect/landmark/start/working_joe diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm index 23084d0c5f72..4049554f7799 100644 --- a/code/game/jobs/job/command/cic/captain.dm +++ b/code/game/jobs/job/command/cic/captain.dm @@ -6,7 +6,6 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED flags_whitelist = WHITELIST_COMMANDER gear_preset = /datum/equipment_preset/uscm_ship/commander - entry_message_body = "You are the Commanding Officer of the USS Almayer as well as the operation. Your goal is to lead the Marines on their mission as well as protect and command the ship and her crew. Your job involves heavy roleplay and requires you to behave like a high-ranking officer and to stay in character at all times. As the Commanding Officer your only superior is High Command itself. You must abide by the Commanding Officer Code of Conduct. Failure to do so may result in punitive action against you. Godspeed." /datum/job/command/commander/New() . = ..() @@ -16,6 +15,10 @@ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_ship/commander/council/plus ) +/datum/job/command/commander/generate_entry_message() + entry_message_body = "You are the Commanding Officer of the [MAIN_SHIP_NAME] as well as the operation. Your goal is to lead the Marines on their mission as well as protect and command the ship and her crew. Your job involves heavy roleplay and requires you to behave like a high-ranking officer and to stay in character at all times. As the Commanding Officer your only superior is High Command itself. You must abide by the Commanding Officer Code of Conduct. Failure to do so may result in punitive action against you. Godspeed." + return ..() + /datum/job/command/commander/get_whitelist_status(list/roles_whitelist, client/player) . = ..() if(!.) diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index d8691e1df4cf..cc9b4f65e624 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -3,9 +3,9 @@ title = JOB_XO flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY gear_preset = /datum/equipment_preset/uscm_ship/xo - entry_message_body = "You are second in command aboard the ship, and are in next in the chain of command after the commanding officer. You may need to fill in for other duties if areas are understaffed, and you are given access to do so. Make the USCM proud!" /datum/job/command/executive/generate_entry_message(mob/living/carbon/human/H) + entry_message_body = "You are second in command aboard the [MAIN_SHIP_NAME], and are in next in the chain of command after the Commanding Officer. Where applicable, you must abide by the Commanding Officer Code of Conduct. You may need to fill in for other duties if areas are understaffed, and you are given access to do so. Make the USCM proud!" return ..() /datum/job/command/executive/generate_entry_conditions(mob/living/M, whitelist_status) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 3ef06ecfd576..b860667486be 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -221,7 +221,7 @@ var/mob/living/carbon/human/new_character = new(NP.loc) new_character.lastarea = get_area(NP.loc) - NP.client.prefs.copy_all_to(new_character) + NP.client.prefs.copy_all_to(new_character, title) if (NP.client.prefs.be_random_body) var/datum/preferences/TP = new() diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index a241bf259913..b909c38cd9e6 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -23,7 +23,7 @@ var/global/datum/authority/branch/role/RoleAuthority #define MED_PRIORITY 2 #define LOW_PRIORITY 3 -#define SHIPSIDE_ROLE_WEIGHT 0.5 +#define SHIPSIDE_ROLE_WEIGHT 0.25 var/global/players_preassigned = 0 diff --git a/code/game/jobs/slot_scaling.dm b/code/game/jobs/slot_scaling.dm index 7e6b0140531b..7230f57eb745 100644 --- a/code/game/jobs/slot_scaling.dm +++ b/code/game/jobs/slot_scaling.dm @@ -47,3 +47,6 @@ /proc/synth_slot_formula(playercount) return job_slot_formula(playercount,120,1,1,2) + +/proc/working_joe_slot_formula(playercount) + return job_slot_formula(playercount,30,1,3,6) diff --git a/code/game/machinery/ARES/ARES.dm b/code/game/machinery/ARES/ARES.dm new file mode 100644 index 000000000000..f8a7351d123e --- /dev/null +++ b/code/game/machinery/ARES/ARES.dm @@ -0,0 +1,236 @@ +/obj/structure/machinery/ares + name = "ARES Machinery" + density = TRUE + anchored = TRUE + use_power = USE_POWER_IDLE + idle_power_usage = 600 + icon = 'icons/obj/structures/machinery/ares.dmi' + unslashable = TRUE + unacidable = TRUE + + var/link_id = MAIN_SHIP_DEFAULT_NAME + var/datum/ares_link/link + +/obj/structure/machinery/ares/ex_act(severity) + return + +/obj/structure/machinery/ares/Initialize(mapload, ...) + link_systems(override = FALSE) + . = ..() + +/obj/structure/machinery/ares/Destroy() + delink() + return ..() + +/obj/structure/machinery/ares/update_icon() + ..() + icon_state = initial(icon_state) + // Broken + if(stat & BROKEN) + icon_state += "_broken" + + // Powered + else if(stat & NOPOWER) + icon_state = initial(icon_state) + icon_state += "_off" + +/// Handles linking and de-linking the ARES systems. +/obj/structure/machinery/ares/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + if(!new_link) + log_debug("Error: link_systems called without a link datum") + if(link && !override) + return FALSE + if(new_link.link_id == link_id) + link = new_link + log_debug("[name] linked to Ares Link [link_id]") + new_link.linked_systems += src + return TRUE + +/obj/structure/machinery/ares/proc/delink() + log_debug("[name] delinked from Ares Link [link.link_id]") + link.linked_systems -= src + link = null + +/obj/structure/machinery/ares/processor + name = "ARES Processor" + desc = "An external processor for ARES, used to process vast amounts of information." + icon_state = "processor" + +/obj/structure/machinery/ares/processor/apollo + name = "ARES Processor (APOLLO)" + desc = "The external component of ARES' APOLLO processor. Primarily responsible for coordinating Working Joes and Maintenance Drones. It definitely wasn't stolen from Seegson." + icon_state = "apollo_processor" + +/obj/structure/machinery/ares/processor/apollo/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + ..() + new_link.p_apollo = src + +/obj/structure/machinery/ares/processor/apollo/delink() + if(link && link.p_apollo == src) + link.p_apollo = null + ..() + +/obj/structure/machinery/ares/processor/interface + name = "ARES Processor (Interface)" + desc = "An external processor for ARES; this one handles core processes for interfacing with the crew, including radio transmissions and broadcasts." + icon_state = "int_processor" + +/obj/structure/machinery/ares/processor/interface/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + ..() + new_link.p_interface = src + +/obj/structure/machinery/ares/processor/interface/delink() + if(link && link.p_interface == src) + link.p_interface = null + ..() + +/obj/structure/machinery/ares/processor/bioscan + name = "ARES Processor (Bioscan)" + desc = "The external component of ARES' Bioscan systems. Without this, the USS Almayer would be incapable of running bioscans!" + icon_state = "bio_processor" + +/obj/structure/machinery/ares/processor/bioscan/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + ..() + new_link.p_bioscan = src + +/obj/structure/machinery/ares/processor/bioscan/delink() + if(link && link.p_bioscan == src) + link.p_bioscan = null + ..() + +/// Central Core +/obj/structure/machinery/ares/cpu + name = "ARES CPU" + desc = "This is ARES' central processor. Made of a casing designed to withstand nuclear blasts, the CPU also contains ARES' blackbox recorder." + icon_state = "CPU" + +/// Memory Substrate, +/obj/structure/machinery/ares/substrate + name = "ARES Substrate" + desc = "The memory substrate of ARES, containing complex protocols and information. Limited capabilities can operate on substrate alone, without the main ARES Unit operational." + icon_state = "substrate" + +// #################### ARES Interface Console ##################### +/obj/structure/machinery/computer/ares_console + name = "ARES Interface" + desc = "A console built to interface with ARES, allowing for 1:1 communication." + icon = 'icons/obj/structures/machinery/ares.dmi' + icon_state = "console" + exproof = TRUE + + var/current_menu = "login" + var/last_menu = "" + + var/authentication = ARES_ACCESS_BASIC + + /// The last person to login. + var/last_login + /// The person pretending to be last_login + var/sudo_holder + /// A record of who logged in and when. + var/list/access_list = list() + + /// The ID used to link all devices. + var/link_id = MAIN_SHIP_DEFAULT_NAME + var/datum/ares_link/link + + /// The current deleted chat log of 1:1 conversations being read. + var/list/deleted_1to1 = list() + + /// Holds all (/datum/ares_record/announcement)s and (/datum/ares_record/security/security_alert)s + var/list/records_announcement = list() + /// Holds all (/datum/ares_record/bioscan)s + var/list/records_bioscan = list() + /// Holds all (/datum/ares_record/bombardment)s + var/list/records_bombardment = list() + /// Holds all (/datum/ares_record/deletion)s + var/list/records_deletion = list() + /// Holds all (/datum/ares_record/talk_log)s + var/list/records_talking = list() + /// Holds all (/datum/ares_record/requisition_log)s + var/list/records_asrs = list() + /// Holds all (/datum/ares_record/security)s and (/datum/ares_record/antiair)s + var/list/records_security = list() + /// Is nuke request usable or not? (Nuke request is not currently coded to work.) + var/nuke_available = FALSE + + + COOLDOWN_DECLARE(ares_distress_cooldown) + COOLDOWN_DECLARE(ares_nuclear_cooldown) + +/obj/structure/machinery/computer/ares_console/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + if(link && !override) + return FALSE + if(new_link.link_id == link_id) + new_link.interface = src + link = new_link + log_debug("[name] linked to Ares Link [link_id]") + new_link.linked_systems += src + return TRUE + +/obj/structure/machinery/computer/ares_console/Initialize(mapload, ...) + link_systems(override = FALSE) + . = ..() + +/obj/structure/machinery/computer/ares_console/proc/delink() + if(link && link.interface == src) + link.interface = null + link.linked_systems -= src + link = null + +/obj/structure/machinery/computer/ares_console/Destroy() + delink() + return ..() + +// #################### Working Joe Ticket Console ##################### +/obj/structure/machinery/computer/working_joe + name = "APOLLO Maintenance Controller" + desc = "A console built to facilitate Working Joes and their operation, allowing for simple allocation of resources." + icon = 'icons/obj/structures/machinery/ares.dmi' + icon_state = "console" + exproof = TRUE + + /// The ID used to link all devices. + var/link_id = MAIN_SHIP_DEFAULT_NAME + var/datum/ares_link/link + var/obj/structure/machinery/ares/processor/interface/processor + + var/current_menu = "login" + var/last_menu = "" + + var/authentication = ARES_ACCESS_BASIC + /// The last person to login. + var/last_login + /// A record of who logged in and when. + var/list/login_list = list() + + + /// If this is used to create AI Core access tickets + var/ticket_console = FALSE + var/obj/item/card/id/authenticator_id + var/ticket_authenticated = FALSE + var/obj/item/card/id/target_id + +/obj/structure/machinery/computer/working_joe/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + if(link && !override) + return FALSE + if(new_link.link_id == link_id) + new_link.ticket_computers += src + link = new_link + log_debug("[name] linked to Ares Link [link_id]") + new_link.linked_systems += src + return TRUE + +/obj/structure/machinery/computer/working_joe/Initialize(mapload, ...) + link_systems(override = FALSE) + . = ..() + +/obj/structure/machinery/computer/working_joe/proc/delink() + if(link) + link.ticket_computers -= src + link.linked_systems -= src + link = null + +/obj/structure/machinery/computer/working_joe/Destroy() + delink() + return ..() diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm new file mode 100644 index 000000000000..79c49818595c --- /dev/null +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -0,0 +1,815 @@ +GLOBAL_DATUM_INIT(ares_link, /datum/ares_link, new) + +/datum/ares_link + var/link_id = MAIN_SHIP_DEFAULT_NAME + /// All motion triggers for the link + var/list/linked_alerts = list() + /// All machinery for the link + var/list/linked_systems = list() + var/obj/structure/machinery/ares/processor/interface/p_interface + var/obj/structure/machinery/ares/processor/apollo/p_apollo + var/obj/structure/machinery/ares/processor/bioscan/p_bioscan + var/obj/structure/machinery/computer/ares_console/interface + var/list/obj/structure/machinery/computer/working_joe/ticket_computers = list() + + /// The chat log of the apollo link. Timestamped. + var/list/apollo_log = list() + + /// Working Joe stuff + var/list/tickets_maintenance = list() + var/list/tickets_access = list() + +/datum/ares_link/Destroy() + for(var/obj/structure/machinery/ares/link in linked_systems) + link.delink() + for(var/obj/structure/machinery/computer/ares_console/interface in linked_systems) + interface.delink() + for(var/obj/effect/step_trigger/ares_alert/alert in linked_alerts) + alert.delink() + ..() + + +// ------ ARES Logging Procs ------ // +/proc/log_ares_apollo(speaker, message) + if(!speaker) + speaker = "Unknown" + var/datum/ares_link/link = GLOB.ares_link + if(!link.p_apollo || link.p_apollo.inoperable()) + return + if(!link.p_interface || link.p_interface.inoperable()) + return + link.apollo_log.Add("[worldtime2text()]: [speaker], '[message]'") + +/datum/ares_link/proc/log_ares_bioscan(title, input) + if(!p_bioscan || p_bioscan.inoperable() || !interface) + return FALSE + interface.records_bioscan.Add(new /datum/ares_record/bioscan(title, input)) + +/datum/ares_link/proc/log_ares_bombardment(mob/living/user, ob_name, coordinates) + interface.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, "Bombardment fired at [coordinates].", user)) + +/datum/ares_link/proc/log_ares_announcement(title, message) + interface.records_announcement.Add(new /datum/ares_record/announcement(title, message)) + +/datum/ares_link/proc/log_ares_antiair(mob/living/user, details) + interface.records_security.Add(new /datum/ares_record/antiair(details, user)) + +/datum/ares_link/proc/log_ares_requisition(source, details, mob/living/user) + interface.records_asrs.Add(new /datum/ares_record/requisition_log(source, details, user)) + +/datum/ares_link/proc/log_ares_security(title, details) + interface.records_security.Add(new /datum/ares_record/security(title, details)) +// ------ End ARES Logging Procs ------ // + +// ------ ARES Interface Procs ------ // +/obj/structure/machinery/computer/proc/get_ares_access(obj/item/card/id/card) + if(ACCESS_ARES_DEBUG in card.access) + return ARES_ACCESS_DEBUG + switch(card.assignment) + if(JOB_WORKING_JOE) + return ARES_ACCESS_JOE + if(JOB_CHIEF_ENGINEER) + return ARES_ACCESS_CE + if(JOB_SYNTH) + return ARES_ACCESS_SYNTH + if(card.paygrade in GLOB.wy_paygrades) + return ARES_ACCESS_WY_COMMAND + if(card.paygrade in GLOB.highcom_paygrades) + return ARES_ACCESS_HIGH + if(card.paygrade in GLOB.co_paygrades) + return ARES_ACCESS_CO + if(ACCESS_MARINE_SENIOR in card.access) + return ARES_ACCESS_SENIOR + if(ACCESS_WY_CORPORATE in card.access) + return ARES_ACCESS_CORPORATE + if(ACCESS_MARINE_COMMAND in card.access) + return ARES_ACCESS_COMMAND + else + return ARES_ACCESS_BASIC + +/obj/structure/machinery/computer/proc/ares_auth_to_text(access_level) + switch(access_level) + if(ARES_ACCESS_BASIC)//0 + return "Authorized" + if(ARES_ACCESS_COMMAND)//1 + return "[MAIN_SHIP_NAME] Command" + if(ARES_ACCESS_JOE)//2 + return "Working Joe" + if(ARES_ACCESS_CORPORATE)//3 + return "Weyland-Yutani" + if(ARES_ACCESS_SENIOR)//4 + return "[MAIN_SHIP_NAME] Senior Command" + if(ARES_ACCESS_CE)//5 + return "Chief Engineer" + if(ARES_ACCESS_SYNTH)//6 + return "USCM Synthetic" + if(ARES_ACCESS_CO)//7 + return "[MAIN_SHIP_NAME] Commanding Officer" + if(ARES_ACCESS_HIGH)//8 + return "USCM High Command" + if(ARES_ACCESS_WY_COMMAND)//9 + return "Weyland-Yutani Directorate" + if(ARES_ACCESS_DEBUG)//10 + return "AI Service Technician" + + +/obj/structure/machinery/computer/ares_console/proc/message_ares(text, mob/Sender, ref) + var/msg = SPAN_STAFF_IC("ARES: [key_name(Sender, 1)] [ARES_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [ARES_REPLY(Sender, ref)]: [text]") + var/datum/ares_record/talk_log/conversation = locate(ref) + conversation.conversation += "[last_login] at [worldtime2text()], '[text]'" + for(var/client/admin in GLOB.admins) + if((R_ADMIN|R_MOD) & admin.admin_holder.rights) + to_chat(admin, msg) + if(admin.prefs.toggles_sound & SOUND_ARES_MESSAGE) + playsound_client(admin, 'sound/machines/chime.ogg', vol = 25) + log_say("[key_name(Sender)] sent '[text]' to ARES 1:1.") + +/obj/structure/machinery/computer/ares_console/proc/response_from_ares(text, ref) + var/datum/ares_record/talk_log/conversation = locate(ref) + conversation.conversation += "[MAIN_AI_SYSTEM] at [worldtime2text()], '[text]'" +// ------ End ARES Interface Procs ------ // + +// ------ ARES Interface UI ------ // + +/obj/structure/machinery/computer/ares_console/attack_hand(mob/user as mob) + if(..() || !allowed(usr) || inoperable()) + return FALSE + + tgui_interact(user) + return TRUE + +/obj/structure/machinery/computer/ares_console/tgui_interact(mob/user, datum/tgui/ui, datum/ui_state/state) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "AresInterface", name) + ui.open() + +/obj/structure/machinery/computer/ares_console/ui_data(mob/user) + var/list/data = list() + + data["current_menu"] = current_menu + data["last_page"] = last_menu + + data["logged_in"] = last_login + data["sudo"] = sudo_holder ? TRUE : FALSE + + data["access_text"] = "[sudo_holder ? "(SUDO)," : ""] access level [authentication], [ares_auth_to_text(authentication)]." + data["access_level"] = authentication + + data["alert_level"] = security_level + data["evac_status"] = EvacuationAuthority.evac_status + data["worldtime"] = world.time + + data["access_log"] = list() + data["access_log"] += access_list + data["apollo_log"] = list() + data["apollo_log"] += link.apollo_log + + data["deleted_conversation"] = list() + data["deleted_conversation"] += deleted_1to1 + + data["distresstime"] = ares_distress_cooldown + data["distresstimelock"] = DISTRESS_TIME_LOCK + data["mission_failed"] = SSticker.mode.is_in_endgame + data["nuketimelock"] = NUCLEAR_TIME_LOCK + data["nuke_available"] = nuke_available + + var/list/logged_announcements = list() + for(var/datum/ares_record/announcement/broadcast as anything in records_announcement) + var/list/current_broadcast = list() + current_broadcast["time"] = broadcast.time + current_broadcast["title"] = broadcast.title + current_broadcast["details"] = broadcast.details + current_broadcast["ref"] = "\ref[broadcast]" + logged_announcements += list(current_broadcast) + data["records_announcement"] = logged_announcements + + var/list/logged_alerts = list() + for(var/datum/ares_record/security/security_alert as anything in records_announcement) + if(!istype(security_alert)) + continue + var/list/current_alert = list() + current_alert["time"] = security_alert.time + current_alert["title"] = security_alert.title + current_alert["details"] = security_alert.details + current_alert["ref"] = "\ref[security_alert]" + logged_alerts += list(current_alert) + data["records_security"] = logged_alerts + + var/list/logged_bioscans = list() + for(var/datum/ares_record/bioscan/scan as anything in records_bioscan) + var/list/current_scan = list() + current_scan["time"] = scan.time + current_scan["title"] = scan.title + current_scan["details"] = scan.details + current_scan["ref"] = "\ref[scan]" + logged_bioscans += list(current_scan) + data["records_bioscan"] = logged_bioscans + + var/list/logged_bombs = list() + for(var/datum/ares_record/bombardment/bomb as anything in records_bombardment) + var/list/current_bomb = list() + current_bomb["time"] = bomb.time + current_bomb["title"] = bomb.title + current_bomb["details"] = bomb.details + current_bomb["user"] = bomb.user + current_bomb["ref"] = "\ref[bomb]" + logged_bombs += list(current_bomb) + data["records_bombardment"] = logged_bombs + + var/list/logged_deletes = list() + for(var/datum/ares_record/deletion/deleted as anything in records_deletion) + if(!istype(deleted)) + continue + var/list/current_delete = list() + current_delete["time"] = deleted.time + current_delete["title"] = deleted.title + current_delete["details"] = deleted.details + current_delete["user"] = deleted.user + current_delete["ref"] = "\ref[deleted]" + logged_deletes += list(current_delete) + data["records_deletion"] = logged_deletes + + var/list/logged_discussions = list() + for(var/datum/ares_record/deleted_talk/deleted_convo as anything in records_deletion) + if(!istype(deleted_convo)) + continue + var/list/deleted_disc = list() + deleted_disc["time"] = deleted_convo.time + deleted_disc["title"] = deleted_convo.title + deleted_disc["ref"] = "\ref[deleted_convo]" + logged_discussions += list(deleted_disc) + data["deleted_discussions"] = logged_discussions + + var/list/logged_adjustments = list() + for(var/datum/ares_record/antiair/aa_adjustment as anything in records_security) + if(!istype(aa_adjustment)) + continue + var/list/current_adjustment = list() + current_adjustment["time"] = aa_adjustment.time + current_adjustment["details"] = aa_adjustment.details + current_adjustment["user"] = aa_adjustment.user + current_adjustment["ref"] = "\ref[aa_adjustment]" + logged_adjustments += list(current_adjustment) + data["aa_adjustments"] = logged_adjustments + + var/list/logged_orders = list() + for(var/datum/ares_record/requisition_log/req_order as anything in records_asrs) + if(!istype(req_order)) + continue + var/list/current_order = list() + current_order["time"] = req_order.time + current_order["details"] = req_order.details + current_order["title"] = req_order.title + current_order["user"] = req_order.user + current_order["ref"] = "\ref[req_order]" + logged_orders += list(current_order) + data["records_requisition"] = logged_orders + + var/list/logged_convos = list() + var/list/active_convo = list() + var/active_ref + for(var/datum/ares_record/talk_log/log as anything in records_talking) + if(!istype(log)) + continue + if(log.user == last_login) + active_convo = log.conversation + active_ref = "\ref[log]" + + var/list/current_convo = list() + current_convo["user"] = log.user + current_convo["ref"] = "\ref[log]" + current_convo["conversation"] = log.conversation + logged_convos += list(current_convo) + + data["active_convo"] = active_convo + data["active_ref"] = active_ref + data["conversations"] = logged_convos + + return data + +/obj/structure/machinery/computer/ares_console/ui_static_data(mob/user) + var/list/data = list() + + data["link_id"] = link_id + + return data + +/obj/structure/machinery/computer/ares_console/ui_status(mob/user, datum/ui_state/state) + . = ..() + if(!allowed(user)) + return UI_UPDATE + if(inoperable()) + return UI_DISABLED + +/obj/structure/machinery/computer/ares_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + playsound(src, "keyboard_alt", 15, 1) + + switch (action) + if("go_back") + if(!last_menu) + return to_chat(usr, SPAN_WARNING("Error, no previous page detected.")) + var/temp_holder = current_menu + current_menu = last_menu + last_menu = temp_holder + + if("login") + var/mob/living/carbon/human/operator = usr + var/obj/item/card/id/idcard = operator.get_active_hand() + if(istype(idcard)) + authentication = get_ares_access(idcard) + last_login = idcard.registered_name + else if(operator.wear_id) + idcard = operator.wear_id + if(istype(idcard)) + authentication = get_ares_access(idcard) + last_login = idcard.registered_name + else + to_chat(usr, SPAN_WARNING("You require an ID card to access this terminal!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(authentication) + access_list += "[last_login] at [worldtime2text()], Access Level [authentication] - [ares_auth_to_text(authentication)]." + current_menu = "main" + + if("sudo") + var/new_user = tgui_input_text(usr, "Enter Sudo Username", "Sudo User", encode = FALSE) + if(new_user) + if(new_user == sudo_holder) + last_login = sudo_holder + sudo_holder = null + return FALSE + if(new_user == last_login) + to_chat(usr, SPAN_WARNING("Already remote logged in as this user.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + sudo_holder = last_login + last_login = new_user + access_list += "[last_login] at [worldtime2text()], Sudo Access." + return TRUE + if("sudo_logout") + access_list += "[last_login] at [worldtime2text()], Sudo Logout." + last_login = sudo_holder + sudo_holder = null + return + // -- Page Changers -- // + if("logout") + last_menu = current_menu + current_menu = "login" + if(sudo_holder) + access_list += "[last_login] at [worldtime2text()], Sudo Logout." + last_login = sudo_holder + sudo_holder = null + access_list += "[last_login] logged out at [worldtime2text()]." + + if("home") + last_menu = current_menu + current_menu = "main" + if("page_1to1") + last_menu = current_menu + current_menu = "talking" + if("page_announcements") + last_menu = current_menu + current_menu = "announcements" + if("page_bioscans") + last_menu = current_menu + current_menu = "bioscans" + if("page_bombardments") + last_menu = current_menu + current_menu = "bombardments" + if("page_apollo") + last_menu = current_menu + current_menu = "apollo" + if("page_access") + last_menu = current_menu + current_menu = "access_log" + if("page_security") + last_menu = current_menu + current_menu = "security" + if("page_requisitions") + last_menu = current_menu + current_menu = "requisitions" + if("page_antiair") + last_menu = current_menu + current_menu = "antiair" + if("page_emergency") + last_menu = current_menu + current_menu = "emergency" + if("page_deleted") + last_menu = current_menu + current_menu = "delete_log" + if("page_deleted_1to1") + last_menu = current_menu + current_menu = "deleted_talks" + + // -- Delete Button -- // + if("delete_record") + var/datum/ares_record/record = locate(params["record"]) + if(record.record_name == ARES_RECORD_DELETED) + return FALSE + var/datum/ares_record/deletion/new_delete = new + var/new_details = "Error" + var/new_title = "Error" + switch(record.record_name) + if(ARES_RECORD_ANNOUNCE) + new_title = "[record.title] at [record.time]" + new_details = record.details + records_announcement -= record + if(ARES_RECORD_BIOSCAN) + new_title = "[record.title] at [record.time]" + new_details = record.details + records_bioscan -= record + if(ARES_RECORD_BOMB) + new_title = "[record.title] at [record.time]" + new_details = "[record.details] Launched by [record.user]." + records_bombardment -= record + + new_delete.details = new_details + new_delete.user = last_login + new_delete.title = new_title + + records_deletion += new_delete + + // -- 1:1 Conversation -- // + if("new_conversation") + var/datum/ares_record/talk_log/convo = new(last_login) + convo.conversation += "[MAIN_AI_SYSTEM] at [worldtime2text()], 'New 1:1 link initiated. Greetings, [last_login].'" + records_talking += convo + + if("clear_conversation") + var/datum/ares_record/talk_log/conversation = locate(params["active_convo"]) + if(!istype(conversation)) + return FALSE + var/datum/ares_record/deleted_talk/deleted = new + deleted.title = conversation.title + deleted.conversation = conversation.conversation + deleted.user = conversation.user + records_deletion += deleted + records_talking -= conversation + + if("message_ares") + var/message = tgui_input_text(usr, "What do you wish to say to ARES?", "ARES Message", encode = FALSE) + if(message) + message_ares(message, usr, params["active_convo"]) + + if("read_record") + var/datum/ares_record/deleted_talk/conversation = locate(params["record"]) + deleted_1to1 = conversation.conversation + last_menu = current_menu + current_menu = "read_deleted" + + // -- Emergency Buttons -- // + if("evacuation_start") + if(security_level < SEC_LEVEL_RED) + to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + if(EvacuationAuthority.flags_scuttle & FLAGS_EVACUATION_DENY) + to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + if(!EvacuationAuthority.initiate_evacuation()) + to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + log_game("[key_name(usr)] has called for an emergency evacuation via ARES.") + message_admins("[key_name_admin(usr)] has called for an emergency evacuation via ARES.") + var/datum/ares_link/link = GLOB.ares_link + link.log_ares_security("Initiate Evacuation", "[last_login] has called for an emergency evacuation via ARES.") + . = TRUE + + if("distress") + if(!SSticker.mode) + return FALSE //Not a game mode? + if(world.time < DISTRESS_TIME_LOCK) + to_chat(usr, SPAN_WARNING("You have been here for less than six minutes... what could you possibly have done!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(!COOLDOWN_FINISHED(src, ares_distress_cooldown)) + to_chat(usr, SPAN_WARNING("The distress launcher is cooling down!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(security_level == SEC_LEVEL_DELTA) + to_chat(usr, SPAN_WARNING("The ship is already undergoing self destruct procedures!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + else if(security_level < SEC_LEVEL_RED) + to_chat(usr, SPAN_WARNING("The ship must be under red alert to launch a distress beacon!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + for(var/client/admin in GLOB.admins) + if((R_ADMIN|R_MOD) & admin.admin_holder.rights) + playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) + message_admins("[key_name(usr)] has requested a Distress Beacon (via ARES)! [CC_MARK(usr)] (SEND) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") + to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command.")) + COOLDOWN_START(src, ares_distress_cooldown, COOLDOWN_COMM_REQUEST) + return TRUE + + if("nuclearbomb") + if(!SSticker.mode) + return FALSE //Not a game mode? + if(world.time < NUCLEAR_TIME_LOCK) + to_chat(usr, SPAN_WARNING("It is too soon to request Nuclear Ordnance!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(!COOLDOWN_FINISHED(src, ares_nuclear_cooldown)) + to_chat(usr, SPAN_WARNING("The ordnance request frequency is garbled, wait for reset!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(security_level == SEC_LEVEL_DELTA || SSticker.mode.is_in_endgame) + to_chat(usr, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + + for(var/client/admin in GLOB.admins) + if((R_ADMIN|R_MOD) & admin.admin_holder.rights) + playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) + message_admins("[key_name(usr)] has requested use of Nuclear Ordnance (via ARES)! [CC_MARK(usr)] (APPROVE) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") + to_chat(usr, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command.")) + COOLDOWN_START(src, ares_nuclear_cooldown, COOLDOWN_COMM_DESTRUCT) + return TRUE +// ------ End ARES Interface UI ------ // + + +/obj/structure/machinery/computer/working_joe/get_ares_access(obj/item/card/id/card) + if(ACCESS_ARES_DEBUG in card.access) + return APOLLO_ACCESS_DEBUG + switch(card.assignment) + if(JOB_WORKING_JOE) + return APOLLO_ACCESS_JOE + if(JOB_CHIEF_ENGINEER, JOB_SYNTH, JOB_CO) + return APOLLO_ACCESS_AUTHED + if(ACCESS_MARINE_AI in card.access) + return APOLLO_ACCESS_AUTHED + if(ACCESS_MARINE_AI_TEMP in card.access) + return APOLLO_ACCESS_TEMP + if((ACCESS_MARINE_COMMAND in card.access ) || (ACCESS_MARINE_ENGINEERING in card.access) || (ACCESS_WY_CORPORATE in card.access)) + return APOLLO_ACCESS_REPORTER + else + return APOLLO_ACCESS_REQUEST + +/obj/structure/machinery/computer/working_joe/ares_auth_to_text(access_level) + switch(access_level) + if(APOLLO_ACCESS_REQUEST)//0 + return "Unauthorized Personnel" + if(APOLLO_ACCESS_REPORTER)//1 + return "Validated Incident Reporter" + if(APOLLO_ACCESS_TEMP)//2 + return "Authorized Visitor" + if(APOLLO_ACCESS_AUTHED)//3 + return "Certified Personnel" + if(APOLLO_ACCESS_JOE)//4 + return "Working Joe" + if(APOLLO_ACCESS_DEBUG)//5 + return "AI Service Technician" + +// ------ Maintenance Controller UI ------ // +/obj/structure/machinery/computer/working_joe/verb/eject_id() + set category = "Object" + set name = "Eject ID Card" + set src in oview(1) + + if(!usr || usr.stat || usr.lying) return + + if(authenticator_id) + authenticator_id.loc = get_turf(src) + if(!usr.get_active_hand() && istype(usr,/mob/living/carbon/human)) + usr.put_in_hands(authenticator_id) + if(operable()) // Powered. Console can response. + visible_message("[SPAN_BOLD("[src]")] states, \"AUTH LOGOUT: Session end confirmed.\"") + else + to_chat(usr, "You remove [authenticator_id] from [src].") + ticket_authenticated = FALSE // No card - no access + authenticator_id = null + + else if(target_id) + target_id.loc = get_turf(src) + if(!usr.get_active_hand() && istype(usr,/mob/living/carbon/human)) + usr.put_in_hands(target_id) + else + to_chat(usr, "You remove [target_id] from [src].") + target_id = null + + else + to_chat(usr, "There is nothing to remove from the console.") + return + +/obj/structure/machinery/computer/working_joe/attackby(obj/object, mob/user) + if(istype(object, /obj/item/card/id)) + if(!operable()) + to_chat(user, SPAN_NOTICE("You try to insert [object] but [src] remains silent.")) + return + var/obj/item/card/id/idcard = object + if((ACCESS_MARINE_AI in idcard.access) || (ACCESS_ARES_DEBUG in idcard.access)) + if(!authenticator_id) + if(user.drop_held_item()) + object.forceMove(src) + authenticator_id = object + authenticate(authenticator_id) + else if(!target_id) + if(user.drop_held_item()) + object.forceMove(src) + target_id = object + else + to_chat(user, "Both slots are full already. Remove a card first.") + return + else + if(!target_id) + if(user.drop_held_item()) + object.forceMove(src) + target_id = object + else + to_chat(user, "Both slots are full already. Remove a card first.") + return + else + ..() + +/obj/structure/machinery/computer/working_joe/proc/authenticate(obj/item/card/id/id_card) + if(!id_card) + visible_message("[SPAN_BOLD("[src]")] states, \"AUTH ERROR: Authenticator card is missing!\"") + return FALSE + + if((ACCESS_MARINE_AI in id_card.access) || (ACCESS_ARES_DEBUG in id_card.access)) + ticket_authenticated = TRUE + visible_message("[SPAN_BOLD("[src]")] states, \"AUTH LOGIN: Welcome, [id_card.registered_name]. Access granted.\"") + return TRUE + + visible_message("[SPAN_BOLD("[src]")] states, \"AUTH ERROR: Access denied.\"") + return FALSE + + + + +/obj/structure/machinery/computer/working_joe/attack_hand(mob/user as mob) + if(..() || !allowed(usr) || inoperable()) + return FALSE + + tgui_interact(user) + return TRUE + +/obj/structure/machinery/computer/working_joe/tgui_interact(mob/user, datum/tgui/ui, datum/ui_state/state) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "WorkingJoe", name) + ui.open() + +/obj/structure/machinery/computer/working_joe/ui_data(mob/user) + var/list/data = list() + + data["ticket_console"] = ticket_console + data["current_menu"] = current_menu + data["last_page"] = last_menu + + data["logged_in"] = last_login + + data["access_text"] = "access level [authentication], [ares_auth_to_text(authentication)]." + data["access_level"] = authentication + + data["alert_level"] = security_level + data["worldtime"] = world.time + + data["access_log"] = list() + data["access_log"] += login_list + + data["apollo_log"] = list() + data["apollo_log"] += link.apollo_log + + data["authenticated"] = ticket_authenticated + + + var/list/logged_maintenance = list() + for(var/datum/ares_ticket/maintenance/maint_ticket as anything in link.tickets_maintenance) + if(!istype(maint_ticket)) + continue + var/list/current_maint = list() + current_maint["time"] = maint_ticket.ticket_time + current_maint["title"] = maint_ticket.ticket_name + current_maint["details"] = maint_ticket.ticket_details + current_maint["status"] = maint_ticket.ticket_status + current_maint["submitter"] = maint_ticket.ticket_submitter + current_maint["assignee"] = maint_ticket.ticket_assignee + current_maint["ref"] = "\ref[maint_ticket]" + logged_maintenance += list(current_maint) + data["maintenance_tickets"] = logged_maintenance + + var/list/logged_access = list() + for(var/datum/ares_ticket/access_ticket/access_ticket as anything in link.tickets_access) + var/list/current_ticket = list() + current_ticket["time"] = access_ticket.ticket_time + current_ticket["title"] = access_ticket.ticket_name + current_ticket["details"] = access_ticket.ticket_details + current_ticket["status"] = access_ticket.ticket_status + current_ticket["submitter"] = access_ticket.ticket_submitter + current_ticket["assignee"] = access_ticket.ticket_assignee + current_ticket["ref"] = "\ref[access_ticket]" + logged_access += list(current_ticket) + data["access_tickets"] = logged_access + + + return data + +/obj/structure/machinery/computer/working_joe/ui_static_data(mob/user) + var/list/data = list() + + data["link_id"] = link_id + + return data + +/obj/structure/machinery/computer/working_joe/ui_status(mob/user, datum/ui_state/state) + . = ..() + if(!allowed(user)) + return UI_UPDATE + if(inoperable()) + return UI_DISABLED + +/obj/structure/machinery/computer/working_joe/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + var/playsound = TRUE + var/mob/living/carbon/human/operator = usr + + switch (action) + if("go_back") + if(!last_menu) + return to_chat(usr, SPAN_WARNING("Error, no previous page detected.")) + var/temp_holder = current_menu + current_menu = last_menu + last_menu = temp_holder + + if("login") + + var/obj/item/card/id/idcard = operator.get_active_hand() + if(istype(idcard)) + authentication = get_ares_access(idcard) + last_login = idcard.registered_name + else if(operator.wear_id) + idcard = operator.wear_id + if(istype(idcard)) + authentication = get_ares_access(idcard) + last_login = idcard.registered_name + else + to_chat(usr, SPAN_WARNING("You require an ID card to access this terminal!")) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE + if(authentication) + login_list += "[last_login] at [worldtime2text()], Access Level [authentication] - [ares_auth_to_text(authentication)]." + current_menu = "main" + + if("logout") + last_menu = current_menu + current_menu = "login" + login_list += "[last_login] logged out at [worldtime2text()]." + + if("home") + last_menu = current_menu + current_menu = "main" + if("page_logins") + last_menu = current_menu + current_menu = "login_records" + if("page_apollo") + last_menu = current_menu + current_menu = "apollo" + if("page_request") + last_menu = current_menu + current_menu = "access_requests" + if("page_returns") + last_menu = current_menu + current_menu = "access_returns" + if("page_report") + last_menu = current_menu + current_menu = "maint_reports" + if("page_tickets") + last_menu = current_menu + current_menu = "access_tickets" + if("page_maintenance") + last_menu = current_menu + current_menu = "maint_claim" + + if("new_report") + var/name = tgui_input_text(usr, "What is the type of maintenance item you wish to report?\n\nExample:\n 'Broken light in Aft Hallway.'", "Ticket Name", encode = FALSE) + if(!name) + return FALSE + var/details = tgui_input_text(usr, "What are the details for this report?", "Ticket Details", encode = FALSE) + if(!details) + return FALSE + var/confirm = tgui_alert(usr, "Please confirm the submission of your maintenance report. \n\n [name] \n\n [details] \n\n Is this correct?", "Confirmation", list("Yes", "No")) + if(confirm == "Yes") + if(link) + var/datum/ares_ticket/maintenance/maint_ticket = new(last_login, name, details) + link.tickets_maintenance += maint_ticket + log_game("ARES: Maintenance Ticket created by [key_name(operator)] as [last_login] with Header '[name]' and Details of '[details]'.") + return TRUE + return FALSE + + if(playsound) + playsound(src, "keyboard_alt", 15, 1) diff --git a/code/game/machinery/ARES/ARES_records.dm b/code/game/machinery/ARES/ARES_records.dm new file mode 100644 index 000000000000..9cb8574e58f7 --- /dev/null +++ b/code/game/machinery/ARES/ARES_records.dm @@ -0,0 +1,99 @@ +/datum/ares_record + var/record_name = "ARES Data Core" + /// World time in text format. + var/time + /// The title of the record, usually announcement title. + var/title + /// The content of the record, announcement text/bioscan info etc. + var/details + /// The name of the initiator of certain records. Who fired an OB, or who deleted something etc. + var/user + +/datum/ares_record/New(title, details) + time = worldtime2text() + src.title = title + src.details = details + +/datum/ares_record/announcement + record_name = ARES_RECORD_ANNOUNCE + +/datum/ares_record/bioscan + record_name = ARES_RECORD_BIOSCAN + +/datum/ares_record/requisition_log + record_name = ARES_RECORD_ASRS + +/datum/ares_record/requisition_log/New(title, details, user) + time = worldtime2text() + src.title = title + src.details = details + src.user = user + +/datum/ares_record/security + record_name = ARES_RECORD_SECURITY + +/datum/ares_record/antiair + record_name = ARES_RECORD_ANTIAIR + +/datum/ares_record/antiair/New(details, user) + time = worldtime2text() + src.title = "AntiAir Adjustment" + src.details = details + src.user = user + +/datum/ares_record/bombardment + record_name = ARES_RECORD_BOMB + +/datum/ares_record/bombardment/New(title, details, user) + time = worldtime2text() + src.title = title + src.details = details + src.user = user + +/datum/ares_record/deletion + record_name = ARES_RECORD_DELETED + +/datum/ares_record/deletion/New() + time = worldtime2text() + +/datum/ares_record/talk_log + record_name = "1:1 Data Log" + var/conversation = list() + +/datum/ares_record/talk_log/New(user) + src.user = user + src.title = "1:1 Log ([user])" + +/datum/ares_record/deleted_talk + record_name = ARES_RECORD_DELETED + var/conversation = list() + +/datum/ares_record/deleted_talk/New() + time = worldtime2text() + + +/datum/ares_ticket + var/ticket_type = "Root Ticket" + var/ticket_status = TICKET_PENDING + /// Name of who is handling the ticket. Derived from last login. + var/ticket_assignee + /// World time in text format. + var/ticket_time + /// Who submitted the ticket. Derived from last login. + var/ticket_submitter + /// The name of the ticket. + var/ticket_name + /// The content of the ticket, usually an explanation of what it is for. + var/ticket_details + +/datum/ares_ticket/New(user, name, details) + ticket_time = worldtime2text() + ticket_submitter = user + ticket_details = details + ticket_name = name + +/datum/ares_ticket/maintenance + ticket_type = ARES_RECORD_MAINTENANCE + +/datum/ares_ticket/access_ticket + ticket_type = ARES_RECORD_ACCESS diff --git a/code/game/machinery/ARES/ARES_step_triggers.dm b/code/game/machinery/ARES/ARES_step_triggers.dm new file mode 100644 index 000000000000..1562f1badaab --- /dev/null +++ b/code/game/machinery/ARES/ARES_step_triggers.dm @@ -0,0 +1,197 @@ +/obj/effect/step_trigger/ares_alert + name = "ARES Apollo Sensor" + layer = 5 + /// Link alerts to ARES Link + var/datum/ares_link/link + var/link_id = MAIN_SHIP_DEFAULT_NAME + /// Alert message to report unless area based. + var/alert_message = "ALERT: Unauthorized movement detected in ARES Core!" + /// Connect alerts to use same cooldowns + var/alert_id + /// Set to true if it should report area name and not specific alert. + var/area_based = FALSE + /// Cooldown duration and next time. + var/cooldown_duration = COOLDOWN_ARES_SENSOR + COOLDOWN_DECLARE(sensor_cooldown) + /// The job on a mob to enter + var/list/pass_jobs = list(JOB_WORKING_JOE, JOB_CHIEF_ENGINEER, JOB_CO) + /// The accesses on an ID card to enter + var/pass_accesses = list(ACCESS_MARINE_AI, ACCESS_ARES_DEBUG) + +/obj/effect/step_trigger/ares_alert/Crossed(mob/living/passer) + if(!COOLDOWN_FINISHED(src, sensor_cooldown))//Don't want alerts spammed. + return FALSE + if(!passer) + return FALSE + if(!(ishuman(passer) || isxeno(passer))) + return FALSE + if(passer.alpha <= 100)//Can't be seen/detected to trigger alert. + return FALSE + if(pass_jobs) + if(passer.job in pass_jobs) + return FALSE + if(isxeno(passer) && (JOB_XENOMORPH in pass_jobs)) + return FALSE + if(ishuman(passer)) + var/mob/living/carbon/human/trespasser = passer + if(pass_accesses && (trespasser.wear_id)) + for(var/tag in pass_accesses) + if(tag in trespasser.wear_id.access) + return FALSE + Trigger(passer) + return TRUE + + +/obj/effect/step_trigger/ares_alert/Initialize(mapload, ...) + link_systems(override = FALSE) + . = ..() + +/obj/effect/step_trigger/ares_alert/Destroy() + delink() + return ..() + +/obj/effect/step_trigger/ares_alert/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) + if(link && !override) + return FALSE + if(new_link.link_id == link_id) + link = new_link + new_link.linked_alerts += src + return TRUE +/obj/effect/step_trigger/ares_alert/proc/delink() + if(link) + link.linked_alerts -= src + link = null + + +/obj/effect/step_trigger/ares_alert/Trigger(mob/living/passer) + var/broadcast_message = alert_message + if(area_based) + var/area_name = get_area_name(src, TRUE) + broadcast_message = "ALERT: Unauthorized movement detected in [area_name]!" + + var/datum/ares_link/link = GLOB.ares_link + if(link.p_apollo.inoperable()) + return FALSE + + to_chat(passer, SPAN_BOLDWARNING("You hear a soft beeping sound as you cross the threshold.")) + var/datum/language/apollo/apollo = GLOB.all_languages[LANGUAGE_APOLLO] + for(var/mob/living/silicon/decoy/ship_ai/ai in ai_mob_list) + apollo.broadcast(ai, broadcast_message) + for(var/mob/listener as anything in (GLOB.human_mob_list + GLOB.dead_mob_list)) + if(listener.hear_apollo())//Only plays sound to mobs and not observers, to reduce spam. + playsound_client(listener.client, sound('sound/misc/interference.ogg'), listener, vol = 45) + COOLDOWN_START(src, sensor_cooldown, cooldown_duration) + if(alert_id && link) + for(var/obj/effect/step_trigger/ares_alert/sensor in link.linked_alerts) + if(sensor.alert_id == src.alert_id) + COOLDOWN_START(sensor, sensor_cooldown, cooldown_duration) + return TRUE + +/obj/effect/step_trigger/ares_alert/public + pass_accesses = list(ACCESS_MARINE_AI_TEMP, ACCESS_MARINE_AI, ACCESS_ARES_DEBUG) +/obj/effect/step_trigger/ares_alert/core + alert_id = "AresCore" + pass_accesses = list(ACCESS_MARINE_AI_TEMP, ACCESS_MARINE_AI, ACCESS_ARES_DEBUG) + +/obj/effect/step_trigger/ares_alert/mainframe + alert_id = "AresMainframe" + alert_message = "ALERT: Unauthorized movement detected in ARES Mainframe!" + +/obj/effect/step_trigger/ares_alert/terminals + alert_id = "AresTerminals" + alert_message = "ALERT: Unauthorized movement detected in ARES' Operations Center!" + +/obj/effect/step_trigger/ares_alert/comms + area_based = TRUE + alert_id = "TComms" + pass_accesses = list(ACCESS_MARINE_CE) + + +/// Trigger will remove ACCESS_MARINE_AI_TEMP unless ACCESS_MARINE_AI is also present. +/obj/effect/step_trigger/ares_alert/access_control + name = "ARES Access Control Sensor" + alert_message = "HARDCODED" + alert_id = "ARES Access" + cooldown_duration = COOLDOWN_ARES_ACCESS_CONTROL + + +/obj/effect/step_trigger/ares_alert/access_control/Crossed(atom/passer as mob|obj) + if(isobserver(passer) || isxeno(passer)) + return FALSE + if(!COOLDOWN_FINISHED(src, sensor_cooldown))//Don't want alerts spammed. + return FALSE + if(!passer) + return FALSE + if(passer.alpha <= 100)//Can't be seen/detected to trigger alert. + return FALSE + var/area/pass_area = get_area(get_step(passer, passer.dir)) + if(istype(pass_area, /area/almayer/command/airoom))//Don't want it to freak out over someone /entering/ the area. Only leaving. + return FALSE + var/obj/item/card/id/idcard + var/check_contents = TRUE + if(ishuman(passer)) + var/mob/living/carbon/human/human_passer = passer + idcard = human_passer.wear_id + if(istype(idcard)) + check_contents = FALSE + else + idcard = null + + if(istype(passer, /obj/item/card/id)) + idcard = passer + check_contents = FALSE + + if(check_contents) + idcard = locate(/obj/item/card/id) in passer + if(!idcard) + for(var/obj/item/holder in passer.contents) + idcard = locate(/obj/item/card/id) in holder.contents + if(idcard) + break + if(!istype(idcard) && ismob(passer)) + Trigger(passer, failure = TRUE) + return FALSE + if(!(ACCESS_MARINE_AI_TEMP in idcard.access))//No temp access, don't care + return FALSE + if((ACCESS_MARINE_AI in idcard.access) || (ACCESS_ARES_DEBUG in idcard.access))//Permanent access prevents loss of temporary + return FALSE + Trigger(passer, idcard) + return TRUE + +/obj/effect/step_trigger/ares_alert/access_control/Trigger(atom/passer, obj/item/card/id/idcard, failure = FALSE) + var/broadcast_message = get_broadcast(passer, idcard, failure) + + var/datum/ares_link/link = GLOB.ares_link + if(link.p_apollo.inoperable()) + return FALSE + + to_chat(passer, SPAN_BOLDWARNING("You hear a harsh buzzing sound as you cross the threshold!")) + var/datum/language/apollo/apollo = GLOB.all_languages[LANGUAGE_APOLLO] + for(var/mob/living/silicon/decoy/ship_ai/ai in ai_mob_list) + apollo.broadcast(ai, broadcast_message) + for(var/mob/listener in (GLOB.human_mob_list + GLOB.dead_mob_list)) + if(listener.hear_apollo())//Only plays sound to mobs and not observers, to reduce spam. + playsound_client(listener.client, sound('sound/misc/interference.ogg'), listener, vol = 45) + if(idcard) + idcard.access -= ACCESS_MARINE_AI_TEMP + COOLDOWN_START(src, sensor_cooldown, COOLDOWN_ARES_ACCESS_CONTROL) + if(alert_id && link) + for(var/obj/effect/step_trigger/ares_alert/sensor in link.linked_alerts) + if(sensor.alert_id == src.alert_id) + COOLDOWN_START(sensor, sensor_cooldown, COOLDOWN_ARES_ACCESS_CONTROL) + return TRUE + +/obj/effect/step_trigger/ares_alert/access_control/proc/get_broadcast(atom/passer, obj/item/card/id/idcard, failure = FALSE) + if(isxeno(passer)) + return "Unidentified lifeform detected departing AI Chamber." + if(ishuman(passer)) + var/mob/living/carbon/human/human_passer = passer + if(failure) + return "CAUTION: [human_passer.name] left the AI Chamber without a locatable ID card." + return "ALERT: [human_passer.name] left the AI Chamber with a temporary access ticket. Removing access." + + if(idcard) + return "ALERT: ID Card assigned to [idcard.registered_name] left the AI Chamber with a temporary access ticket. Removing access." + + log_debug("ARES ERROR 337: Passer: '[passer]', ID: '[idcard]', F Status: '[failure]'") + return "Warning: Error 337 - Access Control Anomaly." diff --git a/code/game/machinery/bio-dome_floodlights.dm b/code/game/machinery/bio-dome_floodlights.dm index 83d40aef21e3..488cf1ed79cc 100644 --- a/code/game/machinery/bio-dome_floodlights.dm +++ b/code/game/machinery/bio-dome_floodlights.dm @@ -1,6 +1,6 @@ /obj/structure/machinery/hydro_floodlight_switch name = "Biodome Floodlight Switch" - icon = 'icons/turf/ground_map.dmi' + icon = 'icons/obj/structures/machinery/power.dmi' icon_state = "panelnopower" desc = "This switch controls the floodlights surrounding the archaeology complex. It only functions when there is power." density = FALSE diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 1a15d40eba9c..a8735cbc06a8 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -110,6 +110,10 @@ /obj/structure/machinery/camera/autoname/almayer/containment/hidden network = list(CAMERA_NET_CONTAINMENT_HIDDEN) +/obj/structure/machinery/camera/autoname/almayer/containment/ares + name = "ares core camera" + network = list(CAMERA_NET_ALMAYER, CAMERA_NET_ARES) + //used by the landing camera dropship equipment. Do not place them right under where the dropship lands. //Should place them near each corner of your LZs. /obj/structure/machinery/camera/autoname/lz_camera diff --git a/code/game/machinery/computer/almayer_control.dm b/code/game/machinery/computer/almayer_control.dm index ec4abc68511b..b2a931224464 100644 --- a/code/game/machinery/computer/almayer_control.dm +++ b/code/game/machinery/computer/almayer_control.dm @@ -118,7 +118,7 @@ return FALSE usr.set_interaction(src) - + var/datum/ares_link/link = GLOB.ares_link switch(href_list["operation"]) if("main") state = STATE_DEFAULT @@ -163,6 +163,7 @@ log_game("[key_name(usr)] has called for an emergency evacuation.") message_admins("[key_name_admin(usr)] has called for an emergency evacuation.") + link.log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") return TRUE state = STATE_EVACUATION @@ -182,6 +183,7 @@ log_game("[key_name(usr)] has canceled the emergency evacuation.") message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.") + link.log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.") return TRUE state = STATE_EVACUATION_CANCEL diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm index d7fe2ed83e02..d4feca457f4a 100644 --- a/code/game/machinery/computer/camera_console.dm +++ b/code/game/machinery/computer/camera_console.dm @@ -318,6 +318,10 @@ name = "Containment Cameras" network = list(CAMERA_NET_CONTAINMENT) +/obj/structure/machinery/computer/cameras/almayer/ares + name = "ARES Core Cameras" + network = list(CAMERA_NET_ARES) + /obj/structure/machinery/computer/cameras/almayer/vehicle name = "Ship Security Cameras" network = list(CAMERA_NET_ALMAYER, CAMERA_NET_VEHICLE) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 2a7b5017d1ed..edc39faf3ddc 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -65,6 +65,7 @@ if(..()) return FALSE usr.set_interaction(src) + var/datum/ares_link/link = GLOB.ares_link switch(href_list["operation"]) if("mapview") tacmap.tgui_interact(usr) @@ -148,6 +149,7 @@ log_game("[key_name(usr)] has called for an emergency evacuation.") message_admins("[key_name_admin(usr)] has called for an emergency evacuation.") + link.log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") return TRUE state = STATE_EVACUATION @@ -167,6 +169,7 @@ log_game("[key_name(usr)] has canceled the emergency evacuation.") message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.") + link.log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.") return TRUE state = STATE_EVACUATION_CANCEL diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index fecedda22a14..8fa0b9b86a0c 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -11,6 +11,7 @@ unslashable = TRUE var/circuit = null //The path to the circuit board type. If circuit==null, the computer can't be disassembled. var/processing = FALSE //Set to true if computer needs to do /process() + var/deconstructible = TRUE var/exproof = 0 /obj/structure/machinery/computer/Initialize() @@ -96,6 +97,9 @@ /obj/structure/machinery/computer/attackby(obj/item/I, mob/user) if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER) && circuit) + if(!deconstructible) + to_chat(user, SPAN_WARNING("You can't figure out how to deconstruct [src]...")) + return if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI)) to_chat(user, SPAN_WARNING("You don't know how to deconstruct [src]...")) return diff --git a/code/game/machinery/computer/groundside_operations.dm b/code/game/machinery/computer/groundside_operations.dm index 234852539226..9856ae8f970e 100644 --- a/code/game/machinery/computer/groundside_operations.dm +++ b/code/game/machinery/computer/groundside_operations.dm @@ -273,16 +273,20 @@ to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Searching for helmet cam. No helmet cam found for this marine! Tell your squad to put their helmets on!")]") else if(cam && cam == new_cam)//click the camera you're watching a second time to stop watching. visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Stopping helmet cam view of [cam_target].")]") + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null usr.reset_view(null) else if(usr.client.view != world_view_size) to_chat(usr, SPAN_WARNING("You're too busy peering through binoculars.")) else + if(cam) + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = new_cam usr.reset_view(cam) + usr.RegisterSignal(cam, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/mob, reset_observer_view_on_deletion)) if("activate_echo") - var/reason = input(usr, "What is the purpose of Echo Squad?", "Activation Reason") + var/reason = strip_html(input(usr, "What is the purpose of Echo Squad?", "Activation Reason")) if(!reason) return if(alert(usr, "Confirm activation of Echo Squad for [reason]", "Confirm Activation", "Yes", "No") != "Yes") return @@ -306,6 +310,8 @@ ..() if(!isRemoteControlling(user)) + if(cam) + user.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null user.reset_view(null) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 5ba958ad95fe..ed06c0117f33 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -185,6 +185,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li flags_atom |= USES_HEARING /obj/structure/machinery/cryopod/Destroy() + SetLuminosity(0) QDEL_NULL(occupant) QDEL_NULL(announce) . = ..() @@ -367,6 +368,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li qdel(G) icon_state = "body_scanner_open" + SetLuminosity(0) if(occupant.key) occupant.ghostize(0) @@ -507,6 +509,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li M.forceMove(src) occupant = M icon_state = "body_scanner_closed" + SetLuminosity(2) time_entered = world.time start_processing() @@ -527,6 +530,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li occupant = null stop_processing() icon_state = "body_scanner_open" + SetLuminosity(0) playsound(src, 'sound/machines/pod_open.ogg', 30) #ifdef OBJECTS_PROXY_SPEECH diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 40bdd68b3b34..8be8609d6008 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -52,6 +52,11 @@ /obj/structure/machinery/door_control/attackby(obj/item/W, mob/user as mob) return src.attack_hand(user) +/obj/structure/machinery/door_control/ex_act(severity) + if(indestructible) + return FALSE + ..() + /obj/structure/machinery/door_control/proc/handle_dropship(ship_id) var/obj/docking_port/mobile/marine_dropship/shuttle = SSshuttle.getShuttle(ship_id) if (!istype(shuttle)) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 49ed190690fe..e3e5fd3bee87 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -551,6 +551,9 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( update_icon() /obj/structure/machinery/door/airlock/attackby(obj/item/C, mob/user) + if(SEND_SIGNAL(C, COMSIG_ITEM_ATTACK_AIRLOCK, src, user) & COMPONENT_CANCEL_AIRLOCK_ATTACK) + return + if(istype(C, /obj/item/clothing/mask/cigarette)) if(isElectrified()) var/obj/item/clothing/mask/cigarette/L = C @@ -606,32 +609,6 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list( update_icon() return - if(istype(C, /obj/item/maintenance_jack) && locked) - var/obj/item/maintenance_jack/current_jack = C - - if(current_jack.crowbar_mode) - return - - if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_MASTER)) //Engi 3 is much faster - user.visible_message(SPAN_DANGER("[user] begins to search for [src]'s bolts!"),\ - SPAN_NOTICE("You search for [src]'s bolts.")) - if(!do_after(user, 15 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) //Otherwise it takes an extra 15 seconds - to_chat(user, SPAN_WARNING("You fail to find the bolts on [src].")) - return - - user.visible_message(SPAN_DANGER("[user] begins to disable [src]'s bolts!"),\ - SPAN_NOTICE("You start to disable [src]'s bolts.")) - playsound(src, "pry", 25, TRUE) - - if(!do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) - to_chat(user, SPAN_WARNING("You decide not to disable the bolts on [src].")) - return - - user.visible_message(SPAN_DANGER("[user] disables the bolts on [src]."),\ - SPAN_NOTICE("You unbolt [src].")) - unlock(TRUE) - return - else if(HAS_TRAIT(C, TRAIT_TOOL_SCREWDRIVER)) if(no_panel) to_chat(user, SPAN_WARNING("\The [src] has no panel to open!")) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 972ce6b7570e..da6137e5e8cb 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -287,10 +287,13 @@ /obj/structure/machinery/door/poddoor/almayer/blended icon_state = "almayer_pdoor1" base_icon_state = "almayer_pdoor" - +/obj/structure/machinery/door/poddoor/almayer/blended/open + density = FALSE /obj/structure/machinery/door/poddoor/almayer/blended/white icon_state = "w_almayer_pdoor1" base_icon_state = "w_almayer_pdoor" +/obj/structure/machinery/door/poddoor/almayer/blended/white/open + density = FALSE /obj/structure/machinery/door/poddoor/almayer/Initialize() . = ..() diff --git a/code/game/machinery/doors/railing.dm b/code/game/machinery/doors/railing.dm index 145a5d8191dc..8449d5d52256 100644 --- a/code/game/machinery/doors/railing.dm +++ b/code/game/machinery/doors/railing.dm @@ -19,7 +19,8 @@ . = ..() if(dir == SOUTH) closed_layer = ABOVE_MOB_LAYER - layer = closed_layer + if(density)//Allows preset-open to work + layer = closed_layer SetOpacity(initial(opacity)) @@ -63,3 +64,6 @@ addtimer(VARSET_CALLBACK(src, operating, FALSE), 1.2 SECONDS) return TRUE + +/obj/structure/machinery/door/poddoor/railing/open + density = FALSE diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index ca676f41453d..783d24c00f2e 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -319,7 +319,7 @@ var/list/alldepartments = list() GLOB.fax_contents += faxcontents - var/msg_admin = SPAN_NOTICE("[target_department]: [key_name(user, 1)] ") + var/msg_admin = SPAN_STAFF_IC("[target_department]: [key_name(user, 1)] ") msg_admin += "[CC_MARK(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_JMP_USER(user)] " switch(target_department) @@ -342,7 +342,7 @@ var/list/alldepartments = list() GLOB.GeneralFaxes.Add("\[view message at [world.timeofday]\] REPLY") msg_admin += "(RPLY): " - msg_admin += "Receiving fax via secure connection ... view message" + msg_admin += SPAN_STAFF_IC("Receiving fax via secure connection ... view message") var/msg_ghost = SPAN_NOTICE("[target_department]: ") msg_ghost += "Receiving fax via secure connection ... view message" diff --git a/code/game/machinery/groundmap_geothermal.dm b/code/game/machinery/groundmap_geothermal.dm index ec20f00449bb..4be9c53f0094 100644 --- a/code/game/machinery/groundmap_geothermal.dm +++ b/code/game/machinery/groundmap_geothermal.dm @@ -198,10 +198,13 @@ else return ..() //Deal with everything else, like hitting with stuff +/obj/structure/machinery/power/geothermal/ex_act(severity, direction) + return FALSE //gameplay-wise these should really never go away + //Putting these here since it's power-related /obj/structure/machinery/colony_floodlight_switch name = "Colony Floodlight Switch" - icon = 'icons/turf/ground_map.dmi' + icon = 'icons/obj/structures/machinery/power.dmi' icon_state = "panelnopower" desc = "This switch controls the floodlights surrounding the archaeology complex. It only functions when there is power." density = FALSE @@ -279,7 +282,7 @@ if(!ispowered) to_chat(user, "Nothing happens.") return 0 - playsound(src,'sound/machines/click.ogg', 15, 1) + playsound(src,'sound/items/Deconstruct.ogg', 30, 1) use_power(5) toggle_lights() turned_on = !(src.turned_on) @@ -299,7 +302,7 @@ icon_state = "flood_s_off" density = TRUE anchored = TRUE - layer = WINDOW_LAYER + layer = ABOVE_XENO_LAYER var/damaged = 0 //Can be smashed by xenos var/is_lit = 0 //whether the floodlight is switched to on or off. Does not necessarily mean it emits light. unslashable = TRUE diff --git a/code/game/machinery/nuclearbomb.dm b/code/game/machinery/nuclearbomb.dm index 7dcdb9e39914..6c0ec4cc0389 100644 --- a/code/game/machinery/nuclearbomb.dm +++ b/code/game/machinery/nuclearbomb.dm @@ -55,31 +55,35 @@ var/bomb_set = FALSE /obj/structure/machinery/nuclearbomb/process() . = ..() - if(timing) - bomb_set = TRUE //So long as there is one nuke timing, it means one nuke is armed. - timeleft = explosion_time - world.time - if(world.time >= explosion_time) - explode() - //3 warnings: 1. Halfway through, 2. 1 minute left, 3. 10 seconds left. - //this structure allows varedits to var/timeleft without losing or spamming warnings. - else if(timer_announcements_flags) - if(timer_announcements_flags & NUKE_SHOW_TIMER_HALF) - if(timeleft <= initial(timeleft) / 2 && timeleft >= initial(timeleft) / 2 - 30) - announce_to_players(NUKE_SHOW_TIMER_HALF) - timer_announcements_flags &= ~NUKE_SHOW_TIMER_HALF - return - if(timer_announcements_flags & NUKE_SHOW_TIMER_MINUTE) - if(timeleft <= 600 && timeleft >= 570) - announce_to_players(NUKE_SHOW_TIMER_MINUTE) - timer_announcements_flags = NUKE_SHOW_TIMER_TEN_SEC - return - if(timer_announcements_flags & NUKE_SHOW_TIMER_TEN_SEC) - if(timeleft <= 100 && timeleft >= 70) - announce_to_players(NUKE_SHOW_TIMER_TEN_SEC) - timer_announcements_flags = 0 - return - else - stop_processing() + if(!timing) + update_minimap_icon() + return PROCESS_KILL + + bomb_set = TRUE //So long as there is one nuke timing, it means one nuke is armed. + timeleft = explosion_time - world.time + if(world.time >= explosion_time) + explode() + return + //3 warnings: 1. Halfway through, 2. 1 minute left, 3. 10 seconds left. + //this structure allows varedits to var/timeleft without losing or spamming warnings. + if(!timer_announcements_flags) + return + + if(timer_announcements_flags & NUKE_SHOW_TIMER_HALF) + if(timeleft <= initial(timeleft) / 2 && timeleft >= initial(timeleft) / 2 - 30) + announce_to_players(NUKE_SHOW_TIMER_HALF) + timer_announcements_flags &= ~NUKE_SHOW_TIMER_HALF + return + if(timer_announcements_flags & NUKE_SHOW_TIMER_MINUTE) + if(timeleft <= 600 && timeleft >= 570) + announce_to_players(NUKE_SHOW_TIMER_MINUTE) + timer_announcements_flags = NUKE_SHOW_TIMER_TEN_SEC + return + if(timer_announcements_flags & NUKE_SHOW_TIMER_TEN_SEC) + if(timeleft <= 100 && timeleft >= 70) + announce_to_players(NUKE_SHOW_TIMER_TEN_SEC) + timer_announcements_flags = 0 + return /obj/structure/machinery/nuclearbomb/attack_alien(mob/living/carbon/xenomorph/M) INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, attack_hand), M) @@ -87,10 +91,10 @@ var/bomb_set = FALSE /obj/structure/machinery/nuclearbomb/attackby(obj/item/O as obj, mob/user as mob) if(anchored && timing && bomb_set && HAS_TRAIT(O, TRAIT_TOOL_WIRECUTTERS)) - user.visible_message(SPAN_DANGER("[user] begins to defuse \the [src]."), SPAN_DANGER("You begin to defuse \the [src]. This will take some time...")) + user.visible_message(SPAN_INFO("[user] begins to defuse \the [src]."), SPAN_INFO("You begin to defuse \the [src]. This will take some time...")) if(do_after(user, 150 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) disable() - playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) + playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) return ..() @@ -103,12 +107,12 @@ var/bomb_set = FALSE if(deployable) if(!ishuman(user) && !isqueen(user)) - to_chat(usr, SPAN_DANGER("You don't have the dexterity to do this!")) + to_chat(usr, SPAN_INFO("You don't have the dexterity to do this!")) return if(isqueen(user)) if(timing && bomb_set) - user.visible_message(SPAN_DANGER("[user] begins to defuse \the [src]."), SPAN_DANGER("You begin to defuse \the [src]. This will take some time...")) + user.visible_message(SPAN_INFO("[user] begins to defuse \the [src]."), SPAN_INFO("You begin to defuse \the [src]. This will take some time...")) if(do_after(user, 5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) disable() return @@ -162,37 +166,38 @@ var/bomb_set = FALSE if(timing == -1) return - if(!ishuman(usr)) + if(!ishuman(ui.user)) return - if(!allowed(usr)) - to_chat(usr, SPAN_DANGER("Access denied!")) + if(!allowed(ui.user)) + to_chat(ui.user, SPAN_INFO("Access denied!")) return if(!anchored) - to_chat(usr, SPAN_DANGER("Engage anchors first!")) + to_chat(ui.user, SPAN_INFO("Engage anchors first!")) return if(safety) - to_chat(usr, SPAN_DANGER("The safety is still on.")) + to_chat(ui.user, SPAN_INFO("The safety is still on.")) return if(!A.can_build_special) - to_chat(usr, SPAN_DANGER("You cannot deploy [src] here!")) + to_chat(ui.user, SPAN_INFO("You cannot deploy [src] here!")) return - if(usr.action_busy) + if(ui.user.action_busy) return - usr.visible_message(SPAN_WARNING("[usr] begins to [timing ? "disengage" : "engage"] [src]!"), SPAN_WARNING("You begin to [timing ? "disengage" : "engage"] [src].")) + ui.user.visible_message(SPAN_WARNING("[ui.user] begins to [timing ? "disengage" : "engage"] [src]!"), SPAN_WARNING("You begin to [timing ? "disengage" : "engage"] [src].")) being_used = TRUE - ui = SStgui.try_update_ui(usr, src, ui) - if(do_after(usr, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + ui = SStgui.try_update_ui(ui.user, src, ui) + if(do_after(ui.user, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) timing = !timing if(timing) if(!safety) bomb_set = TRUE explosion_time = world.time + timeleft + update_minimap_icon() start_processing() announce_to_players() message_admins("\The [src] has been activated by [key_name(ui.user, 1)] [ADMIN_JMP_USER(ui.user)]") @@ -201,28 +206,28 @@ var/bomb_set = FALSE else disable() message_admins("\The [src] has been deactivated by [key_name(ui.user, 1)] [ADMIN_JMP_USER(ui.user)]") - playsound(src.loc, 'sound/effects/thud.ogg', 100, 1) + playsound(loc, 'sound/effects/thud.ogg', 100, 1) being_used = FALSE . = TRUE if("toggleSafety") - if(!allowed(usr)) - to_chat(usr, SPAN_DANGER("Access denied!")) + if(!allowed(ui.user)) + to_chat(ui.user, SPAN_INFO("Access denied!")) return if(timing) - to_chat(usr, SPAN_DANGER("Disengage first!")) + to_chat(ui.user, SPAN_INFO("Disengage first!")) return if(!A.can_build_special) - to_chat(usr, SPAN_DANGER("You cannot deploy [src] here!")) + to_chat(ui.user, SPAN_INFO("You cannot deploy [src] here!")) return - if(usr.action_busy) + if(ui.user.action_busy) return - usr.visible_message(SPAN_WARNING("[usr] begins to [safety ? "disable" : "enable"] the safety on [src]!"), SPAN_WARNING("You begin to [safety ? "disable" : "enable"] the safety on [src].")) + ui.user.visible_message(SPAN_WARNING("[ui.user] begins to [safety ? "disable" : "enable"] the safety on [src]!"), SPAN_WARNING("You begin to [safety ? "disable" : "enable"] the safety on [src].")) being_used = TRUE - ui = SStgui.try_update_ui(usr, src, ui) - if(do_after(usr, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + ui = SStgui.try_update_ui(ui.user, src, ui) + if(do_after(ui.user, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) safety = !safety - playsound(src.loc, 'sound/items/poster_being_created.ogg', 100, 1) + playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) being_used = FALSE if(safety) timing = FALSE @@ -230,63 +235,55 @@ var/bomb_set = FALSE . = TRUE if("toggleCommandLockout") - if(!ishuman(usr)) + if(!ishuman(ui.user)) return - if(!allowed(usr)) - to_chat(usr, SPAN_DANGER("Access denied!")) + if(!allowed(ui.user)) + to_chat(ui.user, SPAN_INFO("Access denied!")) return if(command_lockout) command_lockout = FALSE req_one_access = list() - to_chat(usr, SPAN_DANGER("Command lockout disengaged.")) + to_chat(ui.user, SPAN_INFO("Command lockout disengaged.")) else //Check if they have command access var/list/acc = list() - var/mob/living/carbon/human/H = usr + var/mob/living/carbon/human/H = ui.user if(H.wear_id) acc += H.wear_id.GetAccess() if(H.get_active_hand()) acc += H.get_active_hand().GetAccess() if(!(ACCESS_MARINE_COMMAND in acc)) - to_chat(usr, SPAN_DANGER("Access denied!")) + to_chat(ui.user, SPAN_INFO("Access denied!")) return command_lockout = TRUE req_one_access = list(ACCESS_MARINE_COMMAND) - to_chat(usr, SPAN_DANGER("Command lockout engaged.")) + to_chat(ui.user, SPAN_INFO("Command lockout engaged.")) . = TRUE if("toggleAnchor") if(timing) - to_chat(usr, SPAN_DANGER("Disengage first!")) + to_chat(ui.user, SPAN_INFO("Disengage first!")) return if(!A.can_build_special) - to_chat(usr, SPAN_DANGER("You cannot deploy [src] here!")) + to_chat(ui.user, SPAN_INFO("You cannot deploy [src] here!")) return - if(usr.action_busy) + if(ui.user.action_busy) return being_used = TRUE - ui = SStgui.try_update_ui(usr, src, ui) - if(do_after(usr, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + ui = SStgui.try_update_ui(ui.user, src, ui) + if(do_after(ui.user, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) if(!anchored) - visible_message(SPAN_DANGER("With a steely snap, bolts slide out of [src] and anchor it to the flooring.")) + visible_message(SPAN_INFO("With a steely snap, bolts slide out of [src] and anchor it to the flooring.")) else - visible_message(SPAN_DANGER("The anchoring bolts slide back into the depths of [src].")) - playsound(src.loc, 'sound/items/Deconstruct.ogg', 100, 1) + visible_message(SPAN_INFO("The anchoring bolts slide back into the depths of [src].")) + playsound(loc, 'sound/items/Deconstruct.ogg', 100, 1) anchored = !anchored being_used = FALSE . = TRUE update_icon() - add_fingerprint(usr) - -/obj/structure/machinery/nuclearbomb/start_processing() - . = ..() - update_minimap_icon() - -/obj/structure/machinery/nuclearbomb/stop_processing() - . = ..() - update_minimap_icon() + add_fingerprint(ui.user) /obj/structure/machinery/nuclearbomb/verb/make_deployable() set category = "Object" @@ -297,12 +294,12 @@ var/bomb_set = FALSE return if(!ishuman(usr)) - to_chat(usr, SPAN_DANGER("You don't have the dexterity to do this!")) + to_chat(usr, SPAN_INFO("You don't have the dexterity to do this!")) return var/area/A = get_area(src) if(!A.can_build_special) - to_chat(usr, SPAN_DANGER("You don't want to deploy this here!")) + to_chat(usr, SPAN_INFO("You don't want to deploy this here!")) return usr.visible_message(SPAN_WARNING("[usr] begins to [deployable ? "close" : "adjust"] several panels to make [src] [deployable ? "undeployable" : "deployable"]."), SPAN_WARNING("You begin to [deployable ? "close" : "adjust"] several panels to make [src] [deployable ? "undeployable" : "deployable"].")) @@ -314,26 +311,25 @@ var/bomb_set = FALSE else deployable = TRUE anchored = TRUE - playsound(src.loc, 'sound/items/Deconstruct.ogg', 100, 1) + playsound(loc, 'sound/items/Deconstruct.ogg', 100, 1) being_used = FALSE update_icon() //unified all announcements to one proc /obj/structure/machinery/nuclearbomb/proc/announce_to_players(timer_warning) + + var/list/humans_other = GLOB.human_mob_list + GLOB.dead_mob_list + var/list/humans_uscm = list() + for(var/mob/current_mob as anything in humans_other) + if(current_mob.stat != CONSCIOUS || isyautja(current_mob)) + humans_other -= current_mob + continue + if(current_mob.faction == FACTION_MARINE || current_mob.faction == FACTION_SURVIVOR) //separating marines from other factions. Survs go here too + humans_uscm += current_mob + humans_other -= current_mob + if(timer_warning) //we check for timer warnings first - //humans part - var/list/humans_other = GLOB.human_mob_list + GLOB.dead_mob_list - var/list/humans_USCM = list() - for(var/mob/M in humans_other) - var/mob/living/carbon/human/H = M - if(istype(H)) //if it's unconsious human or yautja, we remove them - if(H.stat != CONSCIOUS || isyautja(H)) - humans_other.Remove(M) - continue - if(M.faction == FACTION_MARINE || M.faction == FACTION_SURVIVOR) //separating marines from other factions. Survs go here too - humans_USCM += M - humans_other -= M - announcement_helper("WARNING.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_USCM, 'sound/misc/notice1.ogg') + announcement_helper("WARNING.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') announcement_helper("WARNING.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg') //preds part var/t_left = duration2text_sec(round(rand(timeleft - timeleft / 10, timeleft + timeleft / 10))) @@ -354,21 +350,9 @@ var/bomb_set = FALSE xeno_announcement(SPAN_XENOANNOUNCE(warning), hive.hivenumber, XENO_GENERAL_ANNOUNCE) return - //deal with start/stop announcements for players - var/list/humans_other = GLOB.human_mob_list + GLOB.dead_mob_list - var/list/humans_USCM = list() - for(var/mob/M in humans_other) - var/mob/living/carbon/human/H = M - if(istype(H)) //if it's unconsious human or yautja, we remove them - if(H.stat != CONSCIOUS || isyautja(H)) - humans_other.Remove(M) - continue - if(M.faction == FACTION_MARINE || M.faction == FACTION_SURVIVOR) //separating marines from other factions. Survs go here too - humans_USCM += M - humans_other -= M var/datum/hive_status/hive if(timing) - announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE ACTIVATED.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_USCM, 'sound/misc/notice1.ogg') + announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE ACTIVATED.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE ACTIVATED.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "HQ Nuclear Tracker", humans_other, 'sound/misc/notice1.ogg') var/t_left = duration2text_sec(round(rand(timeleft - timeleft / 10, timeleft + timeleft / 10))) yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!
A human Purification Device has been detected. You have approximately [t_left] to abandon the hunting grounds before it activates.")) @@ -378,7 +362,7 @@ var/bomb_set = FALSE continue xeno_announcement(SPAN_XENOANNOUNCE("The tallhosts have deployed a hive killer at [get_area_name(loc)]! Stop it at all costs!"), hive.hivenumber, XENO_GENERAL_ANNOUNCE) else - announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DEACTIVATED.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_USCM, 'sound/misc/notice1.ogg') + announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DEACTIVATED.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DEACTIVATED.", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg') yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!
The human Purification Device's signature has disappeared.")) for(var/hivenumber in GLOB.hive_datum) @@ -401,6 +385,7 @@ var/bomb_set = FALSE /obj/structure/machinery/nuclearbomb/proc/explode() if(safety) timing = FALSE + update_minimap_icon() stop_processing() update_icon() return FALSE @@ -422,3 +407,200 @@ var/bomb_set = FALSE bomb_set = FALSE SSminimaps.remove_marker(src) return ..() + +/obj/structure/machinery/nuclearbomb/tech + var/decryption_time = 10 MINUTES + var/decryption_end_time = null + var/decrypting = FALSE + + timeleft = 1 MINUTES + timer_announcements_flags = NUKE_DECRYPT_SHOW_TIMER_ALL + + var/list/linked_decryption_towers + +/obj/structure/machinery/nuclearbomb/tech/Initialize(mapload) + . = ..() + + linked_decryption_towers = list() + + return INITIALIZE_HINT_LATELOAD + +/obj/structure/machinery/nuclearbomb/tech/LateInitialize() + . = ..() + + for(var/obj/structure/machinery/telecomms/relay/preset/tower/mapcomms/possible_telecomm in GLOB.all_static_telecomms_towers) + if(is_ground_level(possible_telecomm.z)) + linked_decryption_towers += possible_telecomm + + RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_TELECOMM_TURNED_OFF, PROC_REF(connected_comm_shutdown)) + +/obj/structure/machinery/nuclearbomb/tech/ui_data(mob/user) + . = ..() + + .["decrypting"] = decrypting + .["decryption_time"] = duration2text_sec(decryption_time) + + .["decryption_complete"] = decryption_time ? FALSE : TRUE + +/obj/structure/machinery/nuclearbomb/tech/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + if(..()) + return + + switch(action) + if("toggleEncryption") + if(!ishuman(ui.user)) + return + + if(!allowed(ui.user)) + to_chat(ui.user, SPAN_INFO("Access denied!")) + return + + if(!anchored) + to_chat(ui.user, SPAN_INFO("Engage anchors first!")) + return + + var/area/current_area = get_area(src) + if(!current_area.can_build_special) + to_chat(ui.user, SPAN_INFO("You cannot deploy [src] here!")) + return + + if(is_ground_level(z)) + for(var/obj/structure/machinery/telecomms/relay/preset/tower/mapcomms/telecomm_unit in linked_decryption_towers) + if(!telecomm_unit.on) + to_chat(ui.user, SPAN_INFO("The groundside telecommunication relays must be activated!")) + return + + if(ui.user.action_busy) + return + + if(being_used) + return + + ui.user.visible_message(SPAN_WARNING("[ui.user] begins to [decrypting ? "stop the decryption process." : "start decrypting."]!"), SPAN_WARNING("You begin to [decrypting ? "stop the decryption process." : "start decrypting."].")) + being_used = TRUE + ui = SStgui.try_update_ui(ui.user, src, ui) + if(do_after(ui.user, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + decrypting = !decrypting + if(decrypting) + //add signal handlers + decryption_end_time = world.time + decryption_time + start_processing() + announce_to_players() + message_admins("[src]'s encryption process has been started by [key_name(ui.user, 1)] [ADMIN_JMP_USER(ui.user)]") + else + //remove signal handlers + decryption_end_time = null + announce_to_players() + message_admins("[src]'s encryption process has been deactivated by [key_name(ui.user, 1)] [ADMIN_JMP_USER(ui.user)]") + playsound(loc, 'sound/effects/thud.ogg', 100, 1) + being_used = FALSE + return TRUE + +/obj/structure/machinery/nuclearbomb/tech/process() + if(!decrypting) + return ..() + + decryption_time = decryption_end_time - world.time + + if(world.time > decryption_end_time) + decrypting = FALSE + decryption_time = 0 + announce_to_players(NUKE_DECRYPT_SHOW_TIMER_COMPLETE) + timer_announcements_flags &= ~NUKE_DECRYPT_SHOW_TIMER_COMPLETE + return PROCESS_KILL + + if(!timer_announcements_flags) + return + + if(timer_announcements_flags & NUKE_DECRYPT_SHOW_TIMER_HALF) + if(decryption_time <= initial(decryption_time) / 2 && decryption_time >= initial(decryption_time) / 2 - 30) + announce_to_players(NUKE_DECRYPT_SHOW_TIMER_HALF) + timer_announcements_flags &= ~NUKE_DECRYPT_SHOW_TIMER_HALF + return + if(timer_announcements_flags & NUKE_DECRYPT_SHOW_TIMER_MINUTE) + if(decryption_time <= 600 && decryption_time >= 570) + announce_to_players(NUKE_DECRYPT_SHOW_TIMER_MINUTE) + timer_announcements_flags &= ~NUKE_DECRYPT_SHOW_TIMER_MINUTE + return + +/obj/structure/machinery/nuclearbomb/tech/announce_to_players(timer_warning) + if(!decryption_time && (timer_warning != NUKE_DECRYPT_SHOW_TIMER_COMPLETE)) + return ..() + + var/list/humans_other = GLOB.human_mob_list + GLOB.dead_mob_list + var/list/humans_uscm = list() + for(var/mob/current_mob as anything in humans_other) + var/mob/living/carbon/human/current_human = current_mob + if(istype(current_human)) //if it's unconsious human or yautja, we remove them + if(current_human.stat != CONSCIOUS || isyautja(current_human)) + humans_other -= current_mob + continue + if(current_mob.faction == FACTION_MARINE || current_mob.faction == FACTION_SURVIVOR) + humans_uscm += current_mob + humans_other -= current_mob + + if(timer_warning) + if(timer_warning == NUKE_DECRYPT_SHOW_TIMER_COMPLETE) + announcement_helper("DECRYPTION COMPLETE", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') + announcement_helper("DECRYPTION COMPLETE", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg') + + yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nThe human Purification Device is able to be activated.")) + + var/datum/hive_status/hive + for(var/hivenumber in GLOB.hive_datum) + hive = GLOB.hive_datum[hivenumber] + if(!length(hive.totalXenos)) + return + xeno_announcement(SPAN_XENOANNOUNCE("The hive killer is ready to be activated! Assault at once!"), hive.hivenumber, XENO_GENERAL_ANNOUNCE) + return + + announcement_helper("DECRYPTION IN [round(decryption_time/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') + announcement_helper("DECRYPTION IN [round(decryption_time/10)] SECONDS.", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg') + + //preds part + var/time_left = duration2text_sec(round(rand(decryption_time - decryption_time / 10, decryption_time + decryption_time / 10))) + yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nYou have approximately [time_left] seconds to abandon the hunting grounds before human Purification Device is able to be activated.")) + + //xenos part + var/warning = "Hive killer is almost prepared to be activated!" + if(timer_warning & NUKE_DECRYPT_SHOW_TIMER_HALF) + warning = "Hive killer is halfway through its initial phase!" + + var/datum/hive_status/hive + for(var/hivenumber in GLOB.hive_datum) + hive = GLOB.hive_datum[hivenumber] + if(!hive.totalXenos.len) + return + xeno_announcement(SPAN_XENOANNOUNCE(warning), hive.hivenumber, XENO_GENERAL_ANNOUNCE) + return + + var/datum/hive_status/hive + if(decrypting) + announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DECRYPTION STARTED.\n\nDECRYPTION IN [round(decryption_time/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') + announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DECRYPTION STARTED.\n\nDECRYPTION IN [round(decryption_time/10)] SECONDS.", "HQ Nuclear Tracker", humans_other, 'sound/misc/notice1.ogg') + var/time_left = duration2text_sec(round(rand(decryption_time - decryption_time / 10, decryption_time + decryption_time / 10))) + yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!
A human Purification Device has been detected. You have approximately [time_left] before it finishes its initial phase.")) + for(var/hivenumber in GLOB.hive_datum) + hive = GLOB.hive_datum[hivenumber] + if(!length(hive.totalXenos)) + continue + xeno_announcement(SPAN_XENOANNOUNCE("The tallhosts have started the initial phase of a hive killer at [get_area_name(loc)]! Destroy their communications relays!"), hive.hivenumber, XENO_GENERAL_ANNOUNCE) + return + + announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE DECRYPTION HALTED.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') + announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE DECRYPTION HALTED.", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg') + yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!
The human Purification Device's signature has disappeared.")) + for(var/hivenumber in GLOB.hive_datum) + hive = GLOB.hive_datum[hivenumber] + if(!length(hive.totalXenos)) + continue + xeno_announcement(SPAN_XENOANNOUNCE("The hive killer's initial phase has been halted! Rejoice!"), hive.hivenumber, XENO_GENERAL_ANNOUNCE) + +/obj/structure/machinery/nuclearbomb/tech/proc/connected_comm_shutdown(obj/structure/machinery/telecomms/relay/preset/tower/telecomm_unit) + SIGNAL_HANDLER + + if(!decrypting) + return + + decrypting = FALSE + announce_to_players() diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 1ef3a326485d..7855f446c805 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -11,7 +11,7 @@ black_market_value = 35 var/obj/item/charging = null var/percent_charge_complete = 0 - var/list/allowed_devices = list(/obj/item/weapon/baton, /obj/item/cell, /obj/item/weapon/gun/energy, /obj/item/device/defibrillator, /obj/item/tool/portadialysis, /obj/item/clothing/suit/auto_cpr) + var/list/allowed_devices = list(/obj/item/weapon/baton, /obj/item/cell, /obj/item/weapon/gun/energy, /obj/item/device/defibrillator, /obj/item/tool/portadialysis, /obj/item/clothing/suit/auto_cpr, /obj/item/smartgun_battery) var/charge_amount = 1000 @@ -166,6 +166,21 @@ update_icon() return + if(istype(charging, /obj/item/smartgun_battery)) + var/obj/item/smartgun_battery/charging_smartgun_battery = charging + if(charging_smartgun_battery.power_cell) + if(!charging_smartgun_battery.power_cell.fully_charged()) + charging_smartgun_battery.power_cell.give(charge_amount) + percent_charge_complete = charging_smartgun_battery.power_cell.percent() + update_use_power(USE_POWER_ACTIVE) + update_icon() + return + + percent_charge_complete = 100 + update_use_power(USE_POWER_IDLE) + update_icon() + return + /* Disable defib recharging if(istype(charging, /obj/item/device/defibrillator)) var/obj/item/device/defibrillator/D = charging diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 66f3a92cbdf2..644402128852 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -1,8 +1,8 @@ /obj/structure/machinery/recharge_station - name = "robot recharge station" + name = "synthetic maintenance station" icon = 'icons/obj/objects.dmi' icon_state = "borgcharger0" - desc = "A recharge and repair station for robots and synthetics. Simply put the synthetic in need of repair in here and they will be fixed up in no time!" + desc = "A Synthetic Maintenance Station designed to recharge, repair and maintain various sizes of artificial people. Simply place the synthetic or android in need of repair in here and they will be fixed up in no time!" density = TRUE anchored = TRUE use_power = USE_POWER_IDLE @@ -14,8 +14,10 @@ var/charging_cap_active = 25000 // Active Cap - When cyborg is inside var/charging_cap_passive = 2500 // Passive Cap - Recharging internal capacitor when no cyborg is inside var/icon_update_tick = 0 // Used to update icon only once every 10 ticks + var/known_implants = list(/obj/item/implant/chem, /obj/item/implant/death_alarm, /obj/item/implant/loyalty, /obj/item/implant/tracking, /obj/item/implant/neurostim) can_buckle = TRUE + /obj/structure/machinery/recharge_station/Initialize(mapload, ...) . = ..() update_icon() @@ -157,21 +159,42 @@ doing_stuff = TRUE else update_use_power(USE_POWER_IDLE) - if (isrobot(occupant) || issynth(occupant)) + if (issynth(occupant)) + var/mob/living/carbon/human/humanoid_occupant = occupant //for special synth surgeries if(occupant.getBruteLoss() > 0 || occupant.getFireLoss() > 0 || occupant.getBrainLoss() > 0) occupant.heal_overall_damage(10, 10, TRUE) occupant.apply_damage(-10, BRAIN) current_internal_charge = max(current_internal_charge - 500, 0) - to_chat(occupant, "Repairing...") + to_chat(occupant, "Structural damage detected. Repairing...") doing_stuff = TRUE occupant.pain.recalculate_pain() if(!doing_stuff && occupant.blood_volume < initial(occupant.blood_volume)) occupant.blood_volume = min(occupant.blood_volume + 10, initial(occupant.blood_volume)) - to_chat(occupant, "Refreshing liquids...") + to_chat(occupant, "Fluid volume low. Refreshing liquids...") doing_stuff = TRUE + if(!doing_stuff) + for(var/obj/limb/current_limb in humanoid_occupant.limbs) + if(current_limb.implants.len) + doing_stuff = TRUE + to_chat(occupant, "Foreign material detected. Beginning removal process...") + for(var/obj/item/current_implant in current_limb.implants) + if(!is_type_in_list(current_implant,known_implants)) + sleep(REMOVE_OBJECT_MAX_DURATION) + current_limb.implants -= current_implant + humanoid_occupant.embedded_items -= current_implant + qdel(current_implant) + to_chat(occupant, "Foreign object removed.") + for(var/datum/internal_organ/current_organ in humanoid_occupant.internal_organs) + if(current_organ.robotic == ORGAN_ASSISTED||current_organ.robotic == ORGAN_ROBOT) //this time the machine can *only* fix robotic organs + if(current_organ.damage > 0) + to_chat(occupant, "Damaged internal component detected. Beginning repair process.") + doing_stuff = TRUE + sleep(FIX_ORGAN_MAX_DURATION) + current_organ.rejuvenate() + to_chat(occupant, "Internal component repaired.") if(!doing_stuff) - to_chat(occupant, "Maintenance complete! Have a nice day!") + to_chat(occupant, "Maintenance cycle completed. All systems nominal.") go_out() diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index ce5e9a743bc5..a25293aebbd3 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -60,7 +60,7 @@ return TRUE return FALSE -/obj/structure/machinery/telecomms/relay/preset/tower/tcomms_startup() +/obj/structure/machinery/telecomms/relay/preset/tower/update_state() . = ..() if(on) playsound(src, 'sound/machines/tcomms_on.ogg', vol = 80, vary = FALSE, sound_range = 16, falloff = 0.5) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 324a358d041f..255d70f45870 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -71,6 +71,9 @@ GLOBAL_LIST_EMPTY_TYPED(telecomms_list, /obj/structure/machinery/telecomms) // When effectively shut down /obj/structure/machinery/telecomms/proc/tcomms_shutdown() on = FALSE + + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GROUNDSIDE_TELECOMM_TURNED_OFF) + if(tcomms_machine) SSradio.remove_tcomm_machine(src) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index ac0d3e852ae1..50abb701145e 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -118,7 +118,11 @@ GLOBAL_LIST_EMPTY(vending_products) if (!item_name || item_name == "" || !typepath) continue - GLOB.vending_products[typepath] = 1 + if(islist(typepath)) + for(var/path in typepath) + GLOB.vending_products[path] = 1 + else + GLOB.vending_products[typepath] = 1 //get which turf the vendor will dispense its products on. /obj/structure/machinery/cm_vending/proc/get_appropriate_vend_turf() @@ -1059,10 +1063,10 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( var/p_name = myprod[1] //taking it's name var/p_cost = cost_index == null ? 0 : myprod[cost_index] - var/item_ref = myprod[3] + var/obj/item/item_ref = myprod[3] var/priority = myprod[priority_index] - - var/obj/item/I = item_ref + if(islist(item_ref)) // multi-vending + item_ref = item_ref[1] var/is_category = item_ref == null @@ -1073,7 +1077,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( "prod_index" = i, "prod_name" = p_name, "prod_color" = priority, - "prod_desc" = initial(I.desc), + "prod_desc" = initial(item_ref.desc), "prod_cost" = p_cost, "image" = imgid ) @@ -1123,24 +1127,23 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( var/list/stock_values = list() - var/mob/living/carbon/human/H = user - var/buy_flags = H.marine_buy_flags + var/mob/living/carbon/human/marine = user var/points = 0 if(vending_machine.instanced_vendor_points) points = vending_machine.available_points_to_display else if(vending_machine.use_snowflake_points) - points = H.marine_snowflake_points + points = marine.marine_snowflake_points else if(vending_machine.use_points) - points = H.marine_points + points = marine.marine_points for (var/i in 1 to length(ui_listed_products)) var/list/myprod = ui_listed_products[i] //we take one list from listed_products var/prod_available = FALSE var/p_cost = myprod[2] - var/avail_flag = myprod[4] - if(points >= p_cost && (!avail_flag || buy_flags & avail_flag)) + var/category = myprod[4] + if(points >= p_cost && (!category || ((category in marine.marine_buyable_categories) && (marine.marine_buyable_categories[category])))) prod_available = TRUE stock_values += list(prod_available) @@ -1153,7 +1156,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( vendor.stat |= IN_USE var/vend_flags = vendor.vend_flags - var/turf/target_turf = vendor.get_appropriate_vend_turf(user) if(LAZYLEN(itemspec)) //making sure it's not empty if(vendor.vend_delay) @@ -1164,54 +1166,17 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( sleep(vendor.vend_delay) var/prod_type = itemspec[3] - - var/obj/item/new_item - if(ispath(prod_type, /obj/item)) - if(ispath(prod_type, /obj/item/weapon/gun)) - new_item = new prod_type(target_turf, TRUE) - else - if(prod_type == /obj/item/device/radio/headset/almayer/marine) - prod_type = vendor.headset_type - else if(prod_type == /obj/item/clothing/gloves/marine) - prod_type = vendor.gloves_type - new_item = new prod_type(target_turf) - new_item.add_fingerprint(user) + if(islist(prod_type)) + for(var/each_type in prod_type) + vendor_successful_vend_one(vendor, each_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) else - new_item = new prod_type(target_turf) + vendor_successful_vend_one(vendor, prod_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) if(vend_flags & VEND_LIMITED_INVENTORY) itemspec[2]-- if(vend_flags & VEND_LOAD_AMMO_BOXES) vendor.update_derived_ammo_and_boxes(itemspec) - if(vend_flags & VEND_UNIFORM_RANKS) - // apply ranks to clothing - var/bitf = itemspec[4] - if(bitf) - if(bitf == MARINE_CAN_BUY_UNIFORM) - var/obj/item/clothing/under/underclothes = new_item - //Gives ranks to the ranked - if(user.wear_id && user.wear_id.paygrade) - var/rankpath = get_rank_pins(user.wear_id.paygrade) - if(rankpath) - var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath() - underclothes.attach_accessory(user, rank_insignia) - - if(vend_flags & VEND_UNIFORM_AUTOEQUIP) - // autoequip - if(istype(new_item, /obj/item) && new_item.flags_equip_slot != NO_FLAGS) //auto-equipping feature here - if(new_item.flags_equip_slot == SLOT_ACCESSORY) - if(user.w_uniform) - var/obj/item/clothing/clothing = user.w_uniform - if(clothing.can_attach_accessory(new_item)) - clothing.attach_accessory(user, new_item) - else - user.equip_to_appropriate_slot(new_item) - - if(vend_flags & VEND_TO_HAND) - if(user.client?.prefs && (user.client?.prefs?.toggle_prefs & TOGGLE_VEND_ITEM_TO_HAND)) - if(vendor.Adjacent(user)) - user.put_in_any_hand_if_possible(new_item, disable_warning = TRUE) else to_chat(user, SPAN_WARNING("ERROR: itemspec is missing. Please report this to admins.")) sleep(15) @@ -1219,29 +1184,87 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( vendor.stat &= ~IN_USE vendor.update_icon() +/proc/vendor_successful_vend_one(obj/structure/machinery/cm_vending/vendor, prod_type, mob/living/carbon/human/user, turf/target_turf, insignas_override) + var/obj/item/new_item + var/vend_flags = vendor.vend_flags + if(ispath(prod_type, /obj/item)) + if(ispath(prod_type, /obj/item/weapon/gun)) + new_item = new prod_type(target_turf, TRUE) + else + if(prod_type == /obj/item/device/radio/headset/almayer/marine) + prod_type = vendor.headset_type + else if(prod_type == /obj/item/clothing/gloves/marine) + prod_type = vendor.gloves_type + new_item = new prod_type(target_turf) + new_item.add_fingerprint(user) + else + new_item = new prod_type(target_turf) + + if(vend_flags & VEND_UNIFORM_RANKS) + if(insignas_override) + var/obj/item/clothing/under/underclothes = new_item + //Gives ranks to the ranked + if(istype(underclothes) && user.wear_id && user.wear_id.paygrade) + var/rankpath = get_rank_pins(user.wear_id.paygrade) + if(rankpath) + var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath() + underclothes.attach_accessory(user, rank_insignia) + + if(vend_flags & VEND_UNIFORM_AUTOEQUIP) + // autoequip + if(istype(new_item, /obj/item) && new_item.flags_equip_slot != NO_FLAGS) //auto-equipping feature here + if(new_item.flags_equip_slot == SLOT_ACCESSORY) + if(user.w_uniform) + var/obj/item/clothing/clothing = user.w_uniform + if(clothing.can_attach_accessory(new_item)) + clothing.attach_accessory(user, new_item) + else + user.equip_to_appropriate_slot(new_item) + + if(vend_flags & VEND_TO_HAND) + if(user.client?.prefs && (user.client?.prefs?.toggle_prefs & TOGGLE_VEND_ITEM_TO_HAND)) + if(vendor.Adjacent(user)) + user.put_in_any_hand_if_possible(new_item, disable_warning = TRUE) + + new_item.post_vendor_spawn_hook(user) + /proc/handle_vend(obj/structure/machinery/cm_vending/vendor, list/listed_products, mob/living/carbon/human/vending_human) if(vendor.vend_flags & VEND_USE_VENDOR_FLAGS) return TRUE - var/can_buy_flags = listed_products[4] - if(!(vending_human.marine_buy_flags & can_buy_flags)) - return FALSE - - if(can_buy_flags == (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH)) - if(vending_human.marine_buy_flags & MARINE_CAN_BUY_R_POUCH) - vending_human.marine_buy_flags &= ~MARINE_CAN_BUY_R_POUCH - else - vending_human.marine_buy_flags &= ~MARINE_CAN_BUY_L_POUCH - return TRUE - if(can_buy_flags == (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH)) - if(vending_human.marine_buy_flags & MARINE_CAN_BUY_COMBAT_R_POUCH) - vending_human.marine_buy_flags &= ~MARINE_CAN_BUY_COMBAT_R_POUCH - else - vending_human.marine_buy_flags &= ~MARINE_CAN_BUY_COMBAT_L_POUCH - return TRUE - - vending_human.marine_buy_flags &= ~can_buy_flags + var/buying_category = listed_products[4] + if(buying_category) + if(!(buying_category in vending_human.marine_buyable_categories)) + return FALSE + if(!vending_human.marine_buyable_categories[buying_category]) + return FALSE + vending_human.marine_buyable_categories[buying_category] -= 1 return TRUE +// Unload ALL the items throwing them around randomly, optionally destroying the vendor +/obj/structure/machinery/cm_vending/proc/catastrophic_failure(throw_objects = TRUE, destroy = FALSE) + stat |= IN_USE + var/list/products = get_listed_products() + var/i = 1 + while(i <= length(products)) + sleep(0.5) + var/list/itemspec = products[i] + if(!itemspec[2] || itemspec[2] <= 0) + i++ + continue + itemspec[2] -= 1 + var/list/spawned = list() + if(islist(itemspec[3])) + for(var/path in itemspec[3]) + spawned += new path(loc) + else if(itemspec[3]) + var/path = itemspec[3] + spawned += new path(loc) + if(throw_objects) + for(var/atom/movable/spawned_atom in spawned) + INVOKE_ASYNC(spawned_atom, TYPE_PROC_REF(/atom/movable, throw_atom), pick(orange(src, 4)), 4, SPEED_FAST) + stat &= ~IN_USE + if(destroy) + qdel(src) //------------HACKING--------------- diff --git a/code/game/machinery/vending/essential_sets.dm b/code/game/machinery/vending/essential_sets.dm index 7d28b00199b0..711b17eb2c3e 100644 --- a/code/game/machinery/vending/essential_sets.dm +++ b/code/game/machinery/vending/essential_sets.dm @@ -57,3 +57,4 @@ /obj/item/clothing/shoes/dress, /obj/item/storage/large_holster/ceremonial_sword/full, ) + diff --git a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm index cd956b33123d..3d6a48b45daa 100644 --- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm @@ -89,17 +89,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), )) /obj/structure/machinery/cm_vending/clothing/commanding_officer diff --git a/code/game/machinery/vending/vendor_types/crew/medical.dm b/code/game/machinery/vending/vendor_types/crew/medical.dm index 3bd5f9ffa35b..ccf4abe03282 100644 --- a/code/game/machinery/vending/vendor_types/crew/medical.dm +++ b/code/game/machinery/vending/vendor_types/crew/medical.dm @@ -60,19 +60,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list( list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -116,19 +116,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_nurse, list( list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -173,21 +173,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list( list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Vials Pouch", 0, /obj/item/storage/pouch/vials, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_MANDATORY), - list("Chemist Pouch", 0, /obj/item/storage/pouch/chem, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_MANDATORY), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Vials Pouch", 0, /obj/item/storage/pouch/vials, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_MANDATORY), + list("Chemist Pouch", 0, /obj/item/storage/pouch/chem, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_MANDATORY), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/mp.dm b/code/game/machinery/vending/vendor_types/crew/mp.dm index cdfb5c014028..cdf374249211 100644 --- a/code/game/machinery/vending/vendor_types/crew/mp.dm +++ b/code/game/machinery/vending/vendor_types/crew/mp.dm @@ -23,8 +23,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list( list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -70,8 +70,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_warden, list( list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm index 50eebd1851c1..231e02bb5118 100644 --- a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm @@ -62,11 +62,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("M30 Tactical Helmet", 0, /obj/item/clothing/head/helmet/marine/pilot, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), - + + list("ARMOR (CHOOSE 1)", 0, null, null, null), + list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("VP78 Pistol", 0, /obj/item/weapon/gun/pistol/vp78, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -83,19 +86,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -148,10 +151,13 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), - list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + + list("ARMOR (CHOOSE 1)", 0, null, null, null), + list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -169,19 +175,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/sea.dm b/code/game/machinery/vending/vendor_types/crew/sea.dm index 195318c0fb00..ee583828ec44 100644 --- a/code/game/machinery/vending/vendor_types/crew/sea.dm +++ b/code/game/machinery/vending/vendor_types/crew/sea.dm @@ -42,14 +42,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list( list("M276 Combat Toolbelt Rig (Full)", 0, /obj/item/storage/belt/gun/utility, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("COMBAT ARMOR (CHOOSE 1)", 0, null, null, null), list("M3-VL Pattern Ballistics Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index e2aeda57b184..24b60079692b 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -53,10 +53,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_chief, list( list("Security HUD Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -107,13 +107,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Welding Kit", 0, /obj/item/tool/weldpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), @@ -138,13 +144,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Officer M10 Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_COMBAT_HELMET, VENDOR_ITEM_REGULAR), list("M10 Technician Helmet", 0, /obj/item/clothing/head/helmet/marine/tech, MARINE_CAN_BUY_COMBAT_HELMET, VENDOR_ITEM_REGULAR), - list("COMBAT POUCHES (CHOOSE 2)", 0, null, null, null), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_COMBAT_R_POUCH|MARINE_CAN_BUY_COMBAT_L_POUCH), VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -179,12 +178,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_req_officer, list( list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Empty)", 0, /obj/item/storage/pouch/tools, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Empty)", 0, /obj/item/storage/pouch/tools, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -228,20 +227,20 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list( list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -285,15 +284,15 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list( list("USCM Shoulder Patch", 0, /obj/item/clothing/accessory/patch, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm index 9fbc76618c70..5b0324edc2a2 100644 --- a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm @@ -37,25 +37,25 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 4d83819c15ca..1d8e5e289066 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -89,12 +89,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("UNIFORM (CHOOSE 1)", 0, null, null, null), - list("Medical Scrubs, Green", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), list("Uniform, Outdated Synth", 0, /obj/item/clothing/under/rank/synthetic/old, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), list("Uniform, Standard Synth", 0, /obj/item/clothing/under/rank/synthetic, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("USCM Standard Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), list("USCM Medical Uniform", 0, /obj/item/clothing/under/marine/medic, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), - list("Working Joe Uniform", 0, /obj/item/clothing/under/rank/synthetic/joe, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), list("WEBBING (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -139,26 +137,26 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK", 0, null, null, null), list("Sterile mask", 0, /obj/item/clothing/mask/surgical, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) @@ -182,7 +180,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR), list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR), list("USCM Service Uniform", 12, /obj/item/clothing/under/marine/officer/bridge, null, VENDOR_ITEM_REGULAR), - list("USCM Flightsuit", 12, /obj/item/clothing/under/marine/officer/pilot/flight, null, VENDOR_ITEM_REGULAR), + list("USCM Flightsuit", 12, /obj/item/clothing/under/rank/synthetic/flight, null, VENDOR_ITEM_REGULAR), list("Engineer Uniform", 12, /obj/item/clothing/under/marine/officer/engi, null, VENDOR_ITEM_REGULAR), list("White T-Shirt and Brown Jeans", 12, /obj/item/clothing/under/tshirt/w_br, null, VENDOR_ITEM_REGULAR), list("Gray T-Shirt and Blue Jeans", 12, /obj/item/clothing/under/tshirt/gray_blu, null, VENDOR_ITEM_REGULAR), @@ -190,6 +188,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Gray Utilities", 12, /obj/item/clothing/under/colonist/ua_civvies, null, VENDOR_ITEM_REGULAR), list("Brown Utilities", 12, /obj/item/clothing/under/colonist/wy_davisone, null, VENDOR_ITEM_REGULAR), list("Steward Utilities", 12, /obj/item/clothing/under/colonist/wy_joliet_shopsteward, null, VENDOR_ITEM_REGULAR), + list("Working Joe Uniform", 36, /obj/item/clothing/under/rank/synthetic/joe, null, VENDOR_ITEM_REGULAR), list("GLASSES", 0, null, null, null), list("HealthMate HUD", 12, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_REGULAR), @@ -245,6 +244,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Labcoat", 12, /obj/item/clothing/suit/storage/labcoat, null, VENDOR_ITEM_REGULAR), list("Labcoat, Researcher", 12, /obj/item/clothing/suit/storage/labcoat/researcher, null, VENDOR_ITEM_REGULAR), list("RO Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR), + list("USCM Poncho", 12, /obj/item/clothing/accessory/poncho, null, VENDOR_ITEM_REGULAR), list("BACKPACK", 0, null, null, null), list("Backpack, Industrial", 12, /obj/item/storage/backpack/industrial, null, VENDOR_ITEM_REGULAR), @@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( use_snowflake_points = TRUE vendor_theme = VENDOR_THEME_COMPANY req_access = list(ACCESS_MARINE_SYNTH) - vendor_role = list(JOB_SYNTH, JOB_SYNTH_SURVIVOR) + vendor_role = list(JOB_SYNTH, JOB_SYNTH_SURVIVOR, JOB_WORKING_JOE) vend_delay = 1 SECONDS diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index 4cc491cecf1d..023bbe390bfc 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -326,17 +326,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/tank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/tank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/dress.dm b/code/game/machinery/vending/vendor_types/dress.dm index 937caef85089..aff221260d03 100644 --- a/code/game/machinery/vending/vendor_types/dress.dm +++ b/code/game/machinery/vending/vendor_types/dress.dm @@ -74,7 +74,7 @@ if(uniform_path in vended_items) can_vend = FALSE var/name = sanitize(initial(O.name)) - var/flags = can_vend ? NO_FLAGS : MARINE_CAN_BUY_ALL + var/flags = can_vend ? null : MARINE_CAN_BUY_DRESS display_list += list( list(name, 0, uniform_path, flags, VENDOR_ITEM_REGULAR) ) diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm index d692684428e5..829c542f6b26 100644 --- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm +++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm @@ -79,21 +79,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list( list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pills)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pills)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index c915c4fa427d..838b21a00e6f 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -35,7 +35,7 @@ list("SU-6 Smart Pistol", round(scale * 3), /obj/item/storage/box/guncase/smartpistol, VENDOR_ITEM_REGULAR), list("MOU-53 Shotgun", round(scale * 2), /obj/item/storage/box/guncase/mou53, VENDOR_ITEM_REGULAR), list("XM88 Heavy Rifle", round(scale * 3), /obj/item/storage/box/guncase/xm88, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", round(scale * 2), /obj/item/storage/box/guncase/lmg, VENDOR_ITEM_REGULAR), + list("M41AE2 Heavy Pulse Rifle", round(scale * 2.5), /obj/item/storage/box/guncase/lmg, VENDOR_ITEM_REGULAR), list("M41A Pulse Rifle MK1", round(scale * 3), /obj/item/storage/box/guncase/m41aMK1, VENDOR_ITEM_REGULAR), list("M56D Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m56d, VENDOR_ITEM_REGULAR), list("M2C Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m2c, VENDOR_ITEM_REGULAR), @@ -74,6 +74,7 @@ list("Technician Welderpack", round(scale * 2), /obj/item/storage/backpack/marine/engineerpack, VENDOR_ITEM_REGULAR), list("Mortar Shell Backpack", round(scale * 1), /obj/item/storage/backpack/marine/mortarpack, VENDOR_ITEM_REGULAR), list("Technician Welder-Satchel", round(scale * 5), /obj/item/storage/backpack/marine/engineerpack/satchel, VENDOR_ITEM_REGULAR), + list("IMP Ammo Rack", round(scale * 2), /obj/item/storage/backpack/marine/ammo_rack, VENDOR_ITEM_REGULAR), list("Radio Telephone Pack", round(scale * 2), /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR), list("BELTS", -1, null, null), @@ -238,7 +239,7 @@ list("M41A MK2 Extended Magazine (10x24mm)", round(scale * 8.1), /obj/item/ammo_magazine/rifle/extended, VENDOR_ITEM_REGULAR), list("SPECIAL AMMUNITION", -1, null, null), - list("M56 Powerpack", 2, /obj/item/smartgun_powerpack, VENDOR_ITEM_REGULAR), + list("M56 Battery", 4, /obj/item/smartgun_battery, VENDOR_ITEM_REGULAR), list("M56 Smartgun Drum", 4, /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR), list("M44 Heavy Speed Loader (.44)", round(scale * 10.5), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), list("M44 Marksman Speed Loader (.44)", round(scale * 5.7), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR), @@ -425,6 +426,7 @@ list("ARMOR", -1, null, null), list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), list("M10 Pattern Technician Helmet", 20, /obj/item/clothing/head/helmet/marine/tech, VENDOR_ITEM_REGULAR), + list("M10 Pattern Corpman Helmet", 20, /obj/item/clothing/head/helmet/marine/medic, VENDOR_ITEM_REGULAR), list("M3 Pattern Carrier Marine Armor", 20, /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_REGULAR), list("M3 Pattern Padded Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR), list("M3 Pattern Padless Marine Armor", 20, /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 74504c412ff2..2dbf0324e3d6 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -50,7 +50,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 12, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), list("M240 Incinerator Unit", 12, /obj/item/storage/box/guncase/flamer, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 18, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 24, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR), list("M56D Heavy Machine Gun", 24, /obj/item/storage/box/guncase/m56d, null, VENDOR_ITEM_REGULAR), @@ -127,19 +126,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index bc63343ee25b..907cb99a94d2 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -6,9 +6,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("SQUAD KIT (CHOOSE 1, for yourself or your squad)", 0, null, null, null), list("M4RA Sniper Kit", 0, /obj/item/storage/box/kit/mini_sniper, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + list("M41A Standard Kit", 0, /obj/item/storage/box/kit/m41a_kit , MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M240 Pyrotechnician Support Kit", 0, /obj/item/storage/box/kit/mini_pyro, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M2C Heavy Machine Gun", 0, /obj/item/storage/box/guncase/m2c, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 0, /obj/item/storage/box/guncase/lmg, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M56D Heavy Machine Gun", 0, /obj/item/storage/box/guncase/m56d, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 0, /obj/item/storage/box/guncase/m79, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("MOU-53 Shotgun", 0, /obj/item/storage/box/guncase/mou53, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), @@ -84,7 +84,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("M240 Incinerator Unit", 18, /obj/item/storage/box/guncase/flamer, null, VENDOR_ITEM_REGULAR), list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 12, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 18, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 18, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR), list("RADIO KEYS", 0, null, null, null), @@ -116,6 +115,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Helmet", 0, /obj/item/clothing/head/helmet/marine/leader, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Backpack", 0, /obj/item/storage/backpack/marine, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), @@ -136,18 +136,18 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -196,7 +196,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list( spawned_gear_list = list( /obj/item/explosive/plastic, /obj/item/device/binoculars/range/designator, - /obj/item/map/current_map, + /obj/item/storage/box/m94/signal, /obj/item/tool/extinguisher/mini, /obj/item/storage/box/zipcuffs, ) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 01966fc7ca3a..ab864947e8f8 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -10,6 +10,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_RECOMMENDED), list("Gauze", 1, /obj/item/stack/medical/bruise_pack, null, VENDOR_ITEM_REGULAR), list("Ointment", 1, /obj/item/stack/medical/ointment, null, VENDOR_ITEM_REGULAR), + list("Blood Bag (O-)", 4, /obj/item/reagent_container/blood/OMinus, null, VENDOR_ITEM_REGULAR), list("FIRSTAID KITS", 0, null, null, null), list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_RECOMMENDED), @@ -69,7 +70,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 8, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 12, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 18, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), list("M3 B12 Pattern Armor", 28, /obj/item/clothing/suit/storage/marine/leader, null, VENDOR_ITEM_REGULAR), @@ -140,27 +140,27 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 8287e53d7774..3777fe75aa16 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -190,7 +190,6 @@ list("VP78 Magazine", round(scale * 5), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), list("SU-6 Smartpistol Magazine (.45)", round(scale * 5), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR), list("M240 Incinerator Tank", round(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR), - list("M41AE2 Box Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/rifle/lmg, VENDOR_ITEM_REGULAR), list("M56D Drum Magazine", round(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR), list("M2C Box Magazine", round(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), list("HIRR Baton Slugs", round(scale * 6), /obj/item/explosive/grenade/slug/baton, VENDOR_ITEM_REGULAR), @@ -316,3 +315,24 @@ list("M41A Solid Stock", round(scale * 1.5), /obj/item/attachable/stock/rifle, VENDOR_ITEM_REGULAR), list("M44 Magnum Sharpshooter Stock", round(scale * 1.5), /obj/item/attachable/stock/revolver, VENDOR_ITEM_REGULAR) ) + +//------------ESSENTIAL SETS--------------- +/obj/effect/essentials_set/random/uscm_light_armor + spawned_gear_list = list( + /obj/item/clothing/suit/storage/marine/light/padded, + /obj/item/clothing/suit/storage/marine/light/padless, + /obj/item/clothing/suit/storage/marine/light/padless_lines, + /obj/item/clothing/suit/storage/marine/light/carrier, + /obj/item/clothing/suit/storage/marine/light/skull, + /obj/item/clothing/suit/storage/marine/light/smooth, + ) + +/obj/effect/essentials_set/random/uscm_heavy_armor + spawned_gear_list = list( + /obj/item/clothing/suit/storage/marine/heavy/padded, + /obj/item/clothing/suit/storage/marine/heavy/padless, + /obj/item/clothing/suit/storage/marine/heavy/padless_lines, + /obj/item/clothing/suit/storage/marine/heavy/carrier, + /obj/item/clothing/suit/storage/marine/heavy/skull, + /obj/item/clothing/suit/storage/marine/heavy/smooth, + ) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index 3a26ede637d0..7ec257142ff5 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -2,11 +2,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/marine, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Helmet", 0, /obj/item/clothing/head/helmet/marine, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Standard Marine Apparel", 0, list(/obj/item/clothing/under/marine, /obj/item/clothing/shoes/marine/knife, /obj/item/clothing/gloves/marine, /obj/item/device/radio/headset/almayer/marine, /obj/item/clothing/head/helmet/marine), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), @@ -32,17 +28,17 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("M276 M40 Grenade Rig (Empty)", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -52,7 +48,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 15, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 15, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 30, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 30, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), @@ -75,9 +70,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), + list("E-Tool", 5, /obj/item/tool/shovel/etool/folded, null, VENDOR_ITEM_REGULAR), + list("Sandbags", 20, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_REGULAR), list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_REGULAR), list("Black Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 15, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), list("SensorMate Medical HUD", 15, /obj/item/clothing/glasses/hud/sensor, null, VENDOR_ITEM_REGULAR), list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index 0a7016207394..b471d61628e0 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -7,10 +7,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list( list("SMARTGUN AMMUNITION", 0, null, null, null), list("M56 Smartgun Drum", 15, /obj/item/ammo_magazine/smartgun, null, VENDOR_ITEM_RECOMMENDED), - list("SMARTGUN EXTRA UTILITIES (CHOOSE 1)", 0, null, null, null), - list("Burst Fire Assembly", 0, /obj/item/attachable/burstfire_assembly, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), - list("High-Capacity Power Cell", 0, /obj/item/cell/high, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), - list("GUN ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -77,18 +73,18 @@ GLOBAL_LIST_INIT(cm_vending_clothing_smartgun, list( list("M280 Smartgunner Drum Belt", 0, /obj/item/storage/belt/marine/smartgunner, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch", 0, /obj/item/storage/pouch/electronics, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch", 0, /obj/item/storage/pouch/electronics, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index b29c1ac2e1d7..d8f1eb742785 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -97,16 +97,16 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list( list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 0883cfb9354c..e373244f72d6 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -27,7 +27,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( list("RESTRICTED FIREARMS", 0, null, null, null), list("VP78 Pistol", 10, /obj/item/storage/box/guncase/vp78, null, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", 15, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), - list("M41AE2 Heavy Pulse Rifle", 30, /obj/item/storage/box/guncase/lmg, null, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 30, /obj/item/storage/box/guncase/m79, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), @@ -96,21 +95,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list( list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/wo_vendors.dm b/code/game/machinery/vending/vendor_types/wo_vendors.dm index 01f66fbfaf48..bdba638c577e 100644 --- a/code/game/machinery/vending/vendor_types/wo_vendors.dm +++ b/code/game/machinery/vending/vendor_types/wo_vendors.dm @@ -151,7 +151,7 @@ list("M44 Heavy Speed Loader (.44)", round(scale * 2), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), list("M44 Marksman Speed Loader (.44)", round(scale * 2), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine (9mm)", round(scale * 5), /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR), - list("M56 Powerpack", round(scale * 5), /obj/item/smartgun_powerpack, VENDOR_ITEM_REGULAR), + list("M56 Battery", round(scale * 5), /obj/item/smartgun_battery, VENDOR_ITEM_REGULAR), list("M56 Smartgun Drum", round(scale * 2), /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR), list("SU-6 Smartpistol Magazine (.45)", round(scale * 6), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR), list("VP78 Magazine", round(scale * 6), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index cbe0871148da..b94ee6902321 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -291,6 +291,8 @@ var/ticks = 0 var/acid_strength = 1 //100% speed, normal var/barricade_damage = 40 + /// How much fuel the acid drains from the flare every acid tick + var/flare_damage = 500 var/barricade_damage_ticks = 10 // tick is once per 5 seconds. This tells us how many times it will try damaging barricades var/in_weather = FALSE @@ -299,13 +301,15 @@ name = "weak acid" acid_strength = 2.5 //250% normal speed barricade_damage = 20 + flare_damage = 150 icon_state = "acid_weak" //Superacid /obj/effect/xenomorph/acid/strong name = "strong acid" - acid_strength = 0.4 //20% normal speed + acid_strength = 0.4 //40% normal speed barricade_damage = 100 + flare_damage = 1875 icon_state = "acid_strong" /obj/effect/xenomorph/acid/New(loc, target) @@ -355,6 +359,12 @@ sleep(50) .() return + if(istype(acid_t, /obj/item/device/flashlight/flare)) + var/obj/item/device/flashlight/flare/flare = acid_t + if(flare.fuel > 0) //Flares that have fuel in them lose fuel instead of melting + flare.fuel -= flare_damage + sleep(rand(150,250) * (acid_strength)) + return .() if(++ticks >= strength_t) visible_message(SPAN_XENODANGER("[acid_t] collapses under its own weight into a puddle of goop and undigested debris!")) @@ -394,8 +404,6 @@ sleep(rand(200,300) * (acid_strength)) .() - - /obj/effect/xenomorph/boiler_bombard name = "???" desc = "" diff --git a/code/game/objects/effects/effect_system/chemsmoke.dm b/code/game/objects/effects/effect_system/chemsmoke.dm index 8ecdb2c07db9..c2323c32c934 100644 --- a/code/game/objects/effects/effect_system/chemsmoke.dm +++ b/code/game/objects/effects/effect_system/chemsmoke.dm @@ -40,7 +40,8 @@ // Culls the selected turfs to a (roughly) circle shape, then calls smokeFlow() to make // sure the smoke can actually path to the turfs. This culls any turfs it can't reach. //------------------------------------------ -/datum/effect_system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 10, c = 0, loca, direct) +/datum/effect_system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 10, c = 0, loca, direct, datum/cause_data/new_cause_data) + cause_data = istype(new_cause_data) ? new_cause_data : cause_data range = n * 0.3 cardinals = c carry.copy_to(chemholder, carry.total_volume) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index 0a2ba1e02e65..9f7a9c8143c7 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -256,6 +256,17 @@ icon = 'icons/effects/effects.dmi' smokeranking = SMOKE_RANK_MED +///////////////////////////////////////// +// Acid Runner Smoke, Harmless Visuals only +///////////////////////////////////////// +/obj/effect/particle_effect/smoke/acid_runner_harmless + color = "#86B028" + time_to_live = 2 + opacity = FALSE + alpha = 200 + smokeranking = SMOKE_RANK_HARMLESS + amount = 0 + ///////////////////////////////////////// // BOILER SMOKES ///////////////////////////////////////// @@ -272,14 +283,14 @@ var/gas_damage = 20 /obj/effect/particle_effect/smoke/xeno_burn/Initialize(mapload, amount, datum/cause_data/cause_data) - var/mob/living/carbon/xenomorph/xeno = cause_data?.resolve_mob() - if (istype(xeno) && xeno.hivenumber) - hivenumber = xeno.hivenumber - - set_hive_data(src, hivenumber) - - . = ..() + if(istype(cause_data)) + var/datum/ui_state/hive_state/cause_data_hive_state = GLOB.hive_state[cause_data.faction] + var/new_hive_number = cause_data_hive_state?.hivenumber + if(new_hive_number) + hivenumber = new_hive_number + set_hive_data(src, new_hive_number) + return ..() /obj/effect/particle_effect/smoke/xeno_burn/apply_smoke_effect(turf/T) ..() @@ -376,7 +387,7 @@ if(!issynth(moob)) var/datum/effects/neurotoxin/neuro_effect = locate() in moob.effects_list if(!neuro_effect) - neuro_effect = new /datum/effects/neurotoxin(moob) + neuro_effect = new(moob, cause_data.resolve_mob()) neuro_effect.strength = effect_amt neuro_effect.duration += neuro_dose if(moob.coughedtime != 1 && !moob.stat) //Coughing/gasping diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index ae624eb50b71..64a5025794e3 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -104,6 +104,9 @@ /obj/effect/landmark/ert_spawns/distress_wo name = "distress_wo" +/obj/effect/landmark/ert_spawns/groundside_xeno + name = "distress_groundside_xeno" + /obj/effect/landmark/monkey_spawn name = "monkey_spawn" icon_state = "monkey_spawn" diff --git a/code/game/objects/effects/spawners/random.dm b/code/game/objects/effects/spawners/random.dm index 7405e01893dd..4d5bf88b9e6c 100644 --- a/code/game/objects/effects/spawners/random.dm +++ b/code/game/objects/effects/spawners/random.dm @@ -467,7 +467,6 @@ /obj/item/weapon/gun/lever_action/r4t = /obj/item/ammo_magazine/lever_action, /obj/item/weapon/gun/shotgun/merc = null, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717 = null, - /obj/item/weapon/gun/shotgun/double = null ) //no ammotypes needed as it spawns random 12g boxes. Apart from the r4t. why is the r4t in the shotgun pool? fuck you, that's why. /obj/effect/spawner/random/gun/shotgun/lowchance diff --git a/code/game/objects/effects/spawners/wo_spawners/supplies.dm b/code/game/objects/effects/spawners/wo_spawners/supplies.dm index e38641592bc4..f2ef887d076c 100644 --- a/code/game/objects/effects/spawners/wo_spawners/supplies.dm +++ b/code/game/objects/effects/spawners/wo_spawners/supplies.dm @@ -194,7 +194,7 @@ /obj/effect/landmark/wo_supplies/ammo/powerpack icon = 'icons/obj/items/clothing/backpacks.dmi' icon_state = "powerpack" - stuff = list(/obj/item/smartgun_powerpack) + stuff = list(/obj/item/smartgun_battery) /obj/effect/landmark/wo_supplies/ammo/box icon = 'icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi' diff --git a/code/game/objects/items/artifacts.dm b/code/game/objects/items/artifacts.dm deleted file mode 100644 index a5845eaf4a97..000000000000 --- a/code/game/objects/items/artifacts.dm +++ /dev/null @@ -1,34 +0,0 @@ -/obj/item/changestone - name = "\proper an uncut ruby" - desc = "The ruby shines and catches the light, despite being uncut." - icon = 'icons/obj/items/misc.dmi' - icon_state = "changerock" - -/obj/item/changestone/proc/change(mob/target) - if(!ishuman(target)) - return FALSE - var/mob/living/carbon/human/humantarget = target - if(humantarget.flags_human_misc & HUMAN_FLAG_CHANGED) - return - if(humantarget.gender == FEMALE) - humantarget.gender = MALE - else - humantarget.gender = FEMALE - humantarget.visible_message(SPAN_NOTICE("[humantarget] changes in a way you can't quite pinpoint."), SPAN_NOTICE("You feel different.")) - humantarget.flags_human_misc |= HUMAN_FLAG_CHANGED - return TRUE - -/obj/item/changestone/attack_hand(mob/user as mob) - change(user) - . = ..() - -/obj/item/changestone/attack(mob/living/M, mob/living/user) - if(change(user)) - return - . = ..() - -/obj/item/changestone/mob_launch_collision(mob/living/L) - . = ..() - change(L) - - diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 04308492752c..976ec285c8f4 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -210,7 +210,7 @@ assignment = "Corporate Mercenary" /obj/item/card/id/pmc/New() - access = get_all_centcom_access() + access = get_all_weyland_access() ..() /obj/item/card/id/pmc/ds @@ -236,7 +236,7 @@ assignment = "General" /obj/item/card/id/general/New() - access = get_all_centcom_access() + access = get_all_weyland_access() /obj/item/card/id/provost name = "provost holo-badge" @@ -246,7 +246,7 @@ assignment = "Provost" /obj/item/card/id/provost/New() - access = get_all_centcom_access() + access = get_all_weyland_access() /obj/item/card/id/syndicate name = "agent card" @@ -342,7 +342,7 @@ assignment = "General" /obj/item/card/id/centcom/New() - access = get_all_centcom_access() + access = get_all_weyland_access() ..() diff --git a/code/game/objects/items/circuitboards/airlock.dm b/code/game/objects/items/circuitboards/airlock.dm index 6fa986e9d17c..873d326847ec 100644 --- a/code/game/objects/items/circuitboards/airlock.dm +++ b/code/game/objects/items/circuitboards/airlock.dm @@ -44,7 +44,7 @@ t1 += "
" - var/list/accesses = get_all_accesses() + var/list/accesses = get_all_main_access() for (var/acc in accesses) var/aname = get_access_desc(acc) diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm index 2650a3057503..1a4aebe813cc 100644 --- a/code/game/objects/items/devices/cictablet.dm +++ b/code/game/objects/items/devices/cictablet.dm @@ -145,6 +145,8 @@ log_game("[key_name(usr)] has called for an emergency evacuation.") message_admins("[key_name_admin(usr)] has called for an emergency evacuation.") + var/datum/ares_link/link = GLOB.ares_link + link.log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.") . = TRUE if("distress") diff --git a/code/game/objects/items/devices/coins.dm b/code/game/objects/items/devices/coins.dm index 9af5f855b0fa..6ab79e3216d4 100644 --- a/code/game/objects/items/devices/coins.dm +++ b/code/game/objects/items/devices/coins.dm @@ -30,7 +30,7 @@ black_market_value = 25 /obj/item/coin/copper - name = "gold coin" + name = "copper coin" desc = "A familiar, but cheap form of currency." icon_state = "coin_copper" black_market_value = 30 @@ -43,7 +43,7 @@ /obj/item/coin/iron name = "iron coin" - desc = "You fear this might get rusty." + desc = "A coin made of sturdy iron. You fear this might become rusty." icon_state = "coin_iron" black_market_value = 15 @@ -55,13 +55,13 @@ /obj/item/coin/uranium name = "uranium coin" - desc = "Don't touch it!" + desc = "A radioactive coin. Don't touch it!" icon_state = "coin_uranium" black_market_value = 35 /obj/item/coin/platinum name = "platinum coin" - desc = "This is quite valuable." + desc = "A coin made of shiny platinum. It is quite valuable." icon_state = "coin_platinum" black_market_value = 35 @@ -73,7 +73,7 @@ /obj/item/coin/chitin name = "chitin coin" - desc = "Durable chitin pressed into a coin. Why would anyone make this?" + desc = "Durable alien chitin pressed into a coin. There are much better uses for chitin..." icon_state = "coin_chitin" black_market_value = 35 diff --git a/code/game/objects/items/devices/data_detector.dm b/code/game/objects/items/devices/data_detector.dm index ad1b9c3bb05f..6a358ec09bd8 100644 --- a/code/game/objects/items/devices/data_detector.dm +++ b/code/game/objects/items/devices/data_detector.dm @@ -17,6 +17,7 @@ /obj/structure/machinery/computer/objective, /obj/item/limb/head/synth, ) + var/detect_empty_vial_boxes = FALSE /obj/item/device/motiondetector/intel/get_help_text() . = "Green indicators on your HUD will show the location of intelligence objects detected by the scanner. Has two modes: slow long-range [SPAN_HELPFUL("(14 tiles)")] and fast short-range [SPAN_HELPFUL("(7 tiles)")]." @@ -42,10 +43,16 @@ var/detected for(var/DT in objects_to_detect) if(istype(I, DT)) + if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random)) + if(!I.contents) + continue detected = TRUE if(I.contents) for(var/obj/item/CI in I.contents) if(istype(CI, DT)) + if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random)) + if(!I.contents) + continue detected = TRUE break if(human_user && detected) @@ -69,6 +76,9 @@ for(var/obj/I in M.contents_twice()) for(var/DT in objects_to_detect) if(istype(I, DT)) + if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random)) + if(!I.contents) + continue detected = TRUE break if(detected) diff --git a/code/game/objects/items/devices/defibrillator.dm b/code/game/objects/items/devices/defibrillator.dm index e873fa893d62..0596ae9d14b8 100644 --- a/code/game/objects/items/devices/defibrillator.dm +++ b/code/game/objects/items/devices/defibrillator.dm @@ -228,6 +228,7 @@ user.visible_message(SPAN_NOTICE("[icon2html(src, viewers(src))] \The [src] beeps: Defibrillation successful.")) playsound(get_turf(src), 'sound/items/defib_success.ogg', 25, 0) user.track_life_saved(user.job) + user.life_revives_total++ H.handle_revive() to_chat(H, SPAN_NOTICE("You suddenly feel a spark and your consciousness returns, dragging you back to the mortal plane.")) if(H.client?.prefs.toggles_flashing & FLASH_CORPSEREVIVE) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index a73cb5fafa2f..a3e587089997 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -58,8 +58,9 @@ if(!toggleable) to_chat(user, SPAN_WARNING("You cannot toggle \the [src.name] on or off.")) return FALSE + if(!isturf(user.loc)) - to_chat(user, "You cannot turn the light on while in [user.loc].") //To prevent some lighting anomalities. + to_chat(user, SPAN_WARNING("You cannot turn the light [on ? "off" : "on"] while in [user.loc].")) //To prevent some lighting anomalies. return FALSE on = !on @@ -285,7 +286,7 @@ /obj/item/device/flashlight/flare/Initialize() . = ..() - fuel = rand(1600 SECONDS, 2000 SECONDS) + fuel = rand(9.5 MINUTES, 10.5 MINUTES) /obj/item/device/flashlight/flare/update_icon() overlays?.Cut() @@ -415,7 +416,7 @@ /obj/item/device/flashlight/flare/on/illumination/Initialize() . = ..() - fuel = rand(800 SECONDS, 1000 SECONDS) // Half the duration of a flare, but justified since it's invincible + fuel = rand(4.5 MINUTES, 5.5 MINUTES) // Half the duration of a flare, but justified since it's invincible /obj/item/device/flashlight/flare/on/illumination/update_icon() return @@ -524,8 +525,9 @@ anchored = TRUE if(activate_message) visible_message(SPAN_DANGER("[src]'s flame reaches full strength. It's fully active now."), null, 5) - msg_admin_niche("Flare target [src] has been activated by [key_name(user, 1)] at ([x], [y], [z]). (JMP LOC)") - log_game("Flare target [src] has been activated by [key_name(user, 1)] at ([x], [y], [z]).") + var/turf/target_turf = get_turf(src) + msg_admin_niche("Flare target [src] has been activated by [key_name(user, 1)] at ([target_turf.x], [target_turf.y], [target_turf.z]). (JMP LOC)") + log_game("Flare target [src] has been activated by [key_name(user, 1)] at ([target_turf.x], [target_turf.y], [target_turf.z]).") return TRUE /obj/item/device/flashlight/flare/signal/attack_hand(mob/user) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 7026f2a3e7d0..3e2c1445f8e5 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -446,6 +446,8 @@ FORENSIC SCANNER /obj/item/device/black_market_scanner/afterattack(atom/hit_atom, mob/user, proximity) if(!proximity) return + if(!ismovable(hit_atom)) + return ..() var/market_value = get_black_market_value(hit_atom) if(isnull(market_value)) return ..() diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm index 476315eb6d22..179245e29ebc 100644 --- a/code/game/objects/items/explosives/plastic.dm +++ b/code/game/objects/items/explosives/plastic.dm @@ -62,10 +62,6 @@ /obj/item/explosive/plastic/afterattack(atom/target, mob/user, flag) setDir(get_dir(user, target)) - if(antigrief_protection && user.faction == FACTION_MARINE && explosive_antigrief_check(src, user)) - to_chat(user, SPAN_WARNING("\The [name]'s safe-area accident inhibitor prevents you from planting it!")) - msg_admin_niche("[key_name(user)] attempted to prime \a [name] in [get_area(src)] [ADMIN_JMP(src.loc)]") - return if(user.action_busy || !flag) return @@ -75,6 +71,11 @@ if(!can_place(user, target)) return + if(antigrief_protection && user.faction == FACTION_MARINE && explosive_antigrief_check(src, user)) + to_chat(user, SPAN_WARNING("[name]'s safe-area accident inhibitor prevents you from planting it!")) + msg_admin_niche("[key_name(user)] attempted to prime \a [name] in [get_area(src)] [ADMIN_JMP(src.loc)]") + return + user.visible_message(SPAN_WARNING("[user] is trying to plant [name] on [target]!"), SPAN_WARNING("You are trying to plant [name] on [target]!")) if(ismob(target)) diff --git a/code/game/objects/items/reagent_containers/food/cans.dm b/code/game/objects/items/reagent_containers/food/cans.dm index 2ecce5323924..aab2ee066e12 100644 --- a/code/game/objects/items/reagent_containers/food/cans.dm +++ b/code/game/objects/items/reagent_containers/food/cans.dm @@ -175,7 +175,8 @@ /obj/item/reagent_container/food/drinks/cans/thirteenloko name = "\improper Thirteen Loko" - desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." + desc = "Consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." + desc_lore = "A rarity among modern markets, Thirteen Loko is an all-Earth original. With a name coined by the general consensus that only the mildly insane willing to imbibe it, this energy drink has garnered a notorious reputation for itself and a sizeable cult following to match it. After a series of legal proceedings by Weyland-Yutani, denatured cobra venom was removed from the recipe, much to the disappointment of the drink's consumers." icon_state = "thirteen_loko" center_of_mass = "x=16;y=8" @@ -224,13 +225,13 @@ . = ..() reagents.add_reagent("lemon_lime", 30) -/obj/item/reagent_container/food/drinks/cans/lemon_lime +/obj/item/reagent_container/food/drinks/cans/iced_tea name = "iced tea can" desc = "Just like the squad redneck's grandmother used to buy." icon_state = "ice_tea_can" center_of_mass = "x=16;y=10" -/obj/item/reagent_container/food/drinks/cans/lemon_lime/Initialize() +/obj/item/reagent_container/food/drinks/cans/iced_tea/Initialize() . = ..() reagents.add_reagent("icetea", 30) @@ -269,6 +270,7 @@ /obj/item/reagent_container/food/drinks/cans/boda name = "\improper Boda" desc = "State regulated soda beverage. Enjoy comrades." + desc_lore = "Designed back in 2159, the advertising campaign for BODA started out as an attempt by the UPP to win the hearts and minds of colonists and settlers across the galaxy. Soon after, the ubiquitous cyan vendors and large supplies of the drink began to crop up in UA warehouses with seemingly no clear origin. Despite some concerns, after initial testing determined that the stored products were safe for consumption and surprisingly popular when blind-tested with focus groups, the strange surplus of BODA was authorized for usage within the UA-associated colonies. Subsequently, it enjoyed a relative popularity before falling into obscurity in the coming decades as supplies dwindled." icon_state = "boda" center_of_mass = "x=16;y=10" diff --git a/code/game/objects/items/reagent_containers/food/condiment.dm b/code/game/objects/items/reagent_containers/food/condiment.dm index 7318a7b0165d..a13489f0af1e 100644 --- a/code/game/objects/items/reagent_containers/food/condiment.dm +++ b/code/game/objects/items/reagent_containers/food/condiment.dm @@ -202,6 +202,7 @@ /obj/item/reagent_container/food/condiment/hotsauce/franks name = "\improper Frank's Red Hot bottle" desc = "A bottle of Weyland-Yutani brand Frank's Red Hot hot sauce." + desc_lore = "Supposedly designed as a middle-ground flavor between ketchup and cayenne, this brand of spicy goodness achieved critical acclaim throughout UA space within both colonies and vessels alike. The sudden and widespread adoption was curiously timed with the near-simultaneous shelving of the original Frank's 'ULTRA' hot sauce." icon_state = "hotsauce_franks" item_state = "hotsauce_franks" diff --git a/code/game/objects/items/reagent_containers/pill.dm b/code/game/objects/items/reagent_containers/pill.dm index 47f73c5429b4..de86ad07f53a 100644 --- a/code/game/objects/items/reagent_containers/pill.dm +++ b/code/game/objects/items/reagent_containers/pill.dm @@ -166,10 +166,6 @@ pill_initial_reagents = list("cyanide" = 50) pill_icon_class = "tox" -/obj/item/reagent_container/pill/adminordrazine - pill_desc = "An Adminordrazine pill. It's magic. We don't have to explain it." - pill_initial_reagents = list("adminordrazine" = 50) - /obj/item/reagent_container/pill/stox pill_desc = "A sleeping pill commonly used to treat insomnia." pill_initial_reagents = list("stoxin" = 15) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 1c3aae767f08..e36225177d91 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -210,8 +210,8 @@ to_chat(user, SPAN_DANGER("The Bluespace portal resists your attempt to add another item.")) //light failure else to_chat(user, SPAN_DANGER("The Bluespace generator malfunctions!")) - for (var/obj/O in src.contents) //it broke, delete what was in it - qdel(O) + for (var/obj/thing in contents) //it broke, delete what was in it + qdel(thing) crit_fail = 1 icon_state = "brokenpack" @@ -399,6 +399,36 @@ xeno_icon_state = "marinepack" xeno_types = list(/mob/living/carbon/xenomorph/runner, /mob/living/carbon/xenomorph/praetorian, /mob/living/carbon/xenomorph/drone, /mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/defender, /mob/living/carbon/xenomorph/sentinel, /mob/living/carbon/xenomorph/spitter) +/obj/item/storage/backpack/marine/ammo_rack + name = "\improper IMP ammo rack" + desc = "A bare IMP frame with buckles designed to hold multiple ammo cans, but can fit any cumbersome box thanks to Marine ingenuity. Helps you lug around extra rounds or supplies." + has_gamemode_skin = FALSE + storage_slots = 3 + icon_state = "ammo_pack_0" + can_hold = list(/obj/item/ammo_box) + max_w_class = SIZE_MASSIVE + throw_range = 0 + xeno_types = null + var/base_icon_state = "ammo_pack" + var/move_delay_mult = 0.4 + +/obj/item/storage/backpack/marine/ammo_rack/update_icon() + . = ..() + icon_state = "[base_icon_state]_[length(contents)]" + +/obj/item/storage/backpack/marine/ammo_rack/pickup(mob/user, silent) + . = ..() + RegisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY, PROC_REF(handle_movedelay)) + +/obj/item/storage/backpack/marine/ammo_rack/proc/handle_movedelay(mob/user, list/movedata) + SIGNAL_HANDLER + if(locate(/obj/item/storage/backpack/marine/ammo_rack) in user.contents) + movedata["move_delay"] += move_delay_mult + +/obj/item/storage/backpack/marine/ammo_rack/dropped(mob/user, silent) + . = ..() + UnregisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY) + /obj/item/storage/backpack/marine/medic name = "\improper USCM corpsman backpack" desc = "A standard-issue backpack worn by USCM medics." @@ -853,17 +883,21 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r return . = ..() -/obj/item/storage/backpack/marine/engineerpack/afterattack(obj/O as obj, mob/user as mob, proximity) - if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously - return - if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel) - O.reagents.trans_to(src, max_fuel) - to_chat(user, SPAN_NOTICE(" You crack the cap off the top of the pack and fill it back up again from the tank.")) - playsound(loc, 'sound/effects/refill.ogg', 25, TRUE, 3) - return - else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel) - to_chat(user, SPAN_NOTICE(" The pack is already full!")) +/obj/item/storage/backpack/marine/engineerpack/afterattack(obj/target, mob/user, proximity) + if(!proximity) return + if(istype(target, /obj/structure/reagent_dispensers)) + if(!(istypestrict(target, /obj/structure/reagent_dispensers/fueltank))) + to_chat(user, SPAN_NOTICE("This must be filled with a fuel tank.")) + return + if(reagents.total_volume < max_fuel) + target.reagents.trans_to(src, max_fuel) + to_chat(user, SPAN_NOTICE("You crack the cap off the top of the pack and fill it back up again from the tank.")) + playsound(loc, 'sound/effects/refill.ogg', 25, TRUE, 3) + return + if(reagents.total_volume == max_fuel) + to_chat(user, SPAN_NOTICE("The pack is already full!")) + return ..() /obj/item/storage/backpack/marine/engineerpack/get_examine_text(mob/user) @@ -889,6 +923,42 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r fuel_type = "utnapthal" has_gamemode_skin = TRUE +/obj/item/storage/backpack/marine/engineerpack/flamethrower/verb/remove_reagents() + set name = "Empty canister" + set category = "Object" + + set src in usr + + if(usr.get_active_hand() != src) + return + + if(alert(usr, "Do you really want to empty out [src]?", "Empty canister", "Yes", "No") != "Yes") + return + + reagents.clear_reagents() + + playsound(loc, 'sound/effects/refill.ogg', 25, 1, 3) + to_chat(usr, SPAN_NOTICE("You empty out [src]")) + update_icon() + +//this is to revert change for the backpack that are for flametrower usage. +// so that they can use custom mix to refill those backpack +/obj/item/storage/backpack/marine/engineerpack/flamethrower/afterattack(obj/target, mob/user, proximity) + if(!proximity) + return + if (!(istype(target, /obj/structure/reagent_dispensers/fueltank))) + return + + if (reagents.total_volume >= max_fuel) + to_chat(user, SPAN_NOTICE("The pack is already full!")) + return + + if(reagents.total_volume < max_fuel) + target.reagents.trans_to(src, max_fuel) + to_chat(user, SPAN_NOTICE("You crack the cap off the top of the pack and fill it back up again from the tank.")) + playsound(loc, 'sound/effects/refill.ogg', 25, TRUE, 3) + return + /obj/item/storage/backpack/marine/engineerpack/flamethrower/attackby(obj/item/W, mob/living/user) if (istype(W, /obj/item/ammo_magazine/flamer_tank)) var/obj/item/ammo_magazine/flamer_tank/FTL = W diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 5900097e030e..198e5b3b9960 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -1126,6 +1126,7 @@ /obj/item/stock_parts/micro_laser, /obj/item/stock_parts/scanning_module, /obj/item/stock_parts/capacitor, + /obj/item/smartgun_battery, ) /obj/item/storage/pouch/electronics/full/fill_preset_inventory() diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index bb68958eb105..25bcefc1cc34 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -256,12 +256,12 @@ else return ..() -/obj/item/tool/weldingtool/afterattack(obj/O as obj, mob/user as mob, proximity) +/obj/item/tool/weldingtool/afterattack(obj/target, mob/user, proximity) if(!proximity) return - if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1) + if (istype(target, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,target) <= 1) if(!welding) - O.reagents.trans_to(src, max_fuel) + target.reagents.trans_to(src, max_fuel) weld_tick = 0 user.visible_message(SPAN_NOTICE("[user] refills [src]."), \ SPAN_NOTICE("You refill [src].")) @@ -270,14 +270,14 @@ message_admins("[key_name_admin(user)] triggered a fueltank explosion with a blowtorch.") log_game("[key_name(user)] triggered a fueltank explosion with a blowtorch.") to_chat(user, SPAN_DANGER("You begin welding on the fueltank, and in a last moment of lucidity realize this might not have been the smartest thing you've ever done.")) - var/obj/structure/reagent_dispensers/fueltank/tank = O + var/obj/structure/reagent_dispensers/fueltank/tank = target tank.explode() return if (welding) remove_fuel(1) - if(isliving(O)) - var/mob/living/L = O + if(isliving(target)) + var/mob/living/L = target L.IgniteMob() @@ -501,7 +501,23 @@ flags_equip_slot = SLOT_SUIT_STORE pry_capable = IS_PRY_CAPABLE_FORCE //but not really ///Whether the Maintenance Jack is on crowbar or wrench mode - var/crowbar_mode = TRUE + var/crowbar_mode = TRUE //False for wrench mode + ///Whether you need the "super strength" trait to pry open doors + var/requires_superstrength_pry = TRUE + ///Whether you get the speed penalty from not having engi 3 + var/requires_skills_unbolt = TRUE + ///How long it takes (in seconds) to pry open an airlock + var/prying_time = 3 SECONDS + ///How long it takes (in seconds) to pry open a resin door + var/resin_prying_time = 5 SECONDS + ///How long it takes (in seconds) to unbolt an airlock + var/unbolt_time = 5 SECONDS + ///How long extra will it take (in seconds) people who do not have engi 3 (if requires_skills_unbolt is true) + var/unskilled_unbolt_time = 15 SECONDS + +/obj/item/maintenance_jack/Initialize() + . = ..() + RegisterSignal(src, COMSIG_ITEM_ATTACK_AIRLOCK, PROC_REF(handle_airlock_attack)) /obj/item/maintenance_jack/get_examine_text(mob/user) . = ..() @@ -523,7 +539,6 @@ animate(transform = matrix(180, MATRIX_ROTATE), time = 2, easing = EASE_OUT) REMOVE_TRAIT(src, TRAIT_TOOL_CROWBAR, TRAIT_SOURCE_INHERENT) ADD_TRAIT(src, TRAIT_TOOL_WRENCH, TRAIT_SOURCE_INHERENT) - pry_capable = null return //Switch to crowbar mode | Pry open doors if super strong trait @@ -535,72 +550,115 @@ animate(transform = matrix(360, MATRIX_ROTATE), time = 2, easing = EASE_OUT) REMOVE_TRAIT(src, TRAIT_TOOL_WRENCH, TRAIT_SOURCE_INHERENT) ADD_TRAIT(src, TRAIT_TOOL_CROWBAR, TRAIT_SOURCE_INHERENT) - pry_capable = IS_PRY_CAPABLE_FORCE - -/obj/item/maintenance_jack/afterattack(obj/door, mob/living/user, proximity) - if(!crowbar_mode) //Otherwise it lets you pry open right after unbolting - return - if(!proximity) - return - if(istype(door, /obj/structure/machinery/door/airlock)) - var/obj/structure/machinery/door/airlock/airlock = door - if(airlock.locked) - to_chat(user, SPAN_DANGER("You can't pry open [airlock] while it is bolted shut.")) +/obj/item/maintenance_jack/proc/handle_airlock_attack(source, obj/structure/machinery/door/airlock/attacked_door, mob/user) + . = COMPONENT_CANCEL_AIRLOCK_ATTACK + if(crowbar_mode) + if(attacked_door.locked) //Bolted + to_chat(user, SPAN_DANGER("You can't pry open [attacked_door] while it is bolted shut.")) return - if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR - if(!airlock.arePowerSystemsOn()) - if(!airlock.operating) - if(airlock.density) - airlock.open(TRUE) - else - airlock.close(TRUE) - else - to_chat(user, SPAN_WARNING("The airlock's motors resist your efforts to force it.")) + if(!attacked_door.arePowerSystemsOn()) //Opens like normal if unpowered + return FALSE + + if(requires_superstrength_pry) + if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR + return + if(!attacked_door.density) //If its open return - if(!airlock.density) + if(attacked_door.heavy) //Unopenable + to_chat(usr, SPAN_DANGER("You cannot force [attacked_door] open.")) return - if(airlock.heavy) - to_chat(usr, SPAN_DANGER("You cannot force [airlock] open.")) - return FALSE - if(user.action_busy || user.a_intent == INTENT_HARM) + if(user.action_busy) return - user.visible_message(SPAN_DANGER("[user] jams [src] into [airlock] and starts to pry it open."), - SPAN_DANGER("You jam [src] into [airlock] and start to pry it open.")) + user.visible_message(SPAN_DANGER("[user] jams [src] into [attacked_door] and starts to pry it open."), + SPAN_DANGER("You jam [src] into [attacked_door] and start to pry it open.")) playsound(src, "pry", 15, TRUE) - if(!do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + if(!do_after(user, prying_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) return - if(!airlock.density) + if(!attacked_door.density) return - if(airlock.locked) - user.visible_message(SPAN_DANGER("[user] fails to force [airlock] open with [src]."), - SPAN_DANGER("You fail to force [airlock] open with [src].")) + if(attacked_door.locked) + user.visible_message(SPAN_DANGER("[user] fails to force [attacked_door] open with [src]."), + SPAN_DANGER("You fail to force [attacked_door] open with [src].")) return - user.visible_message(SPAN_DANGER("[user] forces [airlock] open with [src]."), - SPAN_DANGER("You force [airlock] open with [src].")) - airlock.open(TRUE) + user.visible_message(SPAN_DANGER("[user] forces [attacked_door] open with [src]."), + SPAN_DANGER("You force [attacked_door] open with [src].")) + attacked_door.open(TRUE) + return - else if(istype(door, /obj/structure/mineral_door/resin)) - var/obj/structure/mineral_door/resin/resin_door = door - if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR - return - if(resin_door.isSwitchingStates) - return - if(!resin_door.density || user.action_busy || user.a_intent == INTENT_HARM) - return + //Wrench Mode + if(!attacked_door.locked) + to_chat(user, SPAN_NOTICE("You cannot disable bolts on a door that is already unbolted.")) + return + + if(requires_skills_unbolt) + if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_MASTER)) //Engi 3 is much faster + user.visible_message(SPAN_DANGER("[user] begins to search for [attacked_door]'s bolts!"),\ + SPAN_NOTICE("You search for [attacked_door]'s bolts.")) + if(!do_after(user, unskilled_unbolt_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) //Otherwise it takes an extra 15 seconds + to_chat(user, SPAN_WARNING("You fail to find the bolts on [attacked_door].")) + return + + user.visible_message(SPAN_DANGER("[user] begins to disable [attacked_door]'s bolts!"),\ + SPAN_NOTICE("You start to disable [attacked_door]'s bolts.")) + playsound(attacked_door, "pry", 25, TRUE) + + if(!do_after(user, unbolt_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, src, INTERRUPT_ALL)) + to_chat(user, SPAN_WARNING("You decide not to disable the bolts on [attacked_door].")) + return + + user.visible_message(SPAN_DANGER("[user] disables the bolts on [attacked_door]."),\ + SPAN_NOTICE("You unbolt [attacked_door].")) + attacked_door.unlock(TRUE) + return + +/obj/item/maintenance_jack/afterattack(atom/attacked_obj, mob/living/user, proximity) + if(!proximity) + return + + if(istype(attacked_obj, /obj/structure/mineral_door/resin)) + var/obj/structure/mineral_door/resin/resin_door = attacked_obj + + if(resin_door) + if(crowbar_mode) + if(requires_superstrength_pry) + if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR + return ..() + if(resin_door.isSwitchingStates) + return + if(!resin_door.density || user.action_busy || user.a_intent == INTENT_HARM) + return + + user.visible_message(SPAN_DANGER("[user] jams [src] into [resin_door] and starts to pry it open."), + SPAN_DANGER("You jam [src] into [resin_door] and start to pry it open.")) + playsound(user, 'sound/weapons/wristblades_hit.ogg', 15, TRUE) + + if(!do_after(user, resin_prying_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + to_chat(user, SPAN_NOTICE("You stop prying [resin_door] open.")) + return - user.visible_message(SPAN_DANGER("[user] jams [src] into [resin_door] and starts to pry it open."), - SPAN_DANGER("You jam [src] into [resin_door] and start to pry it open.")) - playsound(user, 'sound/weapons/wristblades_hit.ogg', 15, TRUE) + user.visible_message(SPAN_DANGER("[user] forces [resin_door] open with [src]."), + SPAN_DANGER("You force [resin_door] open with [src].")) + resin_door.Open() + return + + if(istype(attacked_obj, /turf/open/floor)) + var/turf/open/floor/flooring = attacked_obj - if(do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE) && resin_door.density) - user.visible_message(SPAN_DANGER("[user] forces [resin_door] open with [src]."), - SPAN_DANGER("You force [resin_door] open with [src].")) - resin_door.Open() + if(crowbar_mode && user.a_intent == INTENT_HELP) //Only pry flooring on help intent + if(flooring.hull_floor) //no interaction for hulls + return + if(flooring.weeds) + return attackby(src, user) + to_chat(user, SPAN_WARNING("You forcefully pry off [flooring], destroying it in the process.")) + playsound(src, 'sound/items/Crowbar.ogg', 25, 1) + flooring.make_plating() + return + return ..() /* Welding backpack */ @@ -651,17 +709,22 @@ Welding backpack to_chat(user, SPAN_NOTICE("You cannot figure out how to use \the [W] with [src].")) return -/obj/item/tool/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity) - if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously - return - if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel) - O.reagents.trans_to(src, max_fuel) - to_chat(user, SPAN_NOTICE(" You crack the cap off the top of \the [src] and fill it back up again from the tank.")) - playsound(src.loc, 'sound/effects/refill.ogg', 25, 1, 3) - return - else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel) - to_chat(user, SPAN_NOTICE(" \The [src] is already full!")) +/obj/item/tool/weldpack/afterattack(obj/target as obj, mob/user as mob, proximity) + if(!proximity) // this replaces and improves the get_dist(src,target) <= 1 checks used previously return + if(istype(target, /obj/structure/reagent_dispensers)) + if(!(istypestrict(target, /obj/structure/reagent_dispensers/fueltank))) + to_chat(user, SPAN_NOTICE("This must be filled with a fuel tank.")) + return + if(reagents.total_volume < max_fuel) + target.reagents.trans_to(src, max_fuel) + to_chat(user, SPAN_NOTICE("You crack the cap off the top of \the [src] and fill it back up again from the tank.")) + playsound(loc, 'sound/effects/refill.ogg', 25, 1, 3) + return + if (reagents.total_volume >= max_fuel) + to_chat(user, SPAN_NOTICE("[src] is already full!")) + return + ..() /obj/item/tool/weldpack/get_examine_text(mob/user) . = ..() diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 1d0165f12738..b2a66becd869 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -397,7 +397,7 @@ /obj/item/toy/dice name = "d6" - desc = "A dice with six sides." + desc = "A die with six sides." icon = 'icons/obj/items/dice.dmi' icon_state = "d66" w_class = SIZE_TINY @@ -406,11 +406,11 @@ /obj/item/toy/dice/Initialize() . = ..() - icon_state = "[name][rand(sides)]" + icon_state = "[name][rand(1, sides)]" /obj/item/toy/dice/d20 name = "d20" - desc = "A dice with twenty sides." + desc = "A die with twenty sides." icon_state = "d2020" sides = 20 diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 13c6c6b19d07..42a3a2f0b9ea 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -451,3 +451,7 @@ /obj/proc/set_origin_name_prefix(name_prefix) return + +/// override for subtypes that require extra behaviour when spawned from a vendor +/obj/proc/post_vendor_spawn_hook(mob/living/carbon/human/user) + return diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm index 6905a734b915..eac5f154e26e 100644 --- a/code/game/objects/structures/barricade/barricade.dm +++ b/code/game/objects/structures/barricade/barricade.dm @@ -30,6 +30,8 @@ var/brute_multiplier = 1 var/burn_multiplier = 1 var/explosive_multiplier = 1 + var/brute_projectile_multiplier = 1 + var/burn_flame_multiplier = 1 var/repair_materials = list() var/metallic = TRUE @@ -42,12 +44,12 @@ addtimer(CALLBACK(src, PROC_REF(update_icon)), 0) starting_maxhealth = maxhealth -/obj/structure/barricade/initialize_pass_flags(datum/pass_flags_container/PF) +/obj/structure/barricade/initialize_pass_flags(datum/pass_flags_container/pass_flags) ..() - if (PF) - PF.flags_can_pass_all = NONE - PF.flags_can_pass_front = NONE - PF.flags_can_pass_behind = PASS_OVER^(PASS_OVER_ACID_SPRAY|PASS_OVER_THROW_MOB) + if (pass_flags) + pass_flags.flags_can_pass_all = NONE + pass_flags.flags_can_pass_front = NONE + pass_flags.flags_can_pass_behind = PASS_OVER^(PASS_OVER_ACID_SPRAY|PASS_OVER_THROW_MOB) flags_can_pass_front_temp = PASS_OVER_THROW_MOB flags_can_pass_behind_temp = PASS_OVER_THROW_MOB @@ -95,7 +97,7 @@ overlays += image('icons/obj/structures/barricades.dmi', icon_state = "+burn_upgrade_[damage_state]") if(BARRICADE_UPGRADE_BRUTE) overlays += image('icons/obj/structures/barricades.dmi', icon_state = "+brute_upgrade_[damage_state]") - if(BARRICADE_UPGRADE_EXPLOSIVE) + if(BARRICADE_UPGRADE_ANTIFF) overlays += image('icons/obj/structures/barricades.dmi', icon_state = "+explosive_upgrade_[damage_state]") if(is_wired) @@ -106,34 +108,34 @@ ..() -/obj/structure/barricade/hitby(atom/movable/AM) - if(AM.throwing && is_wired) - if(iscarbon(AM)) - var/mob/living/carbon/C = AM - if(C.mob_size <= MOB_SIZE_XENO) - C.visible_message(SPAN_DANGER("The barbed wire slices into [C]!"), +/obj/structure/barricade/hitby(atom/movable/atom_movable) + if(atom_movable.throwing && is_wired) + if(iscarbon(atom_movable)) + var/mob/living/carbon/living_carbon = atom_movable + if(living_carbon.mob_size <= MOB_SIZE_XENO) + living_carbon.visible_message(SPAN_DANGER("The barbed wire slices into [living_carbon]!"), SPAN_DANGER("The barbed wire slices into you!")) - C.apply_damage(10) - C.apply_effect(2, WEAKEN) //Leaping into barbed wire is VERY bad - playsound(C, "bonk", 75, FALSE) + living_carbon.apply_damage(10) + living_carbon.apply_effect(2, WEAKEN) //Leaping into barbed wire is VERY bad + playsound(living_carbon, "bonk", 75, FALSE) ..() -/obj/structure/barricade/Collided(atom/movable/AM) +/obj/structure/barricade/Collided(atom/movable/atom_movable) ..() - if(istype(AM, /mob/living/carbon/xenomorph/crusher)) - var/mob/living/carbon/xenomorph/crusher/C = AM + if(istype(atom_movable, /mob/living/carbon/xenomorph/crusher)) + var/mob/living/carbon/xenomorph/crusher/living_carbon = atom_movable - if (!C.throwing) + if (!living_carbon.throwing) return if(crusher_resistant) - visible_message(SPAN_DANGER("[C] smashes into [src]!")) + visible_message(SPAN_DANGER("[living_carbon] smashes into [src]!")) take_damage(150) playsound(src, barricade_hitsound, 25, TRUE) - else if(!C.stat) - visible_message(SPAN_DANGER("[C] smashes through [src]!")) + else if(!living_carbon.stat) + visible_message(SPAN_DANGER("[living_carbon] smashes through [src]!")) deconstruct(FALSE) playsound(src, barricade_hitsound, 25, TRUE) @@ -163,8 +165,8 @@ if(closed) return NO_BLOCKED_MOVEMENT - var/obj/structure/S = locate(/obj/structure) in get_turf(mover) - if(S && S.climbable && !(S.flags_atom & ON_BORDER) && climbable && isliving(mover)) //Climbable objects allow you to universally climb over others + var/obj/structure/structure = locate(/obj/structure) in get_turf(mover) + if(structure && structure.climbable && !(structure.flags_atom & ON_BORDER) && climbable && isliving(mover)) //Climbable objects allow you to universally climb over others return NO_BLOCKED_MOVEMENT return ..() @@ -180,33 +182,33 @@ /obj/structure/barricade/attack_animal(mob/user as mob) return attack_alien(user) -/obj/structure/barricade/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/zombie_claws)) +/obj/structure/barricade/attackby(obj/item/item, mob/user) + if(istype(item, /obj/item/weapon/zombie_claws)) user.visible_message(SPAN_DANGER("The zombie smashed at the [src.barricade_type] barricade!"), SPAN_DANGER("You smack the [src.barricade_type] barricade!")) if(barricade_hitsound) playsound(src, barricade_hitsound, 35, 1) - hit_barricade(W) + hit_barricade(item) return - for(var/obj/effect/xenomorph/acid/A in src.loc) - if(A.acid_t == src) + for(var/obj/effect/xenomorph/acid/acid in src.loc) + if(acid.acid_t == src) to_chat(user, "You can't get near that, it's melting!") return - if(istype(W, /obj/item/stack/barbed_wire)) - var/obj/item/stack/barbed_wire/B = W + if(istype(item, /obj/item/stack/barbed_wire)) + var/obj/item/stack/barbed_wire/barbed_wire = item if(can_wire) - user.visible_message(SPAN_NOTICE("[user] starts setting up [W.name] on [src]."), - SPAN_NOTICE("You start setting up [W.name] on [src].")) + user.visible_message(SPAN_NOTICE("[user] starts setting up [item.name] on [src]."), + SPAN_NOTICE("You start setting up [item.name] on [src].")) if(do_after(user, 20, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, src) && can_wire) // Make sure there's still enough wire in the stack - if(!B.use(1)) + if(!barbed_wire.use(1)) return playsound(src.loc, 'sound/effects/barbed_wire_movement.ogg', 25, 1) - user.visible_message(SPAN_NOTICE("[user] sets up [W.name] on [src]."), - SPAN_NOTICE("You set up [W.name] on [src].")) + user.visible_message(SPAN_NOTICE("[user] sets up [item.name] on [src]."), + SPAN_NOTICE("You set up [item.name] on [src].")) maxhealth += 50 update_health(-50) @@ -218,7 +220,7 @@ update_icon() return - if(HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS)) + if(HAS_TRAIT(item, TRAIT_TOOL_WIRECUTTERS)) if(is_wired) user.visible_message(SPAN_NOTICE("[user] begin removing the barbed wire on [src]."), SPAN_NOTICE("You begin removing the barbed wire on [src].")) @@ -240,27 +242,27 @@ new/obj/item/stack/barbed_wire( src.loc ) return - if(W.force > force_level_absorption) + if(item.force > force_level_absorption) ..() if(barricade_hitsound) playsound(src, barricade_hitsound, 35, 1) - hit_barricade(W) + hit_barricade(item) -/obj/structure/barricade/bullet_act(obj/item/projectile/P) - bullet_ping(P) +/obj/structure/barricade/bullet_act(obj/item/projectile/bullet) + bullet_ping(bullet) - if(P.ammo.damage_type == BURN) - P.damage = P.damage * burn_multiplier + if(bullet.ammo.damage_type == BURN) + bullet.damage = bullet.damage * burn_multiplier else - P.damage = P.damage * brute_multiplier + bullet.damage = bullet.damage * brute_projectile_multiplier - if(istype(P.ammo, /datum/ammo/xeno/boiler_gas)) + if(istype(bullet.ammo, /datum/ammo/xeno/boiler_gas)) take_damage(round(50 * burn_multiplier)) - else if(P.ammo.flags_ammo_behavior & AMMO_ANTISTRUCT) - take_damage(P.damage * ANTISTRUCT_DMG_MULT_BARRICADES) + else if(bullet.ammo.flags_ammo_behavior & AMMO_ANTISTRUCT) + take_damage(bullet.damage * ANTISTRUCT_DMG_MULT_BARRICADES) - take_damage(P.damage) + take_damage(bullet.damage) return TRUE @@ -282,11 +284,11 @@ /obj/structure/barricade/ex_act(severity, direction, cause_data) - for(var/obj/structure/barricade/B in get_step(src,dir)) //discourage double-stacking barricades by removing health from opposing barricade - if(B.dir == reverse_direction(dir)) + for(var/obj/structure/barricade/barricade in get_step(src,dir)) //discourage double-stacking barricades by removing health from opposing barricade + if(barricade.dir == reverse_direction(dir)) spawn(1) - if(B) - B.ex_act(severity, direction) + if(barricade) + barricade.ex_act(severity, direction) if(health <= 0) var/location = get_turf(src) handle_debris(severity, direction) @@ -321,15 +323,15 @@ new /datum/effects/acid(src, null, null) /obj/structure/barricade/flamer_fire_act(dam = BURN_LEVEL_TIER_1) - take_damage(dam * burn_multiplier) + take_damage(dam * burn_flame_multiplier) -/obj/structure/barricade/proc/hit_barricade(obj/item/I) - take_damage(I.force * 0.5 * brute_multiplier) +/obj/structure/barricade/proc/hit_barricade(obj/item/item) + take_damage(item.force * 0.5 * brute_multiplier) /obj/structure/barricade/proc/take_damage(damage) - for(var/obj/structure/barricade/B in get_step(src,dir)) //discourage double-stacking barricades by removing health from opposing barricade - if(B.dir == reverse_direction(dir)) - B.update_health(damage) + for(var/obj/structure/barricade/barricade in get_step(src,dir)) //discourage double-stacking barricades by removing health from opposing barricade + if(barricade.dir == reverse_direction(dir)) + barricade.update_health(damage) update_health(damage) @@ -357,12 +359,12 @@ if(50 to 75) damage_state = BARRICADE_DMG_SLIGHT if(75 to INFINITY) damage_state = BARRICADE_DMG_NONE -/obj/structure/barricade/proc/weld_cade(obj/item/tool/weldingtool/WT, mob/user) +/obj/structure/barricade/proc/weld_cade(obj/item/tool/weldingtool/welder, mob/user) if(!metallic) user.visible_message(SPAN_WARNING("You can't weld \the [src]!")) return FALSE - if(!(WT.remove_fuel(2, user))) + if(!(welder.remove_fuel(2, user))) return FALSE user.visible_message(SPAN_NOTICE("[user] begins repairing damage to [src]."), @@ -413,20 +415,20 @@ return ..() -/obj/structure/barricade/proc/try_nailgun_usage(obj/item/W, mob/user) - if(length(repair_materials) == 0 || health >= maxhealth || !istype(W, /obj/item/weapon/gun/smg/nailgun)) +/obj/structure/barricade/proc/try_nailgun_usage(obj/item/item, mob/user) + if(length(repair_materials) == 0 || health >= maxhealth || !istype(item, /obj/item/weapon/gun/smg/nailgun)) return FALSE - var/obj/item/weapon/gun/smg/nailgun/NG = W + var/obj/item/weapon/gun/smg/nailgun/nailgun = item - if(!NG.in_chamber || !NG.current_mag || NG.current_mag.current_rounds < 3) + if(!nailgun.in_chamber || !nailgun.current_mag || nailgun.current_mag.current_rounds < 3) to_chat(user, SPAN_WARNING("You require at least 4 nails to complete this task!")) return FALSE // Check if either hand has a metal stack by checking the weapon offhand // Presume the material is a sheet until proven otherwise. var/obj/item/stack/sheet/material = null - if(user.l_hand == NG) + if(user.l_hand == nailgun) material = user.r_hand else material = user.l_hand @@ -445,8 +447,8 @@ to_chat(user, SPAN_WARNING("You'll need some adequate repair material in your other hand to patch up [src]!")) return FALSE - var/soundchannel = playsound(src, NG.repair_sound, 25, 1) - if(!do_after(user, NG.nailing_speed, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, src)) + var/soundchannel = playsound(src, nailgun.repair_sound, 25, 1) + if(!do_after(user, nailgun.nailing_speed, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, src)) playsound(src, null, channel = soundchannel) return FALSE @@ -454,7 +456,7 @@ to_chat(user, SPAN_WARNING("You seems to have misplaced the repair material!")) return FALSE - if(!NG.in_chamber || !NG.current_mag || NG.current_mag.current_rounds < 3) + if(!nailgun.in_chamber || !nailgun.current_mag || nailgun.current_mag.current_rounds < 3) to_chat(user, SPAN_WARNING("You require at least 4 nails to complete this task!")) return FALSE @@ -462,7 +464,7 @@ to_chat(user, SPAN_WARNING("You nail [material] to [src], restoring some of its integrity!")) update_damage_state() material.use(1) - NG.current_mag.current_rounds -= 3 - NG.in_chamber = null - NG.load_into_chamber() + nailgun.current_mag.current_rounds -= 3 + nailgun.in_chamber = null + nailgun.load_into_chamber() return TRUE diff --git a/code/game/objects/structures/barricade/deployable.dm b/code/game/objects/structures/barricade/deployable.dm index b64d0ab1bd0e..7ed2eefd75fb 100644 --- a/code/game/objects/structures/barricade/deployable.dm +++ b/code/game/objects/structures/barricade/deployable.dm @@ -4,7 +4,7 @@ icon_state = "folding_0" health = 350 maxhealth = 350 - burn_multiplier = 1.15 + burn_multiplier = 0.85 brute_multiplier = 1 crusher_resistant = TRUE force_level_absorption = 15 @@ -88,7 +88,7 @@ usr.visible_message(SPAN_NOTICE("[usr] starts collapsing [src]."), SPAN_NOTICE("You begin collapsing [src].")) playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) - if(do_after(usr, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, src)) + if(do_after(usr, 3 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src)) collapse(usr) else to_chat(usr, SPAN_WARNING("You stop collapsing [src].")) @@ -107,6 +107,7 @@ ..() if(PF) PF.flags_can_pass_front &= ~PASS_OVER_THROW_MOB + PF.flags_can_pass_behind &= ~PASS_OVER_THROW_MOB // Cade in hands diff --git a/code/game/objects/structures/barricade/metal.dm b/code/game/objects/structures/barricade/metal.dm index 40f784b064e4..4056ac9021f8 100644 --- a/code/game/objects/structures/barricade/metal.dm +++ b/code/game/objects/structures/barricade/metal.dm @@ -39,12 +39,12 @@ . += SPAN_NOTICE("The cade is protected by a biohazardous upgrade.") if(BARRICADE_UPGRADE_BRUTE) . += SPAN_NOTICE("The cade is protected by a reinforced upgrade.") - if(BARRICADE_UPGRADE_EXPLOSIVE) - . += SPAN_NOTICE("The cade is protected by an explosive upgrade.") + if(BARRICADE_UPGRADE_ANTIFF) + . += SPAN_NOTICE("The cade is protected by a composite upgrade.") -/obj/structure/barricade/metal/attackby(obj/item/W, mob/user) - if(iswelder(W)) - if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH)) +/obj/structure/barricade/metal/attackby(obj/item/item, mob/user) + if(iswelder(item)) + if(!HAS_TRAIT(item, TRAIT_TOOL_BLOWTORCH)) to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) return if(user.action_busy) @@ -52,7 +52,7 @@ if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_TRAINED)) to_chat(user, SPAN_WARNING("You're not trained to repair [src]...")) return - var/obj/item/tool/weldingtool/WT = W + var/obj/item/tool/weldingtool/welder = item if(damage_state == BARRICADE_DMG_HEAVY) to_chat(user, SPAN_WARNING("[src] has sustained too much structural damage to be repaired.")) return @@ -61,10 +61,10 @@ to_chat(user, SPAN_WARNING("[src] doesn't need repairs.")) return - weld_cade(WT, user) + weld_cade(welder, user) return - if(try_nailgun_usage(W, user)) + if(try_nailgun_usage(item, user)) return for(var/obj/effect/xenomorph/acid/A in src.loc) @@ -74,7 +74,7 @@ switch(build_state) if(BARRICADE_BSTATE_SECURED) //Fully constructed step. Use screwdriver to remove the protection panels to reveal the bolts - if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) + if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER)) if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to touch [src]...")) return @@ -88,16 +88,16 @@ build_state = BARRICADE_BSTATE_UNSECURED return - if(istype(W, /obj/item/stack/sheet/metal)) + if(istype(item, /obj/item/stack/sheet/metal)) if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to touch [src]...")) return if(upgraded) to_chat(user, SPAN_NOTICE("This barricade is already upgraded.")) return - var/obj/item/stack/sheet/metal/M = W + var/obj/item/stack/sheet/metal/metal = item if(user.client?.prefs?.no_radials_preference) - var/choice = tgui_input_list(user, "Choose an upgrade to apply to the barricade", "Apply Upgrade", list(BARRICADE_UPGRADE_BURN, BARRICADE_UPGRADE_BRUTE, BARRICADE_UPGRADE_EXPLOSIVE)) + var/choice = tgui_input_list(user, "Choose an upgrade to apply to the barricade", "Apply Upgrade", list(BARRICADE_UPGRADE_BURN, BARRICADE_UPGRADE_BRUTE, BARRICADE_UPGRADE_ANTIFF)) if(!choice) return if(!user.Adjacent(src)) @@ -106,33 +106,37 @@ if(upgraded) to_chat(user, SPAN_NOTICE("This barricade is already upgraded.")) return - if(M.get_amount() < 2) + if(metal.get_amount() < 2) to_chat(user, SPAN_NOTICE("You lack the required metal.")) return - if((usr.get_active_hand()) != M) - to_chat(user, SPAN_WARNING("You must be holding the [M] to upgrade \the [src]!")) + if((usr.get_active_hand()) != metal) + to_chat(user, SPAN_WARNING("You must be holding the [metal] to upgrade \the [src]!")) return switch(choice) if(BARRICADE_UPGRADE_BURN) burn_multiplier = 0.75 + burn_flame_multiplier = 0.75 upgraded = BARRICADE_UPGRADE_BURN to_chat(user, SPAN_NOTICE("You applied a biohazardous upgrade.")) if(BARRICADE_UPGRADE_BRUTE) brute_multiplier = 0.75 + brute_projectile_multiplier = 0.75 upgraded = BARRICADE_UPGRADE_BRUTE to_chat(user, SPAN_NOTICE("You applied a reinforced upgrade.")) - if(BARRICADE_UPGRADE_EXPLOSIVE) - explosive_multiplier = 0.75 - upgraded = BARRICADE_UPGRADE_EXPLOSIVE - to_chat(user, SPAN_NOTICE("You applied an explosive upgrade.")) + if(BARRICADE_UPGRADE_ANTIFF) + explosive_multiplier = 0.5 + brute_projectile_multiplier = 0.5 + burn_flame_multiplier = 0.5 + upgraded = BARRICADE_UPGRADE_ANTIFF + to_chat(user, SPAN_NOTICE("You applied a composite upgrade.")) - M.use(2) + metal.use(2) user.count_niche_stat(STATISTICS_NICHE_UPGRADE_CADES) update_icon() return else - var/static/list/cade_types = list(BARRICADE_UPGRADE_EXPLOSIVE = image(icon = 'icons/obj/structures/barricades.dmi', icon_state = "explosive_obj"), BARRICADE_UPGRADE_BRUTE = image(icon = 'icons/obj/structures/barricades.dmi', icon_state = "brute_obj"), BARRICADE_UPGRADE_BURN = image(icon = 'icons/obj/structures/barricades.dmi', icon_state = "burn_obj")) + var/static/list/cade_types = list(BARRICADE_UPGRADE_ANTIFF = image(icon = 'icons/obj/structures/barricades.dmi', icon_state = "explosive_obj"), BARRICADE_UPGRADE_BRUTE = image(icon = 'icons/obj/structures/barricades.dmi', icon_state = "brute_obj"), BARRICADE_UPGRADE_BURN = image(icon = 'icons/obj/structures/barricades.dmi', icon_state = "burn_obj")) var/choice = show_radial_menu(user, src, cade_types, require_near = TRUE) if(!choice) return @@ -142,33 +146,37 @@ if(upgraded) to_chat(user, SPAN_NOTICE("This barricade is already upgraded.")) return - if(M.get_amount() < 2) + if(metal.get_amount() < 2) to_chat(user, SPAN_NOTICE("You lack the required metal.")) return - if((usr.get_active_hand()) != M) - to_chat(user, SPAN_WARNING("You must be holding the [M] to upgrade \the [src]!")) + if((usr.get_active_hand()) != metal) + to_chat(user, SPAN_WARNING("You must be holding the [metal] to upgrade \the [src]!")) return switch(choice) if(BARRICADE_UPGRADE_BURN) burn_multiplier = 0.75 + burn_flame_multiplier = 0.75 upgraded = BARRICADE_UPGRADE_BURN to_chat(user, SPAN_NOTICE("You applied a biohazardous upgrade.")) if(BARRICADE_UPGRADE_BRUTE) brute_multiplier = 0.75 + brute_projectile_multiplier = 0.75 upgraded = BARRICADE_UPGRADE_BRUTE to_chat(user, SPAN_NOTICE("You applied a reinforced upgrade.")) - if(BARRICADE_UPGRADE_EXPLOSIVE) - explosive_multiplier = 0.75 - upgraded = BARRICADE_UPGRADE_EXPLOSIVE - to_chat(user, SPAN_NOTICE("You applied an explosive upgrade.")) + if(BARRICADE_UPGRADE_ANTIFF) + explosive_multiplier = 0.5 + brute_projectile_multiplier = 0.5 + burn_flame_multiplier = 0.5 + upgraded = BARRICADE_UPGRADE_ANTIFF + to_chat(user, SPAN_NOTICE("You applied a composite upgrade.")) - M.use(2) + metal.use(2) user.count_niche_stat(STATISTICS_NICHE_UPGRADE_CADES) update_icon() return - if(HAS_TRAIT(W, TRAIT_TOOL_MULTITOOL)) + if(HAS_TRAIT(item, TRAIT_TOOL_MULTITOOL)) if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) to_chat(user, SPAN_WARNING("You are not trained to touch [src]...")) return @@ -181,13 +189,15 @@ upgraded = null explosive_multiplier = initial(explosive_multiplier) brute_multiplier = initial(brute_multiplier) + brute_projectile_multiplier = initial(brute_projectile_multiplier) burn_multiplier = initial(burn_multiplier) + burn_flame_multiplier = initial(burn_flame_multiplier) new stack_type (loc, 1) update_icon() return if(BARRICADE_BSTATE_UNSECURED) //Protection panel removed step. Screwdriver to put the panel back, wrench to unsecure the anchor bolts - if(HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER)) + if(HAS_TRAIT(item, TRAIT_TOOL_SCREWDRIVER)) if(user.action_busy) return if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) @@ -199,7 +209,7 @@ SPAN_NOTICE("You set [src]'s protection panel back.")) build_state = BARRICADE_BSTATE_SECURED return - if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) + if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) if(user.action_busy) return if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) @@ -214,7 +224,7 @@ update_icon() //unanchored changes layer return if(BARRICADE_BSTATE_MOVABLE) //Anchor bolts loosened step. Apply crowbar to unseat the panel and take apart the whole thing. Apply wrench to resecure anchor bolts - if(HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) + if(HAS_TRAIT(item, TRAIT_TOOL_WRENCH)) if(user.action_busy) return if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) @@ -224,8 +234,8 @@ if(B != src && B.dir == dir) to_chat(user, SPAN_WARNING("There's already a barricade here.")) return - var/turf/open/T = loc - if(!(istype(T) && T.allow_construction)) + var/turf/open/turf = loc + if(!(istype(turf) && turf.allow_construction)) to_chat(user, SPAN_WARNING("[src] must be secured on a proper surface!")) return playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) @@ -236,7 +246,7 @@ anchored = TRUE update_icon() //unanchored changes layer return - if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) + if(HAS_TRAIT(item, TRAIT_TOOL_CROWBAR)) if(user.action_busy) return if(!skillcheck(user, SKILL_CONSTRUCTION, SKILL_CONSTRUCTION_TRAINED)) diff --git a/code/game/objects/structures/barricade/sandbags.dm b/code/game/objects/structures/barricade/sandbags.dm index d3dce285ab92..0e2b77b4c1e5 100644 --- a/code/game/objects/structures/barricade/sandbags.dm +++ b/code/game/objects/structures/barricade/sandbags.dm @@ -90,7 +90,7 @@ user.visible_message(SPAN_NOTICE("[user] starts adding more [SB] to [src]."), \ SPAN_NOTICE("You start adding sandbags to [src].")) for(var/i = build_stage to BARRICADE_SANDBAG_5) - if(build_stage >= BARRICADE_SANDBAG_5 || !do_after(user, 5, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src) || build_stage >= BARRICADE_SANDBAG_5) + if(build_stage >= BARRICADE_SANDBAG_5 || !do_after(user, 5, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, src) || build_stage >= BARRICADE_SANDBAG_5 || SB.amount == 0) break SB.use(1) increment_build_stage() diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 3449c9d74278..05355feeb154 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -31,10 +31,7 @@ /obj/structure/closet/Initialize() . = ..() if(!opened && fill_from_loc) // if closed, any item at the crate's loc is put in the contents - for(var/obj/item/I in src.loc) - if(I.density || I.anchored || I == src) - continue - I.forceMove(src) + store_items() GLOB.closet_list += src flags_atom |= USES_HEARING diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm index 56328404702e..4d275ee7b9d8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm @@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) //MARINE COMMAND CLOSET /obj/structure/closet/secure_closet/commander name = "commanding officer's locker" - req_access = list(ACCESS_MARINE_CAPTAIN) + req_access = list(ACCESS_MARINE_CO) icon_state = "secure_locked_commander" icon_closed = "secure_unlocked_commander" icon_locked = "secure_locked_commander" @@ -22,7 +22,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) /obj/structure/closet/secure_closet/securecom name = "commanding officer's secure box" - req_access = list(ACCESS_MARINE_CAPTAIN) + req_access = list(ACCESS_MARINE_CO) desc = "A safe for the Commanding Officer to store any equipment they need to have ready at a moment's notice. There's a note inside saying that whatever was inside it before was moved out." icon = 'icons/obj/structures/marine_closet.dmi' icon_state = "commander_safe" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 11bd32b8fdb7..435dfce3f122 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -41,7 +41,7 @@ open() else src.req_access = list() - src.req_access += pick(get_all_accesses()) + src.req_access += pick(get_all_main_access()) ..() /obj/structure/closet/secure_closet/proc/togglelock(mob/living/user) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index b91543d9ec5c..2393b5df8265 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -64,13 +64,22 @@ M.animation_attack_on(src) unpack() M.visible_message(SPAN_DANGER("[M] smashes [src] apart!"), \ - SPAN_DANGER("You smash [src] apart!"), 5, CHAT_TYPE_XENO_COMBAT) + SPAN_DANGER("You smash [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_ATTACK_ACTION /obj/structure/largecrate/ex_act(power) if(power >= EXPLOSION_THRESHOLD_VLOW) unpack() +/obj/structure/largecrate/proc/take_damage(damage) + health -= damage + if(health <= 0) + unpack() + +/obj/structure/largecrate/bullet_act(obj/item/projectile/P) + take_damage(P.calculate_damage(P.damage)) + return TRUE + /obj/structure/largecrate/mule icon_state = "mulecrate" @@ -347,8 +356,6 @@ /obj/item/weapon/gun/revolver/cmb = /obj/item/ammo_magazine/revolver/cmb, /obj/item/weapon/gun/shotgun/merc = /obj/item/ammo_magazine/handful/shotgun/buckshot, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb = /obj/item/ammo_magazine/handful/shotgun/buckshot, - /obj/item/weapon/gun/shotgun/double = /obj/item/ammo_magazine/handful/shotgun/buckshot, - /obj/item/weapon/gun/shotgun/double/with_stock = /obj/item/ammo_magazine/handful/shotgun/buckshot, /obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27, /obj/item/weapon/gun/pistol/skorpion = /obj/item/ammo_magazine/pistol/skorpion, /obj/item/weapon/gun/smg/mac15 = /obj/item/ammo_magazine/smg/mac15, diff --git a/code/game/objects/structures/crates_lockers/secure_crates.dm b/code/game/objects/structures/crates_lockers/secure_crates.dm index abdab195fa11..b4ebb6d5e827 100644 --- a/code/game/objects/structures/crates_lockers/secure_crates.dm +++ b/code/game/objects/structures/crates_lockers/secure_crates.dm @@ -104,7 +104,7 @@ open() else src.req_access = list() - src.req_access += pick(get_all_accesses()) + src.req_access += pick(get_all_main_access()) ..() diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 01f03fd05de0..e8e4b3b0966e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -62,7 +62,38 @@ PLANT_CUT_MACHETE = 3 = Needs at least a machete to be cut down /obj/structure/flora/flamer_fire_act() fire_act() +/obj/structure/flora/fire_act() + if(QDELETED(src) || (fire_flag & FLORA_NO_BURN) || burning) + return + burning = TRUE + var/spread_time = rand(75, 150) + if(!(fire_flag & FLORA_BURN_NO_SPREAD)) + addtimer(CALLBACK(src, PROC_REF(spread_fire)), spread_time) + addtimer(CALLBACK(src, PROC_REF(burn_up)), spread_time + 5 SECONDS) +/obj/structure/flora/proc/spread_fire() + for(var/D in cardinal) //Spread fire + var/turf/T = get_step(src.loc, D) + if(T) + for(var/obj/structure/flora/F in T) + if(fire_flag & FLORA_BURN_SPREAD_ONCE) + F.fire_flag |= FLORA_BURN_NO_SPREAD + if(!(locate(/obj/flamer_fire) in T)) + new /obj/flamer_fire(T, create_cause_data("wildfire")) + +/obj/structure/flora/proc/burn_up() + new /obj/effect/decal/cleanable/dirt(loc) + if(center) + new /obj/effect/decal/cleanable/dirt(loc) //Produces more ash at the center + qdel(src) + +/obj/structure/flora/ex_act(power) + if(power >= EXPLOSION_THRESHOLD_VLOW) + deconstruct(FALSE) + +/obj/structure/flora/get_projectile_hit_boolean(obj/item/projectile/P) + . = ..() + return FALSE //trees /obj/structure/flora/tree @@ -80,10 +111,30 @@ PLANT_CUT_MACHETE = 3 = Needs at least a machete to be cut down icon = 'icons/obj/structures/props/pinetrees.dmi' icon_state = "pine_c" +//dead /obj/structure/flora/tree/dead icon = 'icons/obj/structures/props/deadtrees.dmi' icon_state = "tree_1" +/obj/structure/flora/tree/dead/tree_1 + icon_state = "tree_1" + +/obj/structure/flora/tree/dead/tree_2 + icon_state = "tree_2" + +/obj/structure/flora/tree/dead/tree_3 + icon_state = "tree_3" + +/obj/structure/flora/tree/dead/tree_4 + icon_state = "tree_4" + +/obj/structure/flora/tree/dead/tree_5 + icon_state = "tree_5" + +/obj/structure/flora/tree/dead/tree_6 + icon_state = "tree_6" + +//joshua /obj/structure/flora/tree/joshua name = "joshua tree" desc = "A tall tree covered in spiky-like needles, covering its trunk." @@ -128,14 +179,26 @@ ICE GRASS icon_state = "" variations = 3 +//brown /obj/structure/flora/grass/ice/brown icon_state = "snowgrassbb_1" icon_tag = "snowgrassbb" +/obj/structure/flora/grass/ice/brown/snowgrassbb_1 + icon_state = "snowgrassbb_1" + +/obj/structure/flora/grass/ice/brown/snowgrassbb_2 + icon_state = "snowgrassbb_2" + +/obj/structure/flora/grass/ice/brown/snowgrassbb_3 + icon_state = "snowgrassbb_3" + +//green /obj/structure/flora/grass/ice/green icon_state = "snowgrassgb_1" icon_tag = "snowgrassgb" +//both /obj/structure/flora/grass/ice/both icon_state = "snowgrassall_1" icon_tag = "snowgrassall" @@ -168,13 +231,83 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. */ +//Light desert grass + /obj/structure/flora/grass/desert icon = 'icons/obj/structures/props/dam.dmi' icon_state = "lightgrass_1" +// to replace with +/obj/structure/flora/grass/desert/lightgrass_1 + icon_state = "lightgrass_1" + +/obj/structure/flora/grass/desert/lightgrass_2 + icon_state = "lightgrass_2" + +/obj/structure/flora/grass/desert/lightgrass_3 + icon_state = "lightgrass_3" + +/obj/structure/flora/grass/desert/lightgrass_4 + icon_state = "lightgrass_4" + +/obj/structure/flora/grass/desert/lightgrass_5 + icon_state = "lightgrass_5" + +/obj/structure/flora/grass/desert/lightgrass_6 + icon_state = "lightgrass_6" + +/obj/structure/flora/grass/desert/lightgrass_7 + icon_state = "lightgrass_7" + +/obj/structure/flora/grass/desert/lightgrass_8 + icon_state = "lightgrass_8" + +/obj/structure/flora/grass/desert/lightgrass_9 + icon_state = "lightgrass_9" + +/obj/structure/flora/grass/desert/lightgrass_10 + icon_state = "lightgrass_10" + +/obj/structure/flora/grass/desert/lightgrass_11 + icon_state = "lightgrass_11" + +/obj/structure/flora/grass/desert/lightgrass_12 + icon_state = "lightgrass_12" + +//heavy desert grass /obj/structure/flora/grass/desert/heavy icon_state = "heavygrass_1" +/obj/structure/flora/grass/desert/heavygrass_1 + icon_state = "heavygrass_1" + +/obj/structure/flora/grass/desert/heavygrass_2 + icon_state = "heavygrass_2" + +/obj/structure/flora/grass/desert/heavygrass_3 + icon_state = "heavygrass_3" + +/obj/structure/flora/grass/desert/heavygrass_4 + icon_state = "heavygrass_4" + +/obj/structure/flora/grass/desert/heavygrass_5 + icon_state = "heavygrass_5" + +/obj/structure/flora/grass/desert/heavygrass_6 + icon_state = "heavygrass_6" + +/obj/structure/flora/grass/desert/heavygrass_7 + icon_state = "heavygrass_7" + +/obj/structure/flora/grass/desert/heavygrass_8 + icon_state = "heavygrass_8" + +/obj/structure/flora/grass/desert/heavygrass_9 + icon_state = "heavygrass_9" + +/obj/structure/flora/grass/desert/heavygrass_10 + icon_state = "heavygrass_10" + /* TALLGRASS - SPREADS FIRES @@ -198,35 +331,6 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. overlays.Cut() overlays += image("icon"=src.icon,"icon_state"=overlay_type,"layer"=ABOVE_XENO_LAYER,"dir"=dir) -/obj/structure/flora/fire_act() - if(QDELETED(src) || (fire_flag & FLORA_NO_BURN) || burning) - return - burning = TRUE - var/spread_time = rand(75, 150) - if(!(fire_flag & FLORA_BURN_NO_SPREAD)) - addtimer(CALLBACK(src, PROC_REF(spread_fire)), spread_time) - addtimer(CALLBACK(src, PROC_REF(burn_up)), spread_time + 5 SECONDS) - -/obj/structure/flora/proc/spread_fire() - for(var/D in cardinal) //Spread fire - var/turf/T = get_step(src.loc, D) - if(T) - for(var/obj/structure/flora/F in T) - if(fire_flag & FLORA_BURN_SPREAD_ONCE) - F.fire_flag |= FLORA_BURN_NO_SPREAD - if(!(locate(/obj/flamer_fire) in T)) - new /obj/flamer_fire(T, create_cause_data("wildfire")) - -/obj/structure/flora/proc/burn_up() - new /obj/effect/decal/cleanable/dirt(loc) - if(center) - new /obj/effect/decal/cleanable/dirt(loc) //Produces more ash at the center - qdel(src) - -/obj/structure/flora/ex_act(power) - if(power >= EXPLOSION_THRESHOLD_VLOW) - deconstruct(FALSE) - // MAP VARIANTS // // PARENT FOR COLOR, CORNERS AND CENTERS, BASED ON DIRECTIONS // @@ -516,6 +620,7 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. icon_state = "" //will this break it?? - Nope density = TRUE +//light vines /obj/structure/flora/jungle/vines name = "vines" desc = "A mass of twisted vines." @@ -526,6 +631,19 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. cut_level = PLANT_CUT_MACHETE fire_flag = FLORA_BURN_NO_SPREAD +/obj/structure/flora/jungle/vines/light_1 + icon_state = "light_1" + icon_tag = "light_1" + +/obj/structure/flora/jungle/vines/light_2 + icon_state = "light_2" + icon_tag = "light_2" + +/obj/structure/flora/jungle/vines/light_3 + icon_state = "light_3" + icon_tag = "light_3" + +//heavy hide you /obj/structure/flora/jungle/vines/heavy desc = "A thick, coiled mass of twisted vines." opacity = TRUE diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 60f29c8b40e4..9323bca2877e 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -143,7 +143,7 @@ unslashable = TRUE unacidable = TRUE health = null - layer = TURF_LAYER + layer = ABOVE_TURF_LAYER//Being on turf layer was causing issues with cameras. This SHOULDN'T cause any problems. plane = FLOOR_PLANE density = FALSE opacity = FALSE diff --git a/code/game/objects/structures/pipes/pipes.dm b/code/game/objects/structures/pipes/pipes.dm index aa5f56fb5d8c..9f2b70c70661 100644 --- a/code/game/objects/structures/pipes/pipes.dm +++ b/code/game/objects/structures/pipes/pipes.dm @@ -14,6 +14,8 @@ var/ventcrawl_message_busy = FALSE //Prevent spamming + /// Whether or not the pipe will explode (when on the Almayer) during hijack + var/explodey = TRUE /// The grenade subtypes that pipes will use when they explode var/static/list/exploding_types = list(/obj/item/explosive/grenade/high_explosive/bursting_pipe, /obj/item/explosive/grenade/incendiary/bursting_pipe) @@ -40,7 +42,8 @@ if(!is_mainship_level(z)) return - GLOB.mainship_pipes += src + if(explodey) + GLOB.mainship_pipes += src /obj/structure/pipes/Destroy() for(var/mob/living/M in src) diff --git a/code/game/objects/structures/pipes/standard/manifolds.dm b/code/game/objects/structures/pipes/standard/manifolds.dm index f7bd04ee3fb7..dfbc027455b6 100644 --- a/code/game/objects/structures/pipes/standard/manifolds.dm +++ b/code/game/objects/structures/pipes/standard/manifolds.dm @@ -104,6 +104,10 @@ layer = ATMOS_PIPE_SUPPLY_LAYER color = PIPE_COLOR_BLUE +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom + name = "Reinforced Air supply pipe manifold" + explodey = FALSE + /obj/structure/pipes/standard/manifold/hidden/yellow color = PIPE_COLOR_YELLOW @@ -182,6 +186,10 @@ layer = ATMOS_PIPE_SUPPLY_LAYER color = PIPE_COLOR_BLUE +/obj/structure/pipes/standard/manifold/fourway/hidden/supply/no_boom + name = "reinforced 4-way air supply pipe manifold" + explodey = FALSE + /obj/structure/pipes/standard/manifold/fourway/hidden/yellow color = PIPE_COLOR_YELLOW diff --git a/code/game/objects/structures/pipes/standard/simple.dm b/code/game/objects/structures/pipes/standard/simple.dm index 7101bb3dd95f..93a92e51f71b 100644 --- a/code/game/objects/structures/pipes/standard/simple.dm +++ b/code/game/objects/structures/pipes/standard/simple.dm @@ -104,6 +104,10 @@ layer = ATMOS_PIPE_SUPPLY_LAYER color = PIPE_COLOR_BLUE +/obj/structure/pipes/standard/simple/hidden/supply/no_boom + name = "Reinforced Air supply pipe" + explodey = FALSE + /obj/structure/pipes/standard/simple/hidden/yellow color = PIPE_COLOR_YELLOW diff --git a/code/game/objects/structures/pipes/standard/standard_misc.dm b/code/game/objects/structures/pipes/standard/standard_misc.dm index a50774552b03..dc52da57c750 100644 --- a/code/game/objects/structures/pipes/standard/standard_misc.dm +++ b/code/game/objects/structures/pipes/standard/standard_misc.dm @@ -107,6 +107,10 @@ layer = ATMOS_PIPE_SUPPLY_LAYER color = PIPE_COLOR_BLUE +/obj/structure/pipes/standard/cap/hidden/supply/no_boom + name = "reinforced supply pipe endcap" + explodey = FALSE + /obj/structure/pipes/standard/tank icon = 'icons/obj/pipes/tank.dmi' diff --git a/code/game/objects/structures/pipes/vents/pump_scrubber.dm b/code/game/objects/structures/pipes/vents/pump_scrubber.dm index d0dd3f8301a7..a4565c610ad5 100644 --- a/code/game/objects/structures/pipes/vents/pump_scrubber.dm +++ b/code/game/objects/structures/pipes/vents/pump_scrubber.dm @@ -4,6 +4,10 @@ name = "Air Scrubber" vent_icon = "scrubber" +/obj/structure/pipes/vents/scrubber/no_boom + name = "Reinforced Air Scrubber" + explodey = FALSE + /obj/structure/pipes/vents/scrubber/on icon_state = "on" @@ -13,6 +17,10 @@ icon_state = "map_vent" name = "Air Vent" +/obj/structure/pipes/vents/pump/no_boom + name = "Reinforced Air Vent" + explodey = FALSE + /obj/structure/pipes/vents/pump/on icon_state = "on" diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index e6abda3d1534..f6905d4d044d 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -740,7 +740,7 @@ icon_state = "small_wire" /obj/structure/prop/ice_colony/poly_kevlon_roll - name = "poly_kevlon roll" + name = "plastic roll" desc = "A big roll of poly-kevlon plastic used in temporary shelter construction." icon_state = "kevlon_roll" anchored = FALSE diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index 9fbd9b189c64..f20a7cfc25d6 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -38,6 +38,11 @@ . += SPAN_NOTICE(" Nothing.") if(reagents) . += SPAN_NOTICE("Total volume: [reagents.total_volume] / [reagents.maximum_volume].") + if(dispensing) + . += SPAN_NOTICE("\nTransfer mode: Dispensing") + else + . += SPAN_NOTICE("\nTransfer mode: Filling") + . += SPAN_NOTICE("Transfer rate: [amount_per_transfer_from_this] units") /obj/structure/reagent_dispensers/Destroy() playsound(src.loc, 'sound/effects/slosh.ogg', 50, 1, 3) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index cacb8232fd60..fbd6920875ad 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -70,7 +70,7 @@ /obj/structure/sign/kiddieplaque name = "AI developers plaque" - desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"" + desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. Beneath the image, someone has scratched the word \"PACKETS\"" icon_state = "kiddieplaque" /obj/structure/sign/arcturianstopsign diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 918c58c71a9e..4186ae8608a9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -37,6 +37,8 @@ if(!picked_up_item) return var/mob/living/carbon/human/H = over + if(usr != H) + return if(!CAN_PICKUP(H, src)) return if(buckled_mob) @@ -293,6 +295,11 @@ name = "Delta squad chair" desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in Delta squad blue. This chair is most likely to be the first to fight and first to die." +/obj/structure/bed/chair/comfy/ares + icon_state = "comfychair_ares" + name = "AI core chair" + desc = "A functional chair designed for comfortably sitting a single person with intent to facilitate interactions with the ship AI." + /obj/structure/bed/chair/office anchored = FALSE drag_delay = 1 //Pulling something on wheels is easy diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index ee0486846ec0..090c5ad56f87 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -439,11 +439,20 @@ desc = "An ultra-reinforced window designed to keep the briefing podium a secure area." icon_state = "fwindow" basestate = "fwindow" - not_damageable = 1 - not_deconstructable = 1 + not_damageable = TRUE + not_deconstructable = TRUE unslashable = TRUE unacidable = TRUE +/obj/structure/window/reinforced/ultra/initialize_pass_flags(datum/pass_flags_container/PF) + . = ..() + if (PF) + PF.flags_can_pass_all = NONE + PF.flags_can_pass_front = NONE + PF.flags_can_pass_behind = PASS_OVER^(PASS_OVER_ACID_SPRAY) + flags_can_pass_front_temp = NONE + flags_can_pass_behind_temp = NONE + /obj/structure/window/reinforced/ultra/Initialize() . = ..() GLOB.hijack_bustable_windows += src @@ -566,8 +575,8 @@ name = "hull window" desc = "A glass window with a special rod matrix inside a wall frame. This one was made out of exotic materials to prevent hull breaches. No way to get through here." //icon_state = "rwindow0_debug" //Uncomment to check hull in the map editor - not_damageable = 1 - not_deconstructable = 1 + not_damageable = TRUE + not_deconstructable = TRUE unslashable = TRUE unacidable = TRUE health = 1000000 //Failsafe, shouldn't matter @@ -589,8 +598,8 @@ /obj/structure/window/framed/almayer/white/hull name = "hull window" desc = "An ultra-reinforced window designed to keep research a secure area. This one was made out of exotic materials to prevent hull breaches. No way to get through here." - not_damageable = 1 - not_deconstructable = 1 + not_damageable = TRUE + not_deconstructable = TRUE unslashable = TRUE unacidable = TRUE health = 1000000 //Failsafe, shouldn't matter @@ -619,8 +628,8 @@ name = "hull window" desc = "A glass window with a special rod matrix inside a wall frame. This one was made out of exotic materials to prevent hull breaches. No way to get through here." //icon_state = "rwindow0_debug" //Uncomment to check hull in the map editor - not_damageable = 1 - not_deconstructable = 1 + not_damageable = TRUE + not_deconstructable = TRUE unslashable = TRUE unacidable = TRUE health = 1000000 //Failsafe, shouldn't matter @@ -711,6 +720,16 @@ reinf = 1 window_frame = /obj/structure/window_frame/strata/reinforced +/obj/structure/window/framed/strata/hull + icon_state = "strata_window0" + basestate = "strata_window" + desc = "A glass window. Something tells you this one is somehow indestructible." + not_damageable = TRUE + not_deconstructable = TRUE + unslashable = TRUE + unacidable = TRUE + health = 1000000 + //Kutjevo Windows /obj/structure/window/framed/kutjevo @@ -734,8 +753,8 @@ /obj/structure/window/framed/kutjevo/reinforced/hull icon_state = "kutjevo_window_hull" desc = "A glass window. Something tells you this one is somehow indestructible." - not_damageable = 1 - not_deconstructable = 1 + not_damageable = TRUE + not_deconstructable = TRUE unslashable = TRUE unacidable = TRUE health = 1000000 @@ -771,8 +790,8 @@ /obj/structure/window/framed/solaris/reinforced/hull desc = "A glass window. Something tells you this one is somehow indestructible." - not_damageable = 1 - not_deconstructable = 1 + not_damageable = TRUE + not_deconstructable = TRUE unslashable = TRUE unacidable = TRUE health = 1000000 @@ -803,8 +822,8 @@ /obj/structure/window/framed/dev/reinforced/hull desc = "A glass window. Something tells you this one is somehow indestructible." - not_damageable = 1 - not_deconstructable = 1 + not_damageable = TRUE + not_deconstructable = TRUE unslashable = TRUE unacidable = TRUE health = 1000000 @@ -893,8 +912,8 @@ icon_state = "padded_cellwindow0" basestate = "padded_cellwindow" desc = "A glass window with a special rod matrix inside a wall frame. This one was made out of exotic materials to prevent hull breaches. No way to get through here." - not_damageable = 1 - not_deconstructable = 1 + not_damageable = TRUE + not_deconstructable = TRUE unacidable = TRUE health = 1000000 //Failsafe, shouldn't matter @@ -913,9 +932,15 @@ var/triggered = FALSE //indicates if the shutters have already been triggered /obj/structure/window/framed/corsat/hull/research + icon_state = "paddedresearch_rwindow0" + basestate = "paddedresearch_rwindow" + window_frame = /obj/structure/window_frame/corsat/research health = 300 /obj/structure/window/framed/corsat/hull/security + icon_state = "paddedsec_rwindow0" + basestate = "paddedsec_rwindow" + window_frame = /obj/structure/window_frame/corsat/security health = 400 /obj/structure/window/framed/corsat/hull/Destroy() @@ -942,3 +967,22 @@ P.setDir(EAST) INVOKE_ASYNC(P, TYPE_PROC_REF(/obj/structure/machinery/door, close)) + +/obj/structure/window/framed/corsat/indestructible/ + name = "hull window" + desc = "A glass window with a special rod matrix inside a wall frame. This one has been reinforced to take almost anything the universe can throw at it." + not_damageable = TRUE + not_deconstructable = TRUE + unslashable = TRUE + unacidable = TRUE + health = 1000000 + +/obj/structure/window/framed/corsat/indestructible/research + icon_state = "paddedresearch_rwindow0" + basestate = "paddedresearch_rwindow" + window_frame = /obj/structure/window_frame/corsat/research + +/obj/structure/window/framed/corsat/indestructible/security + icon_state = "paddedsec_rwindow0" + basestate = "paddedsec_rwindow" + window_frame = /obj/structure/window_frame/corsat/security diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm index 445b9a0ecb8f..810b0560bf8b 100644 --- a/code/game/objects/structures/window_frame.dm +++ b/code/game/objects/structures/window_frame.dm @@ -236,6 +236,12 @@ basestate = "strata_window" reinforced = TRUE +/obj/structure/window_frame/strata/hull + icon_state = "strata_window0_frame" + basestate = "strata_window" + unslashable = TRUE + unacidable = TRUE + //Kutjevo frames /obj/structure/window_frame/kutjevo diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 58b2a2dedca1..b760340004f5 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -521,6 +521,7 @@ var/datum/controller/supply/supply_controller = new() qdel(C) // Sell manifests. + var/screams = FALSE for(var/atom/movable/movable_atom in area_shuttle) if(istype(movable_atom, /obj/item/paper/manifest)) var/obj/item/paper/manifest/M = movable_atom @@ -531,6 +532,7 @@ var/datum/controller/supply/supply_controller = new() if(black_market_enabled) var/points_to_add = get_black_market_value(movable_atom) if(points_to_add == KILL_MENDOZA) + screams = TRUE kill_mendoza() black_market_sold_items[movable_atom.type] += 1 black_market_points += points_to_add @@ -538,6 +540,7 @@ var/datum/controller/supply/supply_controller = new() // Don't disintegrate humans! Maul their corpse instead. >:) if(ishuman(movable_atom)) var/timer = 0.5 SECONDS + screams = TRUE for(var/index in 1 to 10) timer += 0.5 SECONDS addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(maul_human), movable_atom), timer) @@ -545,11 +548,11 @@ var/datum/controller/supply/supply_controller = new() // Delete everything else. else qdel(movable_atom) -/proc/maul_human(mob/living/carbon/human/mauled_human) - - for(var/atom/computer as anything in supply_controller.bound_supply_computer_list) - computer.balloon_alert_to_viewers("you hear horrifying noises coming from the elevator!") + if(screams) + for(var/atom/computer as anything in bound_supply_computer_list) + computer.balloon_alert_to_viewers("you hear horrifying noises coming from the elevator!") +/proc/maul_human(mob/living/carbon/human/mauled_human) mauled_human.visible_message(SPAN_HIGHDANGER("The machinery crushes [mauled_human]"), SPAN_HIGHDANGER("The elevator machinery is CRUSHING YOU!")) if(mauled_human.stat != DEAD) @@ -1012,6 +1015,7 @@ var/datum/controller/supply/supply_controller = new() to_chat(usr, SPAN_DANGER("Current retrieval load has reached maximum capacity.")) return + var/datum/ares_link/link = GLOB.ares_link for(var/i=1, i<=supply_controller.requestlist.len, i++) var/datum/supply_order/SO = supply_controller.requestlist[i] if(SO.ordernum == ordernum) @@ -1027,6 +1031,12 @@ var/datum/controller/supply/supply_controller = new() temp += "
Back Main Menu" supply_order.approvedby = usr.name msg_admin_niche("[usr] confirmed supply order of [supply_pack.name].") + var/pack_source = "Cargo Hold" + var/pack_name = supply_pack.name + if(supply_pack.dollar_cost) + pack_source = "Unknown" + pack_name = "Unknown" + link.log_ares_requisition(pack_source, pack_name, usr) else temp = "Not enough money left.
" temp += "
Back Main Menu" @@ -1169,8 +1179,6 @@ var/datum/controller/supply/supply_controller = new() /datum/controller/supply/proc/kill_mendoza() if(!mendoza_status) return //cant kill him twice - for(var/atom/computer as anything in bound_supply_computer_list) - computer.balloon_alert_to_viewers("you hear horrifying noises coming from the elevator!") mendoza_status = FALSE // he'll die soon enough, and in the meantime will be too busy to handle requests. diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 483f3250f8c5..92bce17e50f6 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -230,6 +230,7 @@ name = "wall" icon_state = "wall1" icon = 'icons/turf/shuttle.dmi' + layer = ABOVE_TURF_LAYER /turf/closed/shuttle/is_weedable() return FULLY_WEEDABLE diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index 25682f00df29..4e47fd004f74 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -272,7 +272,9 @@ /turf/open/floor/almayer/uscm/directional icon_state = "logo_directional" - +/turf/open/floor/almayer/no_build + allow_construction = FALSE + hull_floor = TRUE // RESEARCH STUFF /turf/open/floor/almayer/research/containment/entrance diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 41ada18c1552..3f7192b0090b 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -331,6 +331,40 @@ baseturfs = /turf/open/gm/grass scorchable = "grass1" +/turf/open/gm/grass/grass1 + icon_state = "grass1" + +/turf/open/gm/grass/grass2 + icon_state = "grass2" + +/turf/open/gm/grass/grassbeach + icon_state = "grassbeach" + +/turf/open/gm/grass/grassbeach/north + +/turf/open/gm/grass/grassbeach/south + dir = 1 + +/turf/open/gm/grass/grassbeach/west + dir = 4 + +/turf/open/gm/grass/grassbeach/east + dir = 8 + +/turf/open/gm/grass/gbcorner + icon_state = "gbcorner" + +/turf/open/gm/grass/gbcorner/north_west + +/turf/open/gm/grass/gbcorner/south_east + dir = 1 + +/turf/open/gm/grass/gbcorner/south_west + dir = 4 + +/turf/open/gm/grass/gbcorner/north_east + dir = 8 + /turf/open/gm/grass/Initialize(mapload, ...) . = ..() @@ -357,6 +391,45 @@ baseturfs = /turf/open/gm/dirtgrassborder scorchable = "grass1" +/turf/open/gm/dirtgrassborder/north + +/turf/open/gm/dirtgrassborder/south + dir = 1 + +/turf/open/gm/dirtgrassborder/west + dir = 4 + +/turf/open/gm/dirtgrassborder/east + dir = 8 + +/turf/open/gm/dirtgrassborder/grassdirt_corner + icon_state = "grassdirt_corner" + +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west + +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east + dir = 1 + +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east + dir = 4 + +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west + dir = 8 + +/turf/open/gm/dirtgrassborder/grassdirt_corner2 + icon_state = "grassdirt_corner2" + +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west + +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east + dir = 1 + +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east + dir = 4 + +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west + dir = 8 + /turf/open/gm/dirtgrassborder/Initialize(mapload, ...) . = ..() @@ -527,6 +600,44 @@ baseturfs = /turf/open/gm/coast supports_surgery = FALSE +/turf/open/gm/coast/north + +/turf/open/gm/coast/south + dir = 1 + +/turf/open/gm/coast/west + dir = 4 + +/turf/open/gm/coast/east + dir = 8 + +/turf/open/gm/coast/beachcorner + icon_state = "beachcorner" + +/turf/open/gm/coast/beachcorner/north_west + +/turf/open/gm/coast/beachcorner/north_east + dir = 1 + +/turf/open/gm/coast/beachcorner/south_east + dir = 4 + +/turf/open/gm/coast/beachcorner/south_west + dir = 8 + +/turf/open/gm/coast/beachcorner2 + icon_state = "beachcorner2" + +/turf/open/gm/coast/beachcorner2/north_west + +/turf/open/gm/coast/beachcorner2/north_east + dir = 1 + +/turf/open/gm/coast/beachcorner2/south_west + dir = 4 + +/turf/open/gm/coast/beachcorner2/south_east + dir = 8 /turf/open/gm/riverdeep name = "river" diff --git a/code/game/turfs/strata.dm b/code/game/turfs/strata.dm index e48f6bf8bc40..a89f98a732ae 100644 --- a/code/game/turfs/strata.dm +++ b/code/game/turfs/strata.dm @@ -5,6 +5,13 @@ /turf/open/gm/grass/weedable/is_weedable() return FULLY_WEEDABLE +//just in case + +/turf/open/gm/grass/grass1/weedable //inherit from general turfs + +/turf/open/gm/grass/grass1/weedable/is_weedable() + return FULLY_WEEDABLE + /turf/open/gm/dirtgrassborder/weedable /turf/open/gm/dirtgrassborder/weedable/is_weedable() //Gotta have our sexy grass borders be weedable. diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 1012944f4518..54cfdf6e34ea 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -245,6 +245,7 @@ if(!istype(A)) return + SEND_SIGNAL(src, COMSIG_TURF_ENTERED, A) SEND_SIGNAL(A, COMSIG_MOVABLE_TURF_ENTERED, src) // Let explosions know that the atom entered @@ -560,10 +561,10 @@ return NOT_WEEDABLE /turf/open/auto_turf/shale/layer1/is_weedable() - return FALSE + return SEMI_WEEDABLE /turf/open/auto_turf/shale/layer2/is_weedable() - return FALSE + return SEMI_WEEDABLE /turf/closed/wall/is_weedable() return FULLY_WEEDABLE //so we can spawn weeds on the walls diff --git a/code/game/turfs/walls/r_wall.dm b/code/game/turfs/walls/r_wall.dm index a3572138c287..8933ad31c0e8 100644 --- a/code/game/turfs/walls/r_wall.dm +++ b/code/game/turfs/walls/r_wall.dm @@ -265,7 +265,7 @@ name = "heavy reinforced wall" desc = "A huge chunk of ultra-reinforced metal used to separate rooms. Looks virtually indestructible." icon_state = "h_dome" - hull = 1 + hull = TRUE /turf/closed/wall/r_wall/biodome/biodome_unmeltable/ex_act(severity) //Should make it indestructible return diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index b1531d26e3c9..702cbd35560c 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -412,6 +412,8 @@ walltype = WALL_CULT color = "#3c3434" +/turf/closed/wall/cult/make_girder(destroyed_girder) + return /turf/closed/wall/vault icon_state = "rockvault" @@ -702,6 +704,12 @@ var/datum/cause_data/construction_data flags_turf = TURF_ORGANIC +/turf/closed/wall/resin/Initialize(mapload) + . = ..() + + for(var/obj/effect/alien/weeds/node/weed_node in contents) + qdel(weed_node) + /turf/closed/wall/resin/pillar name = "resin pillar segment" hull = TRUE diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 321ff015f7bc..1c94eb485300 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -190,17 +190,30 @@ var/view_size = getviewsize(view) var/aspect_ratio = view_size[1] / view_size[2] - // Calculate desired pixel width using window size and aspect ratio - var/sizes = params2list(winget(src, "mainwindow.split;mapwindow", "size")) + var/desired_width = 0 + var/sizes = params2list(winget(src, "mainwindow.split;mapwindow;mainwindow", "size")) var/map_size = splittext(sizes["mapwindow.size"], "x") - var/height = text2num(map_size[2]) - var/desired_width = round(height * aspect_ratio) - if (text2num(map_size[1]) == desired_width) - // Nothing to do - return + + if(prefs.adaptive_zoom) + // If using adaptive zoom, we directly use the intended horizontal map size to be pixel perfect + var/zoom_factor = get_adaptive_zoom_factor() + if(zoom_factor) + desired_width = view_size[1] * world.icon_size * zoom_factor + 4 // 4 pixels margin + + if(!desired_width) + // Calculate desired pixel width using window size and aspect ratio + var/height = text2num(map_size[2]) + desired_width = round(height * aspect_ratio) var/split_size = splittext(sizes["mainwindow.split.size"], "x") var/split_width = text2num(split_size[1]) + // Always leave at least 240px of verb panel for the poor sod to switch back if they made a mistake + if(split_width - desired_width < 240) + desired_width = split_width - 240 + + if (text2num(map_size[1]) == desired_width) + // Nothing to do + return // Calculate and apply a best estimate // +4 pixels are for the width of the splitter's handle diff --git a/code/game/world.dm b/code/game/world.dm index 3b3a1c2625d3..d6ddd1fa41f6 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -98,7 +98,7 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt") // If the server's configured for local testing, get everything set up ASAP. // Shamelessly stolen from the test manager's host_tests() proc if(testing_locally) - master_mode = "extended" + master_mode = "Extended" // Wait for the game ticker to initialize while(!SSticker.initialized) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 445aa98d349a..ba5d52a23f97 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -67,6 +67,7 @@ var/list/admin_verbs_default = list( /datum/admins/proc/subtlemessageall, /datum/admins/proc/alertall, /datum/admins/proc/imaginary_friend, + /client/proc/toggle_ares_ping, ) var/list/admin_verbs_admin = list( @@ -109,7 +110,7 @@ var/list/admin_verbs_minor_event = list( /client/proc/cmd_admin_change_custom_event, /datum/admins/proc/admin_force_distress, /datum/admins/proc/admin_force_ERT_shuttle, - /client/proc/force_shuttle, + /client/proc/force_hijack, /datum/admins/proc/force_predator_round, //Force spawns a predator round. /client/proc/adjust_predator_round, /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ @@ -152,7 +153,8 @@ var/list/admin_verbs_major_event = list( /client/proc/map_template_upload, /client/proc/enable_podlauncher, /client/proc/change_taskbar_icon, - /client/proc/change_weather + /client/proc/change_weather, + /client/proc/admin_blurb ) var/list/admin_verbs_spawn = list( @@ -171,9 +173,11 @@ var/list/admin_verbs_server = list( /datum/admins/proc/change_ground_map, /datum/admins/proc/change_ship_map, /datum/admins/proc/vote_ground_map, + /datum/admins/proc/override_ground_map, /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_debug_del_all, /datum/admins/proc/togglejoin, + /client/proc/toggle_cdn, ) var/list/admin_verbs_debug = list( @@ -206,6 +210,7 @@ var/list/admin_verbs_debug = list( /datum/admins/proc/view_runtime_log, /*shows the server runtime log for this round*/ /datum/admins/proc/view_href_log, /*shows the server HREF log for this round*/ /datum/admins/proc/view_tgui_log, /*shows the server TGUI log for this round*/ + /client/proc/admin_blurb, ) var/list/admin_verbs_debug_advanced = list( @@ -573,6 +578,16 @@ var/list/roundstart_mod_verbs = list( message_admins("[key_name(usr)] announced a random fact.") SSticker.mode?.declare_fun_facts() +/client/proc/toggle_ares_ping() + set name = "Toggle ARES notification sound" + set category = "Preferences.Logs" + + prefs.toggles_sound ^= SOUND_ARES_MESSAGE + if (prefs.toggles_sound & SOUND_ARES_MESSAGE) + to_chat(usr, SPAN_BOLDNOTICE("You will now hear a ping for ARES messages.")) + else + to_chat(usr, SPAN_BOLDNOTICE("You will no longer hear a ping for ARES messages.")) + #undef MAX_WARNS #undef AUTOBANTIME diff --git a/code/modules/admin/server_verbs.dm b/code/modules/admin/server_verbs.dm index 0d35bd084196..47a60c043741 100644 --- a/code/modules/admin/server_verbs.dm +++ b/code/modules/admin/server_verbs.dm @@ -50,6 +50,42 @@ log_admin("[key_name(usr)] started a groundmap vote.") message_admins("[key_name_admin(usr)] started a groundmap vote.") +/datum/admins/proc/override_ground_map() + set category = "Server" + set name = "M: Override Next Map" + + if(!check_rights(R_SERVER)) + return + + var/map_type = tgui_alert(usr, "Override Ship or Ground Map?", "Map selection", list(GROUND_MAP, SHIP_MAP, "Cancel")) + if(map_type == "Cancel") + return + + var/map = input(usr, "Choose a custom map to run for next round","Upload Map") as null|file + if(!map) + return + if(copytext("[map]", -4) != ".dmm")//4 == length(".dmm") + to_chat(usr, SPAN_WARNING("Filename must end in '.dmm': [map]"), confidential = TRUE) + return + + message_admins(SPAN_ADMINNOTICE("[key_name_admin(usr)] is overriding the next '[map_type]' map with a custom one.")) + fcopy(map, "data/[OVERRIDE_MAPS_TO_FILENAME[map_type]]") + if(tgui_alert(usr, "Do you want to upload a custom map config or use defaults? Config controls things like survivors and monkey types, camouflages, lore messages, map items, nightmare, special environmental features...", "Map Config Flavor", list("Default", "Override")) == "Override") + tgui_alert(usr, "Choose the custom map configuration for next round. Make sure it's VALID. It MUST have \"override_map\":true !", "Warning", list("OK!")) + var/map_config = input(usr, "Choose custom map configuration to upload", "Upload Map Config") as null|file + if(map_config) + var/parse_check = json_decode(file2text(map_config)) + if(parse_check && parse_check["override_map"]) + fcopy(map_config, MAP_TO_FILENAME[map_type]) + tgui_alert(usr, "Done, using uploaded map_config. ALWAYS check at start of round that the map loaded correctly when using this. Passing a map vote or changing it with verb vote will revert these changes. Good luck!", "One little thing...", list("OK")) + message_admins(SPAN_ADMINNOTICE("[key_name_admin(usr)] overrode next '[map_type]' map with '[map]' and '[map_config]' for settings.")) + return + to_chat(usr, SPAN_ADMINNOTICE("Couldn't retrieve map_config file or it was invalid, using default config.")) + + fcopy(OVERRIDE_DEFAULT_MAP_CONFIG[map_type], MAP_TO_FILENAME[map_type]) + tgui_alert(usr, "Done, using default map_config ('Unknown' map). ALWAYS check at start of round that the map loaded correctly when using this. Passing a map vote or changing it with verb vote will revert these changes. Good luck!", "One little thing...", list("OK")) + message_admins(SPAN_ADMINNOTICE("[key_name_admin(usr)] overrode next '[map_type]' map with '[map]' and default settings.")) + /datum/admins/proc/change_ship_map() set category = "Server" set name = "M: Change Ship Map" diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm index 2fa88d926b3b..c0ffeada9883 100644 --- a/code/modules/admin/tabs/admin_tab.dm +++ b/code/modules/admin/tabs/admin_tab.dm @@ -317,7 +317,7 @@ else if(mob.get_type_in_ears(/obj/item/device/radio/headset)) to_chat(mob, message) - message_admins("[key_name(usr)] used Subtle Message All In View from [message_option], saying \"[input]\".") + message_admins(SPAN_STAFF_IC("[key_name(usr)] used Subtle Message All In View from [message_option], saying \"[input]\".")) #undef SUBTLE_MESSAGE_IN_HEAD #undef SUBTLE_MESSAGE_WEYLAND @@ -680,10 +680,14 @@ /proc/set_lz_resin_allowed(allowed = TRUE) if(allowed) for(var/area/A in all_areas) + if(A.flags_area & AREA_UNWEEDABLE) + continue A.is_resin_allowed = TRUE msg_admin_niche("Areas close to landing zones are now weedable.") else for(var/area/A in all_areas) + if(A.flags_area & AREA_UNWEEDABLE) + continue A.is_resin_allowed = initial(A.is_resin_allowed) msg_admin_niche("Areas close to landing zones cannot be weeded now.") GLOB.resin_lz_allowed = allowed diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm index 0cb77a86599b..20d98776c5ab 100644 --- a/code/modules/admin/tabs/event_tab.dm +++ b/code/modules/admin/tabs/event_tab.dm @@ -423,32 +423,28 @@ message_admins("Admin [key_name(usr)] has turned everyone into a primitive") -/client/proc/force_shuttle() - set name = "Force Dropship" - set desc = "Force a dropship to launch" +/client/proc/force_hijack() + set name = "Force Hijack" + set desc = "Force a dropship to be hijacked" set category = "Admin.Shuttles" var/list/shuttles = list(DROPSHIP_ALAMO, DROPSHIP_NORMANDY) - var/tag = tgui_input_list(usr, "Which dropship should be force launched?", "Select a dropship:", shuttles) + var/tag = tgui_input_list(usr, "Which dropship should be force hijacked?", "Select a dropship:", shuttles) if(!tag) return - var/crash = 0 - switch(tgui_input_list(usr, "Would you like to force a crash?", "Force crash", list("Yes", "No"))) - if("Yes") crash = 1 - if("No") crash = 0 - else return var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(tag) if(!dropship) - to_chat(src, SPAN_DANGER("Error: Attempted to force a dropship launch but the shuttle datum was null. Code: MSD_FSV_DIN")) - log_admin("Error: Attempted to force a dropship launch but the shuttle datum was null. Code: MSD_FSV_DIN") + to_chat(src, SPAN_DANGER("Error: Attempted to force a dropship hijack but the shuttle datum was null. Code: MSD_FSV_DIN")) + log_admin("Error: Attempted to force a dropship hijack but the shuttle datum was null. Code: MSD_FSV_DIN") return - if(crash) - var/obj/structure/machinery/computer/shuttle/dropship/flight/computer = dropship.getControlConsole() - computer.hijack(usr) - else - to_chat(usr, SPAN_WARNING("Use the shuttle manipulator to normally move a shuttle")) + var/confirm = tgui_alert(usr, "Are you sure you want to hijack [dropship]?", "Force hijack", list("Yes", "No")) == "Yes" + if(!confirm) + return + + var/obj/structure/machinery/computer/shuttle/dropship/flight/computer = dropship.getControlConsole() + computer.hijack(usr, force = TRUE) /client/proc/cmd_admin_create_centcom_report() set name = "Report: Faction" @@ -539,19 +535,15 @@ if(!input) return FALSE - for(var/obj/structure/machinery/computer/almayer_control/C in machines) - if(!(C.inoperable())) -// var/obj/item/paper/P = new /obj/item/paper(C.loc)//Don't need a printed copy currently. -// P.name = "'[MAIN_AI_SYSTEM] Update.'" -// P.info = input -// P.update_icon() - C.messagetitle.Add("[MAIN_AI_SYSTEM] Update") - C.messagetext.Add(input) - ai_announcement(input) - message_admins("[key_name_admin(src)] has created an AI comms report") - log_admin("AI comms report: [input]") - else - to_chat(usr, SPAN_WARNING("[MAIN_AI_SYSTEM] is not responding. It may be offline or destroyed.")) + var/datum/ares_link/link = GLOB.ares_link + if(link.p_interface.inoperable()) + to_chat(usr, SPAN_WARNING("[MAIN_AI_SYSTEM] is not responding. It may be offline or destroyed.")) + return + + ai_announcement(input) + message_admins("[key_name_admin(src)] has created an AI comms report") + log_admin("AI comms report: [input]") + /client/proc/cmd_admin_create_AI_apollo_report() set name = "Report: ARES Apollo" @@ -564,19 +556,19 @@ if(!input) return FALSE - for(var/obj/structure/machinery/computer/almayer_control/console in machines) - if(console.inoperable()) - to_chat(usr, SPAN_WARNING("[MAIN_AI_SYSTEM] is not responding. It may be offline or destroyed.")) - return - else - var/datum/language/apollo = GLOB.all_languages[LANGUAGE_APOLLO] - for(var/mob/living/silicon/decoy/ship_ai/AI in ai_mob_list) - apollo.broadcast(AI, input) - for(var/mob/listener in (GLOB.human_mob_list + GLOB.dead_mob_list)) - if(listener.hear_apollo())//Only plays sound to mobs and not observers, to reduce spam. - playsound_client(listener.client, sound('sound/misc/interference.ogg'), listener, vol = 45) - message_admins("[key_name_admin(src)] has created an AI Apollo report") - log_admin("AI Apollo report: [input]") + var/datum/ares_link/link = GLOB.ares_link + if(link.p_apollo.inoperable()) + to_chat(usr, SPAN_WARNING("[MAIN_AI_SYSTEM] is not responding. It may be offline or destroyed.")) + return FALSE + + var/datum/language/apollo/apollo = GLOB.all_languages[LANGUAGE_APOLLO] + for(var/mob/living/silicon/decoy/ship_ai/AI in ai_mob_list) + apollo.broadcast(AI, input) + for(var/mob/listener as anything in (GLOB.human_mob_list + GLOB.dead_mob_list)) + if(listener.hear_apollo())//Only plays sound to mobs and not observers, to reduce spam. + playsound_client(listener.client, sound('sound/misc/interference.ogg'), listener, vol = 45) + message_admins("[key_name_admin(src)] has created an AI APOLLO report") + log_admin("AI APOLLO report: [input]") /client/proc/cmd_admin_create_AI_shipwide_report() set name = "Report: ARES Shipwide" @@ -588,19 +580,14 @@ var/input = input(usr, "This is an announcement type message from the ship's AI. This will be announced to every conscious human on Almayer z-level. Be aware, this will work even if ARES unpowered/destroyed. Check with online staff before you send this.", "What?", "") as message|null if(!input) return FALSE + for(var/obj/structure/machinery/ares/processor/interface/processor in machines) + if(processor.inoperable()) + to_chat(usr, SPAN_WARNING("[MAIN_AI_SYSTEM] is not responding. It may be offline or destroyed.")) + return - for(var/obj/structure/machinery/computer/almayer_control/C in machines) - if(!(C.inoperable())) -// var/obj/item/paper/P = new /obj/item/paper(C.loc)//Don't need a printed copy currently. -// P.name = "'[MAIN_AI_SYSTEM] Update.'" -// P.info = input -// P.update_icon() - C.messagetitle.Add("[MAIN_AI_SYSTEM] Shipwide Update") - C.messagetext.Add(input) - - shipwide_ai_announcement(input) - message_admins("[key_name_admin(src)] has created an AI shipwide report") - log_admin("[key_name_admin(src)] AI shipwide report: [input]") + shipwide_ai_announcement(input) + message_admins("[key_name_admin(src)] has created an AI shipwide report") + log_admin("[key_name_admin(src)] AI shipwide report: [input]") /client/proc/cmd_admin_create_predator_report() set name = "Report: Yautja AI" @@ -976,6 +963,27 @@ if("Xeno") GLOB.bioscan_data.qm_bioscan(variance) if("Marine") - GLOB.bioscan_data.ares_bioscan(FALSE, variance) + var/force_check = tgui_alert(usr, "Do you wish to force ARES to display the bioscan?", "Display force", list("Yes", "No"), 20 SECONDS) + var/force_status = FALSE + if(force_check == "Yes") + force_status = TRUE + GLOB.bioscan_data.ares_bioscan(force_status, variance) if("Yautja") GLOB.bioscan_data.yautja_bioscan() + +/client/proc/admin_blurb() + set name = "Global Blurb Message" + set category = "Admin.Events" + + if(!check_rights(R_ADMIN|R_DEBUG)) + return FALSE + var/duration = 5 SECONDS + var/message = "ADMIN TEST" + var/text_input = tgui_input_text(usr, "Announcement message", "Message Contents", message, timeout = 5 MINUTES) + message = text_input + duration = tgui_input_number(usr, "Set the duration of the alert in deci-seconds.", "Duration", 5 SECONDS, 5 MINUTES, 5 SECONDS, 20 SECONDS) + var/confirm = tgui_alert(usr, "Are you sure you wish to send '[message]' to all players for [(duration / 10)] seconds?", "Confirm", list("Yes", "No"), 20 SECONDS) + if(confirm != "Yes") + return FALSE + show_blurb(GLOB.player_list, duration, message, TRUE, "center", "center", "#bd2020", "ADMIN") + message_admins("[key_name(usr)] sent an admin blurb alert to all players. Alert reads: '[message]' and lasts [(duration / 10)] seconds.") diff --git a/code/modules/admin/tabs/round_tab.dm b/code/modules/admin/tabs/round_tab.dm index 980de9eed855..deb27e73f7dc 100644 --- a/code/modules/admin/tabs/round_tab.dm +++ b/code/modules/admin/tabs/round_tab.dm @@ -181,3 +181,34 @@ else to_chat(usr, "Error: Start Now: Game has already started.") return FALSE + +/client/proc/toggle_cdn() + set name = "Toggle CDN" + set category = "Server" + var/static/admin_disabled_cdn_transport = null + if(alert(usr, "Are you sure you want to toggle CDN asset transport?", "Confirm", "Yes", "No") != "Yes") + return + + var/current_transport = CONFIG_GET(string/asset_transport) + if(!current_transport || current_transport == "simple") + if(admin_disabled_cdn_transport) + CONFIG_SET(string/asset_transport, admin_disabled_cdn_transport) + admin_disabled_cdn_transport = null + SSassets.OnConfigLoad() + message_admins("[key_name_admin(usr)] re-enabled the CDN asset transport") + log_admin("[key_name(usr)] re-enabled the CDN asset transport") + return + + to_chat(usr, SPAN_ADMINNOTICE("The CDN is not enabled!")) + if(alert(usr, "CDN asset transport is not enabled! If you're having issues with assets, you can also try disabling filename mutations.", "CDN asset transport is not enabled!", "Try disabling filename mutations", "Nevermind") == "Try disabling filename mutations") + SSassets.transport.dont_mutate_filenames = !SSassets.transport.dont_mutate_filenames + message_admins("[key_name_admin(usr)] [(SSassets.transport.dont_mutate_filenames ? "disabled" : "re-enabled")] asset filename transforms.") + log_admin("[key_name(usr)] [(SSassets.transport.dont_mutate_filenames ? "disabled" : "re-enabled")] asset filename transforms.") + return + + admin_disabled_cdn_transport = current_transport + CONFIG_SET(string/asset_transport, "simple") + SSassets.OnConfigLoad() + SSassets.transport.dont_mutate_filenames = TRUE + message_admins("[key_name_admin(usr)] disabled CDN asset transport") + log_admin("[key_name(usr)] disabled CDN asset transport") diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index ca6f0f977ade..b371db087be6 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -1241,7 +1241,7 @@ log_admin("[src.owner] replied to [key_name(H)]'s USCM message with the message [input].") for(var/client/X in GLOB.admins) if((R_ADMIN|R_MOD) & X.admin_holder.rights) - to_chat(X, "ADMINS/MODS: \red [src.owner] replied to [key_name(H)]'s USCM message with: \blue \")[input]\"") + to_chat(X, SPAN_STAFF_IC("ADMINS/MODS: \red [src.owner] replied to [key_name(H)]'s USCM message with: \blue \")[input]\"")) to_chat(H, SPAN_DANGER("You hear something crackle in your headset before a voice speaks, please stand by for a message from USCM:\" \blue \"[input]\"")) else if(href_list["SyndicateReply"]) @@ -1306,7 +1306,7 @@ fax_message = new(generate_templated_fax(0, organization_type, subject, addressed_to, message_body, sent_by, "Editor in Chief", organization_type)) show_browser(usr, "[fax_message.data]", "pressfaxpreview", "size=500x400") var/send_choice = tgui_input_list(usr, "Send this fax?", "Fax Template", list("Send", "Cancel")) - if(send_choice != "Send") + if(send_choice != "Send") return GLOB.fax_contents += fax_message // save a copy @@ -1345,7 +1345,7 @@ P.stamps += "
This paper has been stamped by the Free Press Quantum Relay." to_chat(src.owner, "Message reply to transmitted successfully.") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) return to_chat(src.owner, "/red Unable to locate fax!") else if(href_list["USCMFaxReply"]) @@ -1388,7 +1388,7 @@ fax_message = new(generate_templated_fax(0, "USCM CENTRAL COMMAND", subject,addressed_to, message_body,sent_by, sent_title, "United States Colonial Marine Corps")) show_browser(usr, "[fax_message.data]", "uscmfaxpreview", "size=500x400") var/send_choice = tgui_input_list(usr, "Send this fax?", "Fax Template", list("Send", "Cancel")) - if(send_choice != "Send") + if(send_choice != "Send") return GLOB.fax_contents += fax_message // save a copy @@ -1427,7 +1427,7 @@ P.stamps += "
This paper has been stamped by the USCM High Command Quantum Relay." to_chat(src.owner, "Message reply to transmitted successfully.") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) return to_chat(src.owner, "/red Unable to locate fax!") @@ -1509,7 +1509,7 @@ P.stamps += "
This paper has been stamped and encrypted by the Weyland-Yutani Quantum Relay (tm)." to_chat(src.owner, "Message reply to transmitted successfully.") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) return to_chat(src.owner, "/red Unable to locate fax!") @@ -1591,7 +1591,7 @@ P.stamps += "
This paper has been stamped by The Office of Colonial Marshals." to_chat(src.owner, "Message reply to transmitted successfully.") - message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]", 1) + message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) return to_chat(src.owner, "/red Unable to locate fax!") @@ -1882,7 +1882,7 @@ if(href_list["ccdeny"]) // CentComm-deny. The distress call is denied, without any further conditions var/mob/ref_person = locate(href_list["ccdeny"]) - marine_announcement("The distress signal has not received a response, the launch tubes are now recalibrating.", "Distress Beacon") + marine_announcement("The distress signal has not received a response, the launch tubes are now recalibrating.", "Distress Beacon", logging = ARES_LOG_SECURITY) log_game("[key_name_admin(usr)] has denied a distress beacon, requested by [key_name_admin(ref_person)]") message_admins("[key_name_admin(usr)] has denied a distress beacon, requested by [key_name_admin(ref_person)]", 1) @@ -1927,7 +1927,7 @@ if(href_list["sddeny"]) // CentComm-deny. The self-destruct is denied, without any further conditions var/mob/ref_person = locate(href_list["sddeny"]) - marine_announcement("The self-destruct request has not received a response, ARES is now recalculating statistics.", "Self-Destruct System") + marine_announcement("The self-destruct request has not received a response, ARES is now recalculating statistics.", "Self-Destruct System", logging = ARES_LOG_SECURITY) log_game("[key_name_admin(usr)] has denied self-destruct, requested by [key_name_admin(ref_person)]") message_admins("[key_name_admin(usr)] has denied self-destruct, requested by [key_name_admin(ref_person)]", 1) @@ -2006,6 +2006,45 @@ player_notes_all(checking.key) + if(href_list["AresReply"]) + var/mob/living/carbon/human/speaker = locate(href_list["AresReply"]) + + if(!istype(speaker)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return FALSE + + if((!GLOB.ares_link.interface) || (GLOB.ares_link.interface.inoperable())) + to_chat(usr, "ARES Interface offline.") + return FALSE + + var/input = input(src.owner, "Please enter a message from ARES to reply to [key_name(speaker)].","Outgoing message from ARES", "") + if(!input) + return FALSE + + to_chat(src.owner, "You sent [input] to [speaker] via ARES Interface.") + log_admin("[src.owner] replied to [key_name(speaker)]'s ARES message with the message [input].") + for(var/client/staff in GLOB.admins) + if((R_ADMIN|R_MOD) & staff.admin_holder.rights) + to_chat(staff, SPAN_STAFF_IC("ADMINS/MODS: [SPAN_RED("[src.owner] replied to [key_name(speaker)]'s ARES message")] with: [SPAN_BLUE(input)] ")) + GLOB.ares_link.interface.response_from_ares(input, href_list["AresRef"]) + + if(href_list["AresMark"]) + var/mob/living/carbon/human/speaker = locate(href_list["AresMark"]) + + if(!istype(speaker)) + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return FALSE + + if((!GLOB.ares_link.interface) || (GLOB.ares_link.interface.inoperable())) + to_chat(usr, "ARES Interface offline.") + return FALSE + + to_chat(src.owner, "You marked [speaker]'s ARES message for response.") + log_admin("[src.owner] marked [key_name(speaker)]'s ARES message. [src.owner] will be responding.") + for(var/client/staff in GLOB.admins) + if((R_ADMIN|R_MOD) & staff.admin_holder.rights) + to_chat(staff, SPAN_STAFF_IC("ADMINS/MODS: [SPAN_RED("[src.owner] marked [key_name(speaker)]'s ARES message for response.")]")) + return /datum/admins/proc/accept_ert(mob/approver, mob/ref_person) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 52aae50a966a..c7a7664af3e8 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -203,6 +203,9 @@ message_admins(SPAN_DANGER("ERROR: Non-admin [key_name(usr)] attempted to execute a SDQL query!")) log_admin("non-admin attempted to execute a SDQL query!") return FALSE + var/prompt = tgui_alert(usr, "Run SDQL2 Query?", "SDQL2", list("Yes", "Cancel")) + if (prompt != "Yes") + return var/list/results = world.SDQL2_query(query_text, key_name_admin(usr), "[key_name(usr)]") if(length(results) == 3) for(var/I in 1 to 3) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 16fff09944ac..03d2ae517354 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -519,7 +519,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) AddInteraction("Deferred to Mentors by [key_name_admin(usr)].", player_message = "Deferred to Mentors.") to_chat(initiator, SPAN_ADMINHELP("Your ticket has been deferred to Mentors.")) - Resolve() + log_ahelp(id, "Defer", "Deferred to mentors by [usr.key]", null, usr.ckey) + Close(silent = TRUE) /datum/admin_help/proc/mark_ticket() if(marked_admin) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index be8a5693df6e..700d42808a07 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -23,7 +23,7 @@ stafftype = "[admin_holder.rank]" msg = strip_html(msg) - log_admin("[key_name(src)] : [msg]") + log_admin("DEAD: [key_name(src)] : [msg]") if (!msg) return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 3b3240405e89..8a017446858d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -149,11 +149,11 @@ if (H.wear_id) var/obj/item/card/id/id = H.wear_id id.icon_state = "gold" - id:access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access() + id:access = get_global_access() else var/obj/item/card/id/id = new/obj/item/card/id(M); id.icon_state = "gold" - id:access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access() + id:access = get_all_main_access() id.registered_name = H.real_name id.registered_ref = WEAKREF(H) id.assignment = "Captain" diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm index b0223cbd3ebd..37bf4f1c9d85 100644 --- a/code/modules/admin/verbs/getlogs.dm +++ b/code/modules/admin/verbs/getlogs.dm @@ -51,7 +51,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) //This proc allows download of past server logs saved within the data/logs/ folder. //It works similarly to show-server-log. @@ -73,7 +73,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) //Other log stuff put here for the sake of organisation @@ -96,7 +96,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) /**Shows this round's attack log*/ /datum/admins/proc/view_attack_log() @@ -117,7 +117,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) /**Shows this round's runtime log*/ /datum/admins/proc/view_runtime_log() @@ -138,7 +138,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) /**Shows this round's href log*/ /datum/admins/proc/view_href_log() @@ -159,7 +159,7 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) /**Shows this round's tgui log*/ /datum/admins/proc/view_tgui_log() @@ -180,4 +180,4 @@ message_admins("[key_name_admin(src)] accessed file: [path]") to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - src << run(file(path)) + src << ftp(file(path)) diff --git a/code/modules/admin/verbs/mob_verbs.dm b/code/modules/admin/verbs/mob_verbs.dm index 3aed46d5434e..376115c0d630 100644 --- a/code/modules/admin/verbs/mob_verbs.dm +++ b/code/modules/admin/verbs/mob_verbs.dm @@ -166,7 +166,7 @@ return to_chat(H, SPAN_DANGER("Message received through headset. [message_option] Transmission \"[msg]\"")) - var/message = WRAP_STAFF_LOG(usr, "subtle messaged [key_name(M)] as [message_option], saying \"[msg]\" in [get_area(M)] ([M.x],[M.y],[M.z]).") + var/message = WRAP_STAFF_LOG(usr, SPAN_STAFF_IC("subtle messaged [key_name(M)] as [message_option], saying \"[msg]\" in [get_area(M)] ([M.x],[M.y],[M.z]).")) message_admins(message, M.x, M.y, M.z) admin_ticket_log(M, message) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 5a60c0185e37..e0210e4577a0 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,9 +17,9 @@ liaison = 1 if(liaison) - msg = SPAN_NOTICE("LIAISON: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]") + msg = SPAN_STAFF_IC("LIAISON: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]") else - msg = SPAN_NOTICE("PRAY: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]") + msg = SPAN_STAFF_IC("PRAY: [key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]") log_admin(msg) for(var/client/C in GLOB.admins) if(AHOLD_IS_MOD(C.admin_holder) && C.prefs.toggles_chat & CHAT_PRAYER) @@ -31,7 +31,7 @@ /proc/high_command_announce(text , mob/Sender , iamessage) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "[SPAN_NOTICE("USCM[iamessage ? "IA" : ""]:")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]" + msg = "[SPAN_STAFF_IC("USCM[iamessage ? "IA" : ""]:")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]" log_admin(msg) for(var/client/C in GLOB.admins) if((R_ADMIN|R_MOD) & C.admin_holder.rights) diff --git a/code/modules/assembly/signaller.dm b/code/modules/assembly/signaller.dm index fe5ce3e3f426..4ac25854e8ea 100644 --- a/code/modules/assembly/signaller.dm +++ b/code/modules/assembly/signaller.dm @@ -139,7 +139,7 @@ /obj/item/device/assembly/signaller/proc/set_frequency(new_frequency) SSradio.remove_object(src, frequency) frequency = new_frequency - radio_connection = SSradio.add_object(src, frequency, RADIO_CHAT) + radio_connection = SSradio.add_object(src, frequency, RADIO_SIGNALS) /obj/item/device/assembly/signaller/Destroy() SSradio.remove_object(src, frequency) diff --git a/code/modules/asset_cache/asset_cache_item.dm b/code/modules/asset_cache/asset_cache_item.dm index 52ebc7190372..72d976bf11f1 100644 --- a/code/modules/asset_cache/asset_cache_item.dm +++ b/code/modules/asset_cache/asset_cache_item.dm @@ -33,3 +33,9 @@ if (extstart) ext = ".[copytext(name, extstart+1)]" resource = file + +/datum/asset_cache_item/vv_edit_var(var_name, var_value) + return FALSE + +/datum/asset_cache_item/CanProcCall(procname) + return FALSE diff --git a/code/modules/asset_cache/transports/webroot_transport.dm b/code/modules/asset_cache/transports/webroot_transport.dm new file mode 100644 index 000000000000..e3cb33b8fabf --- /dev/null +++ b/code/modules/asset_cache/transports/webroot_transport.dm @@ -0,0 +1,87 @@ +/// CDN Webroot asset transport. +/datum/asset_transport/webroot + name = "CDN Webroot asset transport" + +/datum/asset_transport/webroot/Load() + if (validate_config(log = FALSE)) + load_existing_assets() + +/// Processes thru any assets that were registered before we were loaded as a transport. +/datum/asset_transport/webroot/proc/load_existing_assets() + for (var/asset_name in SSassets.cache) + var/datum/asset_cache_item/ACI = SSassets.cache[asset_name] + save_asset_to_webroot(ACI) + +/// Register a browser asset with the asset cache system +/// We also save it to the CDN webroot at this step instead of waiting for send_assets() +/// asset_name - the identifier of the asset +/// asset - the actual asset file or an asset_cache_item datum. +/datum/asset_transport/webroot/register_asset(asset_name, asset) + . = ..() + var/datum/asset_cache_item/ACI = . + + if (istype(ACI) && ACI.hash) + save_asset_to_webroot(ACI) + +/// Saves the asset to the webroot taking into account namespaces and hashes. +/datum/asset_transport/webroot/proc/save_asset_to_webroot(datum/asset_cache_item/ACI) + var/webroot = CONFIG_GET(string/asset_cdn_webroot) + var/newpath = "[webroot][get_asset_suffex(ACI)]" + if (fexists(newpath)) + return + if (fexists("[newpath].gz")) //its a common pattern in webhosting to save gzip'ed versions of text files and let the webserver serve them up as gzip compressed normal files, sometimes without keeping the original version. + return + return fcopy(ACI.resource, newpath) + +/// Returns a url for a given asset. +/// asset_name - Name of the asset. +/// asset_cache_item - asset cache item datum for the asset, optional, overrides asset_name +/datum/asset_transport/webroot/get_asset_url(asset_name, datum/asset_cache_item/asset_cache_item) + if (!istype(asset_cache_item)) + asset_cache_item = SSassets.cache[asset_name] + var/url = CONFIG_GET(string/asset_cdn_url) //config loading will handle making sure this ends in a / + return "[url][get_asset_suffex(asset_cache_item)]" + +/datum/asset_transport/webroot/proc/get_asset_suffex(datum/asset_cache_item/asset_cache_item) + var/base = "[copytext(asset_cache_item.hash, 1, 3)]/" + var/filename = "asset.[asset_cache_item.hash][asset_cache_item.ext]" + if (length(asset_cache_item.namespace)) + base = "namespaces/[copytext(asset_cache_item.namespace, 1, 3)]/[asset_cache_item.namespace]/" + if (!asset_cache_item.namespace_parent) + filename = "[asset_cache_item.name]" + return base + filename + + +/// webroot asset sending - does nothing unless passed legacy assets +/datum/asset_transport/webroot/send_assets(client/client, list/asset_list) + . = FALSE + var/list/legacy_assets = list() + if (!islist(asset_list)) + asset_list = list(asset_list) + for (var/asset_name in asset_list) + var/datum/asset_cache_item/ACI = asset_list[asset_name] + if (!istype(ACI)) + ACI = SSassets.cache[asset_name] + if (!ACI) + legacy_assets += asset_name //pass it on to base send_assets so it can output an error + continue + if (ACI.legacy) + legacy_assets[asset_name] = ACI + if (length(legacy_assets)) + . = ..(client, legacy_assets) + + +/// webroot slow asset sending - does nothing. +/datum/asset_transport/webroot/send_assets_slow(client/client, list/files, filerate) + return FALSE + +/datum/asset_transport/webroot/validate_config(log = TRUE) + if (!CONFIG_GET(string/asset_cdn_url)) + if (log) + log_asset("ERROR: [type]: Invalid Config: ASSET_CDN_URL") + return FALSE + if (!CONFIG_GET(string/asset_cdn_webroot)) + if (log) + log_asset("ERROR: [type]: Invalid Config: ASSET_CDN_WEBROOT") + return FALSE + return TRUE diff --git a/code/modules/character_traits/robotic_limbs.dm b/code/modules/character_traits/robotic_limbs.dm index ee72f22d9d07..be72eca2f6fc 100644 --- a/code/modules/character_traits/robotic_limbs.dm +++ b/code/modules/character_traits/robotic_limbs.dm @@ -20,7 +20,7 @@ /datum/character_trait/robo_limb/apply_trait(mob/living/carbon/human/target, datum/equipment_preset/preset) var/string_paygrade = preset.load_rank(target) var/datum/paygrade/paygrade_datum = GLOB.paygrades[string_paygrade] - if(paygrade_datum.ranking < minimum_ranking) + if(paygrade_datum?.ranking < minimum_ranking) to_chat(target, SPAN_WARNING("You aren't a high enough rank to be eligible to have a prosthetic [robo_limb_name]!")) return var/obj/limb/limb = target.get_limb(code_limb) diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index be2f977b6a53..fbec4aa13f36 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -26,6 +26,8 @@ var/adminobs = null var/area = null var/time_died_as_mouse = null //when the client last died as a mouse + /// The descriminator for larva queue ordering: Generally set to timeofdeath except for facehuggers/admin z-level play + var/larva_queue_time var/donator = 0 var/adminhelped = 0 @@ -42,7 +44,7 @@ var/played = 0 var/midi_silenced = 0 var/datum/soundOutput/soundOutput - var/list/volume_preferences = list(1, 0.5, 1, 0.85)//Game, music, admin midis, lobby music + var/list/volume_preferences = list(1, 0.5, 1, 0.6)//Game, music, admin midis, lobby music //////////// //SECURITY// diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 21915009f77a..6926175c835a 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( var/datum/fax/info = locate(href_list["FaxView"]) - if(!istype(info)) + if(!istype(info)) return if(info.photo_list) @@ -451,6 +451,10 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( ////////////// /client/Del() if(!gc_destroyed) + gc_destroyed = world.time + if (!QDELING(src)) + stack_trace("Client does not purport to be QDELING, this is going to cause bugs in other places!") + SEND_SIGNAL(src, COMSIG_PARENT_QDELETING, TRUE) Destroy() return ..() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index b85337afb8e7..d2d69d095dbd 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -53,6 +53,7 @@ var/const/MAX_SAVE_SLOTS = 10 var/be_special = 0 // Special role selection var/toggle_prefs = TOGGLE_MIDDLE_MOUSE_CLICK|TOGGLE_DIRECTIONAL_ATTACK|TOGGLE_MEMBER_PUBLIC|TOGGLE_AMBIENT_OCCLUSION|TOGGLE_VEND_ITEM_TO_HAND // flags in #define/mode.dm var/auto_fit_viewport = FALSE + var/adaptive_zoom = 0 var/UI_style = "midnight" var/toggles_admin = TOGGLES_ADMIN_DEFAULT var/toggles_chat = TOGGLES_CHAT_DEFAULT @@ -103,7 +104,9 @@ var/const/MAX_SAVE_SLOTS = 10 //SEA specific preferences ///holds our preferred job options for jobs - var/pref_special_job_options = list() + var/list/pref_special_job_options = list() + ///Holds assignment of character slots to jobs. + var/list/pref_job_slots = list() //WL Council preferences. var/yautja_status = WHITELIST_NORMAL @@ -123,6 +126,7 @@ var/const/MAX_SAVE_SLOTS = 10 var/underwear = "Boxers (Camo Conforming)" //underwear type var/undershirt = "Undershirt (Tan)" //undershirt type var/backbag = 2 //backpack type + var/preferred_armor = "Random" //preferred armor type (from their primary prep vendor) var/h_style = "Crewcut" //Hair type var/r_hair = 0 //Hair color @@ -329,6 +333,8 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "

Occupation Choices:

" dat += "
" dat += "\tSet Role Preferences" + dat += "
" + dat += "\tAssign Character Slots to Roles" dat += "" dat += "
" @@ -370,6 +376,8 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "Backpack Type: [backbaglist[backbag]]
" + dat += "Preferred Armor: [preferred_armor]
" + dat += "Show Job Gear: [show_job_gear ? "True" : "False"]
" dat += "Background: Cycle Background
" @@ -382,7 +390,7 @@ var/const/MAX_SAVE_SLOTS = 10 if(length(gear)) dat += "
" for(var/i = 1; i <= gear.len; i++) - var/datum/gear/G = gear_datums[gear[i]] + var/datum/gear/G = gear_datums_by_name[gear[i]] if(G) total_cost += G.cost dat += "[gear[i]] ([G.cost] points) Remove
" @@ -465,10 +473,6 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "Be [role_name]: [be_special & (1<
" n++ - - dat += "
" - dat += "\tSet Role Preferences" - dat += "
" if(MENU_CO) if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_COMMANDER) dat += "
" @@ -568,6 +572,7 @@ var/const/MAX_SAVE_SLOTS = 10 dat += "

Game Settings:

" dat += "Ambient Occlusion: [toggle_prefs & TOGGLE_AMBIENT_OCCLUSION ? "Enabled" : "Disabled"]
" dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"]
" + dat += "Adaptive Zoom: [adaptive_zoom ? "[adaptive_zoom * 2]x" : "Disabled"]
" dat += "tgui Window Mode: [(tgui_fancy) ? "Fancy (default)" : "Compatible (slower)"]
" dat += "tgui Window Placement: [(tgui_lock) ? "Primary monitor" : "Free (default)"]
" dat += "Play Admin Midis: [(toggles_sound & SOUND_MIDI) ? "Yes" : "No"]
" @@ -741,6 +746,83 @@ var/const/MAX_SAVE_SLOTS = 10 onclose(user, "mob_occupation", user.client, list("_src_" = "prefs", "preference" = "job", "task" = "close")) return +//limit - The amount of jobs allowed per column. Defaults to 13 to make it look nice. +//splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice. +//width - Screen' width. Defaults to 550 to make it look nice. +//height - Screen's height. Defaults to 500 to make it look nice. +/datum/preferences/proc/set_job_slots(mob/user, limit = 19, list/splitJobs = list(JOB_CHIEF_REQUISITION), width = 950, height = 700) + if(!RoleAuthority) + return + + var/HTML = "" + HTML += "
" + HTML += "Assign character slots to jobs.
Unavailable occupations are crossed out.

" + HTML += "
Done

" // Easier to press up here. + HTML += "
" // Table within a table for alignment, also allows you to easily add more colomns. + HTML += "" + var/index = -1 + + //The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows. + + var/list/active_role_names = GLOB.gamemode_roles[GLOB.master_mode] + if(!active_role_names) + active_role_names = ROLES_DISTRESS_SIGNAL + + for(var/role_name as anything in active_role_names) + var/datum/job/job = RoleAuthority.roles_by_name[role_name] + if(!job) + debug_log("Missing job for prefs: [role_name]") + continue + index++ + if((index >= limit) || (job.title in splitJobs)) + HTML += "
" + index = 0 + + HTML += "" + continue + else if(job.flags_startup_parameters & ROLE_WHITELISTED && !(RoleAuthority.roles_whitelist[user.ckey] & job.flags_whitelist)) + HTML += "[job.disp_title]" + continue + else if(!job.can_play_role(user.client)) + HTML += "[job.disp_title]" + continue + + HTML += "[job.disp_title]" + + var/slot_name = get_job_slot_name(job.title) + HTML += "" + + HTML += "
" + if(jobban_isbanned(user, job.title)) + HTML += "[job.disp_title]BANNED
WHITELISTED
TIMELOCKED
[slot_name]" + HTML += "
" + HTML += "

" + + var/b_color + var/msg + if(toggle_prefs & TOGGLE_START_JOIN_CURRENT_SLOT) + b_color = "red" + msg = "This preference is ignored when joining at the start of the round." + else + b_color = "green" + msg = "This preference is used when joining at the start of the round." + HTML += "
[msg]
" + if(toggle_prefs & TOGGLE_LATE_JOIN_CURRENT_SLOT) + b_color = "red" + msg = "This preference is ignored when joining a round in progress." + else + b_color = "green" + msg = "This preference is used when joining a round in progress." + HTML += "
[msg]
" + + HTML += "
Reset
" + HTML += "
" + + close_browser(user, "preferences") + show_browser(user, HTML, "Job Assignment", "job_slots_assignment", "size=[width]x[height]") + onclose(user, "job_slots_assignment", user.client, list("_src_" = "prefs", "preference" = "job_slot", "task" = "close")) + return + /datum/preferences/proc/SetRecords(mob/user) var/HTML = "" HTML += "
" @@ -831,6 +913,40 @@ var/const/MAX_SAVE_SLOTS = 10 job_preference_list[J.title] = priority return TRUE +/datum/preferences/proc/assign_job_slot(mob/user, target_job) + var/list/slot_options = list(JOB_SLOT_RANDOMISED_TEXT = JOB_SLOT_RANDOMISED_SLOT, JOB_SLOT_CURRENT_TEXT = JOB_SLOT_CURRENT_SLOT) + var/savefile/S = new /savefile(path) + var/slot_name + for(var/slot in 1 to MAX_SAVE_SLOTS) + S.cd = "/character[slot]" + S["real_name"] >> slot_name + if(slot_name) + slot_options["[slot_name] (slot #[slot])"] = slot + var/chosen_slot = tgui_input_list(user, "Assign character for [target_job] job", "Slot assignment", slot_options) + if(chosen_slot) + pref_job_slots[target_job] = slot_options[chosen_slot] + set_job_slots(user) + +/datum/preferences/proc/get_job_slot_name(job_title) + . = JOB_SLOT_CURRENT_TEXT + if(!(job_title in pref_job_slots)) + return + var/slot_number = pref_job_slots[job_title] + switch(slot_number) + if(JOB_SLOT_RANDOMISED_SLOT) + return JOB_SLOT_RANDOMISED_TEXT + if(1 to MAX_SAVE_SLOTS) + var/savefile/S = new /savefile(path) + S.cd = "/character[slot_number]" + return "[S["real_name"]] (slot #[slot_number])" + +/datum/preferences/proc/reset_job_slots() + pref_job_slots = list() + var/datum/job/J + for(var/role in RoleAuthority.roles_by_path) + J = RoleAuthority.roles_by_path[role] + pref_job_slots[J.title] = JOB_SLOT_CURRENT_SLOT + /datum/preferences/proc/process_link(mob/user, list/href_list) var/whitelist_flags = RoleAuthority.roles_whitelist[user.ckey] @@ -856,40 +972,52 @@ var/const/MAX_SAVE_SLOTS = 10 SetJob(user, href_list["text"], priority) else SetChoices(user) - return 1 + return TRUE + if("job_slot") + switch(href_list["task"]) + if("close") + close_browser(user, "job_slots_assignment") + ShowChoices(user) + if("assign") + assign_job_slot(user, href_list["target_job"]) + if("start_join") + toggle_prefs ^= TOGGLE_START_JOIN_CURRENT_SLOT + set_job_slots(user) + if("late_join") + toggle_prefs ^= TOGGLE_LATE_JOIN_CURRENT_SLOT + set_job_slots(user) + if("reset") + reset_job_slots() + set_job_slots(user) + else + set_job_slots(user) + return TRUE if("loadout") switch(href_list["task"]) if("input") + var/gear_category = tgui_input_list(user, "Select gear category: ", "Gear to add", gear_datums_by_category) + if(!gear_category) + return + var/choice = tgui_input_list(user, "Select gear to add: ", gear_category, gear_datums_by_category[gear_category]) + if(!choice) + return - var/list/valid_gear_choices = list() - - for(var/gear_name in gear_datums) - var/datum/gear/G = gear_datums[gear_name] - if(G.whitelisted && !is_alien_whitelisted(user, G.whitelisted)) - continue - valid_gear_choices += gear_name - - var/choice = tgui_input_list(user, "Select gear to add: ", "Gear to add", valid_gear_choices) - - if(choice && gear_datums[choice]) - - var/total_cost = 0 - - if(isnull(gear) || !islist(gear)) gear = list() - - if(gear && gear.len) - for(var/gear_name in gear) - if(gear_datums[gear_name]) - var/datum/gear/G = gear_datums[gear_name] - total_cost += G.cost - - var/datum/gear/C = gear_datums[choice] - total_cost += C.cost - if(C && total_cost <= MAX_GEAR_COST) - gear += choice - to_chat(user, SPAN_NOTICE("Added \the '[choice]' for [C.cost] points ([MAX_GEAR_COST - total_cost] points remaining).")) - else - to_chat(user, SPAN_WARNING("Adding \the '[choice]' will exceed the maximum loadout cost of [MAX_GEAR_COST] points.")) + var/total_cost = 0 + var/datum/gear/G + if(isnull(gear) || !islist(gear)) + gear = list() + if(gear.len) + for(var/gear_name in gear) + G = gear_datums_by_name[gear_name] + total_cost += G?.cost + + G = gear_datums_by_category[gear_category][choice] + total_cost += G.cost + if(total_cost <= MAX_GEAR_COST) + gear += G.display_name + to_chat(user, SPAN_NOTICE("Added \the '[G.display_name]' for [G.cost] points ([MAX_GEAR_COST - total_cost] points remaining).")) + else + to_chat(user, SPAN_WARNING("Adding \the '[choice]' will exceed the maximum loadout cost of [MAX_GEAR_COST] points.")) if("remove") var/i_remove = text2num(href_list["gear"]) @@ -1100,8 +1228,9 @@ var/const/MAX_SAVE_SLOTS = 10 if("pred_gender") predator_gender = predator_gender == MALE ? FEMALE : MALE if("pred_age") - var/new_predator_age = tgui_input_number(user, "Choose your Predator's age(20 to 10000):", "Character Preference", 1234, 10000, 20) - if(new_predator_age) predator_age = max(min( round(text2num(new_predator_age)), 10000),20) + var/new_predator_age = tgui_input_number(user, "Choose your Predator's age(175 to 3000):", "Character Preference", 1234, 3000, 175) + if(new_predator_age) + predator_age = max(min( round(text2num(new_predator_age)), 3000),175) if("pred_trans_type") var/new_translator_type = tgui_input_list(user, "Choose your translator type.", "Translator Type", PRED_TRANSLATORS) if(!new_translator_type) @@ -1470,6 +1599,11 @@ var/const/MAX_SAVE_SLOTS = 10 if(new_pref_squad) preferred_squad = new_pref_squad + if("prefarmor") + var/new_pref_armor = tgui_input_list(user, "Choose your character's default style of armor:", "Character Preferences", GLOB.armor_style_list) + if(new_pref_armor) + preferred_armor = new_pref_armor + if("limbs") var/limb_name = tgui_input_list(user, "Which limb do you want to change?", list("Left Leg","Right Leg","Left Arm","Right Arm","Left Foot","Right Foot","Left Hand","Right Hand")) if(!limb_name) return @@ -1720,6 +1854,12 @@ var/const/MAX_SAVE_SLOTS = 10 if(auto_fit_viewport && owner) owner.fit_viewport() + if("adaptive_zoom") + adaptive_zoom += 1 + if(adaptive_zoom == 3) + adaptive_zoom = 0 + owner?.adaptive_zoom() + if("inputstyle") var/result = tgui_alert(user, "Which input style do you want?", "Input Style", list("Modern", "Legacy")) if(!result) @@ -1799,11 +1939,26 @@ var/const/MAX_SAVE_SLOTS = 10 ShowChoices(user) return 1 -// Transfers both physical characteristics and character information to character -/datum/preferences/proc/copy_all_to(mob/living/carbon/human/character, safety = 0) + +/// Loads appropriate character slot for the given job as assigned in preferences. +/datum/preferences/proc/find_assigned_slot(job_title, is_late_join = FALSE) + if(toggle_prefs & (is_late_join ? TOGGLE_LATE_JOIN_CURRENT_SLOT : TOGGLE_START_JOIN_CURRENT_SLOT)) + return + var/slot_for_job = pref_job_slots[job_title] + switch(slot_for_job) + if(JOB_SLOT_RANDOMISED_SLOT) + be_random_body = TRUE + be_random_name = TRUE + if(1 to MAX_SAVE_SLOTS) + load_character(slot_for_job) + +/// Transfers both physical characteristics and character information to character +/datum/preferences/proc/copy_all_to(mob/living/carbon/human/character, job_title, is_late_join = FALSE) if(!istype(character)) return + find_assigned_slot(job_title, is_late_join) + if(be_random_name) real_name = random_name(gender) @@ -1819,15 +1974,16 @@ var/const/MAX_SAVE_SLOTS = 10 character.voice = real_name character.name = character.real_name - character.flavor_texts["general"] = flavor_texts["general"] - character.flavor_texts["head"] = flavor_texts["head"] - character.flavor_texts["face"] = flavor_texts["face"] - character.flavor_texts["eyes"] = flavor_texts["eyes"] - character.flavor_texts["torso"] = flavor_texts["torso"] - character.flavor_texts["arms"] = flavor_texts["arms"] - character.flavor_texts["hands"] = flavor_texts["hands"] - character.flavor_texts["legs"] = flavor_texts["legs"] - character.flavor_texts["feet"] = flavor_texts["feet"] + if(!be_random_body) + character.flavor_texts["general"] = flavor_texts["general"] + character.flavor_texts["head"] = flavor_texts["head"] + character.flavor_texts["face"] = flavor_texts["face"] + character.flavor_texts["eyes"] = flavor_texts["eyes"] + character.flavor_texts["torso"] = flavor_texts["torso"] + character.flavor_texts["arms"] = flavor_texts["arms"] + character.flavor_texts["hands"] = flavor_texts["hands"] + character.flavor_texts["legs"] = flavor_texts["legs"] + character.flavor_texts["feet"] = flavor_texts["feet"] character.med_record = strip_html(med_record) character.sec_record = strip_html(sec_record) @@ -1981,47 +2137,6 @@ var/const/MAX_SAVE_SLOTS = 10 message_admins("[character] ([character.ckey]) has spawned with their gender as plural or neuter. Please notify coders.") character.gender = MALE - -// Transfers the character's information (name, flavor text, records, roundstart clothes, etc.) to the mob -/datum/preferences/proc/copy_information_to(mob/living/carbon/human/character, safety = 0) - if(!istype(character)) - return - - if(be_random_name) - real_name = random_name(gender) - - if(CONFIG_GET(flag/humans_need_surnames)) - var/firstspace = findtext(real_name, " ") - var/name_length = length(real_name) - if(!firstspace) //we need a surname - real_name += " [pick(last_names)]" - else if(firstspace == name_length) - real_name += "[pick(last_names)]" - - character.real_name = real_name - character.voice = real_name - character.name = character.real_name - - character.flavor_texts["general"] = flavor_texts["general"] - character.flavor_texts["head"] = flavor_texts["head"] - character.flavor_texts["face"] = flavor_texts["face"] - character.flavor_texts["eyes"] = flavor_texts["eyes"] - character.flavor_texts["torso"] = flavor_texts["torso"] - character.flavor_texts["arms"] = flavor_texts["arms"] - character.flavor_texts["hands"] = flavor_texts["hands"] - character.flavor_texts["legs"] = flavor_texts["legs"] - character.flavor_texts["feet"] = flavor_texts["feet"] - - character.med_record = med_record - character.sec_record = sec_record - character.gen_record = gen_record - character.exploit_record = exploit_record - - character.origin = origin - character.personal_faction = faction - character.religion = religion - - /datum/preferences/proc/open_load_dialog(mob/user) var/dat = "" dat += "
" diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index fa208b73a840..1d4b77f15550 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -1,694 +1,806 @@ -var/global/list/gear_datums = list() +var/global/list/gear_datums_by_category = list() +var/global/list/gear_datums_by_name = list() /proc/populate_gear_list() - for(var/type in typesof(/datum/gear)-/datum/gear) - var/datum/gear/G = new type() - gear_datums[G.display_name] = G - return 1 + var/datum/gear/G + for(var/gear_type in subtypesof(/datum/gear)) + G = new gear_type() + if(!G.display_name) + continue //Skipping parent types that are not actual items. + if(!G.category) + log_debug("Improper gear datum: [gear_type].") + continue + if(G.display_name in gear_datums_by_name) + log_debug("Duplicate gear datum name: [G.display_name].") + continue + LAZYSET(gear_datums_by_category[G.category], "[G.display_name] [G.cost == 1 ? "(1 point)" : "([G.cost] points)"]", G) + gear_datums_by_name[G.display_name] = G /datum/gear var/display_name // Name/index. + var/category //Used for sorting in the loadout selection. var/path // Path to item. - var/cost // Number of points used. - var/slot // Slot to equip to. + var/cost = 2 // Number of points used. + var/slot // Slot to equip to, if any. var/list/allowed_roles // Roles that can spawn with this item. - var/whitelisted // Term to check the whitelist for.. var/list/allowed_origins -// This is sorted both by slot and alphabetically! Don't fuck it up! -// Headslot items +/datum/gear/eyewear + category = "Eyewear" + slot = WEAR_EYES -/datum/gear/cmbandana - display_name = "USCM Bandana (Green)" - path = /obj/item/clothing/head/cmbandana - cost = 3 - slot = WEAR_HEAD +/datum/gear/eyewear/aviators + display_name = "Aviator shades" + path = /obj/item/clothing/glasses/sunglasses/aviator + +/datum/gear/eyewear/eyepatch + display_name = "Eyepatch" + path = /obj/item/clothing/glasses/eyepatch + +/datum/gear/eyewear/rpg_glasses + display_name = "Marine RPG Glasses" + path = /obj/item/clothing/glasses/regular allowed_origins = USCM_ORIGINS -/datum/gear/cmbandanatan - display_name = "USCM Bandana (Tan)" - path = /obj/item/clothing/head/cmbandana/tan - cost = 3 - slot = WEAR_HEAD +/datum/gear/eyewear/prescription_glasses + display_name = "Prescription Glasses" + path = /obj/item/clothing/glasses/regular/hipster + +/datum/gear/eyewear/goggles + display_name = "Ballistic goggles" + path = /obj/item/clothing/glasses/mgoggles + +/datum/gear/eyewear/prescription_goggles + display_name = "Prescription ballistic goggles" + path = /obj/item/clothing/glasses/mgoggles/prescription + +/datum/gear/eyewear/goggles_black + display_name = "Ballistic goggles, black" + path = /obj/item/clothing/glasses/mgoggles/black + +/datum/gear/eyewear/goggles_orange + display_name = "Ballistic goggles, orange" + path = /obj/item/clothing/glasses/mgoggles/orange + +/datum/gear/eyewear/bimex_shades + display_name = "BiMex personal shades" + path = /obj/item/clothing/glasses/sunglasses/big + +/datum/gear/eyewear/sunglasses + display_name = "Sunglasses" + path = /obj/item/clothing/glasses/sunglasses + +/datum/gear/eyewear/prescription_sunglasses + display_name = "Prescription sunglasses" + path = /obj/item/clothing/glasses/sunglasses/prescription + +/datum/gear/mask + category = "Masks and scarves" + slot = WEAR_FACE + +/datum/gear/mask/balaclava_black + display_name = "Balaclava, black" + path = /obj/item/clothing/mask/balaclava + +/datum/gear/mask/balaclava_green + display_name = "Balaclava, green" + path = /obj/item/clothing/mask/balaclava/tactical + +/datum/gear/mask/coif + display_name = "Coif" + path = /obj/item/clothing/mask/rebreather/scarf + +/datum/gear/mask/face_wrap_black + display_name = "Face wrap, black" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/black + +/datum/gear/mask/face_wrap_green + display_name = "Face wrap, green" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green + +/datum/gear/mask/face_wrap_grey + display_name = "Face wrap, grey" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask + +/datum/gear/mask/face_wrap_red + display_name = "Face wrap, red" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/red + +/datum/gear/mask/face_wrap_tan + display_name = "Face wrap, tan" + path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/tan + +/datum/gear/mask/face_wrap_squad + display_name = "Face wrap, squad specific" + path =/obj/item/clothing/mask/rebreather/scarf/tacticalmask/squad + +/datum/gear/mask/gas + display_name = "Gas mask" + path = /obj/item/clothing/mask/gas + +/datum/gear/mask/scarf_black + display_name = "Scarf, black" + path = /obj/item/clothing/mask/tornscarf/black + +/datum/gear/mask/scarf_desert + display_name = "Scarf, desert" + path = /obj/item/clothing/mask/tornscarf/desert + +/datum/gear/mask/scarf_green + display_name = "Scarf, green" + path = /obj/item/clothing/mask/tornscarf/green + +/datum/gear/mask/scarf_grey + display_name = "Scarf, grey" + path = /obj/item/clothing/mask/tornscarf + +/datum/gear/mask/scarf_urban + display_name = "Scarf, urban" + path = /obj/item/clothing/mask/tornscarf/urban + +/datum/gear/mask/scarf_white + display_name = "Scarf, white" + path = /obj/item/clothing/mask/tornscarf/snow + +/datum/gear/mask/uscm allowed_origins = USCM_ORIGINS -/datum/gear/cmbeanie - display_name = "USCM Beanie (Gray)" - path = /obj/item/clothing/head/beanie/gray +/datum/gear/mask/uscm/balaclava_green + display_name = "USCM balaclava, green" + path = /obj/item/clothing/mask/rebreather/scarf/green + +/datum/gear/mask/uscm/balaclava_grey + display_name = "USCM balaclava, grey" + path = /obj/item/clothing/mask/rebreather/scarf/gray + +/datum/gear/mask/uscm/balaclava_tan + display_name = "USCM balaclava, tan" + path = /obj/item/clothing/mask/rebreather/scarf/tan + +/datum/gear/headwear + category = "Headwear" cost = 3 slot = WEAR_HEAD + +/datum/gear/headwear/durag_black + display_name = "Durag, black" + path = /obj/item/clothing/head/durag/black + +/datum/gear/headwear/durag + display_name = "Durag, mission specific" + path = /obj/item/clothing/head/durag + +/datum/gear/headwear/uscm allowed_origins = USCM_ORIGINS -/datum/gear/cmbeanie/green - display_name = "USCM Beanie (Green)" +/datum/gear/headwear/uscm/bandana_green + display_name = "USCM bandana, green" + path = /obj/item/clothing/head/cmbandana + +/datum/gear/headwear/uscm/bandana_tan + display_name = "USCM bandana, tan" + path = /obj/item/clothing/head/cmbandana/tan + +/datum/gear/headwear/uscm/beanie_grey + display_name = "USCM beanie, grey" + path = /obj/item/clothing/head/beanie/gray + +/datum/gear/headwear/uscm/beanie_green + display_name = "USCM beanie, green" path = /obj/item/clothing/head/beanie/green -/datum/gear/cmbeanie/tan - display_name = "USCM Beanie (Tan)" +/datum/gear/headwear/uscm/beanie_tan + display_name = "USCM beanie, tan" path = /obj/item/clothing/head/beanie/tan -/datum/gear/squadberet - display_name = "USCM Beret (Squad Specific)" +/datum/gear/headwear/uscm/beret_squad + display_name = "USCM beret, squad specific" path = /obj/item/clothing/head/beret/cm/squadberet - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS -/datum/gear/cmberet - display_name = "USCM Beret (Green)" + +/datum/gear/headwear/uscm/beret_green + display_name = "USCM beret, green" path = /obj/item/clothing/head/beret/cm - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS -/datum/gear/cmberettan - display_name = "USCM Beret (Tan)" +/datum/gear/headwear/uscm/beret_tan + display_name = "USCM beret, tan" path = /obj/item/clothing/head/beret/cm/tan - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS -/datum/gear/cmheadband - display_name = "USCM Headband (Green)" - path = /obj/item/clothing/head/headband - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/headwear/uscm/boonie_olive + display_name = "USCM boonie hat, olive" + path = /obj/item/clothing/head/cmcap/boonie -/datum/gear/cmheadbandred - display_name = "USCM Headband (Red)" - path = /obj/item/clothing/head/headband/red - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/headwear/uscm/boonie_tan + display_name = "USCM boonie hat, tan" + path = /obj/item/clothing/head/cmcap/boonie/tan -/datum/gear/cmheadbandtan - display_name = "USCM Headband (Tan)" - path = /obj/item/clothing/head/headband/tan - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/headwear/uscm/cap + display_name = "USCM cap" + path = /obj/item/clothing/head/cmcap -/datum/gear/cmheadbandbrown - display_name = "USCM Headband (Brown)" +/datum/gear/headwear/uscm/headband_brown + display_name = "USCM headband, brown" path = /obj/item/clothing/head/headband/brown - cost = 3 - slot = WEAR_HEAD -/datum/gear/cmheadbandgray - display_name = "USCM Headband (Gray)" +/datum/gear/headwear/uscm/headband_green + display_name = "USCM headband, green" + path = /obj/item/clothing/head/headband + +/datum/gear/headwear/uscm/headband_grey + display_name = "USCM headband, grey" path = /obj/item/clothing/head/headband/gray - cost = 3 - slot = WEAR_HEAD -/datum/gear/cmheadbandsquad - display_name = "USCM Headband (Squad)" +/datum/gear/headwear/uscm/headband_red + display_name = "USCM headband, red" + path = /obj/item/clothing/head/headband/red + +/datum/gear/headwear/uscm/headband_tan + display_name = "USCM headband, tan" + path = /obj/item/clothing/head/headband/tan + +/datum/gear/headwear/uscm/headband_squad + display_name = "USCM headband, squad specific" path = /obj/item/clothing/head/headband/squad - cost = 3 - slot = WEAR_HEAD -/datum/gear/cmheadset - display_name = "USCM Earpiece" +/datum/gear/headwear/uscm/headset + display_name = "USCM headset" path = /obj/item/clothing/head/headset - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS -/datum/gear/cmcap - display_name = "USCM Cap" - path = /obj/item/clothing/head/cmcap - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/helmet_garb + category = "Helmet accessories" + cost = 1 -/datum/gear/booniehat - display_name = "USCM Boonie Hat (Olive)" - path = /obj/item/clothing/head/cmcap/boonie - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/helmet_garb/flair_initech + display_name = "Flair, Initech" + path = /obj/item/prop/helmetgarb/flair_initech -/datum/gear/booniehattan - display_name = "USCM Boonie Hat (Tan)" - path = /obj/item/clothing/head/cmcap/boonie/tan - cost = 3 - slot = WEAR_HEAD - allowed_origins = USCM_ORIGINS +/datum/gear/helmet_garb/flair_io + display_name = "Flair, Io" + path = /obj/item/prop/helmetgarb/flair_io -/datum/gear/durag - display_name = "Durag (Mission Specific)" - path = /obj/item/clothing/head/durag - cost = 3 - slot = WEAR_HEAD +/datum/gear/helmet_garb/flair_peace + display_name = "Flair, Peace and Love" + path = /obj/item/prop/helmetgarb/flair_peace -/datum/gear/duragblack - display_name = "Durag (Black)" - path = /obj/item/clothing/head/durag/black - cost = 3 - slot = WEAR_HEAD +/datum/gear/helmet_garb/flair_uscm + display_name = "Flair, USCM" + path = /obj/item/prop/helmetgarb/flair_uscm -/datum/gear/eyepatch - display_name = "Eyepatch" - path = /obj/item/clothing/glasses/eyepatch - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/helmet_gasmask + display_name = "M5 integrated gasmask" + path = /obj/item/prop/helmetgarb/helmet_gasmask -/datum/gear/thugshades - display_name = "BiMex Personal Shades" - path = /obj/item/clothing/glasses/sunglasses/big - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/gunoil + display_name = "Gun oil" + path = /obj/item/prop/helmetgarb/gunoil -/datum/gear/sunglasses - display_name = "Cheap Sunglasses" - path = /obj/item/clothing/glasses/sunglasses - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/netting + display_name = "Helmet netting" + path = /obj/item/prop/helmetgarb/netting -/datum/gear/prescription_sunglasses - display_name = "Prescription Sunglasses" - path = /obj/item/clothing/glasses/sunglasses/prescription - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/lucky_feather + display_name = "Lucky feather, red" + path = /obj/item/prop/helmetgarb/lucky_feather -/datum/gear/cigar - display_name = "Premium Cigar" - path = /obj/item/clothing/mask/cigarette/cigar - slot = WEAR_FACE - cost = 2 +/datum/gear/helmet_garb/lucky_feather/yellow + display_name = "Lucky feather, yellow" + path = /obj/item/prop/helmetgarb/lucky_feather/yellow -/datum/gear/classic_cigar - display_name = "Classic Cigar" - path = /obj/item/clothing/mask/cigarette/cigar/classic - slot = WEAR_FACE - cost = 3 +/datum/gear/helmet_garb/lucky_feather/purple + display_name = "Lucky feather, purple" + path = /obj/item/prop/helmetgarb/lucky_feather/purple -/datum/gear/cigarette - display_name = "Cigarette" - path = /obj/item/clothing/mask/cigarette - slot = WEAR_FACE - cost = 1 +/datum/gear/helmet_garb/lucky_feather/blue + display_name = "Lucky feather, blue" + path = /obj/item/prop/helmetgarb/lucky_feather/blue -/datum/gear/balaclava - display_name = "Black Balaclava" - path = /obj/item/clothing/mask/balaclava - slot = WEAR_FACE - cost = 2 +/datum/gear/helmet_garb/broken_nvgs + display_name = "Night vision goggles, broken" + path = /obj/item/prop/helmetgarb/helmet_nvg/cosmetic -/datum/gear/balaclava/green - display_name = "Green Balaclava" - path = /obj/item/clothing/mask/balaclava/tactical - slot = WEAR_FACE - cost = 2 +/datum/gear/helmet_garb/prescription_bottle + display_name = "Prescription bottle" + path = /obj/item/prop/helmetgarb/prescription_bottle -/datum/gear/coif - display_name = "Coif" - path = /obj/item/clothing/mask/rebreather/scarf - cost = 2 - slot = WEAR_FACE +/datum/gear/helmet_garb/raincover + display_name = "Rain cover" + path = /obj/item/prop/helmetgarb/raincover -/datum/gear/cmbalaclava - display_name = "USCM Balaclava (Green)" - path = /obj/item/clothing/mask/rebreather/scarf/green - cost = 2 - slot = WEAR_FACE - allowed_origins = USCM_ORIGINS +/datum/gear/helmet_garb/rabbits_foot + display_name = "Rabbit's foot" + path = /obj/item/prop/helmetgarb/rabbitsfoot -/datum/gear/cmbalaclava/tan - display_name = "USCM Balaclava (Tan)" - path = /obj/item/clothing/mask/rebreather/scarf/tan - cost = 2 - slot = WEAR_FACE +/datum/gear/helmet_garb/rosary + display_name = "Rosary" + path = /obj/item/prop/helmetgarb/rosary -/datum/gear/cmbalaclava/gray - display_name = "USCM Balaclava (Gray)" - path = /obj/item/clothing/mask/rebreather/scarf/gray - cost = 2 - slot = WEAR_FACE +/datum/gear/helmet_garb/spent_buck + display_name = "Spent buckshot" + path = /obj/item/prop/helmetgarb/spent_buckshot -/datum/gear/cmgoggles - display_name = "Ballistic Goggles" - path = /obj/item/clothing/glasses/mgoggles - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/spent_flechette + display_name = "Spent flechette" + path = /obj/item/prop/helmetgarb/spent_flech -/datum/gear/cmPgoggles - display_name = "Prescription Ballistic Goggles" - path = /obj/item/clothing/glasses/mgoggles/prescription - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/spent_slugs + display_name = "Spent slugs" + path = /obj/item/prop/helmetgarb/spent_slug -/datum/gear/cmgogglesblack - display_name = "Ballistic Goggles (Black)" - path = /obj/item/clothing/glasses/mgoggles/black - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/spacejam_tickets + display_name = "Tickets to Space Jam" + path = /obj/item/prop/helmetgarb/spacejam_tickets -/datum/gear/cmgogglesorange - display_name = "Ballistic Goggles (Orange)" - path = /obj/item/clothing/glasses/mgoggles/orange - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/trimmed_wire + display_name = "Trimmed barbed wire" + path = /obj/item/prop/helmetgarb/trimmed_wire -/datum/gear/aviators - display_name = "Aviator Shades" - path = /obj/item/clothing/glasses/sunglasses/aviator - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/bullet_pipe + display_name = "10x99mm XM42B casing pipe" + path = /obj/item/prop/helmetgarb/bullet_pipe + allowed_origins = USCM_ORIGINS -/datum/gear/rpgglasses - display_name = "Marine RPG Glasses" - path = /obj/item/clothing/glasses/regular - cost = 2 - slot = WEAR_EYES +/datum/gear/helmet_garb/chaplain_patch + display_name = "USCM chaplain helmet patch" + path = /obj/item/prop/helmetgarb/chaplain_patch allowed_origins = USCM_ORIGINS -/datum/gear/prescglasses - display_name = "Prescription Glasses" - path = /obj/item/clothing/glasses/regular/hipster - cost = 2 - slot = WEAR_EYES +/datum/gear/paperwork + category = "Paperwork" -/datum/gear/tacticalmask - display_name = "Face Wrap (Gray)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/pen + display_name = "Pen, black" + path = /obj/item/tool/pen + cost = 1 -/datum/gear/tacticalmasktan - display_name = "Face Wrap (Tan)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/tan - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/pen_blue + display_name = "Pen, blue" + path = /obj/item/tool/pen/blue -/datum/gear/tacticalmaskred - display_name = "Face Wrap (Red)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/red - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/pen_green + display_name = "Pen, green" + path = /obj/item/tool/pen/green -/datum/gear/tacticalmaskgreeen - display_name = "Face Wrap (Green)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/pen_red + display_name = "Pen, red" + path = /obj/item/tool/pen/red -/datum/gear/tacticalmasksquad - display_name = "Face Wrap (Squad)" - path =/obj/item/clothing/mask/rebreather/scarf/tacticalmask/squad - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/paper + display_name = "Sheet of paper" + path = /obj/item/paper + cost = 1 -/datum/gear/tacticalmaskblack - display_name = "Face Wrap (Black)" - path = /obj/item/clothing/mask/rebreather/scarf/tacticalmask/black - slot = WEAR_FACE - cost = 2 -// -/datum/gear/tornscarfclassic - display_name = "Scarf (Grey)" - path = /obj/item/clothing/mask/tornscarf - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/clipboard + display_name = "Clipboard" + path = /obj/item/clipboard -/datum/gear/tornscarfgreen - display_name = "Scarf (Green)" - path = /obj/item/clothing/mask/tornscarf/green - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/folder_black + display_name = "Folder, black" + path = /obj/item/folder/black -/datum/gear/tornscarfwhite - display_name = "Scarf (White)" - path = /obj/item/clothing/mask/tornscarf/snow - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/folder_blue + display_name = "Folder, blue" + path = /obj/item/folder/blue -/datum/gear/tornscarfdesert - display_name = "Scarf (Desert)" - path = /obj/item/clothing/mask/tornscarf/desert - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/folder_red + display_name = "Folder, red" + path = /obj/item/folder/red -/datum/gear/tornscarfurban - display_name = "Scarf (Urban)" - path = /obj/item/clothing/mask/tornscarf/urban - slot = WEAR_FACE - cost = 2 +/datum/gear/paperwork/folder_white + display_name = "Folder, white" + path = /obj/item/folder/white -/datum/gear/tornscarfblack - display_name = "Scarf (Black)" - path = /obj/item/clothing/mask/tornscarf/black - slot = WEAR_FACE - cost = 2 -// -/datum/gear/greenfacepaint - display_name = "Green Facepaint" - path = /obj/item/facepaint/green - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/paperwork/folder_yellow + display_name = "Folder, yellow" + path = /obj/item/folder/yellow -/datum/gear/brownfacepaint - display_name = "Brown Facepaint" - path = /obj/item/facepaint/brown - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/paperwork/notepad_black + display_name = "Notepad, black" + path = /obj/item/notepad/black -/datum/gear/blackfacepaint - display_name = "Black Facepaint" - path = /obj/item/facepaint/black - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/paperwork/notepad_blue + display_name = "Notepad, blue" + path = /obj/item/notepad/blue -/datum/gear/fullbodyfacepaint - display_name = "Fullbody Paint" - path = /obj/item/facepaint/sniper - slot = WEAR_IN_BACK - cost = 4 //To match with the skull paint amount of point, gave this amount of point for the same reason of the skull facepaint (too cool for everyone to be able to constantly use) +/datum/gear/paperwork/notepad_green + display_name = "Notepad, green" + path = /obj/item/notepad/green -/datum/gear/aceofspades - display_name = "Ace of Spades" - path = /obj/item/toy/handcard/aceofspades - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/paperwork/notepad_red + display_name = "Notepad, red" + path = /obj/item/notepad/red -/datum/gear/pack_emeraldgreen - display_name = "Pack Of Emerald Greens" - path = /obj/item/storage/fancy/cigarettes/emeraldgreen - slot = WEAR_IN_BACK +/datum/gear/toy + category = "Recreational" + +/datum/gear/toy/camera + display_name = "Camera" + path = /obj/item/device/camera + +/datum/gear/toy/mags cost = 1 -/datum/gear/pack_lucky_strikes - display_name = "Pack Of Lucky Strikes" - path = /obj/item/storage/fancy/cigarettes/lucky_strikes - slot = WEAR_IN_BACK +/datum/gear/toy/mags/magazine_dirty + display_name = "Magazine" + path = /obj/item/prop/magazine/dirty + +/datum/gear/toy/mags/boots_magazine_one + display_name = "Boots Issue No.117" + path = /obj/item/prop/magazine/boots/n117 + +/datum/gear/toy/mags/boots_magazine_two + display_name = "Boots Issue No.150" + path = /obj/item/prop/magazine/boots/n150 + +/datum/gear/toy/mags/boot_magazine_three + display_name = "Boots Issue No.160" + path = /obj/item/prop/magazine/boots/n160 + +/datum/gear/toy/mags/boots_magazine_four + display_name = "Boots Issue No.54" + path = /obj/item/prop/magazine/boots/n054 + +/datum/gear/toy/mags/boots_magazine_five + display_name = "Boots Issue No.55" + path = /obj/item/prop/magazine/boots/n055 + +/datum/gear/toy/film + display_name = "Camera film" + path = /obj/item/device/camera_film cost = 1 -/datum/gear/weed_joint - display_name = "Joint of Space Weed" - path = /obj/item/clothing/mask/cigarette/weed - slot = WEAR_IN_BACK +/datum/gear/toy/card + cost = 1 + +/datum/gear/toy/card/ace_of_spades + display_name = "Card, ace of spades" + path = /obj/item/toy/handcard/aceofspades + +/datum/gear/toy/card/uno_reverse_red + display_name = "Card, Uno Reverse - red" + path = /obj/item/toy/handcard/uno_reverse_red + +/datum/gear/toy/card/uno_reverse_blue + display_name = "Card, Uno Reverse - blue" + path = /obj/item/toy/handcard/uno_reverse_blue + +/datum/gear/toy/card/uno_reverse_purple + display_name = "Card, Uno Reverse - purple" + path = /obj/item/toy/handcard/uno_reverse_purple + +/datum/gear/toy/card/uno_reverse_yellow + display_name = "Card, Uno Reverse - yellow" + path = /obj/item/toy/handcard/uno_reverse_yellow + +/datum/gear/toy/deck + display_name = "Deck of cards, regular" + path = /obj/item/toy/deck + +/datum/gear/toy/deck/uno + display_name = "Deck of cards, Uno" + path = /obj/item/toy/deck/uno + +/datum/gear/toy/d6 + display_name = "Die, 6 sides" + path = /obj/item/toy/dice + +/datum/gear/toy/d20 + display_name = "Die, 20 sides" + path = /obj/item/toy/dice/d20 + +/datum/gear/toy/walkman + display_name = "Walkman" + path = /obj/item/device/walkman + +/datum/gear/toy/crayon + display_name = "Crayon" + path = /obj/item/toy/crayon/rainbow + +/datum/gear/weapon + category = "Weapons" cost = 4 -/datum/gear/type_80_Bayonet +/datum/gear/weapon/type_80_Bayonet display_name = "Type 80 Bayonet" path = /obj/item/attachable/bayonet/upp_replica - slot = WEAR_IN_BACK - cost = 4 -/datum/gear/m8_cartridge_bayonet +/datum/gear/weapon/m8_cartridge_bayonet display_name = "M8 Cartridge Bayonet" path = /obj/item/storage/box/co2_knife - slot = WEAR_IN_BACK - cost = 4 -/datum/gear/clfpistol +/datum/gear/weapon/clfpistol display_name = "D18 Holdout Pistol" path = /obj/item/storage/box/clf - slot = WEAR_IN_BACK - cost = 4 -/datum/gear/m4a3_custom +/datum/gear/weapon/m4a3_custom display_name = "M4A3 Custom Pistol" path = /obj/item/weapon/gun/pistol/m4a3/custom - slot = WEAR_IN_BACK - cost = 4 allowed_origins = USCM_ORIGINS -/datum/gear/m44_custom_revolver +/datum/gear/weapon/m44_custom_revolver display_name = "M44 Custom Revolver" path = /obj/item/weapon/gun/revolver/m44/custom - slot = WEAR_IN_BACK - cost = 7 allowed_origins = USCM_ORIGINS -/datum/gear/jungle_boots - display_name = "Jungle Pattern Combat Boots" - path = /obj/item/clothing/shoes/marine/jungle - slot = WEAR_IN_BACK - cost = 3 +/datum/gear/drink + category = "Canned drinks" -/datum/gear/uno_reverse_red - display_name = "Uno Reverse - Red" - path = /obj/item/toy/handcard/uno_reverse_red - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/drink/water + display_name = "Bottled water" + path = /obj/item/reagent_container/food/drinks/cans/waterbottle + cost = 1 -/datum/gear/uno_reverse_blue - display_name = "Uno Reverse - Blue" - path = /obj/item/toy/handcard/uno_reverse_blue - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/drink/grape_juice + display_name = "Grape juice" + path = /obj/item/reagent_container/food/drinks/cans/grape_juice -/datum/gear/uno_reverse_purple - display_name = "Uno Reverse - Purple" - path = /obj/item/toy/handcard/uno_reverse_purple - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/drink/lemon_lime + display_name = "Lemon lime" + path = /obj/item/reagent_container/food/drinks/cans/lemon_lime -/datum/gear/uno_reverse_yellow - display_name = "Uno Reverse - Yellow" - path = /obj/item/toy/handcard/uno_reverse_yellow - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/drink/iced_tea + display_name = "Iced tea" + path = /obj/item/reagent_container/food/drinks/cans/iced_tea + +/datum/gear/drink/cola + display_name = "Classic Cola" + path = /obj/item/reagent_container/food/drinks/cans/classcola + +/datum/gear/drink/mountain_wind + display_name = "Mountain Wind" + path = /obj/item/reagent_container/food/drinks/cans/space_mountain_wind + +/datum/gear/drink/space_up + display_name = "Space Up" + path = /obj/item/reagent_container/food/drinks/cans/space_up + +/datum/gear/drink/souto_classic + display_name = "Classic Souto" + path = /obj/item/reagent_container/food/drinks/cans/souto/classic + +/datum/gear/drink/souto_diet + display_name = "Diet Souto" + path = /obj/item/reagent_container/food/drinks/cans/souto/diet/classic + +/datum/gear/drink/boda + display_name = "Boda Soda" + path = /obj/item/reagent_container/food/drinks/cans/boda + cost = 3 //Legally imported from UPP. + +/datum/gear/drink/boda/plus + display_name = "Boda Cola" + path = /obj/item/reagent_container/food/drinks/cans/bodaplus + +/datum/gear/drink/alcohol + cost = 3 //Illegal in military. + +/datum/gear/drink/alcohol/ale + display_name = "Weyland-Yutani IPA Ale" + path = /obj/item/reagent_container/food/drinks/cans/ale + +/datum/gear/drink/alcohol/aspen + display_name = "Weyland-Yutani Aspen Beer" + path = /obj/item/reagent_container/food/drinks/cans/aspen + +/datum/gear/drink/alcohol/beer + display_name = "Weyland-Yutani Lite Beer" + path = /obj/item/reagent_container/food/drinks/cans/beer + +/datum/gear/drink/alcohol/loko + display_name = "Thirteen Loko" + path = /obj/item/reagent_container/food/drinks/cans/thirteenloko + +/datum/gear/flask + category = "Flasks" + +/datum/gear/flask/canteen + display_name = "Canteen" + path = /obj/item/reagent_container/food/drinks/flask/canteen + +/datum/gear/flask/leather + display_name = "Leather flask" + path = /obj/item/reagent_container/food/drinks/flask/detflask + +/datum/gear/flask/leather_black + display_name = "Black leather flask" + path = /obj/item/reagent_container/food/drinks/flask/barflask + +/datum/gear/flask/metal + display_name = "Metal flask" + path = /obj/item/reagent_container/food/drinks/flask + +/datum/gear/flask/uscm + display_name = "USCM flask" + path = /obj/item/reagent_container/food/drinks/flask/marine + +/datum/gear/flask/vacuum + display_name = "Vacuum flask" + path = /obj/item/reagent_container/food/drinks/flask/vacuumflask + +/datum/gear/flask/wy + display_name = "WY flask" + path = /obj/item/reagent_container/food/drinks/flask/weylandyutani + +/datum/gear/snack_sweet + category = "Food (sweets)" -/datum/gear/candy +/datum/gear/snack_sweet/candy display_name = "Bar of candy" path = /obj/item/reagent_container/food/snacks/candy - slot = WEAR_IN_BACK - cost = 2 -/datum/gear/lime - display_name = "Lucky Lime" - path = /obj/item/reagent_container/food/snacks/grown/lime - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/snack_sweet/chocolate + display_name = "Bar of chocolate" + path = /obj/item/reagent_container/food/snacks/chocolatebar -/datum/gear/pen - display_name = "Pen" - path = /obj/item/tool/pen - slot = WEAR_IN_BACK - cost = 1 +/datum/gear/snack_sweet/candy_apple + display_name = "Candied apple" + path = /obj/item/reagent_container/food/snacks/candiedapple -/datum/gear/lighter - display_name = "Random Lighter" - path = /obj/item/tool/lighter/random - slot = WEAR_IN_BACK - cost = 2 +/datum/gear/snack_sweet/cookie + display_name = "Cookie" + path = /obj/item/reagent_container/food/snacks/cookie -/datum/gear/uscmpatch - display_name = "USCM shoulder patch" - path = /obj/item/clothing/accessory/patch - cost = 1 - slot = WEAR_IN_ACCESSORY - allowed_origins = USCM_ORIGINS +/datum/gear/snack_sweet/fortune_cookie + display_name = "Fortune cookie" + path = /obj/item/reagent_container/food/snacks/fortunecookie/prefilled + cost = 3 -/datum/gear/falconpatch - display_name = "Falling Falcons shoulder patch" - path = /obj/item/clothing/accessory/patch/falcon - cost = 1 - slot = WEAR_IN_ACCESSORY - allowed_origins = USCM_ORIGINS +/datum/gear/snack_sweet/donut_normal + display_name = "Donut" + path = /obj/item/reagent_container/food/snacks/donut/normal -/datum/gear/gas_mask - display_name = "Gas Mask" - path = /obj/item/clothing/mask/gas - cost = 2 - slot = WEAR_FACE +/datum/gear/snack_sweet/donut_jelly + display_name = "Jelly donut" + path = /obj/item/reagent_container/food/snacks/donut/jelly -/datum/gear/gunoil - display_name = "Gun Oil" - path = /obj/item/prop/helmetgarb/gunoil - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_sweet/donut_cherry + display_name = "Cherry donut" + path = /obj/item/reagent_container/food/snacks/donut/cherryjelly -/datum/gear/netting - display_name = "Helmet Netting" - path = /obj/item/prop/helmetgarb/netting - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged + category = "Food (packaged)" -/datum/gear/spent_buck - display_name = "Spent Buckshot" - path = /obj/item/prop/helmetgarb/spent_buckshot - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/beef_jerky + display_name = "Beef jerky" + path = /obj/item/reagent_container/food/snacks/sosjerky -/datum/gear/spent_slugs - display_name = "Spent Slugs" - path = /obj/item/prop/helmetgarb/spent_slug - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/meat_bar + display_name = "MEAT bar" + path = /obj/item/reagent_container/food/snacks/eat_bar -/datum/gear/spent_flechette - display_name = "Spent Flechette" - path = /obj/item/prop/helmetgarb/spent_flech - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/kepler_crisps + display_name = "Kepler Crisps" + path = /obj/item/reagent_container/food/snacks/kepler_crisps -/datum/gear/prescription_bottle - display_name = "Prescription Bottle" - path = /obj/item/prop/helmetgarb/prescription_bottle - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/burrito + display_name = "Packaged burrito" + path = /obj/item/reagent_container/food/snacks/packaged_burrito -/datum/gear/raincover - display_name = "Helmet Rain Cover" - path = /obj/item/prop/helmetgarb/raincover - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/cheeseburger + display_name = "Packaged cheeseburger" + path = /obj/item/reagent_container/food/snacks/packaged_burger -/datum/gear/rabbits_foot - display_name = "Rabbit's Foot" - path = /obj/item/prop/helmetgarb/rabbitsfoot - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/hotdog + display_name = "Packaged hotdog" + path = /obj/item/reagent_container/food/snacks/packaged_hdogs -/datum/gear/rosary - display_name = "Rosary" - path = /obj/item/prop/helmetgarb/rosary - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_packaged/chips_pepper + display_name = "W-Y Pepper Chips" + path = /obj/item/reagent_container/food/snacks/wy_chips/pepper -/datum/gear/lucky_feather - display_name = "Lucky Feather - Red" - path = /obj/item/prop/helmetgarb/lucky_feather - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_grown + category = "Food (healthy)" -/datum/gear/lucky_feather/blue - display_name = "Lucky Feather - Blue" - path = /obj/item/prop/helmetgarb/lucky_feather/blue +/datum/gear/snack_grown/apple + display_name = "Apple" + path = /obj/item/reagent_container/food/snacks/grown/apple -/datum/gear/lucky_feather/purple - display_name = "Lucky Feather - Purple" - path = /obj/item/prop/helmetgarb/lucky_feather/purple +/datum/gear/snack_grown/carrot + display_name = "Carrot" + path = /obj/item/reagent_container/food/snacks/grown/carrot -/datum/gear/lucky_feather/yellow - display_name = "Lucky Feather - Yellow" - path = /obj/item/prop/helmetgarb/lucky_feather/yellow +/datum/gear/snack_grown/corn + display_name = "Corn" + path = /obj/item/reagent_container/food/snacks/grown/corn -/datum/gear/helmet_gasmask - display_name = "M5 integrated gasmask" - path = /obj/item/prop/helmetgarb/helmet_gasmask - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/snack_grown/lemon + display_name = "Lemon" + path = /obj/item/reagent_container/food/snacks/grown/lemon -/datum/gear/trimmed_wire - display_name = "Trimmed Barbed Wire" - path = /obj/item/prop/helmetgarb/trimmed_wire - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/snack_grown/lime + display_name = "Lime" + path = /obj/item/reagent_container/food/snacks/grown/lime -/datum/gear/bullet_pipe - display_name = "10x99mm XM42B casing pipe" - path = /obj/item/prop/helmetgarb/bullet_pipe - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_grown/orange + display_name = "Orange" + path = /obj/item/reagent_container/food/snacks/grown/orange -/datum/gear/flair_initech - display_name = "Initech Flair" - path = /obj/item/prop/helmetgarb/flair_initech - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/snack_grown/potato + display_name = "Potato" + path = /obj/item/reagent_container/food/snacks/grown/potato -/datum/gear/flair_io - display_name = "Io Flair" - path = /obj/item/prop/helmetgarb/flair_io - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/smoking + category = "Smoking" -/datum/gear/flair_peace - display_name = "Peace and Love Flair" - path = /obj/item/prop/helmetgarb/flair_peace +/datum/gear/smoking/cigarette + display_name = "Cigarette" + path = /obj/item/clothing/mask/cigarette cost = 1 - slot = WEAR_IN_BACK + slot = WEAR_FACE -/datum/gear/flair_uscm - display_name = "USCM Flair" - path = /obj/item/prop/helmetgarb/flair_uscm - cost = 1 - slot = WEAR_IN_BACK - allowed_origins = USCM_ORIGINS +/datum/gear/smoking/cigarette/cigar_classic + display_name = "Classic cigar" + path = /obj/item/clothing/mask/cigarette/cigar/classic + cost = 3 -/datum/gear/broken_nvgs - display_name = "Broken Night Vision Goggles" - path = /obj/item/prop/helmetgarb/helmet_nvg/cosmetic - cost = 1 - slot = WEAR_IN_BACK +/datum/gear/smoking/cigarette/cigar_premium + display_name = "Premium cigar" + path = /obj/item/clothing/mask/cigarette/cigar + cost = 2 -/datum/gear/spacejam_tickets - display_name = "Authentic Tickets to Space Jam" - path = /obj/item/prop/helmetgarb/spacejam_tickets - cost = 4 - slot = WEAR_IN_BACK +/datum/gear/smoking/pack_emerald_green + display_name = "Pack Of Emerald Greens" + path = /obj/item/storage/fancy/cigarettes/emeraldgreen -/datum/gear/weyland_booze - display_name = "Weyland-Yutani Lite" - path = /obj/item/reagent_container/food/drinks/cans/beer - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/smoking/pack_lucky_strikes + display_name = "Pack Of Lucky Strikes" + path = /obj/item/storage/fancy/cigarettes/lucky_strikes -/datum/gear/weyland_IPA - display_name = "Weyland-Yutani IPA" - path = /obj/item/reagent_container/food/drinks/cans/beer - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/smoking/weed_joint + display_name = "Joint of space weed" + path = /obj/item/clothing/mask/cigarette/weed + cost = 4 -/datum/gear/flask - display_name = "Metal Flask" - path = /obj/item/reagent_container/food/drinks/flask - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/smoking/lighter + display_name = "Lighter, cheap" + path = /obj/item/tool/lighter/random + cost = 1 -/datum/gear/flask_canteen - display_name = "Canteen" - path = /obj/item/reagent_container/food/drinks/flask/canteen - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/smoking/zippo + display_name = "Lighter, zippo" + path = /obj/item/tool/lighter/zippo -/datum/gear/flask_uscm - display_name = "USCM Flask" - path = /obj/item/reagent_container/food/drinks/flask/marine - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/misc + category = "Miscellaneous" -/datum/gear/flask_wy - display_name = "WY Flask" - path = /obj/item/reagent_container/food/drinks/flask/weylandyutani - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/misc/facepaint_green + display_name = "Facepaint, green" + path = /obj/item/facepaint/green -/datum/gear/flask_det - display_name = "Leather Flask" - path = /obj/item/reagent_container/food/drinks/flask/detflask - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/misc/facepaint_brown + display_name = "Facepaint, brown" + path = /obj/item/facepaint/brown -/datum/gear/flask_bar - display_name = "Black Leather Flask" - path = /obj/item/reagent_container/food/drinks/flask/barflask - cost = 2 - slot = WEAR_IN_BACK +/datum/gear/misc/facepaint_black + display_name = "Facepaint, black" + path = /obj/item/facepaint/black -/datum/gear/flask_vacuum - display_name = "Vacuum Flask" - path = /obj/item/reagent_container/food/drinks/flask/vacuumflask - cost = 3 //they're too cool for 2 points - slot = WEAR_IN_BACK +/datum/gear/misc/facepaint_body + display_name = "Fullbody paint" + path = /obj/item/facepaint/sniper + cost = 4 //To match with the skull paint amount of point, gave this amount of point for the same reason of the skull facepaint (too cool for everyone to be able to constantly use) + +/datum/gear/misc/jungle_boots + display_name = "Jungle pattern combat boots" + path = /obj/item/clothing/shoes/marine/jungle + cost = 3 -/datum/gear/pdt_kit - display_name = "PDT/L Kit" +/datum/gear/misc/pdt_kit + display_name = "PDT/L kit" path = /obj/item/storage/box/pdt_kit cost = 3 - slot = WEAR_IN_BACK -/datum/gear/sunscreen_stick - display_name = "USCM Issue Sunscreen" +/datum/gear/misc/sunscreen_stick + display_name = "USCM issue sunscreen" path = /obj/item/facepaint/sunscreen_stick cost = 1 //The cadmium poisoning pays for the discounted cost longterm - slot = WEAR_IN_BACK + allowed_origins = USCM_ORIGINS -/datum/gear/chaplain_patch - display_name = "USCM Chaplain Helmet Patch" - path = /obj/item/prop/helmetgarb/chaplain_patch - cost = 1 //similar price to flairs - slot = WEAR_IN_BACK +/datum/gear/misc/patch_uscm + display_name = "USCM shoulder patch" + path = /obj/item/clothing/accessory/patch + cost = 1 + slot = WEAR_IN_ACCESSORY + allowed_origins = USCM_ORIGINS + +/datum/gear/misc/patch_uscm/falcon + display_name = "Falling Falcons shoulder patch" + path = /obj/item/clothing/accessory/patch/falcon diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index be930b2c64ba..0a1b54112f18 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -150,6 +150,7 @@ S["view_controller"] >> View_MC S["observer_huds"] >> observer_huds S["pref_special_job_options"] >> pref_special_job_options + S["pref_job_slots"] >> pref_job_slots S["synth_name"] >> synthetic_name S["synth_type"] >> synthetic_type @@ -191,6 +192,7 @@ S["custom_cursors"] >> custom_cursors S["autofit_viewport"] >> auto_fit_viewport + S["adaptive_zoom"] >> adaptive_zoom //Sanitize ooccolor = sanitize_hexcolor(ooccolor, CONFIG_GET(string/ooc_color_default)) @@ -222,6 +224,7 @@ no_radials_preference = sanitize_integer(no_radials_preference, FALSE, TRUE, FALSE) no_radial_labels_preference = sanitize_integer(no_radial_labels_preference, FALSE, TRUE, FALSE) auto_fit_viewport = sanitize_integer(auto_fit_viewport, FALSE, TRUE, TRUE) + adaptive_zoom = sanitize_integer(adaptive_zoom, 0, 2, 0) synthetic_name = synthetic_name ? sanitize_text(synthetic_name, initial(synthetic_name)) : initial(synthetic_name) synthetic_type = sanitize_inlist(synthetic_type, PLAYER_SYNTHS, initial(synthetic_type)) @@ -251,6 +254,7 @@ hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, TRUE) custom_cursors = sanitize_integer(custom_cursors, FALSE, TRUE, TRUE) pref_special_job_options = sanitize_islist(pref_special_job_options, list()) + pref_job_slots = sanitize_islist(pref_job_slots, list()) vars["fps"] = fps if(remembered_key_bindings) @@ -326,6 +330,7 @@ S["view_controller"] << View_MC S["observer_huds"] << observer_huds S["pref_special_job_options"] << pref_special_job_options + S["pref_job_slots"] << pref_job_slots S["synth_name"] << synthetic_name S["synth_type"] << synthetic_type @@ -358,6 +363,7 @@ S["hotkeys"] << hotkeys S["autofit_viewport"] << auto_fit_viewport + S["adaptive_zoom"] << adaptive_zoom S["hear_vox"] << hear_vox @@ -445,6 +451,7 @@ S["traits"] >> traits S["preferred_squad"] >> preferred_squad + S["preferred_armor"] >> preferred_armor S["nanotrasen_relation"] >> nanotrasen_relation //S["skin_style"] >> skin_style @@ -494,6 +501,7 @@ underwear = sanitize_inlist(underwear, gender == MALE ? GLOB.underwear_m : GLOB.underwear_f, initial(underwear)) undershirt = sanitize_inlist(undershirt, gender == MALE ? GLOB.undershirt_m : GLOB.undershirt_f, initial(undershirt)) backbag = sanitize_integer(backbag, 1, backbaglist.len, initial(backbag)) + preferred_armor = sanitize_inlist(preferred_armor, GLOB.armor_style_list, "Random") //b_type = sanitize_text(b_type, initial(b_type)) alternate_option = sanitize_integer(alternate_option, 0, 3, initial(alternate_option)) @@ -589,6 +597,7 @@ S["nanotrasen_relation"] << nanotrasen_relation S["preferred_squad"] << preferred_squad + S["preferred_armor"] << preferred_armor //S["skin_style"] << skin_style S["uplinklocation"] << uplinklocation diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 90b605b7f54f..9e3d9eb33766 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -201,13 +201,19 @@ to_chat(src, SPAN_BOLDNOTICE("The icon on your taskbar will no longer flash when an admin messages you. Warning, use at own risk.")) //be special -/client/verb/toggle_be_special(role in be_special_flags) +/client/verb/toggle_be_special() set name = "Toggle SpecialRole Candidacy" set category = "Preferences" set desc = "Toggles which special roles you would like to be a candidate for, during events." + + var/list/be_special_flags = list( + "Xenomorph after unrevivable death" = BE_ALIEN_AFTER_DEATH, + "Agent" = BE_AGENT, + ) + var/role = tgui_input_list(usr, "Toggle which candidacy?", "Select role", be_special_flags) + if(!role) + return var/role_flag = be_special_flags[role] - - if(!role_flag) return prefs.be_special ^= role_flag prefs.save_preferences() to_chat(src, SPAN_BOLDNOTICE("You will [(prefs.be_special & role_flag) ? "now" : "no longer"] be considered for [role] events (where possible).")) @@ -507,10 +513,30 @@ prefs.auto_fit_viewport = !prefs.auto_fit_viewport if(prefs.auto_fit_viewport) to_chat(src, SPAN_NOTICE("Now auto fitting viewport.")) + fit_viewport() else to_chat(src, SPAN_NOTICE("No longer auto fitting viewport.")) prefs.save_preferences() +/client/verb/toggle_adaptive_zooming() + set name = "Toggle Adaptive Zooming" + set category = "Preferences.UI" + + switch(prefs.adaptive_zoom) + if(0) + prefs.adaptive_zoom = 1 + to_chat(src, SPAN_BOLDNOTICE("Adaptive Zooming is now enabled, switching between x1 and x2 zoom. This is recommended for 1080p monitors.")) + adaptive_zoom() + if(1) + prefs.adaptive_zoom = 2 + to_chat(src, SPAN_BOLDNOTICE("Adaptive Zooming is now enabled, switching between x2 and x4 zoom.")) + adaptive_zoom() + if(2) + prefs.adaptive_zoom = 0 + to_chat(src, SPAN_BOLDNOTICE("Adaptive Zooming is now disabled.")) + adaptive_zoom() + prefs.save_preferences() + //------------ GHOST PREFERENCES --------------------------------- /client/proc/show_ghost_preferences() // Shows ghost-related preferences. diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 79584be10f0a..7bcf1dd6645c 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -541,7 +541,7 @@ /obj/item/clothing/glasses/sunglasses desc = "Generic off-brand eyewear, used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes." - name = "cheap sunglasses" + name = "sunglasses" icon_state = "sun" item_state = "sunglasses" darkness_view = -1 diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index be58dd80cc25..63d0c8f364af 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -100,27 +100,25 @@ req_skill_level = SKILL_SPEC_SMARTGUN var/far_sight = FALSE - var/powerpack = null + var/obj/item/weapon/gun/smartgun/linked_smartgun = null /obj/item/clothing/glasses/night/m56_goggles/Destroy() - powerpack = null + linked_smartgun = null disable_far_sight() return ..() -/obj/item/clothing/glasses/night/m56_goggles/proc/link_powerpack(mob/user) - if(!QDELETED(user) && !QDELETED(user.back)) - if(istype(user.back, /obj/item/smartgun_powerpack)) - powerpack = user.back +/obj/item/clothing/glasses/night/m56_goggles/proc/link_smartgun(mob/user) + if(!QDELETED(user)) + linked_smartgun = locate() in user + if(linked_smartgun) return TRUE return FALSE /obj/item/clothing/glasses/night/m56_goggles/mob_can_equip(mob/user, slot) if(slot == WEAR_EYES) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(!istype(H.back, /obj/item/smartgun_powerpack)) - to_chat(user, "You must be wearing an M56 Powerpack on your back to wear these.") - return FALSE + if(!link_smartgun(user)) + to_chat(user, SPAN_NOTICE("You must have your smartgun equipped to wear these.")) + return FALSE return ..() /obj/item/clothing/glasses/night/m56_goggles/equipped(mob/user, slot) @@ -129,6 +127,7 @@ return ..() /obj/item/clothing/glasses/night/m56_goggles/dropped(mob/living/carbon/human/user) + linked_smartgun = null disable_far_sight(user) return ..() @@ -137,8 +136,8 @@ if(user.glasses != src) to_chat(user, SPAN_WARNING("You can't activate far sight without wearing \the [src]!")) return - if(!link_powerpack(user)) - to_chat(user, SPAN_WARNING("You can't use this without a powerpack!")) + if(!link_smartgun(user)) + to_chat(user, SPAN_WARNING("You can't use this without a smartgun!")) return far_sight = TRUE if(user) @@ -146,7 +145,7 @@ user.client.change_view(8, src) START_PROCESSING(SSobj, src) else - powerpack = null + linked_smartgun = null far_sight = FALSE if(user) if(user.client) @@ -154,8 +153,8 @@ STOP_PROCESSING(SSobj, src) var/datum/action/item_action/m56_goggles/far_sight/FT = locate(/datum/action/item_action/m56_goggles/far_sight) in actions - FT.update_button_icon() - + if(FT) + FT.update_button_icon() /obj/item/clothing/glasses/night/m56_goggles/proc/disable_far_sight(mob/living/carbon/human/user) if(!istype(user)) @@ -169,14 +168,11 @@ if(!istype(user)) set_far_sight(null, FALSE) return PROCESS_KILL - if(powerpack != user.back) + if(!link_smartgun(user)) set_far_sight(user, FALSE) return PROCESS_KILL - var/obj/item/smartgun_powerpack/pp = user.back - if(istype(pp)) - var/obj/item/cell/c = pp.pcell - if(!pp.drain_powerpack(25 * delta_time, c)) - set_far_sight(user, FALSE) + if(!linked_smartgun.drain_battery(25 * delta_time)) + set_far_sight(user, FALSE) /datum/action/item_action/m56_goggles/far_sight/New() . = ..() diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index 4d5b17f35847..bbddc1f10bb7 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -163,3 +163,18 @@ /obj/item/clothing/gloves/marine/veteran/insulated/van_bandolier name = "custom shooting gloves" desc = "Highly protective against injury, temperature, and electric shock. Cool in the summer, warm in the winter, and a secure grip on any surface. You could buy a lot for the price of these, and they're worth every penny." + +/obj/item/clothing/gloves/marine/joe + name = "Seegson hazardous gloves" + desc = "Special Synthetic gloves made for touching and interacting with extremely hazardous materials. Resistant to biohazard liquids, corrosive materials and more. SEEGSON is proudly displayed on the back, along with a biohazard symbol. Tomorrow, Together." + icon_state = "working_joe" + item_state = "working_joe" + siemens_coefficient = 0 + armor_melee = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_MEDIUM + armor_bomb = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_VERYHIGH + armor_rad = CLOTHING_ARMOR_VERYHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUM + unacidable = TRUE + adopts_squad_color = FALSE diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index dcee7800ba1b..165dc03f25e2 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -57,8 +57,9 @@ if(!toggleable) to_chat(user, SPAN_WARNING("You cannot toggle [src] on or off.")) return FALSE + if(!isturf(user.loc)) - to_chat(user, "You cannot turn the light on while in [user.loc].") //To prevent some lighting anomalies. + to_chat(user, SPAN_WARNING("You cannot turn the light [on ? "off" : "on"] while in [user.loc].")) //To prevent some lighting anomalies. return FALSE on = !on diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index c5a001a97c0b..e6dd7be603df 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -130,8 +130,9 @@ ..() if(!isturf(user.loc)) - to_chat(user, "You cannot turn the light on while in [user.loc]") //To prevent some lighting anomalities. + to_chat(user, SPAN_WARNING("You cannot turn the light [on ? "off" : "on" ] while in [user.loc].")) //To prevent some lighting anomalies. return + on = !on icon_state = "hardhat[on]_pumpkin" diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index b9aa567d1f61..d4c772336e2a 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -63,6 +63,16 @@ /obj/item/clothing/shoes/marine/upp_knife knife_type = /obj/item/attachable/bayonet/upp +/obj/item/clothing/shoes/marine/joe + name = "biohazard boots" + desc = "A pair of somewhat cheaply made biohazard boots. Tomorrow, Together." + armor_bullet = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + armor_rad = CLOTHING_ARMOR_MEDIUMHIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + knife_type = /obj/item/attachable/bayonet + /obj/item/clothing/shoes/dress name = "dress shoes" desc = "Pre-polished fancy dress shoes. You can see your reflection in them." diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 1c74080a928f..278ffb666bfd 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -221,7 +221,6 @@ /obj/item/explosive/grenade, /obj/item/device/binoculars, /obj/item/attachable/bayonet, - /obj/item/storage/backpack/general_belt, /obj/item/storage/large_holster/machete, /obj/item/weapon/baseballbat, /obj/item/weapon/baseballbat/metal, @@ -289,7 +288,6 @@ /obj/item/explosive/grenade, /obj/item/device/binoculars, /obj/item/attachable/bayonet, - /obj/item/storage/backpack/general_belt, /obj/item/storage/large_holster/machete, /obj/item/weapon/baseballbat, /obj/item/weapon/baseballbat/metal, @@ -297,3 +295,7 @@ /obj/item/device/walkman, ) +/obj/item/clothing/suit/storage/snow_suit/liaison + name = "liaison's winter coat" + desc = "A Weyland-Yutani winter coat. Only the best comfort for the liaison in a cold environment." + icon_state = "snowsuit_liaison" diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index eff6f1306827..ab62ea782a09 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -132,10 +132,9 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 drop_sound = "armorequip" equip_sounds = list('sound/handling/putting_on_armor1.ogg') var/armor_variation = 0 - //speciality does NOTHING if you have NO_NAME_OVERRIDE -/obj/item/clothing/suit/storage/marine/Initialize() +/obj/item/clothing/suit/storage/marine/Initialize(mapload) . = ..() if(!(flags_atom & NO_NAME_OVERRIDE)) name = "[specialty]" @@ -143,12 +142,12 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 name += " snow armor" //Leave marine out so that armors don't have to have "Marine" appended (see: generals). else name += " armor" - if(armor_variation) - icon_state = replacetext(icon_state,"1","[rand(1,armor_variation)]") if(!(flags_atom & NO_SNOW_TYPE)) select_gamemode_skin(type) armor_overlays = list("lamp") //Just one for now, can add more later. + if(armor_variation && mapload) + post_vendor_spawn_hook() update_icon() pockets.max_w_class = SIZE_SMALL //Can contain small items AND rifle magazines. pockets.bypass_w_limit = list( @@ -171,6 +170,22 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 else armor_overlays["lamp"] = null if(user) user.update_inv_wear_suit() + +/obj/item/clothing/suit/storage/marine/post_vendor_spawn_hook(mob/living/carbon/human/user) //used for randomizing/selecting a variant for armors. + var/new_look //used for the icon_state text replacement. + + if(!user?.client?.prefs) + new_look = rand(1,armor_variation) + + else if(user.client.prefs.preferred_armor == "Random") + new_look = rand(1,armor_variation) + + else + new_look = GLOB.armor_style_list[user.client.prefs.preferred_armor] + + icon_state = replacetext(icon_state,"1","[new_look]") + update_icon(user) + /obj/item/clothing/suit/storage/marine/pickup(mob/user) if(flags_marine_armor & ARMOR_LAMP_ON) user.SetLuminosity(brightness_on, FALSE, src) @@ -206,8 +221,9 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 ..() if(!isturf(user.loc)) - to_chat(user, SPAN_WARNING("You cannot turn the light on while in [user.loc].")) //To prevent some lighting anomalities. + to_chat(user, SPAN_WARNING("You cannot turn the light [is_light_on() ? "off" : "on"] while in [user.loc].")) //To prevent some lighting anomalies. return + if(flashlight_cooldown > world.time) return if(!ishuman(user)) @@ -400,7 +416,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 /obj/item/clothing/suit/storage/marine/smartgunner - name = "M56 combat harness" + name = "\improper M56 combat harness" desc = "A heavy protective vest designed to be worn with the M56 Smartgun System. \nIt has specially designed straps and reinforcement to carry the Smartgun and accessories." icon_state = "8" item_state = "armor" @@ -430,6 +446,35 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 name = "M56 combat harness" //select_gamemode_skin(type) +/obj/item/clothing/suit/storage/marine/smartgunner/mob_can_equip(mob/equipping_mob, slot, disable_warning = FALSE) + . = ..() + + if(equipping_mob.back) + to_chat(equipping_mob, SPAN_WARNING("You can't equip [src] while wearing a backpack.")) + return FALSE + +/obj/item/clothing/suit/storage/marine/smartgunner/equipped(mob/user, slot, silent) + . = ..() + + if(slot == WEAR_JACKET) + RegisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP, PROC_REF(check_equipping)) + +/obj/item/clothing/suit/storage/marine/smartgunner/proc/check_equipping(mob/living/carbon/human/equipping_human, obj/item/equipping_item, slot) + SIGNAL_HANDLER + + if(slot != WEAR_BACK) + return + + . = COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP + + if(equipping_item.flags_equip_slot == SLOT_BACK) + to_chat(equipping_human, SPAN_WARNING("You can't equip [equipping_item] on your back while wearing [src].")) + return + +/obj/item/clothing/suit/storage/marine/smartgunner/unequipped(mob/user, slot) + . = ..() + + UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP) /obj/item/clothing/suit/storage/marine/leader name = "\improper B12 pattern marine armor" @@ -470,6 +515,30 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 armor_internaldamage = CLOTHING_ARMOR_LOW storage_slots = 2 +/obj/item/clothing/suit/storage/marine/light/padded + icon_state = "L1" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/padless + icon_state = "L2" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/padless_lines + icon_state = "L3" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/carrier + icon_state = "L4" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/skull + icon_state = "L5" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/light/smooth + icon_state = "L6" + armor_variation = 0 + /obj/item/clothing/suit/storage/marine/light/vest name = "\improper M3-VL pattern ballistics vest" desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel." @@ -535,6 +604,30 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 slowdown = SLOWDOWN_ARMOR_LOWHEAVY movement_compensation = SLOWDOWN_ARMOR_MEDIUM +/obj/item/clothing/suit/storage/marine/heavy/padded + icon_state = "H1" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/padless + icon_state = "H2" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/padless_lines + icon_state = "H3" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/carrier + icon_state = "H4" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/skull + icon_state = "H5" + armor_variation = 0 + +/obj/item/clothing/suit/storage/marine/heavy/smooth + icon_state = "H6" + armor_variation = 0 + //===========================//SPECIALIST\\================================\\ //=======================================================================\\ diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 4b679c77c247..540c311f9221 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -161,7 +161,7 @@ flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE flags_atom = NO_NAME_OVERRIDE flags_cold_protection = ICE_PLANET_MIN_COLD_PROT - suit_restricted = list(/obj/item/clothing/suit/armor/vest/pilot, /obj/item/clothing/suit/storage/marine/light/vest/dcc, /obj/item/clothing/suit/storage/jacket/marine/pilot) + suit_restricted = list(/obj/item/clothing/suit/armor/vest/pilot, /obj/item/clothing/suit/storage/marine/light/vest/dcc, /obj/item/clothing/suit/storage/jacket/marine/pilot, /obj/item/clothing/suit/storage/marine/light/vest) /obj/item/clothing/under/marine/officer/pilot/flight name = "tactical pilot officer flightsuit" @@ -777,12 +777,22 @@ icon_state = "liaison_regular" worn_state = "liaison_regular" +/obj/item/clothing/under/liaison_suit/charcoal + name = "liaison's charcoal suit" + desc = "A stiff, stylish charcoal suit commonly worn by businessmen from the Weyland-Yutani corporation. Expertly crafted to make you look like a prick." + icon_state = "liaison_charcoal" + worn_state = "liaison_charcoal" + /obj/item/clothing/under/liaison_suit/outing name = "liaison's outfit" desc = "A casual outfit consisting of a collared shirt and a vest. Looks like something you might wear on the weekends, or on a visit to a derelict colony." icon_state = "liaison_outing" worn_state = "liaison_outing" +/obj/item/clothing/under/liaison_suit/outing/red + icon_state = "liaison_outing_red" + worn_state = "liaison_outing_red" + /obj/item/clothing/under/liaison_suit/formal name = "liaison's white suit" desc = "A formal, white suit. Looks like something you'd wear to a funeral, a Weyland-Yutani corporate dinner, or both. Stiff as a board, but makes you feel like rolling out of a Rolls-Royce." @@ -795,6 +805,12 @@ icon_state = "liaison_suspenders" worn_state = "liaison_suspenders" +/obj/item/clothing/under/liaison_suit/blazer + name = "liaison's blue blazer" + desc = "A stiff but casual blue blazer. Similar can be found in any Weyland-Yutani office. Only the finest wear for the galaxy's most cunning." + icon_state = "liaison_blue_blazer" + worn_state = "liaison_blue_blazer" + /obj/item/clothing/under/marine/reporter name = "combat correspondent uniform" desc = "A relaxed and robust uniform fit for any potential reporting needs." @@ -842,12 +858,44 @@ worn_state = "synth_councillor" displays_id = FALSE +/obj/item/clothing/under/rank/synthetic/flight + name = "tactical flightsuit" + desc = "A flightsuit with plenty of leather straps, pouches, and other essential gear." + icon_state = "pilot_flightsuit_alt" + item_state = "pilot_flightsuit_alt" + worn_state = "pilot_flightsuit_alt" + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + flags_cold_protection = ICE_PLANET_MIN_COLD_PROT + /obj/item/clothing/under/rank/synthetic/old icon_state = "rdalt_s" worn_state = "rdalt_s" /obj/item/clothing/under/rank/synthetic/joe name = "\improper Working Joe Uniform" - desc = "A cheap uniform made for Synthetic labor." + desc = "A cheap uniform made for Synthetic labor. Tomorrow, Together." icon_state = "working_joe" worn_state = "working_joe" + +/obj/item/clothing/under/rank/synthetic/joe/engi + name = "\improper Working Joe Hazardous Uniform" + desc = "A reinforced uniform used for Synthetic labor in hazardous areas. Tomorrow, Together." + icon_state = "working_joe_engi" + worn_state = "working_joe_engi" + flags_inventory = CANTSTRIP + armor_melee = CLOTHING_ARMOR_LOW + armor_energy = CLOTHING_ARMOR_MEDIUMLOW + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_HIGH + armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + +/obj/item/clothing/under/rank/synthetic/joe/engi/overalls + name = "\improper Working Joe Hazardous Uniform" + desc = "A reinforced uniform used for Synthetic labor in hazardous areas. Comes with an additional layer for liquid hazards. Tomorrow, Together." + icon_state = "working_joe_overalls" + worn_state = "working_joe_overalls" + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + unacidable = TRUE diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index 87f0e3b6548c..f21cd6498615 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -512,27 +512,33 @@ START_PROCESSING(SSprocessing, src) -/obj/effect/alien/resin/acid_pillar/proc/can_target(mob/living/carbon/C, position_to_get = 0) - if(get_dist(src, C) > range) +/obj/effect/alien/resin/acid_pillar/proc/can_target(mob/living/carbon/current_mob, position_to_get = 0) + /// Is it a friendly xenomorph that is on fire + var/burning_friendly = FALSE + + if(get_dist(src, current_mob) > range) return FALSE - var/check_dead = FALSE - if(C.ally_of_hivenumber(hivenumber)) - if(!C.on_fire || !isxeno(C)) + if(current_mob.ally_of_hivenumber(hivenumber)) + if(!isxeno(current_mob)) + return FALSE + if(!current_mob.on_fire) return FALSE - else if(C.lying || C.is_mob_incapacitated(TRUE)) + burning_friendly = TRUE + + else if(current_mob.lying || current_mob.is_mob_incapacitated(TRUE)) return FALSE - if(!check_dead && C.health < 0) + if(!burning_friendly && current_mob.health < 0) return FALSE - if(check_dead && C.stat == DEAD) + if(current_mob.stat == DEAD) return FALSE var/turf/current_turf var/turf/last_turf = loc var/atom/temp_atom = new acid_type() var/current_pos = 1 - for(var/i in getline(src, C)) + for(var/i in getline(src, current_mob)) current_turf = i if(LinkBlocked(temp_atom, last_turf, current_turf)) qdel(temp_atom) diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index 9376e2b6e914..c38e540efb30 100644 --- a/code/modules/cm_aliens/structures/special/pylon_core.dm +++ b/code/modules/cm_aliens/structures/special/pylon_core.dm @@ -108,6 +108,7 @@ var/last_healed = 0 var/last_attempt = 0 // logs time of last attempt to prevent spam. if you want to destroy it, you must commit. var/last_larva_time = 0 + var/last_larva_queue_time = 0 var/last_surge_time = 0 var/spawn_cooldown = 30 SECONDS var/surge_cooldown = 90 SECONDS @@ -135,25 +136,40 @@ // Handle spawning larva if core is connected to a hive if(linked_hive) - for(var/mob/living/carbon/xenomorph/larva/L in range(2, src)) - if(!L.ckey && L.burrowable && !QDELETED(L)) - visible_message(SPAN_XENODANGER("[L] quickly burrows into \the [src].")) - linked_hive.stored_larva++ - linked_hive.hive_ui.update_burrowed_larva() - qdel(L) - - if((last_larva_time + spawn_cooldown) < world.time && can_spawn_larva()) // every minute + for(var/mob/living/carbon/xenomorph/larva/worm in range(2, src)) + if((!worm.ckey || worm.stat == DEAD) && worm.burrowable && (worm.hivenumber == linked_hive.hivenumber) && !QDELETED(worm)) + visible_message(SPAN_XENODANGER("[worm] quickly burrows into \the [src].")) + if(!worm.banished) + // Goob job bringing her back home, but no doubling please + linked_hive.stored_larva++ + linked_hive.hive_ui.update_burrowed_larva() + qdel(worm) + + var/spawning_larva = can_spawn_larva() && (last_larva_time + spawn_cooldown) < world.time + if(spawning_larva) last_larva_time = world.time + if(spawning_larva || (last_larva_queue_time + spawn_cooldown * 4) < world.time) + last_larva_queue_time = world.time var/list/players_with_xeno_pref = get_alien_candidates() - if(players_with_xeno_pref && players_with_xeno_pref.len && can_spawn_larva()) - spawn_burrowed_larva(pick(players_with_xeno_pref)) + if(players_with_xeno_pref && players_with_xeno_pref.len) + if(spawning_larva && spawn_burrowed_larva(players_with_xeno_pref[1])) + // We were in spawning_larva mode and successfully spawned someone + message_alien_candidates(players_with_xeno_pref, dequeued = 1) + else + // Just time to update everyone their queue status (or the spawn failed) + message_alien_candidates(players_with_xeno_pref, dequeued = 0) if(linked_hive.hijack_burrowed_surge && (last_surge_time + surge_cooldown) < world.time) last_surge_time = world.time linked_hive.stored_larva++ + linked_hive.hijack_burrowed_left-- announce_dchat("The hive has gained another burrowed larva! Use the Join As Xeno verb to take it.", src) if(surge_cooldown > 30 SECONDS) //mostly for sanity purposes surge_cooldown = surge_cooldown - surge_incremental_reduction //ramps up over time + if(linked_hive.hijack_burrowed_left < 1) + linked_hive.hijack_burrowed_surge = FALSE + xeno_message(SPAN_XENOANNOUNCE("The hive's power wanes. You will no longer gain pooled larva over time."), 3, linked_hive.hivenumber) + // Hive core can repair itself over time if(health < maxhealth && last_healed <= world.time) diff --git a/code/modules/cm_marines/anti_air.dm b/code/modules/cm_marines/anti_air.dm index 22d43456437b..fc67f9a2018d 100644 --- a/code/modules/cm_marines/anti_air.dm +++ b/code/modules/cm_marines/anti_air.dm @@ -102,6 +102,7 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon if(!almayer_aa_cannon) return + var/datum/ares_link/link = GLOB.ares_link switch(action) if("protect") almayer_aa_cannon.protecting_section = params["section_id"] @@ -109,10 +110,12 @@ var/obj/structure/anti_air_cannon/almayer_aa_cannon almayer_aa_cannon.protecting_section = "" return message_admins("[key_name(usr)] has set the AA to [html_encode(almayer_aa_cannon.protecting_section)].") + link.log_ares_antiair(usr, "Set AA to cover [html_encode(almayer_aa_cannon.protecting_section)].") . = TRUE if("deactivate") almayer_aa_cannon.protecting_section = "" message_admins("[key_name(usr)] has deactivated the AA cannon.") + link.log_ares_antiair(usr, "Deactivated Anti Air systems.") . = TRUE add_fingerprint(usr) diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 172cbb671997..4ce6be802f3d 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -366,6 +366,17 @@ new /obj/item/ammo_magazine/rifle/m4ra/ap(src) new /obj/item/ammo_magazine/rifle/m4ra/ap(src) +/obj/item/storage/box/kit/m41a_kit + name = "\improper M41A Rifle Kit" + pro_case_overlay = "pursuit" + +/obj/item/storage/box/kit/m41a_kit/fill_preset_inventory() + new /obj/item/weapon/gun/rifle/m41a(src) + new /obj/item/attachable/angledgrip(src) + new /obj/item/attachable/suppressor(src) + new /obj/item/attachable/extended_barrel(src) + new /obj/item/ammo_magazine/rifle/ap(src) + new /obj/item/ammo_magazine/rifle/ap(src) /obj/item/storage/box/kit/heavy_support name = "\improper Forward HPR Shield Kit" diff --git a/code/modules/cm_marines/equipment/weapons.dm b/code/modules/cm_marines/equipment/weapons.dm index 97484d8b13c1..858b9dbeb79d 100644 --- a/code/modules/cm_marines/equipment/weapons.dm +++ b/code/modules/cm_marines/equipment/weapons.dm @@ -14,7 +14,7 @@ . = ..() new /obj/item/clothing/glasses/night/m56_goggles(src) new /obj/item/weapon/gun/smartgun(src) - new /obj/item/smartgun_powerpack(src) + new /obj/item/smartgun_battery(src) new /obj/item/clothing/suit/storage/marine/smartgunner(src) update_icon() @@ -42,7 +42,7 @@ . = ..() new /obj/item/clothing/glasses/night/m56_goggles(src) new /obj/item/weapon/gun/smartgun/co(src) - new /obj/item/smartgun_powerpack(src) + new /obj/item/smartgun_battery(src) new /obj/item/clothing/suit/storage/marine/smartgunner(src) new /obj/item/storage/belt/marine/smartgunner(src) update_icon() @@ -71,7 +71,7 @@ . = ..() new /obj/item/clothing/glasses/night/m56_goggles(src) new /obj/item/weapon/gun/smartgun/dirty(src) - new /obj/item/smartgun_powerpack/pmc(src) + new /obj/item/smartgun_battery(src) new /obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc(src) new /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner(src) new /obj/item/storage/belt/gun/smartgunner/pmc/full(src) @@ -85,84 +85,3 @@ overlays += image(icon, "smartgun") else icon_state = "kit_case_e" - -/obj/item/smartgun_powerpack - name = "\improper M56 powerpack" - desc = "A heavy reinforced backpack with support equipment and power cells for the M56 Smartgun System." - icon = 'icons/obj/items/clothing/backpacks.dmi' - icon_state = "powerpack" - flags_atom = FPRINT|CONDUCT - flags_equip_slot = SLOT_BACK - w_class = SIZE_HUGE - var/obj/item/cell/pcell = null - var/reloading = 0 - -/obj/item/smartgun_powerpack/Initialize(mapload, ...) - . = ..() - pcell = new /obj/item/cell/high(src) - -/obj/item/smartgun_powerpack/Destroy() - . = ..() - QDEL_NULL(pcell) - -/obj/item/smartgun_powerpack/dropped(mob/living/user) // called on unequip - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.glasses && istype(H.glasses, /obj/item/clothing/glasses/night/m56_goggles)) - if(H.back == src) - to_chat(H, SPAN_NOTICE("You remove \the [H.glasses].")) - H.drop_inv_item_on_ground(H.glasses) - ..() - - -/obj/item/smartgun_powerpack/attackby(obj/item/A as obj, mob/user as mob) - if(istype(A,/obj/item/cell)) - var/obj/item/cell/C = A - visible_message("[user.name] swaps out the power cell in the [src.name].","You swap out the power cell in the [src] and drop the old one.") - to_chat(user, "The new cell contains: [C.charge] power.") - pcell.update_icon() - pcell.forceMove(get_turf(user)) - pcell = C - user.drop_inv_item_to_loc(C, src) - playsound(src,'sound/machines/click.ogg', 25, 1) - else - ..() - -/obj/item/smartgun_powerpack/get_examine_text(mob/user) - . = ..() - if (pcell && get_dist(user, src) <= 1) - . += "A small gauge in the corner reads: Power: [pcell.charge] / [pcell.maxcharge]." - -/obj/item/smartgun_powerpack/proc/drain_powerpack(drain = 0, obj/item/cell/c) - var/actual_drain = (rand(drain/2,drain)/25) - if(c && c.charge > 0) - if(c.charge > actual_drain) - c.charge -= actual_drain - else - c.charge = 0 - to_chat(usr, SPAN_WARNING("[src] emits a low power warning and immediately shuts down!")) - return TRUE - if(!c || c.charge == 0) - to_chat(usr, SPAN_WARNING("[src] emits a low power warning and immediately shuts down!")) - return FALSE - return FALSE - -/obj/item/smartgun_powerpack/pmc - icon_state = "powerpack" - -/obj/item/smartgun_powerpack/pmc/Initialize(mapload, ...) - . = ..() - pcell = new /obj/item/cell/hyper(src) - -/obj/item/smartgun_powerpack/snow - icon_state = "powerpack" - -/obj/item/smartgun_powerpack/fancy - icon_state = "powerpackw" - -/obj/item/smartgun_powerpack/merc - icon_state = "powerpackp" - -/obj/item/smartgun_powerpack/clf - name = "\improper M56 'Freedom' powerpack" - desc = "A heavy reinforced backpack with support equipment and power cells for the M56 Smartgun System. This one has the CLF logo carved into the backplate." diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 1327788af55f..3539a43e6c15 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -109,7 +109,7 @@ Access:
"} - var/known_access_rights = get_all_accesses() + var/known_access_rights = get_all_main_access() for(var/A in target_id_card.access) if(A in known_access_rights) contents += " [get_access_desc(A)]" @@ -177,7 +177,7 @@ if(!authenticated || !target_id_card) return - var/new_name = params["name"] // reject_bad_name() can be added here + var/new_name = strip_html(params["name"]) if(!new_name) visible_message(SPAN_NOTICE("[src] buzzes rudely.")) return @@ -191,13 +191,13 @@ return if(target == "Custom") - var/custom_name = params["custom_name"] + var/custom_name = strip_html(params["custom_name"]) if(custom_name) target_id_card.assignment = custom_name else var/list/new_access = list() if(is_centcom) - new_access = get_centcom_access(target) + new_access = get_all_weyland_access() else var/datum/job/job = RoleAuthority.roles_for_mode[target] @@ -205,7 +205,7 @@ visible_message("[SPAN_BOLD("[src]")] states, \"DATA ERROR: Can not find next entry in database: [target]\"") return new_access = job.get_access() - target_id_card.access -= get_all_centcom_access() + get_all_accesses() + target_id_card.access -= get_all_weyland_access() + get_all_main_access() target_id_card.access |= new_access target_id_card.assignment = target target_id_card.rank = target @@ -227,7 +227,7 @@ log_idmod(target_id_card, " [key_name_admin(usr)] granted [access_type] IFF. ") return TRUE access_type = text2num(params["access_target"]) - if(access_type in (is_centcom ? get_all_centcom_access() : get_all_accesses())) + if(access_type in (is_centcom ? get_all_weyland_access() : get_main_marine_access())) if(access_type in target_id_card.access) target_id_card.access -= access_type log_idmod(target_id_card, " [key_name_admin(usr)] revoked access '[access_type]'. ") @@ -239,7 +239,7 @@ if(!authenticated || !target_id_card) return - target_id_card.access |= (is_centcom ? get_all_centcom_access() : get_all_accesses()) + target_id_card.access |= (is_centcom ? get_all_weyland_access() : get_main_marine_access()) target_id_card.faction_group |= factions log_idmod(target_id_card, " [key_name_admin(usr)] granted the ID all access and USCM IFF. ") return TRUE @@ -984,7 +984,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) JOB_PMC_MEDIC = 224, JOB_PMC_INVESTIGATOR = 224, JOB_PMC_ENGINEER = 225, - JOB_PMC = 226, + JOB_PMC_STANDARD = 226, JOB_PMC_DOCTOR = 227, JOB_WY_GOON_LEAD = 228, JOB_WY_GOON = 229, @@ -1014,6 +1014,91 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) "[squad_name][JOB_SQUAD_MARINE]" = (squad_number + 6), ) squad_number += 10 + if(FACTION_WY, FACTION_PMC) + jobs = list( + // Note that jobs divisible by 10 are considered heads of staff, and bolded + // 00-09: High Command + JOB_DIRECTOR = 00, + JOB_CHIEF_EXECUTIVE = 01, + // 10-19: Command Level Staff + JOB_PMC_DIRECTOR = 10, + JOB_DIVISION_MANAGER = 10, + JOB_ASSISTANT_MANAGER = 11, + // 20-29: Corporate Staff + JOB_EXECUTIVE_SUPERVISOR = 20, + JOB_SENIOR_EXECUTIVE = 21, + JOB_EXECUTIVE_SPECIALIST = 22, + JOB_EXECUTIVE = 23, + JOB_JUNIOR_EXECUTIVE = 24, + // 30-39: Security + JOB_WY_GOON_LEAD = 30, + JOB_WY_GOON = 31, + // 40-49: MedSci + JOB_PMC_SYNTH = 40, + JOB_PMC_XENO_HANDLER = 41, + JOB_PMC_DOCTOR = 42, + JOB_WY_GOON_RESEARCHER = 43, + // 50-59: Engineering & Vehicle Crew + JOB_PMC_CREWMAN = 51, + JOB_PMC_ENGINEER = 52, + // 60-69: Investigation Team + JOB_PMC_LEAD_INVEST = 60, + JOB_PMC_INVESTIGATOR = 61, + JOB_PMC_DETAINER = 62, + + // 70-79 PMCs Combat Team + JOB_PMC_LEADER = 70, + JOB_PMC_SNIPER = 71, + JOB_PMC_GUNNER = 72, + JOB_PMC_MEDIC = 73, + JOB_PMC_STANDARD = 75, + + // ANYTHING ELSE = UNKNOWN_JOB_ID, Unknowns/custom jobs will appear after civilians, and before stowaways + JOB_STOWAWAY = 999, + + // 200-229: Visitors + JOB_UPP_REPRESENTATIVE = 201, + JOB_TWE_REPRESENTATIVE = 201, + JOB_COLONEL = 201, + JOB_TRAINEE = 202, //Trainees aren't really cared about + ) + if(FACTION_UPP) + jobs = list( + // Note that jobs divisible by 10 are considered heads of staff, and bolded + // 00-09: High Command + JOB_UPP_KOL_OFFICER = 00, + // 10-19: Command Team + JOB_UPP_MAY_OFFICER = 10, + JOB_UPP_KPT_OFFICER = 11, + JOB_UPP_SRLT_OFFICER = 13, + JOB_UPP_LT_OFFICER = 14, + // 20-29: Commandos + JOB_UPP_COMMANDO_LEADER = 20, + JOB_UPP_COMMANDO_MEDIC = 21, + JOB_UPP_COMMANDO = 22, + // 30-39: Security + JOB_UPP_POLICE = 31, + // 40-49: MedSci + JOB_UPP_LT_DOKTOR = 41, + // 50-59: Engineering + JOB_UPP_COMBAT_SYNTH = 50, + JOB_UPP_CREWMAN = 51, + // 60-69: Soldiers + JOB_UPP_LEADER = 60, + JOB_UPP_SPECIALIST = 61, + JOB_UPP_MEDIC = 62, + JOB_UPP_ENGI = 63, + JOB_UPP = 64, + JOB_UPP_CONSCRIPT = 65, + + // ANYTHING ELSE = UNKNOWN_JOB_ID, Unknowns/custom jobs will appear after civilians, and before stowaways + JOB_STOWAWAY = 999, + + // 200-229: Visitors + JOB_UPP_REPRESENTATIVE = 201, + JOB_TWE_REPRESENTATIVE = 201, + JOB_COLONEL = 201 + ) else jobs = list() diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index 431b03fb31d3..14e990809f4f 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -484,14 +484,13 @@ var/list/ob_type_fuel_requirements var/list/turf_list = list() for(var/turf/T in range(range_num, target)) - if(protected_by_pylon(TURF_PROTECTION_OB, T)) - continue - turf_list += T for(var/i = 1 to total_amount) for(var/k = 1 to instant_amount) var/turf/U = pick(turf_list) + if(protected_by_pylon(TURF_PROTECTION_OB, U)) //If the turf somehow gained OB protection while the cluster was firing + continue fire_in_a_hole(U) sleep(delay_between_clusters) diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 0c303b7028e3..070cf1f6c1cf 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -430,6 +430,7 @@ current_squad = null if(cam && !ishighersilicon(usr)) usr.reset_view(null) + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null state = 0 if("pick_squad") @@ -593,13 +594,17 @@ to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Searching for helmet cam. No helmet cam found for this marine! Tell your squad to put their helmets on!")]") else if(cam && cam == new_cam)//click the camera you're watching a second time to stop watching. visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("Stopping helmet cam view of [cam_target].")]") + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null usr.reset_view(null) else if(usr.client.view != world_view_size) to_chat(usr, SPAN_WARNING("You're too busy peering through binoculars.")) else + if(cam) + usr.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = new_cam usr.reset_view(cam) + usr.RegisterSignal(cam, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/mob, reset_observer_view_on_deletion)) attack_hand(usr) //The above doesn't ever seem to work. /obj/structure/machinery/computer/overwatch/check_eye(mob/user) @@ -611,6 +616,8 @@ /obj/structure/machinery/computer/overwatch/on_unset_interaction(mob/user) ..() if(!isRemoteControlling(user)) + if(cam) + user.UnregisterSignal(cam, COMSIG_PARENT_QDELETING) cam = null user.reset_view(null) @@ -859,6 +866,9 @@ message_admins(FONT_SIZE_HUGE("ALERT: [key_name(user)] fired an orbital bombardment in [A.name] for squad '[current_squad]' [ADMIN_JMP(T)]")) log_attack("[key_name(user)] fired an orbital bombardment in [A.name] for squad '[current_squad]'") + /// Project ARES interface log. + GLOB.ares_link.log_ares_bombardment(user, ob_name, "X[x_bomb], Y[y_bomb] in [A.name]") + busy = FALSE var/turf/target = locate(T.x + rand(-3, 3), T.y + rand(-3, 3), T.z) if(target && istype(target)) diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index ec79a2f7f3fd..2db33c10ed46 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -111,6 +111,11 @@ to_chat(usr, SPAN_WARNING("It's too cramped in here to deploy \a [src].")) return var/turf/T = get_turf(usr) + if(istype(T, /turf/open)) + var/turf/open/floor = T + if(!floor.allow_construction) + to_chat(user, SPAN_WARNING("You cannot install \the [src] here, find a more secure surface!")) + return FALSE var/fail = FALSE if(T.density) fail = TRUE @@ -195,6 +200,11 @@ to_chat(usr, SPAN_WARNING("It's too cramped in here to deploy \a [src].")) return var/turf/T = get_turf(user) + if(istype(T, /turf/open)) + var/turf/open/floor = T + if(!floor.allow_construction) + to_chat(user, SPAN_WARNING("You cannot install \the [src] here, find a more secure surface!")) + return FALSE var/fail = FALSE if(T.density) fail = TRUE @@ -370,6 +380,11 @@ if(fail) to_chat(user, SPAN_WARNING("You can't install \the [src] here, something is in the way.")) return + if(istype(T, /turf/open)) + var/turf/open/floor = T + if(!floor.allow_construction) + to_chat(user, SPAN_WARNING("You cannot install \the [src] here, find a more secure surface!")) + return FALSE if(gun_mounted) to_chat(user, "You're securing the M56D into place...") @@ -1061,7 +1076,7 @@ if(SSinterior.in_interior(user)) to_chat(usr, SPAN_WARNING("It's too cramped in here to deploy \a [src].")) return FALSE - if(OT.density || !isturf(OT)) + if(OT.density || !isturf(OT) || !OT.allow_construction) to_chat(user, SPAN_WARNING("You can't set up \the [src] here.")) return FALSE if(rotate_check.density) diff --git a/code/modules/cm_tech/tech.dm b/code/modules/cm_tech/tech.dm index f13e4f7fddf8..dea505f3237a 100644 --- a/code/modules/cm_tech/tech.dm +++ b/code/modules/cm_tech/tech.dm @@ -21,6 +21,9 @@ var/background_icon = "background" var/background_icon_locked = "marine" + var/announce_name + var/announce_message + /datum/tech/proc/can_unlock(mob/M) SHOULD_CALL_PARENT(TRUE) @@ -65,8 +68,13 @@ unlocked = TRUE to_chat(user, SPAN_HELPFUL("You have purchased the '[name]' tech node.")) + log_admin("[key_name_admin(user)] has bought '[name]' via tech points.") holder.spend_points(required_points) update_icon(node) + + if(!(tech_flags & TECH_FLAG_NO_ANNOUNCE) && announce_message && announce_name) + marine_announcement(announce_message, announce_name, 'sound/misc/notice2.ogg') + return TRUE /datum/tech/ui_status(mob/user, datum/ui_state/state) diff --git a/code/modules/cm_tech/techs/abstract/repeatable.dm b/code/modules/cm_tech/techs/abstract/repeatable.dm index e9706538071c..4b240814e0c6 100644 --- a/code/modules/cm_tech/techs/abstract/repeatable.dm +++ b/code/modules/cm_tech/techs/abstract/repeatable.dm @@ -4,9 +4,6 @@ /datum/tech/repeatable name = "Repeatable Tech" - var/announce_name - var/announce_message - tech_flags = TECH_FLAG_MULTIUSE var/purchase_cooldown = 10 SECONDS var/next_purchase = 0 @@ -35,8 +32,6 @@ /datum/tech/repeatable/on_unlock() ..() - if(!(tech_flags & TECH_FLAG_NO_ANNOUNCE) && announce_message && announce_name) - marine_announcement(announce_message, announce_name, 'sound/misc/notice2.ogg') next_purchase = world.time + purchase_cooldown required_points += increase_per_purchase diff --git a/code/modules/cm_tech/techs/abstract/transitory.dm b/code/modules/cm_tech/techs/abstract/transitory.dm index 09301b6ba205..7798b6053d0e 100644 --- a/code/modules/cm_tech/techs/abstract/transitory.dm +++ b/code/modules/cm_tech/techs/abstract/transitory.dm @@ -87,3 +87,22 @@ required_points = 5 flags = TREE_FLAG_MARINE + +/datum/tech/transitory/tier4 + name = "Unlock Tier 4" + tier = /datum/tier/three_transition_four + + before = /datum/tier/three + next = /datum/tier/four + +/datum/tech/transitory/tier4/xeno + techs_to_unlock = 0 + required_points = 5 + + flags = TREE_FLAG_XENO + +/datum/tech/transitory/tier4/marine + techs_to_unlock = 0 + required_points = 5 + + flags = TREE_FLAG_MARINE diff --git a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm index fb9666623e1c..84361baa618f 100644 --- a/code/modules/cm_tech/techs/marine/tier3/cryorine.dm +++ b/code/modules/cm_tech/techs/marine/tier3/cryorine.dm @@ -23,4 +23,4 @@ /datum/tech/repeatable/cryomarine/on_unlock() . = ..() - SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Squad)", FALSE, FALSE) + SSticker.mode.get_specific_call("Marine Cryo Reinforcements (Squad)", FALSE, FALSE, announce_dispatch_message = FALSE) diff --git a/code/modules/cm_tech/techs/marine/tier4/nuke.dm b/code/modules/cm_tech/techs/marine/tier4/nuke.dm new file mode 100644 index 000000000000..eb4e64b59951 --- /dev/null +++ b/code/modules/cm_tech/techs/marine/tier4/nuke.dm @@ -0,0 +1,43 @@ +#define NUKE_UNLOCK_TIME (120 MINUTES) + +/datum/tech/nuke + name = "Nuclear Device" + //desc = "Purchase a nuclear device. Only able to purchase after X minutes into the operation. It's the only way to be sure." //See New() + icon_state = "nuke" + + required_points = 20 + + tier = /datum/tier/four + + announce_name = "NUCLEAR ARSENAL ACQUIRED" + announce_message = "A nuclear device has been purchased and will be delivered to requisitions via ASRS." + + flags = TREE_FLAG_MARINE + +/datum/tech/nuke/New() + desc = "Purchase a nuclear device. Only able to purchase [NUKE_UNLOCK_TIME / (1 MINUTES)] minutes into the operation. It's the only way to be sure." + +/datum/tech/nuke/on_unlock() + . = ..() + + var/datum/supply_order/new_order = new /datum/supply_order() + new_order.ordernum = supply_controller.ordernum + supply_controller.ordernum++ + new_order.object = supply_controller.supply_packs["Intel Operational Nuke"] + new_order.orderedby = MAIN_AI_SYSTEM + + supply_controller.shoppinglist += new_order + +/datum/tech/nuke/can_unlock(mob/unlocking_mob) + . = ..() + + if(!.) + return + + if(ROUND_TIME < NUKE_UNLOCK_TIME) + to_chat(unlocking_mob, SPAN_WARNING("You cannot purchase this node before [NUKE_UNLOCK_TIME / (1 MINUTES)] minutes into the operation.")) + return FALSE + + return TRUE + +#undef NUKE_UNLOCK_TIME diff --git a/code/modules/decorators/weapon_map_decorator.dm b/code/modules/decorators/weapon_map_decorator.dm index b724fac1c1d2..55e78f349a60 100644 --- a/code/modules/decorators/weapon_map_decorator.dm +++ b/code/modules/decorators/weapon_map_decorator.dm @@ -1,5 +1,5 @@ /datum/decorator/weapon_map_decorator - var/list/map_array = list() + var/list/camouflage_type var/icon/c_icon var/icon/l_icon @@ -8,7 +8,7 @@ var/icon/j_icon /datum/decorator/weapon_map_decorator/is_active_decor() - return map_array.Find(SSmapping.configs[GROUND_MAP].map_name) + return SSmapping.configs[GROUND_MAP].camouflage_type == camouflage_type /datum/decorator/weapon_map_decorator/get_decor_types() return typesof(/obj/item/weapon/gun) - /obj/item/weapon/gun @@ -28,41 +28,41 @@ gun.item_icons[WEAR_J_STORE] = j_icon /datum/decorator/weapon_map_decorator/classic + camouflage_type = "classic" c_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/classic/suit_slot.dmi' - map_array = list(MAP_PRISON_STATION, MAP_PRISON_STATION_V3, MAP_LV522_CHANCES_CLAIM) /datum/decorator/weapon_map_decorator/desert + camouflage_type = "desert" c_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/desert/suit_slot.dmi' - map_array = list(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO) /datum/decorator/weapon_map_decorator/jungle + camouflage_type = "jungle" c_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/suit_slot.dmi' - map_array = list(MAP_LV_624, MAP_RUNTIME,MAP_NEW_VARADERO) /datum/decorator/weapon_map_decorator/snow + camouflage_type = "snow" c_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/suit_slot.dmi' - map_array = list(MAP_CORSAT, MAP_SOROKYNE_STRATA, MAP_ICE_COLONY, MAP_ICE_COLONY_V3) /datum/decorator/weapon_map_decorator/urban + camouflage_type = "urban" // Sprites not currently all done! c_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_obj.dmi' l_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_lefthand.dmi' r_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_righthand.dmi' b_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/back.dmi' j_icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/suit_slot.dmi' - map_array = list() diff --git a/code/modules/defenses/defenses.dm b/code/modules/defenses/defenses.dm index ee6db2b10455..f47ae3e4d77b 100644 --- a/code/modules/defenses/defenses.dm +++ b/code/modules/defenses/defenses.dm @@ -303,6 +303,10 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) return else + var/turf/open/floor = get_turf(src) + if(!floor.allow_construction) + to_chat(user, SPAN_WARNING("You cannot secure \the [src] here, find a more secure surface!")) + return FALSE user.visible_message(SPAN_NOTICE("[user] begins securing [src] to the ground."), SPAN_NOTICE("You begin securing [src] to the ground.")) diff --git a/code/modules/defenses/handheld.dm b/code/modules/defenses/handheld.dm index e68522871561..233dad313d25 100644 --- a/code/modules/defenses/handheld.dm +++ b/code/modules/defenses/handheld.dm @@ -66,7 +66,12 @@ blocked = TRUE break - if(istype(T, /turf/closed)) + if(istype(T, /turf/open)) + var/turf/open/floor = T + if(!floor.allow_construction) + to_chat(user, SPAN_WARNING("You cannot deploy \a [src] here, find a more secure surface!")) + return FALSE + else blocked = TRUE if(blocked) diff --git a/code/modules/defenses/planted_flag.dm b/code/modules/defenses/planted_flag.dm index 18300c63ffa1..fac725047fa9 100644 --- a/code/modules/defenses/planted_flag.dm +++ b/code/modules/defenses/planted_flag.dm @@ -27,6 +27,8 @@ /obj/structure/machinery/defenses/planted_flag/Initialize() . = ..() + RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(turf_changed)) + if(turned_on) apply_area_effect() start_processing() @@ -80,6 +82,11 @@ apply_buff_to_player(H) +/obj/structure/machinery/defenses/planted_flag/proc/turf_changed() + SIGNAL_HANDLER + if(range_bounds) + QDEL_NULL(range_bounds) + /obj/structure/machinery/defenses/planted_flag/proc/apply_buff_to_player(mob/living/carbon/human/H) H.activate_order_buff(COMMAND_ORDER_HOLD, buff_intensity, 1.5 SECONDS) H.activate_order_buff(COMMAND_ORDER_FOCUS, buff_intensity, 1.5 SECONDS) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 7024974c7e7b..3d485f3abda7 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -63,6 +63,7 @@ start_processing() set_range() update_icon() + RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(unset_range)) /obj/structure/machinery/defenses/sentry/Destroy() //Clear these for safety's sake. targets = null @@ -107,7 +108,9 @@ range_bounds = RECT(x, y - 4, 7, 7) /obj/structure/machinery/defenses/sentry/proc/unset_range() - qdel(range_bounds) + SIGNAL_HANDLER + if(range_bounds) + QDEL_NULL(range_bounds) /obj/structure/machinery/defenses/sentry/update_icon() ..() diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index f6c9dee782c6..fc70e5fc90bb 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -164,8 +164,7 @@ new_human.marine_points = MARINE_TOTAL_BUY_POINTS //resetting buy points new_human.marine_snowflake_points = MARINE_TOTAL_SNOWFLAKE_POINTS - new_human.marine_buy_flags = MARINE_CAN_BUY_ALL - + new_human.marine_buyable_categories = MARINE_CAN_BUY_ALL new_human.hud_set_squad() new_human.add_to_all_mob_huds() @@ -173,9 +172,8 @@ if(!new_human.client || !new_human.client.prefs || !new_human.client.prefs.gear) return//We want to equip them with custom stuff second, after they are equipped with everything else. var/datum/gear/G - var/i - for(i in new_human.client.prefs.gear) - G = gear_datums[i] + for(var/gear_name in new_human.client.prefs.gear) + G = gear_datums_by_name[gear_name] if(G) if(G.allowed_roles && !(assignment in G.allowed_roles)) to_chat(new_human, SPAN_WARNING("Custom gear [G.display_name] cannot be equipped: Invalid Role")) @@ -183,7 +181,7 @@ if(G.allowed_origins && !(new_human.origin in G.allowed_origins)) to_chat(new_human, SPAN_WARNING("Custom gear [G.display_name] cannot be equipped: Invalid Origin")) return - if(!new_human.equip_to_slot_or_del(new G.path, G.slot)) + if(!(G.slot && new_human.equip_to_slot_or_del(new G.path, G.slot))) new_human.equip_to_slot_or_del(new G.path, WEAR_IN_BACK) //Gives ranks to the ranked @@ -816,7 +814,7 @@ var/list/rebel_rifles = list( /datum/equipment_preset/proc/add_pmc_survivor_weapon(mob/living/carbon/human/new_human) // Random Weapons a WY PMC may have during a deployment on a colony. They are not equiped with the elite weapons than their space station counterparts but they do bear some of the better weapons the outer rim has to offer. - var/random_weapon = rand(0,5) + var/random_weapon = rand(0,6) switch(random_weapon) if(0) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_L_HAND) @@ -836,6 +834,9 @@ var/list/rebel_rifles = list( if(5) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/merc(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) + if(6) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/no_lock(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41a(new_human), WEAR_WAIST) /** * Randomizes the primary weapon a survivor might find at the start of the outbreak in a gun cabinet. @@ -897,16 +898,16 @@ var/list/rebel_rifles = list( list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index 6b5f913c8d02..311605a407c7 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -91,16 +91,16 @@ list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -205,19 +205,19 @@ list("Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -334,19 +334,19 @@ list("Medical Storage Rig", 0, /obj/item/storage/belt/medical, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -492,16 +492,16 @@ list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -566,7 +566,6 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/clf(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/clf/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) @@ -590,16 +589,16 @@ list("Y8 Miner Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -732,16 +731,16 @@ list("Officer Beret", 0, /obj/item/clothing/head/beret/sec/hos, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -924,19 +923,19 @@ list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK", 0, null, null, null), list("Sterile mask", 0, /obj/item/clothing/mask/surgical, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) @@ -1023,7 +1022,6 @@ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(H), WEAR_IN_JACKET) H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba/highimpact(H), WEAR_IN_JACKET) H.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/clf(H), WEAR_J_STORE) - H.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/clf(H), WEAR_BACK) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), WEAR_HANDS) H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/clf/full(H), WEAR_WAIST) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(H), WEAR_FEET) @@ -1047,16 +1045,16 @@ list("Y8 Miner Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 3d8d1a6883ef..a1ea205a8f61 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -1,47 +1,3 @@ -/datum/equipment_preset/cmb - name = "Colonial Marshal" - - assignment = "CMB Deputy" - rank = JOB_CMB - faction = FACTION_USCM - -/datum/equipment_preset/cmb/New() - . = ..() - access = get_all_accesses() + get_all_civilian_accesses() - -/datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(80;MALE,20;FEMALE) - var/datum/preferences/A = new() - A.randomize_appearance(new_human) - var/random_name - var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) - var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) - var/hair_color = pick(hair_colors) - new_human.r_hair = hair_colors[hair_color][1] - new_human.g_hair = hair_colors[hair_color][2] - new_human.b_hair = hair_colors[hair_color][3] - new_human.r_facial = hair_colors[hair_color][1] - new_human.g_facial = hair_colors[hair_color][2] - new_human.b_facial = hair_colors[hair_color][3] - var/eye_color = pick(colors) - new_human.r_eyes = colors[eye_color][1] - new_human.g_eyes = colors[eye_color][2] - new_human.b_eyes = colors[eye_color][3] - if(new_human.gender == MALE) - random_name = "[pick(first_names_male)] [pick(last_names)]" - new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) - new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) - else - random_name = "[pick(first_names_female)] [pick(last_names)]" - new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - new_human.change_real_name(new_human, random_name) - new_human.age = rand(20,45) - new_human.r_hair = rand(15,35) - new_human.g_hair = rand(15,35) - new_human.b_hair = rand(25,45) - -//*****************************************************************************************************/ - /datum/equipment_preset/cmb name = "Colonial Marshal" faction = FACTION_USCM @@ -53,8 +9,7 @@ /datum/equipment_preset/cmb/New() . = ..() - access = get_all_accesses() + get_all_civilian_accesses() - + access = get_friendly_ert_access() /datum/equipment_preset/cmb/load_name(mob/living/carbon/human/new_human) new_human.gender = pick(80;MALE,20;FEMALE) @@ -448,7 +403,7 @@ /datum/equipment_preset/uscm/cmb/New() . = ..() - access = get_all_accesses() + list(ACCESS_MARINE_PREP) + access = get_friendly_ert_access() assignment = "Anchorpoint Station Marine Rifleman" rank = JOB_SQUAD_MARINE @@ -504,7 +459,6 @@ flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/leader/New() . = ..() - access = get_all_accesses() + list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) assignment = "Anchorpoint Station Marine Team Leader" rank = JOB_SQUAD_LEADER @@ -550,7 +504,6 @@ flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/rto/New() . = ..() - access = get_all_accesses() + list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP) assignment = "Anchorpoint Station Marine Technical Specialist" rank = JOB_SQUAD_TEAM_LEADER @@ -598,7 +551,6 @@ flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/medic/New() . = ..() - access = get_all_accesses() + list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) assignment = "Anchorpoint Station Hospital Corpsman" rank = JOB_SQUAD_MEDIC @@ -660,7 +612,6 @@ flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/smartgunner/New() . = ..() - access = get_all_accesses() + list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) assignment = "Anchorpoint Station Marine Smartgunner" rank = JOB_SQUAD_SMARTGUN @@ -670,7 +621,6 @@ /datum/equipment_preset/uscm/cmb/smartgunner/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3/custom, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/hp, WEAR_IN_ACCESSORY) @@ -679,7 +629,6 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) @@ -688,3 +637,4 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/smartgunner/full/, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headband/red, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index c318eb6b76d4..62495ac59213 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -8,7 +8,7 @@ /datum/equipment_preset/contractor/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_all_main_access() /datum/equipment_preset/contractor/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(80;MALE,20;FEMALE) @@ -57,7 +57,7 @@ /datum/equipment_preset/contractor/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_all_main_access() /datum/equipment_preset/dust_raider/load_name(mob/living/carbon/human/new_human) @@ -598,7 +598,7 @@ /datum/equipment_preset/contractor/covert/heavy/New() . = ..() - access = get_antagonist_pmc_access() + access = get_weyland_pmc_access() /datum/equipment_preset/contractor/covert/heavy/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) @@ -651,7 +651,7 @@ /datum/equipment_preset/contractor/covert/engi/New() . = ..() - access = get_antagonist_pmc_access() + access = get_weyland_pmc_access() /datum/equipment_preset/contractor/covert/engi/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_davisone, WEAR_BODY) @@ -703,7 +703,7 @@ /datum/equipment_preset/contractor/covert/medic/New() . = ..() - access = get_antagonist_pmc_access() + access = get_weyland_pmc_access() /datum/equipment_preset/contractor/covert/medic/load_gear(mob/living/carbon/human/new_human) //clothing diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 08389ed00a60..02671cc02a93 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -217,7 +217,7 @@ /datum/equipment_preset/corpse/clown/New() . = ..() //As a joke, clown has all access so they can clown everywhere... - access = get_all_accesses() + access = get_all_main_access() /datum/equipment_preset/corpse/clown/load_name(mob/living/carbon/human/new_human, randomise) . = ..() //To load gender, randomise appearance, etc. @@ -711,7 +711,7 @@ assignment = "Colonial Liberation Front Soldier" idtype = /obj/item/card/id/silver xenovictim = FALSE - faction = FACTION_UPP + faction = FACTION_CLF access = list( ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, @@ -753,6 +753,7 @@ assignment = "Union of Progressive Peoples Soldier" idtype = /obj/item/card/id/silver xenovictim = FALSE + faction = FACTION_UPP access = list( ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, @@ -792,10 +793,10 @@ /datum/equipment_preset/corpse/pmc name = "Corpse - Weyland-Yutani PMC (Standard)" flags = EQUIPMENT_PRESET_START_OF_ROUND - assignment = "Weyland-Yutani PMC (Standard)" + assignment = JOB_PMC_STANDARD faction = FACTION_PMC faction_group = FACTION_LIST_WY - rank = JOB_PMC + rank = JOB_PMC_STANDARD paygrade = "PMC-OP" idtype = /obj/item/card/id/pmc skills = /datum/skills/civilian/survivor/pmc diff --git a/code/modules/gear_presets/dust_raider.dm b/code/modules/gear_presets/dust_raider.dm index 0f62ae71fbb7..e6464d56085e 100644 --- a/code/modules/gear_presets/dust_raider.dm +++ b/code/modules/gear_presets/dust_raider.dm @@ -83,7 +83,6 @@ //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) add_common_wo_equipment(new_human) //Backup SMG Weapon diff --git a/code/modules/gear_presets/forcon_survivors.dm b/code/modules/gear_presets/forcon_survivors.dm index c18582ff44e1..a883759a2f7f 100644 --- a/code/modules/gear_presets/forcon_survivors.dm +++ b/code/modules/gear_presets/forcon_survivors.dm @@ -158,7 +158,6 @@ skills = /datum/skills/military/survivor/forecon_smartgunner /datum/equipment_preset/survivor/forecon/smartgunner/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_R_HAND) ..() new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911(new_human), WEAR_IN_BELT) diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index 19eb64942f10..3930f6fb9999 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -246,7 +246,7 @@ /datum/equipment_preset/fun/santa/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_global_access() /datum/equipment_preset/fun/santa/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE @@ -342,7 +342,7 @@ /datum/equipment_preset/fun/van_bandolier/New() . = ..() - access = get_all_accesses() + access = get_global_access() /datum/equipment_preset/fun/van_bandolier/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 6dd3f830eb12..c2beca202e84 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -38,7 +38,7 @@ /datum/equipment_preset/other/freelancer/New() . = ..() - access = get_all_accesses() + access = get_all_main_access() /datum/equipment_preset/other/freelancer/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(60;MALE,40;FEMALE) @@ -247,7 +247,7 @@ /datum/equipment_preset/other/elite_merc/New() . = ..() - access = get_all_accesses() + access = get_all_main_access() /datum/equipment_preset/other/elite_merc/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(70;MALE,30;FEMALE) @@ -280,7 +280,7 @@ /datum/equipment_preset/other/elite_merc/standard/New() . = ..() - access = get_antagonist_pmc_access() + access = get_weyland_pmc_access() /datum/equipment_preset/other/elite_merc/standard/load_gear(mob/living/carbon/human/new_human) //TODO: add unique backpacks and satchels @@ -321,7 +321,7 @@ /datum/equipment_preset/other/elite_merc/heavy/New() . = ..() - access = get_antagonist_pmc_access() + access = get_weyland_pmc_access() /datum/equipment_preset/other/elite_merc/heavy/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels @@ -365,7 +365,7 @@ /datum/equipment_preset/other/elite_merc/engineer/New() . = ..() - access = get_antagonist_pmc_access() + access = get_weyland_pmc_access() /datum/equipment_preset/other/elite_merc/engineer/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels @@ -422,7 +422,7 @@ /datum/equipment_preset/other/elite_merc/medic/New() . = ..() - access = get_antagonist_pmc_access() + access = get_weyland_pmc_access() /datum/equipment_preset/other/elite_merc/medic/load_gear(mob/living/carbon/human/new_human) //webbing @@ -472,7 +472,7 @@ /datum/equipment_preset/other/elite_merc/leader/New() . = ..() - access = get_antagonist_pmc_access() + access = get_weyland_pmc_access() /datum/equipment_preset/other/elite_merc/leader/load_gear(mob/living/carbon/human/new_human) //clothes @@ -512,7 +512,7 @@ /datum/equipment_preset/other/business_person/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_all_main_access() /datum/equipment_preset/other/business_person/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels @@ -562,7 +562,7 @@ /datum/equipment_preset/other/pizza/New() . = ..() - access = get_freelancer_access() + access = get_civil_ert_access() /datum/equipment_preset/other/pizza/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE,FEMALE) @@ -607,7 +607,7 @@ /datum/equipment_preset/other/souto/New() . = ..() - access = get_freelancer_access() + access = get_civil_ert_access() /datum/equipment_preset/other/souto/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE @@ -789,7 +789,7 @@ /datum/equipment_preset/other/xeno_cultist/New() . = ..() - access = get_all_civilian_accesses() + access = get_all_civilian_access() /datum/equipment_preset/other/xeno_cultist/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain/cultist(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 3e111ce3fa30..59f1b9e09cdf 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -12,7 +12,7 @@ /datum/equipment_preset/pmc/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + get_antagonist_access() + access = get_weyland_pmc_access() /datum/equipment_preset/pmc/load_name(mob/living/carbon/human/new_human, randomise) @@ -59,8 +59,8 @@ name = "Weyland-Yutani PMC (Standard)" flags = EQUIPMENT_PRESET_EXTRA - assignment = "Weyland-Yutani PMC (Standard)" - rank = JOB_PMC + assignment = JOB_PMC_STANDARD + rank = JOB_PMC_STANDARD paygrade = "PMC-OP" skills = /datum/skills/pmc @@ -139,17 +139,17 @@ list("M276 M40 Grenade Rig (Empty)", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -201,8 +201,8 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), name = "Weyland-Yutani PMC (Detainer)" flags = EQUIPMENT_PRESET_EXTRA - assignment = "Weyland-Yutani PMC (Detainer)" - rank = JOB_PMC + assignment = JOB_PMC_DETAINER + rank = JOB_PMC_DETAINER paygrade = "PMC-EN" skills = /datum/skills/pmc @@ -268,17 +268,17 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig (Empty)", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -401,23 +401,23 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -579,23 +579,23 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -759,19 +759,19 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -898,19 +898,19 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -995,8 +995,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/splint, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/cell/hyper, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/pmc, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/smartgun_battery, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/dirty, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/large/vp78, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) @@ -1021,17 +1020,17 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M280 Smartgunner Drum Belt", 0, /obj/item/storage/belt/marine/smartgunner, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1144,17 +1143,17 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1203,7 +1202,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), name = "Weyland-Yutani PMC (Crewman)" flags = EQUIPMENT_PRESET_EXTRA - assignment = "Weyland-Yutani PMC (Crewman)" + assignment = JOB_PMC_CREWMAN rank = JOB_PMC_CREWMAN paygrade = "PMC-VS" skills = /datum/skills/pmc/tank_crew @@ -1252,19 +1251,19 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1400,19 +1399,19 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch (Full)", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1546,23 +1545,23 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1717,20 +1716,20 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Bayonet Sheath (Full)", 0, /obj/item/storage/pouch/bayonet, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Small Document Pouch", 0, /obj/item/storage/pouch/document/small, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1950,27 +1949,27 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Document Pouch", 0, /obj/item/storage/pouch/document, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (Oxycodone)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Revival Mix)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Oxycodone)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 0, /obj/item/storage/pouch/machete/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), ) diff --git a/code/modules/gear_presets/survivors.dm b/code/modules/gear_presets/survivors.dm index d29498ee9f89..42d5ec0915bb 100644 --- a/code/modules/gear_presets/survivors.dm +++ b/code/modules/gear_presets/survivors.dm @@ -961,6 +961,7 @@ /datum/equipment_preset/survivor/colonial_marshal/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) add_ice_colony_survivor_equipment(new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) @@ -1007,6 +1008,7 @@ name = "Survivor - Solaris Colonial Marshal Deputy" assignment = "CMB Deputy" + /datum/equipment_preset/survivor/colonial_marshal/solaris/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) @@ -1057,6 +1059,7 @@ /datum/equipment_preset/survivor/interstellar_commerce_commission_liason/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY) + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) add_ice_colony_survivor_equipment(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 50c2edfea3eb..f2a5283e2a26 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -9,7 +9,7 @@ /datum/equipment_preset/synth/New() . = ..() - access = get_all_accesses() + access = get_global_access() /datum/equipment_preset/synth/load_race(mob/living/carbon/human/new_human) if(new_human.client?.prefs?.synthetic_type) @@ -141,7 +141,7 @@ /datum/equipment_preset/synth/survivor/New() . = ..() - access = get_all_civilian_accesses() + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_CORPORATE //Access to civillians stuff + medbay stuff + engineering stuff + research + access = get_all_civilian_access() + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_CORPORATE //Access to civillians stuff + medbay stuff + engineering stuff + research /datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human) for(var/equipment in equipment_to_spawn) @@ -454,7 +454,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/synth/working_joe - name = "Working Joe" + name = "Synthetic - Working Joe" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE faction = FACTION_MARINE faction_group = list(FACTION_MARINE) @@ -465,7 +465,7 @@ /datum/equipment_preset/synth/working_joe/New() . = ..() - access = get_all_accesses() + access = get_global_access() /datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_WORKING_JOE) @@ -475,7 +475,7 @@ /datum/equipment_preset/synth/working_joe/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET) //don't remove shrap by yourself, go to android maintenance or have ARES call a human handler! new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) @@ -486,11 +486,47 @@ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bucket(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/mop(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/wet_sign(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/lights/mixed(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/bag/trash(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/circuitboard/apc(new_human.back), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/circuitboard/airlock(new_human.back), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/cell(new_human.back), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/cell(new_human.back), WEAR_IN_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/lightreplacer(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/glass/medium_stack(new_human.back), WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/maintenance_jack(new_human), WEAR_J_STORE) + +/datum/equipment_preset/synth/working_joe/engi + name = "Synthetic - Hazmat Joe" + +/datum/equipment_preset/synth/working_joe/engi/load_gear(mob/living/carbon/human/new_human) + var/choice = rand(1,2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/joe(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mt(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/joe(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/inflatable/door(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/inflatable/door(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/inflatable(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/inflatable(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/maintenance_jack(new_human), WEAR_J_STORE) + + switch(choice) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe/engi(new_human), WEAR_BODY) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/joe/engi/overalls(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/lightreplacer(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(new_human.back), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/glass/large_stack(new_human.back), WEAR_IN_R_STORE) + /datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human) . = ..() new_human.h_style = "Bald" @@ -589,7 +625,7 @@ /datum/equipment_preset/synth/infiltrator/New() . = ..() - access = get_all_accesses() + access = get_global_access() /datum/equipment_preset/synth/infiltrator/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE,FEMALE) diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 35b4f5fe68c8..2f7148302485 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -177,16 +177,16 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -307,19 +307,19 @@ list("Type 41 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Utilities)", 0, /obj/item/storage/pouch/medical/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Utilities)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -472,18 +472,18 @@ list("Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (Choose 2)", 0, null, null, null), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), @@ -610,16 +610,16 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -735,16 +735,16 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -857,18 +857,18 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1011,18 +1011,18 @@ list("Type 43 Military Police Rig", 0, /obj/item/storage/belt/security/MP/UPP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1174,18 +1174,18 @@ list("Type 47 Pistol Holster Rig NY", 0, /obj/item/storage/belt/gun/type47/NY, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1331,18 +1331,18 @@ list("Type 47 Pistol Holster Rig NY", 0, /obj/item/storage/belt/gun/type47/NY/shrapnel, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1488,18 +1488,18 @@ list("Type 47 Pistol Holster Rig NY", 0, /obj/item/storage/belt/gun/type47/NY/shrapnel, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1646,18 +1646,18 @@ list("Type 47 Pistol Holster Rig NY", 0, /obj/item/storage/belt/gun/type47/NY/shrapnel, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -1900,18 +1900,18 @@ list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Construction Pouch", 0, /obj/item/storage/pouch/construction, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK", 0, null, null, null), list("Sterile mask", 0, /obj/item/clothing/mask/surgical, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) @@ -2062,9 +2062,9 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -2103,6 +2103,10 @@ idtype = /obj/item/card/id/data languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_TSL, LANGUAGE_SPANISH, LANGUAGE_CHINESE) +/datum/equipment_preset/upp/commando/New() + . = ..() + access = get_global_access() + /datum/equipment_preset/upp/commando/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo, WEAR_L_EAR) @@ -2151,18 +2155,18 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/PK9/tranq, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -2281,19 +2285,19 @@ list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -2442,18 +2446,18 @@ list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/PK9/tranq, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), @@ -2583,14 +2587,14 @@ list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/tank, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/tank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), @@ -2714,16 +2718,16 @@ list("Type 41 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_RECOMMENDED), - list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), - list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, (MARINE_CAN_BUY_R_POUCH|MARINE_CAN_BUY_L_POUCH), VENDOR_ITEM_REGULAR), + list("Auto-Injector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Medical Pouch (Splints)", 0, /obj/item/storage/pouch/medical/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch (Pills)", 0, /obj/item/storage/pouch/medical/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medkit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 2bae28c7fa76..6165a7eaaa56 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -33,13 +33,17 @@ if(!GLOB.data_core.manifest_modify(new_human.real_name, WEAKREF(new_human), assignment, rank)) GLOB.data_core.manifest_inject(new_human) + var/obj/item/card/id/ID = new_human.wear_id + var/datum/money_account/acct = create_account(new_human, rand(30, 50), GLOB.paygrades[ID.paygrade]) + ID.associated_account_number = acct.account_number + var/datum/squad/auto_squad = get_squad_by_name(auto_squad_name) if(auto_squad) transfer_marine_to_squad(new_human, auto_squad, new_human.assigned_squad, new_human.wear_id) if(!auto_squad.active) auto_squad.engage_squad(FALSE) - new_human.marine_buy_flags &= ~MARINE_CAN_BUY_EAR + new_human.marine_buyable_categories[MARINE_CAN_BUY_EAR] = 0 new_human.sec_hud_set_ID() new_human.hud_set_squad() @@ -127,11 +131,10 @@ /datum/equipment_preset/uscm/sg/full/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(new_human), WEAR_EYES) @@ -547,21 +550,17 @@ /datum/equipment_preset/uscm/smartgunner_equipped/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) - //Backup SMG Weapon + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles(new_human), WEAR_EYES) /datum/equipment_preset/uscm/smartgunner_equipped/cryo name = "USCM Cryo Squad Smartgunner (Equipped)" @@ -786,7 +785,7 @@ /datum/equipment_preset/uscm/marsoc/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_global_access() /datum/equipment_preset/uscm/marsoc/load_gear(mob/living/carbon/human/new_human) //back diff --git a/code/modules/gear_presets/uscm_dress.dm b/code/modules/gear_presets/uscm_dress.dm index cf95bca252cc..600b8dcce1b2 100644 --- a/code/modules/gear_presets/uscm_dress.dm +++ b/code/modules/gear_presets/uscm_dress.dm @@ -111,7 +111,7 @@ /datum/equipment_preset/uscm_event/dress/officer/capt/New() . = ..() - access = get_all_marine_access() - ACCESS_MARINE_CAPTAIN + access = get_main_marine_access() /datum/equipment_preset/uscm_event/dress/officer/co name = "Dress Blues - (O-4) Major" diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 52e7b2a83e48..1af69f567077 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -39,7 +39,7 @@ /datum/equipment_preset/uscm_event/colonel/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_global_access() /datum/equipment_preset/uscm_event/colonel/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR) @@ -74,7 +74,7 @@ /datum/equipment_preset/uscm_event/general/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_global_access() /datum/equipment_preset/uscm_event/general/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels @@ -206,7 +206,7 @@ /datum/equipment_preset/uscm_event/provost/New() . = ..() - access = get_all_marine_access() + access = get_global_access() /datum/equipment_preset/uscm_event/provost/enforcer name = "Provost Enforcer (ME5)" @@ -485,7 +485,7 @@ /datum/equipment_preset/uscm_event/uaac/tis/New() . = ..() - access = get_all_marine_access() + access = get_global_access() /datum/equipment_preset/uscm_event/uaac/tis/io name = "UAAC-TIS Intelligence Officer (NO2)" diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 5b921f07f219..2b8cb2ce453c 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -204,7 +204,7 @@ /datum/equipment_preset/uscm_ship/uscm_police/riot_mp/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_main_marine_access() /datum/equipment_preset/uscm_ship/uscm_police/riot_mp/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 1569d282807e..7aa9eabb3042 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -198,6 +198,7 @@ ACCESS_MARINE_MAINT, ACCESS_MARINE_OT, ACCESS_MARINE_SYNTH, + ACCESS_MARINE_AI, ) assignment = JOB_CHIEF_ENGINEER rank = JOB_CHIEF_ENGINEER @@ -510,7 +511,7 @@ /datum/equipment_preset/uscm_ship/xo/New() . = ..() - access = get_all_marine_access() - ACCESS_MARINE_CAPTAIN + access = get_main_marine_access() /datum/equipment_preset/uscm_ship/xo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -581,7 +582,7 @@ /datum/equipment_preset/uscm_ship/sea/New() . = ..() - access = get_all_marine_access() - ACCESS_MARINE_CAPTAIN + access = get_main_marine_access() /datum/equipment_preset/uscm_ship/sea/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -733,7 +734,7 @@ /datum/equipment_preset/uscm_ship/officer/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_all_marine_access() /datum/equipment_preset/uscm_ship/officer/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 3c242cd506d3..78128c32a44a 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -13,7 +13,7 @@ /datum/equipment_preset/pmc/w_y_whiteout/New() . = ..() - access = get_antagonist_pmc_access() + access = get_global_access() /datum/equipment_preset/pmc/w_y_whiteout/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_COMBAT) @@ -136,10 +136,7 @@ role_comm_title = "WO-TT" /datum/equipment_preset/pmc/w_y_whiteout/terminator/load_gear(mob/living/carbon/human/new_human) - // back - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack/pmc, WEAR_BACK) //face - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/whiteout, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) //head @@ -166,6 +163,8 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/whiteout, WEAR_EYES) + var/obj/item/device/internal_implant/agility/implant = new() implant.on_implanted(new_human) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 5ca610c06434..1033a5f14db3 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -109,7 +109,7 @@ /datum/equipment_preset/wo/xo/New() . = ..() - access = get_all_marine_access() + access = get_main_marine_access() /datum/equipment_preset/wo/xo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -156,8 +156,6 @@ //jacket new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) - //back - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_BACK) //head new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor/com(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/chiefofficer(new_human), WEAR_HEAD) @@ -702,10 +700,8 @@ skills = /datum/skills/smartgunner /datum/equipment_preset/wo/marine/sg/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/smartgun_powerpack(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index 8532391dd2c5..c773ea9b9b4e 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -21,7 +21,7 @@ /datum/equipment_preset/wy/New() . = ..() - access += get_all_civilian_accesses() + get_all_centcom_access() + access += get_all_civilian_access() + get_all_weyland_access() /datum/equipment_preset/wy/load_id(mob/living/carbon/human/new_human) . = ..() @@ -86,7 +86,7 @@ /datum/equipment_preset/wy/manager/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_global_access() /datum/equipment_preset/wy/manager/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) @@ -103,7 +103,7 @@ paygrade = "WYC7" /datum/equipment_preset/wy/manager/division_manager - name = "Corporate - new_human - Division Manager" + name = "Corporate - H - Division Manager" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_DIVISION_MANAGER rank = JOB_DIVISION_MANAGER diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index 8bc4cd1ad681..753693ef31f9 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -9,7 +9,7 @@ /datum/equipment_preset/goon/New() . = ..() - access = get_all_accesses() + get_all_centcom_access() + access = get_all_main_access() /datum/equipment_preset/goon/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm index 0cd73d499e35..e8eee898a711 100644 --- a/code/modules/mapping/preloader.dm +++ b/code/modules/mapping/preloader.dm @@ -22,10 +22,12 @@ GLOBAL_DATUM_INIT(_preloader, /datum/map_preloader, new) value = deepCopyList(value) what.vars[attribute] = value +/// Area passthrough: do not instanciate a new area, reuse the current one /area/template_noop name = "Area Passthrough" icon_state = "noop" +/// Turf passthrough: do not instanciate a new turf, reuse the current one /turf/template_noop name = "Turf Passthrough" icon_state = "noop" diff --git a/code/modules/maptext_alerts/screen_alerts.dm b/code/modules/maptext_alerts/screen_alerts.dm index 1fed8b2da551..e96b436bde21 100644 --- a/code/modules/maptext_alerts/screen_alerts.dm +++ b/code/modules/maptext_alerts/screen_alerts.dm @@ -1,28 +1,25 @@ +/* +* These are ported from TGMC and are hopefully more flexible than text blurbs +*/ + /** * proc for playing a screen_text on a mob. * enqueues it if a screen text is running and plays i otherwise * Arguments: * * text: text we want to be displayed * * alert_type: typepath for screen text type we want to play here + * * override_color: the color of the text to use */ - -/* -* These are ported from TGMC and are hopefully more flexible than text blurbs -*/ - /mob/proc/play_screen_text(text, alert_type = /atom/movable/screen/text/screen_text, override_color = "#FFFFFF") - if(!client) - return var/atom/movable/screen/text/screen_text/text_box = new alert_type() text_box.text_to_play = text + text_box.player = client if(override_color) text_box.color = override_color + LAZYADD(client.screen_texts, text_box) if(LAZYLEN(client.screen_texts) == 1) //lets only play one at a time, for thematic effect and prevent overlap - INVOKE_ASYNC(text_box, TYPE_PROC_REF(/atom/movable/screen/text/screen_text, play_to_client), client) - return - client.screen_texts += text_box - + INVOKE_ASYNC(text_box, TYPE_PROC_REF(/atom/movable/screen/text/screen_text, play_to_client)) /atom/movable/screen/text/screen_text icon = null @@ -52,6 +49,8 @@ var/style_close = "" ///var for the text we are going to play var/text_to_play + ///The client that this text is for + var/client/player /atom/movable/screen/text/screen_text/command_order maptext_height = 64 @@ -65,14 +64,8 @@ style_open = "" style_close = "" -/** - * proc for actually playing this screen_text on a mob. - * Arguments: - * * player: client to play to - */ -/atom/movable/screen/text/screen_text/proc/play_to_client(client/player) - if(!player) - return +///proc for actually playing this screen_text on a mob. +/atom/movable/screen/text/screen_text/proc/play_to_client() player?.screen += src if(fade_in_time) animate(src, alpha = 255) @@ -84,37 +77,42 @@ if(reading_tag) if(text_to_play[tag_position] == ">") reading_tag = FALSE - lines_to_skip += tag_position - else - lines_to_skip += tag_position + lines_to_skip += tag_position tag_position++ else tag_position = findtext(text_to_play, html_locate_regex, tag_position) reading_tag = TRUE + for(var/letter = 2 to length(text_to_play) + letters_per_update step letters_per_update) if(letter in lines_to_skip) continue maptext = "[style_open][copytext_char(text_to_play, 1, letter)][style_close]" sleep(play_delay) - addtimer(CALLBACK(src, PROC_REF(after_play), player), fade_out_delay) + + addtimer(CALLBACK(src, PROC_REF(after_play)), fade_out_delay) ///handles post-play effects like fade out after the fade out delay -/atom/movable/screen/text/screen_text/proc/after_play(client/player) - if(!player) - return +/atom/movable/screen/text/screen_text/proc/after_play() if(!fade_out_time) - end_play(player) + end_play() return + animate(src, alpha = 0, time = fade_out_time) - addtimer(CALLBACK(src, PROC_REF(end_play), player), fade_out_time) + addtimer(CALLBACK(src, PROC_REF(end_play)), fade_out_time) ///ends the play then deletes this screen object and plays the next one in queue if it exists -/atom/movable/screen/text/screen_text/proc/end_play(client/player) +/atom/movable/screen/text/screen_text/proc/end_play() if(!player) + qdel(src) return + player.screen -= src LAZYREMOVE(player.screen_texts, src) qdel(src) - if(!LAZYLEN(player.screen_texts)) + + if(QDELETED(player)) + QDEL_NULL_LIST(player.screen_texts) return - player.screen_texts[1].play_to_client(player) + + if(LAZYLEN(player.screen_texts)) + player.screen_texts[1].play_to_client() // Theres more? diff --git a/code/modules/mentor/mentorhelp.dm b/code/modules/mentor/mentorhelp.dm index 8413b6d118e6..84dacf4f8bfb 100644 --- a/code/modules/mentor/mentorhelp.dm +++ b/code/modules/mentor/mentorhelp.dm @@ -108,28 +108,28 @@ sound_to(recipient, 'sound/effects/mhelp.ogg') to_chat(recipient, wrap_message(msg, sender)) - for(var/client/C in GLOB.admins) + for(var/client/admin_client in GLOB.admins) var/formatted = msg var/soundfile - if(!C || C == recipient) + if(!admin_client || admin_client == recipient) continue // Initial broadcast - else if(!staff_only && !recipient && CLIENT_HAS_RIGHTS(C, R_MENTOR)) + else if(!staff_only && !recipient && CLIENT_HAS_RIGHTS(admin_client, R_MENTOR)) formatted = wrap_message(formatted, sender) soundfile = 'sound/effects/mhelp.ogg' - // Staff eavesdrop - else if(CLIENT_HAS_RIGHTS(C, R_MENTOR) && CLIENT_IS_STAFF(C)) + // Eavesdrop + else if(CLIENT_HAS_RIGHTS(admin_client, R_MENTOR) && (!staff_only || CLIENT_IS_STAFF(admin_client)) && admin_client != sender) if(include_keys) formatted = SPAN_MENTORHELP(key_name(sender, TRUE) + " -> " + key_name(recipient, TRUE) + ": ") + msg else continue - if(soundfile && with_sound && (C.prefs?.toggles_sound & SOUND_ADMINHELP)) - sound_to(C, soundfile) - to_chat(C, formatted) + if(soundfile && with_sound && (admin_client.prefs?.toggles_sound & SOUND_ADMINHELP)) + sound_to(admin_client, soundfile) + to_chat(admin_client, formatted) return // Makes the sender input a message and sends it diff --git a/code/modules/mob/camera/imaginary_friend.dm b/code/modules/mob/camera/imaginary_friend.dm index 826a4db29891..054dd6ea8ff4 100644 --- a/code/modules/mob/camera/imaginary_friend.dm +++ b/code/modules/mob/camera/imaginary_friend.dm @@ -39,7 +39,7 @@ /mob/camera/imaginary_friend/Initialize(mapload, mob/owner) . = ..() - if(!owner) + if(!owner || !owner.client) return INITIALIZE_HINT_QDEL src.owner = owner diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 20c8b7f374db..fcb95a6fd783 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -33,8 +33,8 @@ plane = GHOST_PLANE layer = ABOVE_FLY_LAYER stat = DEAD - var/adminlarva = 0 - var/ghostvision = 1 + var/adminlarva = FALSE + var/ghostvision = TRUE var/can_reenter_corpse var/started_as_observer //This variable is set to 1 when you enter the game as an observer. //If you died in the game and are a ghost - this will remain as null. @@ -45,7 +45,7 @@ "Squad HUD" = FALSE, "Xeno Status HUD" = FALSE ) - universal_speak = 1 + universal_speak = TRUE var/updatedir = TRUE //Do we have to update our dir as the ghost moves around? var/atom/movable/following = null var/datum/orbit_menu/orbit_menu @@ -55,6 +55,8 @@ var/own_orbit_size = 0 var/observer_actions = list(/datum/action/observer_action/join_xeno) var/datum/action/minimap/observer/minimap + var/larva_queue_cached_message + alpha = 127 /mob/dead/observer/verb/toggle_ghostsee() @@ -327,8 +329,8 @@ Works together with spawning an observer, noted above. ghost.langchat_make_image() SStgui.on_transfer(src, ghost) - if(is_admin_level(z)) - ghost.timeofdeath = 0 // Bypass respawn limit if you die on the admin zlevel + if(is_admin_level((get_turf(src))?.z)) // Gibbed humans ghostize the brain in their head which itself is z 0 + ghost.timeofdeath = 1 // Bypass respawn limit if you die on the admin zlevel ghost.key = key ghost.mind = mind @@ -363,6 +365,12 @@ Works together with spawning an observer, noted above. if(ghost.client.player_data) ghost.client.player_data.load_timestat_data() + // Larva queue: We use the larger of their existing queue time or the new timeofdeath except for facehuggers + // We don't change facehugger timeofdeath because they are still on cooldown if they died as a hugger + // Facehuggers are atleast 1 because they did get some action compared to those at 0 timeofdeath + var/new_tod = isfacehugger(src) ? 1 : ghost.timeofdeath + ghost.client.larva_queue_time = max(ghost.client.larva_queue_time, new_tod) + ghost.set_huds_from_prefs() return ghost @@ -386,7 +394,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/list/options = list("Ghost", "Stay in body") if(check_rights(R_MOD)) options = list("Aghost") + options - var/response = tgui_alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to return to your body. You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", options) + var/text_prompt = "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to return to your body. You can't change your mind so choose wisely!)" + var/is_nested = (buckled && istype(buckled, /obj/structure/bed/nest)) ? TRUE : FALSE + var/obj/structure/bed/nest/nest = FALSE + if(is_nested) + text_prompt += "\nSince you're nested, you will be given a chance to reenter your body upon being freed." + nest = buckled + var/response = tgui_alert(src, text_prompt, "Are you sure you want to ghost?", options) if(response == "Aghost") client.admin_ghost() return @@ -396,9 +410,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(location) //to avoid runtime when a mob ends up in nullspace msg_admin_niche("[key_name_admin(usr)] has ghosted. [ADMIN_JMP(location)]") log_game("[key_name_admin(usr)] has ghosted.") - var/mob/dead/observer/ghost = ghostize(FALSE) //FALSE parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 + var/mob/dead/observer/ghost = ghostize((is_nested && nest && !QDELETED(nest))) //FALSE parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 if(ghost && !is_admin_level(z)) ghost.timeofdeath = world.time + ghost.client?.larva_queue_time = world.time + if(is_nested && nest && !QDELETED(nest)) + ghost.can_reenter_corpse = FALSE + nest.ghost_of_buckled_mob = ghost /mob/dead/observer/Move(atom/newloc, direct) following = null @@ -433,6 +451,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp for(var/obj/effect/step_trigger/S in new_turf) //<-- this is dumb S.Crossed(src) + // CRUTCH because ghost don't respect normal movement rules + SEND_SIGNAL(new_turf, COMSIG_TURF_ENTERED, src) + SEND_SIGNAL(src, COMSIG_GHOST_MOVED, new_turf) + /mob/dead/observer/get_examine_text(mob/user) return list(desc) @@ -1061,6 +1083,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!(RoleAuthority.roles_whitelist[key_to_use] & WHITELIST_PREDATOR)) return + if(!SSticker.mode) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(toggle_predator_action))) + return + if(SSticker.mode.flags_round_type & MODE_PREDATOR) if(locate(/datum/action/join_predator) in actions) return diff --git a/code/modules/mob/language/languages.dm b/code/modules/mob/language/languages.dm index 546c2bf7714f..e5b693e02b80 100644 --- a/code/modules/mob/language/languages.dm +++ b/code/modules/mob/language/languages.dm @@ -147,7 +147,7 @@ /datum/language/apollo name = LANGUAGE_APOLLO - desc = "The Apollo Link is an AI subprocessor designed by SEEGSON, allowing for coordination of maintenance drones and Working Joes. WY denies claims the processor was stolen for ARES." + desc = "The APOLLO Link is an AI subprocessor designed by SEEGSON, allowing for coordination of maintenance drones and Working Joes. WY denies claims the processor was stolen for ARES." color = "skrell" speech_verb = "states" ask_verb = "queries" @@ -166,6 +166,8 @@ var/message_body = "broadcasts, \"[message]\"" GLOB.STUI.game.Add("\[[time_stamp()]]APOLLO: [key_name(speaker)] : [message]
") GLOB.STUI.processing |= STUI_LOG_GAME_CHAT + log_say("[speaker.name != "Unknown" ? speaker.name : "([speaker.real_name])"] \[APOLLO\]: [message] (CKEY: [speaker.key]) (JOB: [speaker.job])") + log_ares_apollo(speaker.real_name, message) for (var/mob/dead in GLOB.dead_mob_list) if(!istype(dead,/mob/new_player) && !istype(dead,/mob/living/brain)) //No meta-evesdropping dead.show_message("[message_start] [message_body]", SHOW_MESSAGE_VISIBLE) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c5fed21671c4..d01416b2443f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1722,3 +1722,10 @@ to_chat(src, SPAN_DANGER("You are currently unable to throw harmful items.")) return . = ..() + +/mob/living/carbon/human/equip_to_slot_if_possible(obj/item/equipping_item, slot, ignore_delay = 1, del_on_fail = 0, disable_warning = 0, redraw_mob = 1, permanent = 0) + + if(SEND_SIGNAL(src, COMSIG_HUMAN_ATTEMPTING_EQUIP, equipping_item, slot) & COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP) + return FALSE + + . = ..() diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 16d456867f91..7f9801145a8e 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -121,7 +121,7 @@ //moved from IDs to prevent some exploits and to make points more flexible var/marine_points = MARINE_TOTAL_BUY_POINTS var/marine_snowflake_points = MARINE_TOTAL_SNOWFLAKE_POINTS - var/marine_buy_flags = MARINE_CAN_BUY_ALL + var/marine_buyable_categories = MARINE_CAN_BUY_ALL var/spawned_corpse = FALSE // For the corpse spawner //taken from blood.dm @@ -158,9 +158,6 @@ var/datum/action/human_action/activable/selected_ability - /// misc human flags - var/flags_human_misc = 0 - ///list of weakrefs of recently dropped objects var/list/remembered_dropped_objects = list() diff --git a/code/modules/mob/living/carbon/human/life/handle_organs.dm b/code/modules/mob/living/carbon/human/life/handle_organs.dm index 605d1f6612c0..8d0a0dbc3e15 100644 --- a/code/modules/mob/living/carbon/human/life/handle_organs.dm +++ b/code/modules/mob/living/carbon/human/life/handle_organs.dm @@ -1,4 +1,3 @@ -#define NO_IB_LIMBS list("l_foot","r_foot","l_hand","r_hand") // Takes care of organ & limb related updates, such as broken and missing limbs /mob/living/carbon/human/proc/handle_organs() @@ -25,7 +24,7 @@ var/damage = rand(3,5) I.take_damage(damage) pain.apply_pain(damage * PAIN_ORGAN_DAMAGE_MULTIPLIER) - if(E.is_broken() && prob(2) && !(E.name in NO_IB_LIMBS)) + if(E.is_broken() && prob(2)) var/damage = rand(3,5) var/datum/wound/internal_bleeding/internal_bleed = new E.add_bleeding(internal_bleed, TRUE, damage) @@ -60,5 +59,3 @@ emote("pain") custom_pain("You can't stand on broken legs!", 1) apply_effect(5, WEAKEN) - -#undef NO_IB_LIMBS diff --git a/code/modules/mob/living/carbon/human/life/life_helpers.dm b/code/modules/mob/living/carbon/human/life/life_helpers.dm index fdfb0c10fa43..0339bf6ec742 100644 --- a/code/modules/mob/living/carbon/human/life/life_helpers.dm +++ b/code/modules/mob/living/carbon/human/life/life_helpers.dm @@ -200,7 +200,9 @@ if(thermal_protection_flags & BODY_FLAG_HAND_RIGHT) thermal_protection += THERMAL_PROTECTION_HAND_RIGHT - return min(1, thermal_protection) + var/list/protection_data = list("protection" = thermal_protection) + SEND_SIGNAL(src, COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS, protection_data) + return min(1, protection_data["protection"]) /mob/living/carbon/human/proc/process_glasses(obj/item/clothing/glasses/G) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 415344d04254..355f69ca05a9 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -209,6 +209,22 @@ There are several things that need to be remembered: overlays_standing[HAIR_LAYER] = hair_s apply_overlay(HAIR_LAYER) +//Call when target overlay should be added/removed +/mob/living/carbon/human/update_targeted() + remove_overlay(TARGETED_LAYER) + + var/image/holo_card_image + + if(holo_card_color) + holo_card_image = image("icon" = 'icons/effects/Targeted.dmi', "icon_state" = "holo_card_[holo_card_color]") + + if(!holo_card_image) + return + + holo_card_image.layer = -TARGETED_LAYER + overlays_standing[TARGETED_LAYER] = holo_card_image + apply_overlay(TARGETED_LAYER) + //Call when someone is gauzed or splinted, or when one of those items are removed /mob/living/carbon/human/update_med_icon() remove_overlay(MEDICAL_LAYER) diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm index 1b1577b95fe2..eb5a629760ee 100644 --- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -55,6 +55,9 @@ var/area/AR = get_area(T) if(isnull(AR) || !(AR.is_resin_allowed)) + if(AR.flags_area & AREA_UNWEEDABLE) + to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return @@ -90,6 +93,8 @@ to_chat(X, SPAN_NOTICE("You will be ready to dig a new tunnel in 4 minutes.")) playsound(X.loc, 'sound/weapons/pierce.ogg', 25, 1) + return ..() + /datum/action/xeno_action/onclick/build_tunnel/proc/cooldown_end() var/mob/living/carbon/xenomorph/X = owner to_chat(X, SPAN_NOTICE("You are ready to dig a tunnel again.")) @@ -155,7 +160,7 @@ apply_cooldown() - ..() + return ..() /datum/action/xeno_action/activable/gut name = "Gut (200)" @@ -173,7 +178,7 @@ return if(xeno.queen_gut(target)) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/onclick/psychic_whisper name = "Psychic Whisper" @@ -206,6 +211,7 @@ else to_chat(M, SPAN_XENO("You hear the voice of [X] resonate in your head. \"[msg]\"")) to_chat(X, SPAN_XENONOTICE("You said: \"[msg]\" to [M]")) + return ..() /datum/action/xeno_action/onclick/psychic_radiance name = "Psychic Radiance" @@ -236,6 +242,7 @@ var/targetstring = english_list(target_list) to_chat(X, SPAN_XENONOTICE("You said: \"[msg]\" to [targetstring]")) log_say("PsychicRadiance: [key_name(X)]->[targetstring] : [msg]") + return ..() /datum/action/xeno_action/activable/queen_give_plasma name = "Give Plasma (400)" @@ -283,6 +290,7 @@ target.flick_heal_overlay(3 SECONDS, COLOR_CYAN) apply_cooldown() to_chat(X, SPAN_XENONOTICE("You transfer some plasma to [target].")) + return ..() /datum/action/xeno_action/onclick/queen_order name = "Give Order (100)" @@ -311,6 +319,8 @@ else to_chat(X, SPAN_WARNING("You must overwatch the Xenomorph you want to give orders to.")) + return + return ..() /datum/action/xeno_action/onclick/queen_award name = "Give Royal Jelly (500)" @@ -325,6 +335,7 @@ return if(give_jelly_award(xeno.hive)) xeno.use_plasma(plasma_cost) + return ..() /datum/action/xeno_action/onclick/queen_word name = "Word of the Queen (50)" @@ -336,6 +347,7 @@ var/mob/living/carbon/xenomorph/queen/xeno = owner // We don't test or apply the cooldown here because the proc does it since verbs can activate it too xeno.hive_message() + return ..() /datum/action/xeno_action/onclick/queen_tacmap name = "View Xeno Tacmap" @@ -345,6 +357,7 @@ /datum/action/xeno_action/onclick/queen_tacmap/use_ability(atom/target) var/mob/living/carbon/xenomorph/queen/xeno = owner xeno.xeno_tacmap() + return ..() ///////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index e03f225ccade..29779480f143 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -12,6 +12,8 @@ var/hivenumber = XENO_HIVE_NORMAL var/faction = FACTION_XENOMORPH var/flags_embryo = FALSE // Used in /ciphering/predator property + /// The ckey of any player hugger that made this embryo + var/hugger_ckey /obj/item/alien_embryo/Initialize(mapload, ...) . = ..() @@ -33,6 +35,7 @@ C.med_hud_set_status() STOP_PROCESSING(SSobj, src) affected_mob = null + GLOB.player_embryo_list -= src . = ..() /obj/item/alien_embryo/process() @@ -145,19 +148,33 @@ var/mob/picked // If the bursted person themselves has Xeno enabled, they get the honor of first dibs on the new larva. - if((!isyautja(affected_mob) || (isyautja(affected_mob) && prob(20))) && istype(affected_mob.buckled, /obj/structure/bed/nest)) + if((!isyautja(affected_mob) || (isyautja(affected_mob) && prob(20))) && istype(affected_mob.buckled, /obj/structure/bed/nest)) if(affected_mob.first_xeno || (affected_mob.client && affected_mob.client.prefs && (affected_mob.client.prefs.be_special & BE_ALIEN_AFTER_DEATH) && !jobban_isbanned(affected_mob, JOB_XENOMORPH))) picked = affected_mob else if(affected_mob.mind && affected_mob.mind.ghost_mob && affected_mob.client && affected_mob.client.prefs && (affected_mob.client.prefs.be_special & BE_ALIEN_AFTER_DEATH) && !jobban_isbanned(affected_mob, JOB_XENOMORPH)) picked = affected_mob.mind.ghost_mob - if(!picked) // Get a candidate from observers var/list/candidates = get_alien_candidates() - if(candidates && candidates.len) - picked = pick(candidates) + // If they were facehugged by a player thats still in queue, they get second dibs on the new larva. + if(hugger_ckey) + for(var/mob/dead/observer/cur_obs as anything in candidates) + if(cur_obs.ckey == hugger_ckey) + picked = cur_obs + candidates -= cur_obs + message_alien_candidates(candidates, dequeued = 0) + for(var/obj/item/alien_embryo/embryo as anything in GLOB.player_embryo_list) + if(embryo.hugger_ckey == cur_obs.ckey && embryo != src) + // Skipping src just in case an admin wants to quickly check before this thing fully deletes + // If this nulls out any embryo, wow + embryo.hugger_ckey = null + break + + if(!picked) + picked = candidates[1] + message_alien_candidates(candidates, dequeued = 1) // Spawn the larva var/mob/living/carbon/xenomorph/larva/new_xeno diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm index 1f88643db764..4806f7528582 100644 --- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm @@ -140,6 +140,7 @@ if(3) hive.tier_3_xenos |= new_xeno + log_game("EVOLVE: [key_name(src)] evolved into [new_xeno].") if(mind) mind.transfer_to(new_xeno) else @@ -327,6 +328,7 @@ qdel(new_xeno) return + log_game("EVOLVE: [key_name(src)] de-evolved into [new_xeno].") if(mind) mind.transfer_to(new_xeno) else diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm index 121a231b7bf8..8b3b1d54f26d 100644 --- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm @@ -209,6 +209,11 @@ if(stat == UNCONSCIOUS) return + // Force reset throw now because [/atom/movable/proc/launch_impact] only does that later on + // If we DON'T, step()'s move below can collide, rebound, trigger this proc again, into infinite recursion + throwing = FALSE + rebounding = FALSE + if(leaping && can_hug(L, hivenumber)) attach(L) else if(L.density) @@ -241,46 +246,46 @@ throw_atom(target, 3, SPEED_FAST) return TRUE -/obj/item/clothing/mask/facehugger/proc/attach(mob/living/M, silent = FALSE, knockout_mod = 1) - if(attached || !can_hug(M, hivenumber)) +/obj/item/clothing/mask/facehugger/proc/attach(mob/living/living_mob, silent = FALSE, knockout_mod = 1, hugger_ckey = null) + if(attached || !can_hug(living_mob, hivenumber)) return FALSE // This is always going to be valid because of the can_hug check above - var/mob/living/carbon/human/H = M + var/mob/living/carbon/human/human = living_mob if(!silent) - H.visible_message(SPAN_DANGER("[src] leaps at [H]'s face!")) + human.visible_message(SPAN_DANGER("[src] leaps at [human]'s face!")) if(isxeno(loc)) //Being carried? Drop it var/mob/living/carbon/xenomorph/X = loc X.drop_inv_item_on_ground(src) - if(isturf(H.loc)) - forceMove(H.loc)//Just checkin + if(isturf(human.loc)) + forceMove(human.loc)//Just checkin - if(!H.handle_hugger_attachment(src)) + if(!human.handle_hugger_attachment(src)) return FALSE attached = TRUE - forceMove(H) + forceMove(human) icon_state = initial(icon_state) - H.equip_to_slot(src, WEAR_FACE) - H.update_inv_wear_mask() - H.disable_lights() - H.disable_special_items() - if(ishuman_strict(H)) - playsound(loc, H.gender == "male" ? 'sound/misc/facehugged_male.ogg' : 'sound/misc/facehugged_female.ogg' , 25, 0) - else if(isyautja(H)) + human.equip_to_slot(src, WEAR_FACE) + human.update_inv_wear_mask() + human.disable_lights() + human.disable_special_items() + if(ishuman_strict(human)) + playsound(loc, human.gender == "male" ? 'sound/misc/facehugged_male.ogg' : 'sound/misc/facehugged_female.ogg' , 25, 0) + else if(isyautja(human)) playsound(loc, 'sound/voice/pred_facehugged.ogg', 65, FALSE) if(!sterile) - if(!H.species || !(H.species.flags & IS_SYNTHETIC)) //synthetics aren't paralyzed - H.apply_effect(MIN_IMPREGNATION_TIME * 0.5 * knockout_mod, PARALYZE) //THIS MIGHT NEED TWEAKS + if(!human.species || !(human.species.flags & IS_SYNTHETIC)) //synthetics aren't paralyzed + human.apply_effect(MIN_IMPREGNATION_TIME * 0.5 * knockout_mod, PARALYZE) //THIS MIGHT NEED TWEAKS - addtimer(CALLBACK(src, PROC_REF(impregnate), H), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME)) + addtimer(CALLBACK(src, PROC_REF(impregnate), human, hugger_ckey), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME)) return TRUE -/obj/item/clothing/mask/facehugger/proc/impregnate(mob/living/carbon/human/target) +/obj/item/clothing/mask/facehugger/proc/impregnate(mob/living/carbon/human/target, hugger_ckey = null) if(!target || target.wear_mask != src) //Was taken off or something return if(SEND_SIGNAL(target, COMSIG_HUMAN_IMPREGNATE, src) & COMPONENT_NO_IMPREGNATE) @@ -295,6 +300,8 @@ if(!embryos) var/obj/item/alien_embryo/embryo = new /obj/item/alien_embryo(target) embryo.hivenumber = hivenumber + embryo.hugger_ckey = hugger_ckey + GLOB.player_embryo_list += embryo embryo.flags_embryo = flags_embryo flags_embryo = NO_FLAGS diff --git a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm index 902a2d06092c..46e144a1b1f5 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm @@ -74,6 +74,7 @@ if(oldXeno) to_chat(src, SPAN_XENOWARNING("You stop watching [oldXeno].")) + UnregisterSignal(oldXeno, COMSIG_PARENT_QDELETING) if(!QDELETED(oldXeno)) oldXeno.hud_set_queen_overwatch() else @@ -109,19 +110,25 @@ SEND_SIGNAL(src, COMSIG_XENO_STOP_OVERWATCH_XENO, oldXeno) oldXeno.hud_set_queen_overwatch() UnregisterSignal(src, COMSIG_MOB_MOVE_OR_LOOK) + UnregisterSignal(oldXeno, COMSIG_PARENT_QDELETING) observed_xeno = targetXeno observed_xeno.hud_set_queen_overwatch() SEND_SIGNAL(src, COMSIG_XENO_OVERWATCH_XENO, observed_xeno) RegisterSignal(src, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(overwatch_handle_mob_move_or_look)) + RegisterSignal(observed_xeno, COMSIG_PARENT_QDELETING, PROC_REF(overwatch_handle_deletion)) src.reset_view() +/mob/living/carbon/xenomorph/proc/overwatch_handle_deletion(mob/living/carbon/xenomorph/deleted, forced) + SIGNAL_HANDLER + overwatch(deleted, TRUE) + // Called from xeno Life() // Makes sure that Xeno overwatch is reset when the overwatched Xeno dies. /mob/living/carbon/xenomorph/proc/handle_overwatch() - if (observed_xeno && (observed_xeno == DEAD || QDELETED(observed_xeno))) + if (observed_xeno && (observed_xeno.stat == DEAD || QDELETED(observed_xeno))) overwatch(null, TRUE) /mob/living/carbon/xenomorph/proc/overwatch_handle_mob_move_or_look(mob/living/carbon/xenomorph/mover, actually_moving, direction, specific_direction) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index d2c099d0c1ff..22cb816f865b 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -147,7 +147,7 @@ . += "" //A simple handler for checking your state. Used in pretty much all the procs. -/mob/living/carbon/xenomorph/proc/check_state(permissive = 0) +/mob/living/carbon/xenomorph/proc/check_state(permissive = FALSE) if(!permissive) if(is_mob_incapacitated() || lying || buckled || evolving || !isturf(loc)) to_chat(src, SPAN_WARNING("You cannot do this in your current state.")) @@ -434,6 +434,9 @@ if(istype(O, /obj/structure/fence)) has_obstacle = TRUE break + if(istype(O, /obj/structure/tunnel)) + has_obstacle = TRUE + break if(istype(O, /obj/structure/bed)) if(istype(O, /obj/structure/bed/chair/dropship/passenger)) var/obj/structure/bed/chair/dropship/passenger/P = O diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm index 84f522e87171..af8f33cf1c76 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm @@ -376,4 +376,8 @@ to_chat(src, SPAN_WARNING("\The [target] doesn't use plasma.")) return FALSE + if(target == src) + to_chat(src, SPAN_WARNING("You can't transfer plasma to yourself!")) + return FALSE + return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_powers.dm index 957fc3fe337d..dff6c82efbf8 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_powers.dm @@ -56,6 +56,7 @@ X.visible_message(SPAN_XENODANGER("[X] fires a massive blast of acid at [A]!"), SPAN_XENODANGER("You fire a massive blast of acid at [A]!")) remove_stack_effects("You feel your speed return to normal!") + return TRUE /datum/action/xeno_action/activable/acid_lance/proc/stack() var/mob/living/carbon/xenomorph/X = owner @@ -103,7 +104,7 @@ return (activated_once || ..()) /datum/action/xeno_action/activable/xeno_spit/bombard/use_ability(atom/A) - ..() + . = ..() var/mob/living/carbon/xenomorph/xeno = owner if(!action_cooldown_check()) // activate c/d only if we already spit for (var/action_type in action_types_to_cd) @@ -122,7 +123,6 @@ if (!action_cooldown_check()) return - if (!xeno.check_state()) return if(sound_play) @@ -139,7 +139,8 @@ spicy_gas = new /datum/effect_system/smoke_spread/xeno_weaken else CRASH("Globber has unknown ammo [xeno.ammo]! Oh no!") - spicy_gas.set_up(1, 0, get_turf(xeno), null, 6) + var/datum/cause_data/cause_data = create_cause_data("acid shroud gas", owner) + spicy_gas.set_up(1, 0, get_turf(xeno), null, 6, new_cause_data = cause_data) spicy_gas.start() to_chat(xeno, SPAN_XENOHIGHDANGER("You dump your acid through your pores, creating a shroud of gas!")) for (var/action_type in action_types_to_cd) @@ -150,7 +151,7 @@ xeno_action.apply_cooldown_override(cooldown_duration) apply_cooldown() - return + return ..() /datum/action/xeno_action/onclick/dump_acid/proc/remove_speed_buff() if (movespeed_buff_applied && isxeno(owner)) @@ -166,9 +167,9 @@ if(!actually_moving) return - var/obj/effect/particle_effect/smoke/S = new /obj/effect/particle_effect/smoke/xeno_burn(get_turf(mover), 1, create_cause_data(initial(mover.caste_type), mover)) - S.time_to_live = 3 - S.spread_speed = 1000000 + var/obj/effect/particle_effect/smoke/xeno_burn/smoke_effect = new(get_turf(mover), 1, create_cause_data("dumped acid gas", mover)) + smoke_effect.time_to_live = 3 + smoke_effect.spread_speed = 1000000 /datum/action/xeno_action/onclick/dump_acid/remove_from() remove_speed_buff() @@ -211,7 +212,6 @@ target_turfs += get_step(left_turf, turn(dir_between, -90)) target_turfs += get_step(right_turf, turn(dir_between, 90)) - for (var/turf/T in target_turfs) if (!istype(T) || T.density) continue @@ -242,9 +242,7 @@ to_chat(X, SPAN_XENODANGER("You tap in your reserves to prepare a stronger [mine.name]!")) apply_cooldown() - ..() - return - + return ..() /datum/action/xeno_action/activable/acid_mine/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -284,35 +282,30 @@ button.overlays -= "+empowered" apply_cooldown() - ..() - return + return ..() -/datum/action/xeno_action/activable/acid_shotgun/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - if (!istype(X)) +/datum/action/xeno_action/activable/acid_shotgun/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + if (!istype(xeno)) return if (!action_cooldown_check()) return - if(!A || A.layer >= FLY_LAYER || !isturf(X.loc) || !X.check_state()) + if(!target || target.layer >= FLY_LAYER || !isturf(xeno.loc) || !xeno.check_state()) return - X.visible_message(SPAN_XENOWARNING("The [X] fires a blast of acid at [A]!"), SPAN_XENOWARNING("You fire a blast of acid at [A]!")) - - var/turf/target = locate(A.x, A.y, A.z) - var/obj/item/projectile/P = new /obj/item/projectile(X.loc, create_cause_data(initial(X.caste_type), X)) + xeno.visible_message(SPAN_XENOWARNING("The [xeno] fires a blast of acid at [target]!"), SPAN_XENOWARNING("You fire a blast of acid at [target]!")) + var/turf/target_turf = locate(target.x, target.y, target.z) + var/obj/item/projectile/proj = new(xeno.loc, create_cause_data("acid shotgun", xeno)) var/datum/ammo/ammoDatum = new ammo_type() - P.generate_bullet(ammoDatum) - - P.fire_at(target, X, X, ammoDatum.max_range, ammoDatum.shell_speed) + proj.generate_bullet(ammoDatum) + proj.fire_at(target_turf, xeno, xeno, ammoDatum.max_range, ammoDatum.shell_speed) apply_cooldown() - ..() - return - + return ..() /datum/ammo/xeno/acid_shotgun name = "acid ball" @@ -353,8 +346,9 @@ else if(stabbing_xeno.ammo == GLOB.ammo_list[/datum/ammo/xeno/boiler_gas]) var/datum/effects/neurotoxin/neuro_effect = locate() in carbon_target.effects_list if(!neuro_effect) - neuro_effect = new /datum/effects/neurotoxin(carbon_target) + neuro_effect = new(carbon_target, owner) neuro_effect.duration += 16 to_chat(carbon_target,SPAN_HIGHDANGER("You are injected with something from [stabbing_xeno]'s tailstab!")) else CRASH("Globber has unknown ammo [stabbing_xeno.ammo]! Oh no!") + return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm index 9b8d72465321..84b6c5ff5fef 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm @@ -15,6 +15,7 @@ X.tunnel(get_turf(A)) else X.burrow() + return ..() /datum/action/xeno_action/onclick/tremor name = "Tremor (100)" @@ -27,4 +28,4 @@ /datum/action/xeno_action/onclick/tremor/use_ability() var/mob/living/carbon/xenomorph/X = owner X.tremor() - ..() + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm index 515d03ddc3bb..4f104c00f92e 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm @@ -7,11 +7,16 @@ if(used_burrow || tunnel || is_ventcrawling || action_busy) return - var/turf/T = get_turf(src) - if(!T) + var/turf/current_turf = get_turf(src) + if(!current_turf) + return + + var/area/current_area = get_area(current_turf) + if(current_area.flags_area & AREA_NOTUNNEL) + to_chat(src, SPAN_XENOWARNING("There's no way to burrow here.")) return - if(istype(T, /turf/open/floor/almayer/research/containment) || istype(T, /turf/closed/wall/almayer/research/containment)) + if(istype(current_turf, /turf/open/floor/almayer/research/containment) || istype(current_turf, /turf/closed/wall/almayer/research/containment)) to_chat(src, SPAN_XENOWARNING("You can't escape this cell!")) return @@ -88,6 +93,13 @@ to_chat(src, SPAN_NOTICE("You must be burrowed to do this.")) return + if(tunnel) + tunnel = FALSE + to_chat(src, SPAN_NOTICE("You stop tunneling.")) + used_tunnel = TRUE + addtimer(CALLBACK(src, PROC_REF(do_tunnel_cooldown)), (caste ? caste.tunnel_cooldown : 5 SECONDS)) + return + if(used_tunnel) to_chat(src, SPAN_NOTICE("You must wait some time to do this.")) return @@ -120,13 +132,6 @@ to_chat(src, SPAN_WARNING("There's something solid there to stop you emerging.")) return - if(tunnel) - tunnel = FALSE - to_chat(src, SPAN_NOTICE("You stop tunneling.")) - used_tunnel = TRUE - addtimer(CALLBACK(src, PROC_REF(do_tunnel_cooldown)), (caste ? caste.tunnel_cooldown : 5 SECONDS)) - return - if(!T || T.density) to_chat(src, SPAN_NOTICE("You cannot tunnel to there!")) tunnel = TRUE @@ -136,6 +141,9 @@ /mob/living/carbon/xenomorph/proc/process_tunnel(turf/T) + if(!tunnel) + return + if(world.time > tunnel_timer) tunnel = FALSE do_tunnel(T) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm index 1f27e69e3a89..1ee32225a40d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm @@ -1,16 +1,15 @@ /datum/action/xeno_action/activable/throw_hugger/use_ability(atom/A) var/mob/living/carbon/xenomorph/carrier/X = owner X.throw_hugger(A) - ..() + return ..() /datum/action/xeno_action/activable/retrieve_egg/use_ability(atom/A) var/mob/living/carbon/xenomorph/carrier/X = owner X.retrieve_egg(A) - ..() + return ..() /datum/action/xeno_action/onclick/set_hugger_reserve/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/carrier/carrier = owner - carrier.huggers_reserved = tgui_input_number(usr, "How many facehuggers would you like to keep safe from Observers wanting to join as facehuggers?", "How many to reserve?", 0, carrier.huggers_max, carrier.huggers_reserved) - to_chat(carrier, SPAN_XENONOTICE("You reserved [carrier.huggers_reserved] facehuggers for yourself.")) + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_powers.dm index 79b86977eb7c..ce4a631e281f 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_powers.dm @@ -136,8 +136,7 @@ to_chat(H, SPAN_XENOHIGHDANGER("You are slowed as [X] knocks you off balance!")) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/crusher_stomp/charger/use_ability() var/mob/living/carbon/xenomorph/Xeno = owner @@ -183,8 +182,7 @@ to_chat(Human, SPAN_XENOHIGHDANGER("You are shaken as [Xeno] quakes the earth!")) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/crusher_shield/use_ability(atom/Target) var/mob/living/carbon/xenomorph/xeno = owner @@ -216,8 +214,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_shield)), 70, TIMER_UNIQUE|TIMER_OVERRIDE) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/crusher_shield/proc/remove_explosion_immunity() var/mob/living/carbon/xenomorph/xeno = owner @@ -274,11 +271,9 @@ COMSIG_LIVING_PRE_COLLIDE, COMSIG_XENO_STOP_MOMENTUM, COMSIG_XENO_START_CHARGING, - button.icon_state = "template" )) - if(!activated) button.icon_state = "template" - + return ..() /datum/action/xeno_action/activable/tumble/use_ability(atom/Target) if(!action_cooldown_check()) @@ -320,4 +315,4 @@ Xeno.launch_towards(LM) apply_cooldown() - ..() + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm index 76efba62c5be..67e16d4b70de 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm @@ -31,8 +31,7 @@ xeno.update_icons() apply_cooldown() - ..() - return + return ..() // Defender Headbutt /datum/action/xeno_action/activable/headbutt/use_ability(atom/target_atom) @@ -100,8 +99,7 @@ carbone.throw_atom(thrown_turf, headbutt_distance, SPEED_SLOW, src) playsound(carbone,'sound/weapons/alien_claw_block.ogg', 50, 1) apply_cooldown() - ..() - return + return ..() // Defender Tail Sweep /datum/action/xeno_action/onclick/tail_sweep/use_ability(atom/A) @@ -153,8 +151,7 @@ playsound(human,'sound/weapons/alien_claw_block.ogg', 50, 1) apply_cooldown() - ..() - return + return ..() // Defender Fortify /datum/action/xeno_action/activable/fortify/use_ability(atom/target) @@ -190,8 +187,7 @@ button.icon_state = "template" apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/fortify/action_activate() ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm index 9dede41be053..e76cc4322bdb 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm @@ -25,4 +25,4 @@ if(current_airlock.density) //if its CLOSED YOU'RE SCUTTLING AND CANNOT POUNCE!!! to_chat(owner, SPAN_WARNING("You cannot do that while squeezing and scuttling!")) return FALSE - ..() + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index 224d3136b213..824e0cc5f9fd 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -317,6 +317,7 @@ xeno.recalculate_speed() xeno.zoom_in() button.icon_state = "template_active" + return ..() /datum/action/xeno_action/onclick/toggle_long_range/proc/on_zoom_out() var/mob/living/carbon/xenomorph/xeno = owner @@ -372,10 +373,10 @@ action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_4 -/datum/action/xeno_action/activable/transfer_plasma/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - X.xeno_transfer_plasma(A, plasma_transfer_amount, transfer_delay, max_range) - ..() +/datum/action/xeno_action/activable/transfer_plasma/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + xeno.xeno_transfer_plasma(target, plasma_transfer_amount, transfer_delay, max_range) + return ..() /datum/action/xeno_action/onclick/xenohide name = "Hide" diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index 74158cbe81d6..921b61a23bc9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -47,6 +47,9 @@ var/area/AR = get_area(T) if(isnull(AR) || !(AR.is_resin_allowed)) + if(AR.flags_area & AREA_UNWEEDABLE) + to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return @@ -65,11 +68,8 @@ qdel(weed) playsound(X.loc, "alien_resin_build", 25) - apply_cooldown() - - ..() - return + return ..() /mob/living/carbon/xenomorph/lay_down() if(hardcore) @@ -94,6 +94,7 @@ var/mob/living/carbon/xenomorph/xeno = owner xeno.lay_down() button.icon_state = xeno.resting ? "template_active" : "template" + return ..() // Shift spits /datum/action/xeno_action/onclick/shift_spits/use_ability(atom/A) @@ -110,9 +111,7 @@ to_chat(X, SPAN_NOTICE("You will now spit [X.ammo.name] ([X.ammo.spit_cost] plasma).")) button.overlays.Cut() button.overlays += image('icons/mob/hud/actions_xeno.dmi', button, "shift_spit_[X.ammo.icon_state]") - ..() - return - + return ..() /datum/action/xeno_action/onclick/regurgitate/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -128,8 +127,7 @@ // Also has good reason to be a proc on all Xenos X.regurgitate(M, TRUE) - ..() - return + return ..() /datum/action/xeno_action/onclick/choose_resin/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -301,19 +299,19 @@ // Destructive Acid -/datum/action/xeno_action/activable/corrosive_acid/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - X.corrosive_acid(A, acid_type, acid_plasma_cost) - for(var/obj/item/explosive/plastic/E in A.contents) - X.corrosive_acid(E,acid_type,acid_plasma_cost) - ..() - +/datum/action/xeno_action/activable/corrosive_acid/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + xeno.corrosive_acid(target, acid_type, acid_plasma_cost) + for(var/obj/item/explosive/plastic/explosive in target.contents) + xeno.corrosive_acid(explosive,acid_type,acid_plasma_cost) + return ..() -/datum/action/xeno_action/onclick/emit_pheromones/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - if(!istype(X)) +/datum/action/xeno_action/onclick/emit_pheromones/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + if(!istype(xeno)) return - X.emit_pheromones(emit_cost = plasma_cost) + xeno.emit_pheromones(emit_cost = plasma_cost) + return ..() /mob/living/carbon/xenomorph/proc/emit_pheromones(pheromone, emit_cost = 30) if(!check_state(TRUE)) @@ -495,12 +493,11 @@ else if (spray_type == ACID_SPRAY_CONE) X.do_acid_spray_cone(get_turf(A), spray_effect_type, spray_distance) - ..() - return + return ..() /datum/action/xeno_action/onclick/xenohide/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner - if(!xeno.check_state(1)) + if(!xeno.check_state(TRUE)) return if(xeno.layer != XENO_HIDING_LAYER) xeno.layer = XENO_HIDING_LAYER @@ -511,6 +508,7 @@ to_chat(xeno, SPAN_NOTICE("You have stopped hiding.")) button.icon_state = "template" xeno.update_wounds() + return ..() /datum/action/xeno_action/onclick/place_trap/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -551,6 +549,7 @@ playsound(X.loc, "alien_resin_build", 25) new /obj/effect/alien/resin/trap(T, X) to_chat(X, SPAN_XENONOTICE("You place a resin hole on the weeds, it still needs a sister to fill it with acid.")) + return ..() /turf/proc/check_xeno_trap_placement(mob/living/carbon/xenomorph/X) if(is_weedable() < FULLY_WEEDABLE || !can_xeno_build(src)) @@ -601,6 +600,9 @@ var/area/AR = get_area(T) if(isnull(AR) || !(AR.is_resin_allowed)) + if(AR.flags_area & AREA_UNWEEDABLE) + to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return FALSE @@ -612,6 +614,9 @@ to_chat(X, SPAN_XENOWARNING("It's too tight in here to build.")) return FALSE + if(!X.check_alien_construction(T)) + return FALSE + var/choice = XENO_STRUCTURE_CORE if(X.hive.hivecore_cooldown) to_chat(X, SPAN_WARNING("The weeds are still recovering from the death of the hive core, wait until the weeds have recovered!")) @@ -625,8 +630,8 @@ for(var/structure_name in X.hive.hive_structure_types) message += "[get_xeno_structure_desc(structure_name)]
" to_chat(X, SPAN_NOTICE(message)) - return - if(!X.check_state(1) || !X.check_plasma(400)) + return TRUE + if(!X.check_state(TRUE) || !X.check_plasma(400)) return FALSE var/structure_type = X.hive.hive_structure_types[choice] var/datum/construction_template/xenomorph/structure_template = new structure_type() @@ -686,8 +691,7 @@ X.use_plasma(400) X.place_construction(T, structure_template) - - + return ..() // XSS Spacecheck @@ -762,18 +766,18 @@ SPAN_XENOWARNING("You spit a [xeno.ammo.name] at [atom]!") ) playsound(xeno.loc, sound_to_play, 25, 1) + var/obj/item/projectile/proj = new (current_turf, create_cause_data(xeno.ammo.name, xeno)) + proj.generate_bullet(xeno.ammo) + proj.permutated += xeno + proj.def_zone = xeno.get_limbzone_target() + proj.fire_at(spit_target, xeno, xeno, xeno.ammo.max_range, xeno.ammo.shell_speed) - var/obj/item/projectile/Proj = new (current_turf, create_cause_data(initial(xeno.caste_type), xeno)) - Proj.generate_bullet(xeno.ammo) - Proj.permutated += xeno - Proj.def_zone = xeno.get_limbzone_target() - Proj.fire_at(spit_target, xeno, xeno, xeno.ammo.max_range, xeno.ammo.shell_speed) spitting = FALSE SEND_SIGNAL(xeno, COMSIG_XENO_POST_SPIT) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/activable/bombard/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm index ee2592126d5b..e0a29a034029 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm @@ -116,4 +116,4 @@ macro_path = /datum/action/xeno_action/verb/verb_headbite ability_primacy = XENO_PRIMARY_ACTION_4 action_type = XENO_ACTION_CLICK - xeno_cooldown = 0 SECONDS + xeno_cooldown = 10 SECONDS diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm index fae94d7ce061..0c4ba1f2e86d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm @@ -25,8 +25,7 @@ // Only resets when invisibility ends apply_cooldown_override(1000000000) - ..() - return + return ..() /datum/action/xeno_action/onclick/lurker_invisibility/proc/invisibility_off() if(!owner || owner.alpha == initial(owner.alpha)) @@ -80,8 +79,7 @@ xeno.next_move = world.time + 1 // Autoattack reset apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/lurker_assassinate/proc/unbuff_slash() var/mob/living/carbon/xenomorph/xeno = owner @@ -174,8 +172,7 @@ xeno.animation_attack_on(target) xeno.emote("roar") - ..() - return + return ..() /datum/action/xeno_action/activable/tail_jab/use_ability(atom/targeted_atom) @@ -250,8 +247,7 @@ log_attack("[key_name(xeno)] attacked [key_name(hit_target)] with Tail Jab") apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/tail_jab/proc/reset_direction(mob/living/carbon/xenomorph/xeno, last_dir, new_dir) // If the xenomorph is still holding the same direction as the tail stab animation's changed it to, reset it back to the old direction so the xenomorph isn't stuck facing backwards. @@ -308,4 +304,5 @@ xeno.flick_heal_overlay(3 SECONDS, "#00B800") xeno.emote("roar") log_attack("[key_name(xeno)] was executed by [key_name(target_carbon)] with a headbite!") - return TRUE + apply_cooldown() + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index 05a0dbda327a..d3865872f0ab 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -104,6 +104,7 @@ button.overlays.Cut() button.overlays += image('icons/mob/hud/actions_xeno.dmi', button, action_icon_result) + return ..() ////////// Oppressor powers @@ -343,6 +344,7 @@ button.overlays.Cut() button.overlays += image('icons/mob/hud/actions_xeno.dmi', button, action_icon_result) + return ..() /datum/action/xeno_action/activable/prae_retrieve name = "Retrieve" diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index 990a7f919cce..70666e83bc74 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -73,8 +73,7 @@ BD.regen_shield() apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/pounce/prae_dash/use_ability(atom/A) if(!activated_once && !action_cooldown_check() || owner.throwing) @@ -84,9 +83,11 @@ . = ..() if(.) activated_once = TRUE + button.icon_state = "template_active" addtimer(CALLBACK(src, PROC_REF(timeout)), time_until_timeout) else damage_nearby_targets() + return TRUE /datum/action/xeno_action/activable/pounce/prae_dash/proc/timeout() if (activated_once) @@ -104,6 +105,7 @@ return activated_once = FALSE + button.icon_state = X.selected_ability == src ? "template_on" : "template" var/list/target_mobs = list() var/list/L = orange(1, X) @@ -192,8 +194,7 @@ xeno_throw_human(target_carbon, vanguard_user, get_dir(vanguard_user, target_atom), fling_distance) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/cleave/proc/remove_buff() buffed = FALSE @@ -229,8 +230,7 @@ apply_cooldown() xeno_attack_delay(stabbing_xeno) - ..() - return + return ..() /datum/action/xeno_action/activable/prae_abduct/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -364,8 +364,7 @@ addtimer(CALLBACK(src, /datum/action/xeno_action/activable/prae_abduct/proc/remove_tail_overlay, H, tail_image), 0.5 SECONDS) //needed so it can actually be seen as it gets deleted too quickly otherwise. apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/prae_abduct/proc/remove_tail_overlay(mob/living/carbon/human/overlayed_human, image/tail_image) overlayed_human.overlays -= tail_image @@ -434,8 +433,7 @@ shake_camera(target_carbon, 2, 1) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/tail_lash/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -522,8 +520,7 @@ H.apply_effect(get_xeno_stun_duration(H, 0.5), WEAKEN) new /datum/effects/xeno_slow(H, X, ttl = get_xeno_stun_duration(H, 25)) - ..() - return + return ..() /////////// Dancer powers @@ -595,8 +592,7 @@ target_carbon.last_damage_data = create_cause_data(initial(dancer_user.caste_type), dancer_user) target_carbon.apply_armoured_damage(damage, ARMOR_MELEE, BRUTE, "chest", 10) playsound(target_carbon, 'sound/weapons/alien_tail_attack.ogg', 30, TRUE) - ..() - return + return ..() /datum/action/xeno_action/onclick/prae_dodge/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -627,8 +623,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_effects)), duration) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/prae_dodge/proc/remove_effects() var/mob/living/carbon/xenomorph/xeno = owner @@ -695,7 +690,7 @@ to_chat(dancer_user, SPAN_WARNING("You can't attack through [atom_in_turf]!")) return - + // Hmm today I will kill a marine while looking away from them dancer_user.face_atom(target_carbon) @@ -704,11 +699,11 @@ var/buffed = FALSE var/datum/effects/dancer_tag/dancer_tag_effect = locate() in target_carbon.effects_list - + if (dancer_tag_effect) buffed = TRUE qdel(dancer_tag_effect) - + if (!buffed) new /datum/effects/xeno_slow(target_carbon, dancer_user, null, null, get_xeno_stun_duration(target_carbon, slow_duration)) @@ -741,8 +736,7 @@ target_carbon.apply_effect(daze_duration, DAZE) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/prae_acid_ball/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -774,8 +768,7 @@ grenade.throw_atom(A, 5, SPEED_SLOW, X, TRUE) addtimer(CALLBACK(grenade, TYPE_PROC_REF(/obj/item/explosive, prime)), prime_delay) - ..() - return + return ..() /datum/action/xeno_action/activable/warden_heal/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -912,8 +905,7 @@ use_plasma_owner() apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/prae_retrieve/use_ability(atom/A) var/mob/living/carbon/xenomorph/X = owner @@ -1060,4 +1052,4 @@ to_chat(X, SPAN_XENOBOLDNOTICE("You fling [targetXeno] towards you with your resin hook, and they in front of you!")) targetXeno.throw_atom(throw_target_turf, throw_dist, SPEED_VERY_FAST, pass_flags = PASS_MOB_THRU) apply_cooldown() - return + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm index 1958b6e9e576..058e643f5c64 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm @@ -40,9 +40,7 @@ shake_camera(M, 10, 1) apply_cooldown() - - . = ..() - return + return ..() /datum/action/xeno_action/onclick/smash/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -95,9 +93,7 @@ shake_camera(M, 0.2 SECONDS, 1) apply_cooldown() - - . = ..() - return + return ..() /datum/action/xeno_action/activable/devastate/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -163,5 +159,4 @@ xeno.visible_message(SPAN_XENODANGER("[xeno] rapidly slices into [carbon]!")) - . = ..() - return + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm index 3811aae1719b..65ea443c133c 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm @@ -130,8 +130,7 @@ SSround_recording.recorder.stop_tracking(target_xeno) SSround_recording.recorder.track_player(new_xeno) qdel(target_xeno) - ..() - return + return ..() /datum/action/xeno_action/onclick/remove_eggsac/use_ability(atom/A) var/mob/living/carbon/xenomorph/queen/X = owner @@ -154,7 +153,7 @@ if(!X.ovipositor) return X.dismount_ovipositor() - + return ..() /datum/action/xeno_action/onclick/grow_ovipositor/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/queen/xeno = owner @@ -203,7 +202,7 @@ xeno.visible_message(SPAN_XENOWARNING("\The [xeno] has grown an ovipositor!"), \ SPAN_XENOWARNING("You have grown an ovipositor!")) xeno.mount_ovipositor() - + return ..() /datum/action/xeno_action/onclick/set_xeno_lead/use_ability(atom/A) var/mob/living/carbon/xenomorph/queen/X = owner @@ -246,7 +245,7 @@ X.overwatch(possible_xenos[1]) else to_chat(X, SPAN_XENOWARNING("There are no Xenomorph leaders. Overwatch a Xenomorph to make it a leader.")) - + return ..() /datum/action/xeno_action/activable/queen_heal/use_ability(atom/A, verbose) var/mob/living/carbon/xenomorph/queen/X = owner @@ -291,6 +290,7 @@ apply_cooldown() to_chat(X, SPAN_XENONOTICE("You channel your plasma to heal your sisters' wounds around this area.")) + return ..() /datum/action/xeno_action/onclick/give_evo_points/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/queen/user_xeno = owner @@ -351,6 +351,7 @@ target_xeno.evolution_stored += evo_points_per_larva user_xeno.hive.stored_larva-- + return ..() /datum/action/xeno_action/onclick/banish/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/queen/user_xeno = owner @@ -412,6 +413,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_banish), user_xeno.hive, target_xeno.name), 30 MINUTES) message_admins("[key_name_admin(user_xeno)] has banished [key_name_admin(target_xeno)]. Reason: [reason]") + return ..() /datum/action/xeno_action/onclick/banish/proc/remove_banish(datum/hive_status/hive, name) hive.banished_ckeys.Remove(name) @@ -468,22 +470,7 @@ target_xeno.lock_evolve = FALSE user_xeno.hive.banished_ckeys.Remove(banished_name) - -/datum/action/xeno_action/activable/secrete_resin/remote/queen/use_ability(atom/A) - . = ..() - if(!.) - return - - if(!boosted) - return - var/mob/living/carbon/xenomorph/X = owner - var/datum/hive_status/HS = X.hive - if(!HS || !HS.hive_location) - return - // 5 screen radius - if(get_dist(A, HS.hive_location) > 35) - // Apply the normal cooldown if not building near the hive - apply_cooldown_override(initial(xeno_cooldown)) + return ..() /datum/action/xeno_action/onclick/eye name = "Enter Eye Form" @@ -525,6 +512,9 @@ var/area/AR = get_area(T) if(!AR.is_resin_allowed) + if(AR.flags_area & AREA_UNWEEDABLE) + to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return @@ -573,6 +563,7 @@ to_chat(X, SPAN_XENONOTICE("You plant weeds at [T].")) apply_cooldown() + return ..() /datum/action/xeno_action/activable/expand_weeds/proc/reset_turf_cooldown(turf/T) recently_built_turfs -= T @@ -605,7 +596,7 @@ tunnel_xeno(src, xeno) addtimer(CALLBACK(src, PROC_REF(transport_xenos), T), 3 SECONDS) - return TRUE + return ..() /datum/action/xeno_action/activable/place_queen_beacon/proc/tunnel_xeno(datum/source, mob/living/carbon/xenomorph/X) SIGNAL_HANDLER @@ -694,7 +685,7 @@ var/obj/effect/alien/resin/resin_pillar/RP = new pillar_type(new_turf) RP.start_decay(brittle_time, decay_time) - return TRUE + return ..() /datum/action/xeno_action/activable/blockade/proc/check_turf(mob/living/carbon/xenomorph/queen/Q, turf/T) if(T.density) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm index df9baa46c29d..8c6c0834eebc 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm @@ -25,6 +25,7 @@ return ..() else actual_empower(xeno) + return TRUE /datum/action/xeno_action/onclick/empower/proc/actual_empower(mob/living/carbon/xenomorph/xeno) var/datum/behavior_delegate/ravager_base/behavior = xeno.behavior_delegate @@ -220,9 +221,7 @@ new /datum/effects/xeno_slow/superslow/(carbon_target, ravager_user, ttl = superslow_duration) apply_cooldown() - ..() - return - + return ..() ///////////// BERSERKER POWERS @@ -257,7 +256,6 @@ X.add_filter("apprehend_on", 1, list("type" = "outline", "color" = "#522020ff", "size" = 1)) // Dark red because the berserker is scary in this state apply_cooldown() - return ..() /datum/action/xeno_action/onclick/apprehend/proc/apprehend_off() @@ -352,8 +350,7 @@ H.dazed += daze_amount apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/eviscerate/use_ability(atom/A) var/mob/living/carbon/xenomorph/xeno = owner @@ -437,8 +434,7 @@ xeno.anchored = FALSE xeno.update_canmove() - ..() - return + return ..() ////////// HEDGEHOG POWERS @@ -474,8 +470,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_shield)), shield_duration) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/spike_shield/action_cooldown_check() if (shield_active) // If active shield, return FALSE so that this action does not get carried out @@ -536,8 +531,7 @@ playsound(X, 'sound/effects/spike_spray.ogg', 25, 1) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/rav_spikes/action_cooldown_check() if(!owner) @@ -577,8 +571,7 @@ playsound(X, 'sound/effects/spike_spray.ogg', 25, 1) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/spike_shed/action_cooldown_check() if (cooldown_timer_id == TIMER_ID_NULL) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm index 99c980a76c85..64e4b73cfbd2 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_powers.dm @@ -24,8 +24,7 @@ P.fire_at(target, X, X, ammoDatum.max_range, ammoDatum.shell_speed) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/acider_acid/use_ability(atom/A) @@ -43,7 +42,7 @@ X.corrosive_acid(A, acid_type, 0) for(var/obj/item/explosive/plastic/E in A.contents) X.corrosive_acid(E,acid_type,0) - ..() + return ..() /mob/living/carbon/xenomorph/runner/corrosive_acid(atom/O, acid_type, plasma_cost) if (mutation_type != RUNNER_ACIDER) @@ -192,18 +191,24 @@ X.set_effect(BD.caboom_timer*2, SUPERSLOW) X.say(";FOR THE HIVE!!!") + return ..() /datum/action/xeno_action/activable/acider_for_the_hive/proc/cancel_ability() - var/mob/living/carbon/xenomorph/X = owner + var/mob/living/carbon/xenomorph/xeno = owner - if(!istype(X)) + if(!istype(xeno)) return - var/datum/behavior_delegate/runner_acider/BD = X.behavior_delegate - if(!istype(BD)) + var/datum/behavior_delegate/runner_acider/behavior = xeno.behavior_delegate + if(!istype(behavior)) return - BD.caboom_trigger = FALSE - X.color = null - X.SetLuminosity(0) - BD.modify_acid(-BD.max_acid / 4) - to_chat(X, SPAN_XENOWARNING("You remove all your explosive acid before it combusted.")) + behavior.caboom_trigger = FALSE + xeno.color = null + xeno.SetLuminosity(0) + behavior.modify_acid(-behavior.max_acid / 4) + + // Done this way rather than setting to 0 in case something else slowed us + // -Original amount set - (time exploding + timer inaccuracy) * how much gets removed per tick / 2 + xeno.adjust_effect(behavior.caboom_timer * -2 - (behavior.caboom_timer - behavior.caboom_left + 2) * xeno.life_slow_reduction * 0.5, SUPERSLOW) + + to_chat(xeno, SPAN_XENOWARNING("You remove all your explosive acid before it combusted.")) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm index 5cd45d4788ff..58384a01a3fa 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm @@ -28,7 +28,7 @@ projectile.fire_at(target, xeno, xeno, xeno.ammo.max_range, xeno.ammo.shell_speed) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/activable/scattered_spit/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -63,7 +63,7 @@ projectile.fire_at(target, xeno, xeno, xeno.ammo.max_range, xeno.ammo.shell_speed) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/onclick/paralyzing_slash/use_ability(atom/target) var/mob/living/carbon/xenomorph/xeno = owner @@ -90,8 +90,7 @@ addtimer(CALLBACK(src, PROC_REF(unbuff_slash)), buff_duration) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/paralyzing_slash/proc/unbuff_slash() var/mob/living/carbon/xenomorph/xeno = owner diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_powers.dm index a27b62ee626b..ec8dfd9b7cd9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_powers.dm @@ -30,8 +30,7 @@ addtimer(CALLBACK(src, PROC_REF(remove_effects)), duration) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/charge_spit/proc/disable_spatter() SIGNAL_HANDLER diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm index 460c287384f8..bd6e2bb8d08b 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm @@ -20,13 +20,13 @@ macro_path = /datum/action/xeno_action/verb/verb_fling action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 - xeno_cooldown = 65 + xeno_cooldown = 60 // Configurables var/fling_distance = 4 - var/stun_power = 1 - var/weaken_power = 1 - var/slowdown = FALSE + var/stun_power = 0 + var/weaken_power = 0.5 + var/slowdown = 2 // Warrior Lunge @@ -40,7 +40,7 @@ xeno_cooldown = 100 // Configurables - var/grab_range = 6 + var/grab_range = 4 var/click_miss_cooldown = 15 var/twitch_message_cooldown = 0 //apparently this is necessary for a tiny code that makes the lunge message on cooldown not be spammable, doesn't need to be big so 5 will do. @@ -53,7 +53,7 @@ macro_path = /datum/action/xeno_action/verb/verb_punch action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 - xeno_cooldown = 50 + xeno_cooldown = 45 // Configurables var/base_damage = 25 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm index 52bd88aad01e..1ba675f5e6d6 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm @@ -59,8 +59,7 @@ X.update_icons() apply_cooldown() - ..() - + return ..() /datum/action/xeno_action/activable/fling/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/woyer = owner @@ -121,8 +120,7 @@ carbone.throw_atom(throw_turf, fling_distance, SPEED_VERY_FAST, woyer, TRUE) apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/activable/warrior_punch/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/woyer = owner @@ -166,7 +164,7 @@ playsound(carbone,S, 50, 1) do_base_warrior_punch(carbone, target_limb) apply_cooldown() - ..() + return ..() /datum/action/xeno_action/activable/warrior_punch/proc/do_base_warrior_punch(mob/living/carbon/carbone, obj/limb/target_limb) var/mob/living/carbon/xenomorph/woyer = owner diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm index 96e04b265990..60fdda450df3 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm @@ -131,6 +131,9 @@ // TODO: make hidden a part of can_use_action if(!hidden && can_use_action() && use_ability(arglist(args))) SEND_SIGNAL(src, COMSIG_XENO_ACTION_USED, owner) + return TRUE + + return FALSE // For actions that do something on each life tick /datum/action/xeno_action/proc/life_tick() diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 1a847217d881..246e2d2809db 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -12,8 +12,13 @@ if(M.fortify || M.burrow) return XENO_NO_DELAY_ACTION + var/intent = M.a_intent + + if(M.behavior_delegate) + intent = M.behavior_delegate.override_intent(src) + //Reviewing the four primary intents - switch(M.a_intent) + switch(intent) if(INTENT_HELP) if(on_fire) @@ -282,6 +287,9 @@ SPAN_DANGER("You nudge your head against [src]."), null, 5, CHAT_TYPE_XENO_FLUFF) /mob/living/proc/is_xeno_grabbable() + if(stat == DEAD) + return FALSE + return TRUE /mob/living/carbon/human/is_xeno_grabbable() @@ -302,20 +310,6 @@ /obj/item/attack_alien(mob/living/carbon/xenomorph/M) return -/obj/vehicle/attack_alien(mob/living/carbon/xenomorph/M) - if(M.a_intent == INTENT_HARM) - M.animation_attack_on(src) - M.flick_attack_overlay(src, "slash") - health -= 15 - playsound(loc, "alien_claw_metal", 25, 1) - M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]."),SPAN_DANGER("You [M.slash_verb] [src]."), null, 5, CHAT_TYPE_XENO_COMBAT) - healthcheck() - return XENO_ATTACK_ACTION - else - attack_hand(M) - return XENO_NONCOMBAT_ACTION - - /obj/attack_larva(mob/living/carbon/xenomorph/larva/M) return //larva can't do anything @@ -628,12 +622,6 @@ SPAN_DANGER("You pry [src] open."), null, 5, CHAT_TYPE_XENO_COMBAT) return XENO_NO_DELAY_ACTION - -//Nerfing the damn Cargo Tug Train -/obj/vehicle/train/attack_alien(mob/living/carbon/xenomorph/M) - attack_hand(M) - return XENO_NONCOMBAT_ACTION - /obj/structure/mineral_door/resin/attack_larva(mob/living/carbon/xenomorph/larva/M) var/turf/cur_loc = M.loc if(!istype(cur_loc)) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index 1bb8b42775ee..1b8ac2ee05dc 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -66,7 +66,7 @@ PF.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM /mob/living/carbon/xenomorph/facehugger/Life(delta_time) - if(stat != DEAD && !lying) + if(stat != DEAD && !lying && !(locate(/obj/effect/alien/weeds) in get_turf(src))) adjustBruteLoss(1) return ..() @@ -143,9 +143,9 @@ /mob/living/carbon/xenomorph/facehugger/proc/handle_hug(mob/living/carbon/human/human) var/obj/item/clothing/mask/facehugger/hugger = new /obj/item/clothing/mask/facehugger(loc, hivenumber) - var/did_hug = hugger.attach(human, TRUE, 0.5) + var/did_hug = hugger.attach(human, TRUE, 0.5, client?.ckey) if(client) - client?.player_data?.adjust_stat(PLAYER_STAT_FACEHUGS, STAT_CATEGORY_XENO, 1) + client.player_data?.adjust_stat(PLAYER_STAT_FACEHUGS, STAT_CATEGORY_XENO, 1) var/area/hug_area = get_area(src) if(hug_area) for(var/mob/dead/observer/observer as anything in GLOB.observer_list) @@ -155,6 +155,7 @@ for(var/mob/dead/observer/observer as anything in GLOB.observer_list) to_chat(observer, SPAN_DEADSAY("[human] has been facehugged by [src]" + " [OBSERVER_JMP(observer, human)]")) to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [src]")) + timeofdeath = 1 // Ever so slightly deprioritized for larva queue qdel(src) if(hug_area) xeno_message(SPAN_XENOMINORWARNING("You sense that [src] has facehugged a host at \the [hug_area]!"), 1, src.hivenumber) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm index 04b7e04c2da5..4cf0ff113615 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm @@ -170,3 +170,5 @@ /mob/living/carbon/xenomorph/larva/emote(act, m_type, message, intentional, force_silence) playsound(loc, "alien_roar_larva", 15) +/mob/living/carbon/xenomorph/larva/is_xeno_grabbable() + return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm index 1fd1b44cda7a..1269f89f9144 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm @@ -88,6 +88,15 @@ return original_damage +/datum/behavior_delegate/lurker_base/override_intent(mob/living/carbon/target_carbon) + . = ..() + + if(!isxeno_human(target_carbon)) + return + + if(next_slash_buffed) + return INTENT_HARM + /datum/behavior_delegate/lurker_base/melee_attack_additional_effects_target(mob/living/carbon/target_carbon) if (!isxeno_human(target_carbon)) return diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm index d66d034bbe66..d815bc18f9d5 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm @@ -112,7 +112,6 @@ /datum/behavior_delegate/warrior_base name = "Base Warrior Behavior Delegate" - var/slash_charge_cdr = 0.20 SECONDS // Amount to reduce charge cooldown by per slash var/lifesteal_percent = 7 var/max_lifesteal = 9 var/lifesteal_range = 3 // Marines within 3 tiles of range will give the warrior extra health @@ -120,21 +119,6 @@ var/color = "#6c6f24" var/emote_cooldown = 0 -/datum/behavior_delegate/warrior_base/melee_attack_additional_effects_self() - ..() - - var/datum/action/xeno_action/activable/lunge/cAction1 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/lunge) - if (!cAction1.action_cooldown_check()) - cAction1.reduce_cooldown(slash_charge_cdr) - - var/datum/action/xeno_action/activable/fling/cAction2 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/fling) - if (!cAction2.action_cooldown_check()) - cAction2.reduce_cooldown(slash_charge_cdr) - - var/datum/action/xeno_action/activable/warrior_punch/cAction3 = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/warrior_punch) - if (!cAction3.action_cooldown_check()) - cAction3.reduce_cooldown(slash_charge_cdr) - /datum/behavior_delegate/warrior_base/melee_attack_additional_effects_target(mob/living/carbon/A) ..() diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm index ce3f55700753..fe4b4cca2fb1 100644 --- a/code/modules/mob/living/carbon/xenomorph/death.dm +++ b/code/modules/mob/living/carbon/xenomorph/death.dm @@ -37,12 +37,13 @@ if(GLOB.hive_datum[hivenumber].stored_larva) GLOB.hive_datum[hivenumber].stored_larva = round(GLOB.hive_datum[hivenumber].stored_larva * 0.5) //Lose half on dead queen - var/turf/larva_spawn + var/list/players_with_xeno_pref = get_alien_candidates() - while(GLOB.hive_datum[hivenumber].stored_larva > 0 && istype(GLOB.hive_datum[hivenumber].hive_location, /obj/effect/alien/resin/special/pylon/core)) // stil some left - larva_spawn = get_turf(GLOB.hive_datum[hivenumber].hive_location) - if(players_with_xeno_pref && players_with_xeno_pref.len) - var/mob/xeno_candidate = pick(players_with_xeno_pref) + if(players_with_xeno_pref && istype(GLOB.hive_datum[hivenumber].hive_location, /obj/effect/alien/resin/special/pylon/core)) + var/turf/larva_spawn = get_turf(GLOB.hive_datum[hivenumber].hive_location) + var/count = 0 + while(GLOB.hive_datum[hivenumber].stored_larva > 0 && count < length(players_with_xeno_pref)) // still some left + var/mob/xeno_candidate = players_with_xeno_pref[++count] var/mob/living/carbon/xenomorph/larva/new_xeno = new /mob/living/carbon/xenomorph/larva(larva_spawn) new_xeno.set_hive_and_update(hivenumber) @@ -50,11 +51,14 @@ if(!SSticker.mode.transfer_xeno(xeno_candidate, new_xeno)) qdel(new_xeno) return + new_xeno.visible_message(SPAN_XENODANGER("A larva suddenly burrows out of the ground!"), SPAN_XENODANGER("You burrow out of the ground after feeling an immense tremor through the hive, which quickly fades into complete silence...")) - GLOB.hive_datum[hivenumber].stored_larva-- - GLOB.hive_datum[hivenumber].hive_ui.update_burrowed_larva() + GLOB.hive_datum[hivenumber].stored_larva-- + GLOB.hive_datum[hivenumber].hive_ui.update_burrowed_larva() + if(count) + message_alien_candidates(players_with_xeno_pref, dequeued = count) if(hive && hive.living_xeno_queen == src) xeno_message(SPAN_XENOANNOUNCE("A sudden tremor ripples through the hive... the Queen has been slain! Vengeance!"),3, hivenumber) @@ -113,7 +117,9 @@ // Tell the marines where the last one is. var/name = "[MAIN_AI_SYSTEM] Bioscan Status" var/input = "Bioscan complete.\n\nSensors indicate one remaining unknown lifeform signature in [get_area(X)]." - marine_announcement(input, name, 'sound/AI/bioscan.ogg') + var/datum/ares_link/link = GLOB.ares_link + link.log_ares_bioscan(name, input) + marine_announcement(input, name, 'sound/AI/bioscan.ogg', logging = ARES_LOG_NONE) // Tell the xeno she is the last one. if(X.client) to_chat(X, SPAN_XENOANNOUNCE("Your carapace rattles with dread. You are all that remains of the hive!")) @@ -134,10 +140,10 @@ switch(caste.caste_type) //This will need to be changed later, when we have proper xeno pathing. Might do it on caste or something. if(XENO_CASTE_BOILER) - var/mob/living/carbon/xenomorph/boiler/B = src + var/mob/living/carbon/xenomorph/boiler/src_boiler = src visible_message(SPAN_DANGER("[src] begins to bulge grotesquely, and explodes in a cloud of corrosive gas!")) - B.smoke.set_up(2, 0, get_turf(src)) - B.smoke.start() + src_boiler.smoke.set_up(2, 0, get_turf(src), new_cause_data = src_boiler.smoke.cause_data) + src_boiler.smoke.start() remains.icon_state = "gibbed-a-corpse" if(XENO_CASTE_RUNNER) remains.icon_state = "gibbed-a-corpse-runner" diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index 86604a62dab6..842e3b45a76d 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -48,8 +48,15 @@ if(!got_evolution_message) evolve_message() got_evolution_message = TRUE + if(ROUND_TIME < XENO_ROUNDSTART_PROGRESS_TIME_2) evolution_stored += progress_amount + return + + if(evolution_stored > evolution_threshold + progress_amount) + evolution_stored -= progress_amount + return + else evolution_stored += progress_amount @@ -397,7 +404,7 @@ Make sure their actual health updates immediately.*/ return var/atom/tracking_atom - switch(QL.track_state) + switch(QL.track_state[1]) if(TRACKER_QUEEN) if(!hive || !hive.living_xeno_queen) QL.icon_state = "trackoff" @@ -408,8 +415,13 @@ Make sure their actual health updates immediately.*/ QL.icon_state = "trackoff" return tracking_atom = hive.hive_location - else - var/leader_tracker = text2num(QL.track_state) + if(TRACKER_LEADER) + if(!QL.track_state[2]) + QL.icon_state = "trackoff" + return + + var/leader_tracker = QL.track_state[2] + if(!hive || !hive.xeno_leader_list) QL.icon_state = "trackoff" return @@ -420,6 +432,23 @@ Make sure their actual health updates immediately.*/ QL.icon_state = "trackoff" return tracking_atom = hive.xeno_leader_list[leader_tracker] + if(TRACKER_TUNNEL) + if(!QL.track_state[2]) + QL.icon_state = "trackoff" + return + + var/tunnel_tracker = QL.track_state[2] + + if(!hive || !hive.tunnels) + QL.icon_state = "trackoff" + return + if(tunnel_tracker > hive.tunnels.len) + QL.icon_state = "trackoff" + return + if(!hive.tunnels[tunnel_tracker]) + QL.icon_state = "trackoff" + return + tracking_atom = hive.tunnels[tunnel_tracker] if(!tracking_atom) QL.icon_state = "trackoff" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/behavior_delegate.dm b/code/modules/mob/living/carbon/xenomorph/mutators/behavior_delegate.dm index 756be3bedf6f..1cb563461138 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/behavior_delegate.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/behavior_delegate.dm @@ -100,3 +100,7 @@ /// Handling the xeno icon state or overlays, return TRUE if icon state should not be changed /datum/behavior_delegate/proc/on_update_icons() return + +/// Used to override an intent for some abilities that must force harm on next attack_alien() +/datum/behavior_delegate/proc/override_intent(mob/living/carbon/target_carbon) + return bound_xeno.a_intent diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm index 57ff925a635c..0e6b7e4657d3 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm @@ -121,8 +121,7 @@ xeno.update_icons() apply_cooldown() - ..() - return + return ..() /datum/action/xeno_action/onclick/change_fruit name = "Change Fruit" @@ -331,7 +330,7 @@ apply_cooldown() xeno_cooldown = initial(xeno_cooldown) - ..() + return ..() /datum/action/xeno_action/verb/verb_resin_surge() set category = "Alien" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/healer.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/healer.dm index 3c949f2bd6fb..5caab38529e6 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/healer.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/healer.dm @@ -70,7 +70,7 @@ /datum/action/xeno_action/activable/apply_salve/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/xeno = owner xeno.xeno_apply_salve(target_atom, health_transfer_amount, max_range, damage_taken_mod) - ..() + return ..() /datum/action/xeno_action/verb/verb_apply_salve() set category = "Alien" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm index f5264aecfeab..3200fd0da4a1 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/hivelord/resin_whisperer.dm @@ -113,6 +113,7 @@ target_turf.visible_message(SPAN_XENONOTICE("The weeds begin pulsating wildly and secrete resin in the shape of \a [resing_construction.construction_name]!"), null, 5) to_chat(owner, SPAN_XENONOTICE("You focus your plasma into the weeds below you and force the weeds to secrete resin in the shape of \a [resing_construction.construction_name].")) playsound(target_turf, "alien_resin_build", 25) + return TRUE /datum/action/xeno_action/verb/verb_coerce_resin() set category = "Alien" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/dancer.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/dancer.dm index 841c06151aa5..a21f549ea8cd 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/dancer.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/dancer.dm @@ -1,7 +1,7 @@ /datum/xeno_mutator/praetorian_dancer // My name is Cuban Pete, I'm the King of the Rumba Beat name = "STRAIN: Praetorian - Dancer" - description = "You lose all of your acid-based abilities and a small amount of your armor in exchange for increased movement speed, evasion, and unparalleled agility that gives you an ability to move even more quickly, dodge bullets, and phase through tallhosts. By slashing tallhosts, you temporarily increase your evasion and you also you apply a tag that changes how your two new tail abilities function. By tagging hosts, you will make Impale hit twice and instead of once and make Tail Trip knock hosts down instead of stunning them." + description = "You lose all of your acid-based abilities and a small amount of your armor in exchange for increased movement speed, evasion, and unparalleled agility that gives you an ability to move even more quickly, dodge bullets, and phase through tallhosts. By slashing tallhosts, you temporarily increase your movement speed and you also you apply a tag that changes how your two new tail abilities function. By tagging hosts, you will make Impale hit twice instead of once and make Tail Trip knock hosts down instead of stunning them." flavor_description = "Demonstrate to the talls what 'there is beauty in death' truly symbolizes, then dance upon their graves!" cost = MUTATOR_COST_EXPENSIVE individual_only = TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm index 25ee9b315cc4..a2699a4f0f40 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm @@ -147,6 +147,8 @@ damage *= XVX_ACID_DAMAGEMULT target_living.apply_damage(damage, BURN) + for(var/turf/T in view(bound_xeno, acid_range)) + new /obj/effect/particle_effect/smoke/acid_runner_harmless(T) playsound(bound_xeno, 'sound/effects/blobattack.ogg', 75) if(bound_xeno.client && bound_xeno.hive) addtimer(CALLBACK(bound_xeno.hive, TYPE_PROC_REF(/datum/hive_status, free_respawn), bound_xeno.client), 5 SECONDS) diff --git a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm index 4f3852a6a055..3bfb4e355416 100644 --- a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm +++ b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm @@ -31,6 +31,9 @@ GLOBAL_VAR_INIT(resin_lz_allowed, FALSE) var/area/AR = get_area(T) if(isnull(AR) || !(AR.is_resin_allowed)) + if(AR.flags_area & AREA_UNWEEDABLE) + to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index b5431720e14a..5d3ee0b04ba7 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -285,6 +285,8 @@ var/larva_gestation_multiplier = 1 var/bonus_larva_spawn_chance = 1 var/hijack_burrowed_surge = FALSE //at hijack, start spawning lots of burrowed + /// how many burrowed is going to spawn during larva surge + var/hijack_burrowed_left = 0 var/ignore_slots = FALSE var/dynamic_evolution = TRUE @@ -877,6 +879,8 @@ /datum/hive_status/proc/abandon_on_hijack() var/area/hijacked_dropship = get_area(living_xeno_queen) + var/shipside_humans_weighted_count = 0 + var/xenos_count = 0 for(var/name_ref in hive_structures) for(var/obj/effect/alien/resin/special/S in hive_structures[name_ref]) if(get_area(S) == hijacked_dropship) @@ -885,6 +889,10 @@ qdel(S) for(var/mob/living/carbon/xenomorph/xeno as anything in totalXenos) if(get_area(xeno) != hijacked_dropship && xeno.loc && is_ground_level(xeno.loc.z)) + if(isfacehugger(xeno)) + to_chat(xeno, SPAN_XENOANNOUNCE("The Queen has left without you, you quickly find a hiding place to enter hibernation as you lose touch with the hive mind.")) + qdel(xeno) + continue if(xeno.hunter_data.hunted && !isqueen(xeno)) to_chat(xeno, SPAN_XENOANNOUNCE("The Queen has left without you, seperating you from her hive! You must defend yourself from the headhunter before you can enter hibernation...")) xeno.set_hive_and_update(XENO_HIVE_FORSAKEN) @@ -895,6 +903,9 @@ xeno.handle_stomach_contents() qdel(xeno) stored_larva++ + continue + if(!isfacehugger(xeno)) + xenos_count++ for(var/i in GLOB.alive_mob_list) var/mob/living/potential_host = i if(!(potential_host.status_flags & XENO_HOST)) @@ -907,7 +918,13 @@ for(var/obj/item/alien_embryo/embryo in potential_host) embryo.hivenumber = XENO_HIVE_FORSAKEN potential_host.update_med_icon() + for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list) + if((isspecieshuman(current_human) || isspeciessynth(current_human)) && current_human.job) + var/turf/turf = get_turf(current_human) + if(is_mainship_level(turf?.z)) + shipside_humans_weighted_count += RoleAuthority.calculate_role_weight(current_human.job) hijack_burrowed_surge = TRUE + hijack_burrowed_left = max(n_ceil(shipside_humans_weighted_count * 0.5) - xenos_count, 5) hivecore_cooldown = FALSE xeno_message(SPAN_XENOBOLDNOTICE("The weeds have recovered! A new hive core can be built!"),3,hivenumber) diff --git a/code/modules/mob/living/living_healthscan.dm b/code/modules/mob/living/living_healthscan.dm index 067f39e1ab42..6875aa934fd2 100644 --- a/code/modules/mob/living/living_healthscan.dm +++ b/code/modules/mob/living/living_healthscan.dm @@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) "hugged" = (locate(/obj/item/alien_embryo) in target_mob), ) - var/internal_bleeding = FALSE + var/internal_bleeding = FALSE //do they have internal bleeding anywhere if(!isnull(data_detail_level)) detail_level = data_detail_level @@ -158,11 +158,10 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) var/core_fracture_detected = FALSE var/unknown_implants = 0 for(var/obj/limb/limb in human_target_mob.limbs) - var/internal_bleeding_check = FALSE + var/internal_bleeding_check = FALSE //do they have internal bleeding in this limb for(var/datum/effects/bleeding/internal/ib in limb.bleeding_effects_list) internal_bleeding = TRUE - if(detail_level >= DETAIL_LEVEL_BODYSCAN) - internal_bleeding_check = TRUE + internal_bleeding_check = TRUE break if(limb.hidden) unknown_implants++ diff --git a/code/modules/mob/living/silicon/decoy/decoy.dm b/code/modules/mob/living/silicon/decoy/decoy.dm index abd07e056be7..b625b19b172d 100644 --- a/code/modules/mob/living/silicon/decoy/decoy.dm +++ b/code/modules/mob/living/silicon/decoy/decoy.dm @@ -10,6 +10,8 @@ bound_width = 96 custom_slashed_sound = "alien_claw_metal" var/obj/item/device/radio/headset/almayer/mcom/ai/ai_headset //The thing it speaks into. + maxHealth = 1000 + health = 1000 /mob/living/silicon/decoy/ship_ai //For the moment, pending better pathing. var/silent_announcement_cooldown = 0 @@ -20,6 +22,7 @@ desc = "This is the artificial intelligence system for the [MAIN_SHIP_NAME]. Like many other military-grade AI systems, this one was manufactured by Weyland-Yutani." ai_headset = new(src) ai_mob_list += src + real_name = MAIN_AI_SYSTEM /mob/living/silicon/decoy/ship_ai/Destroy() QDEL_NULL(ai_headset) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 7e7952974c8c..0c182fb0fe9c 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -258,6 +258,9 @@ if(!istype(W)) return FALSE + if(SEND_SIGNAL(src, COMSIG_MOB_ATTEMPTING_EQUIP, W, slot) & COMPONENT_MOB_CANCEL_ATTEMPT_EQUIP) + return FALSE + if(!W.mob_can_equip(src, slot, disable_warning)) if(del_on_fail) qdel(W) @@ -356,6 +359,9 @@ SEND_SIGNAL(client, COMSIG_CLIENT_RESET_VIEW, A) return +/mob/proc/reset_observer_view_on_deletion(atom/deleted, force) + SIGNAL_HANDLER + reset_view(null) /mob/proc/show_inv(mob/user) user.set_interaction(src) @@ -837,7 +843,7 @@ note dizziness decrements automatically in the mob's Life() proc. return FALSE to_chat(src, SPAN_WARNING("You attempt to get a good grip on [selection] in your body.")) else - if(get_active_hand()) + if(usr.get_active_hand()) to_chat(usr, SPAN_WARNING("You need an empty hand for this!")) return FALSE to_chat(usr, SPAN_WARNING("You attempt to get a good grip on [selection] in [src]'s body.")) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 80bac5eb282b..b469052104fd 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -125,6 +125,7 @@ var/life_steps_total = 0 var/life_kills_total = 0 var/life_damage_taken_total = 0 + var/life_revives_total = 0 var/festivizer_hits_total = 0 var/life_value = 1 // when killed, the killee gets this much added to its life_kills_total diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 81296f346d50..39cc5b25e519 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -141,10 +141,9 @@ X.visible_message(SPAN_WARNING("[X] devours [pulled]!"), \ SPAN_WARNING("You devour [pulled]!"), null, 5) - //IMPORTANT CODER NOTE: Due to us using the old lighting engine, we need to hacky hack hard to get this working properly - //So we're just going to get the lights out of here by forceMoving them to a far-away place - //They will be recovered when regurgitating, since this also calls forceMove - pulled.moveToNullspace() + if(ishuman(pulled)) + var/mob/living/carbon/human/pulled_human = pulled + pulled_human.disable_lights() //Then, we place the mob where it ought to be X.stomach_contents.Add(pulled) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index a7102c392611..9f88f0f9d611 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -243,7 +243,7 @@ spawning = TRUE close_spawn_windows() - var/mob/living/carbon/human/character = create_character() //creates the human and transfers vars and mind + var/mob/living/carbon/human/character = create_character(TRUE) //creates the human and transfers vars and mind RoleAuthority.equip_role(character, RoleAuthority.roles_for_mode[rank], late_join = TRUE) EquipCustomItems(character) @@ -349,7 +349,7 @@ show_browser(src, dat, "Late Join", "latechoices", "size=420x700") -/mob/new_player/proc/create_character() +/mob/new_player/proc/create_character(is_late_join = FALSE) spawning = TRUE close_spawn_windows() @@ -368,7 +368,7 @@ new_character.lastarea = get_area(loc) - client.prefs.copy_all_to(new_character) + client.prefs.copy_all_to(new_character, job, is_late_join) if (client.prefs.be_random_body) var/datum/preferences/TP = new() @@ -444,7 +444,7 @@ /mob/proc/close_spawn_windows() // Somehow spawn menu stays open for non-newplayers close_browser(src, "latechoices") //closes late choices window close_browser(src, "playersetup") //closes the player setup window - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // Stops lobby music. + src << sound(null, repeat = 0, wait = 0, volume = 85, channel = SOUND_CHANNEL_LOBBY) // Stops lobby music. if(src.open_uis) for(var/datum/nanoui/ui in src.open_uis) if(ui.allowed_user_stat == -1) diff --git a/code/modules/organs/limbs.dm b/code/modules/organs/limbs.dm index 0fb60be95d29..dae33bea8157 100644 --- a/code/modules/organs/limbs.dm +++ b/code/modules/organs/limbs.dm @@ -65,6 +65,8 @@ var/list/bleeding_effects_list = list() + var/can_bleed_internally = TRUE + var/destroyed = FALSE var/status = LIMB_ORGANIC var/processing = FALSE @@ -511,6 +513,9 @@ This function completely restores a damaged organ to perfect condition. if(status & (LIMB_ROBOT|LIMB_SYNTHSKIN)) return + if(internal && !can_bleed_internally) + internal = FALSE + if(length(bleeding_effects_list)) if(!internal) for(var/datum/effects/bleeding/external/B in bleeding_effects_list) @@ -1278,6 +1283,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit display_name = "foot" max_damage = 30 min_broken_damage = 20 + can_bleed_internally = FALSE /obj/limb/arm name = "arm" @@ -1290,6 +1296,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit display_name = "hand" max_damage = 30 min_broken_damage = 20 + can_bleed_internally = FALSE /obj/limb/arm/l_arm name = "l_arm" diff --git a/code/modules/paperwork/notepad.dm b/code/modules/paperwork/notepad.dm index d3d8b6f0305d..f30d56c4a7eb 100644 --- a/code/modules/paperwork/notepad.dm +++ b/code/modules/paperwork/notepad.dm @@ -14,12 +14,14 @@ var/page = 1 var/screen = 0 - var/list/color_types = list("red", "green", "black", "blue") + var/list/cover_colours = list("red", "green", "black", "blue") + var/cover_colour /obj/item/notepad/Initialize(mapload, ...) . = ..() - - icon_state = initial(icon_state) + "_[pick(color_types)]" + if(!cover_colour) + cover_colour = pick(cover_colours) + icon_state = initial(icon_state) + "_[cover_colour]" for(var/i = 1 to paper_left) new /obj/item/paper(src) @@ -125,3 +127,15 @@ if((loc == usr && usr.stat == CONSCIOUS)) name = "[(n_name ? text("[n_name]") : "notepad")]" add_fingerprint(usr) + +/obj/item/notepad/black + cover_colour = "black" + +/obj/item/notepad/blue + cover_colour = "blue" + +/obj/item/notepad/green + cover_colour = "green" + +/obj/item/notepad/red + cover_colour = "red" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 918d3ab60a7f..60aa2f2c16e7 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -509,7 +509,7 @@ /obj/item/paper/flag name = "paper flag" - desc = "Somebody attached a blank piece of paper to a stick. You feel like waving it around like an idiot." + desc = "Somebody crudely glued a piece of paper to a stick. You feel like waving it around like an idiot." icon_state = "paper_flag" item_state = "paper_flag" diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 67003d4f79d0..5a335002d71d 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -102,6 +102,30 @@ display round(lastgen) and phorontank amount else . += SPAN_NOTICE("The generator is off.") +/obj/structure/machinery/power/port_gen/attack_alien(mob/living/carbon/xenomorph/attacking_xeno) + if(!active && !anchored) + return ..() + + if(attacking_xeno.mob_size < MOB_SIZE_XENO) + to_chat(attacking_xeno, SPAN_XENOWARNING("You're too small to do any significant damage to affect this!")) + return XENO_NO_DELAY_ACTION + + attacking_xeno.animation_attack_on(src) + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] slashes [src]!"), SPAN_DANGER("You slash [src]!")) + playsound(attacking_xeno, pick('sound/effects/metalhit.ogg', 'sound/weapons/alien_claw_metal1.ogg', 'sound/weapons/alien_claw_metal2.ogg', 'sound/weapons/alien_claw_metal3.ogg'), 25, 1) + + if(active) + active = FALSE + stop_processing() + icon_state = initial(icon_state) + visible_message(SPAN_NOTICE("[src] sputters to a stop!")) + return XENO_NONCOMBAT_ACTION + + if(anchored) + anchored = FALSE + visible_message(SPAN_NOTICE("[src]'s bolts are dislodged!")) + return XENO_NONCOMBAT_ACTION + //A power generator that runs on solid plasma sheets. /obj/structure/machinery/power/port_gen/pacman name = "P.A.C.M.A.N.-type Portable Generator" diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index 30f7f1928182..ff90a6659fb2 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -144,7 +144,7 @@ empty = TRUE /obj/item/ammo_box/magazine/m4ra/ext - name = "\improper magazine box (Ext M4RA x 16)" + name = "\improper magazine box (Ext M4RA x 12)" overlay_ammo_type = "_ext" num_of_magazines = 12 magazine_type = /obj/item/ammo_magazine/rifle/m4ra/ext diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index bea61f506d6c..2f7b4de127c7 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -2753,7 +2753,7 @@ return var/datum/effects/neurotoxin/neuro_effect = locate() in moob.effects_list if(!neuro_effect) - neuro_effect = new /datum/effects/neurotoxin(moob) + neuro_effect = new /datum/effects/neurotoxin(moob, proj.firer) neuro_effect.duration += 5 moob.apply_effect(3, DAZE) to_chat(moob, SPAN_HIGHDANGER("Neurotoxic liquid spreads all over you and immediately soaks into your pores and orifices! Oh fuck!")) // Fucked up but have a chance to escape rather than being game-ended @@ -2776,9 +2776,10 @@ /datum/ammo/xeno/boiler_gas/proc/drop_nade(turf/turf, obj/item/projectile/proj) var/lifetime_mult = 1.0 + var/datum/cause_data if(isboiler(proj.firer)) - smoke_system.cause_data = proj.weapon_cause_data - smoke_system.set_up(smokerange, 0, turf) + cause_data = proj.weapon_cause_data + smoke_system.set_up(smokerange, 0, turf, new_cause_data = cause_data) smoke_system.lifetime = 12 * lifetime_mult smoke_system.start() turf.visible_message(SPAN_DANGER("A glob of acid lands with a splat and explodes into noxious fumes!")) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 22da1976ddbe..0baf6f527d4b 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -732,6 +732,29 @@ Defined in conflicts.dm of the #defines folder. to_chat(user, SPAN_NOTICE("Hold on there cowboy, that grip is bolted on. You are unable to modify it.")) return +/obj/item/attachable/flashlight/laser_light_combo //Unique attachment for the VP78 based on the fact it has a Laser-Light Module in AVP2010 + name = "VP78 Laser-Light Module" + desc = "A Laser-Light module for the VP78 Service Pistol which is currently undergoing limited field testing as part of the USCMs next generation pistol program. All VP78 pistols come equipped with the module." + icon = 'icons/obj/items/weapons/guns/attachments/under.dmi' + icon_state = "vplaserlight" + attach_icon = "vplaserlight_a" + slot = "under" + original_state = "vplaserlight" + original_attach = "vplaserlight_a" + +/obj/item/attachable/flashlight/laser_light_combo/New() + ..() + accuracy_mod = HIT_ACCURACY_MULT_TIER_1 + movement_onehanded_acc_penalty_mod = -MOVEMENT_ACCURACY_PENALTY_MULT_TIER_5 + scatter_mod = -SCATTER_AMOUNT_TIER_10 + scatter_unwielded_mod = -SCATTER_AMOUNT_TIER_9 + accuracy_unwielded_mod = HIT_ACCURACY_MULT_TIER_1 + +/obj/item/attachable/flashlight/laser_light_combo/attackby(obj/item/combo_light, mob/user) + if(HAS_TRAIT(combo_light, TRAIT_TOOL_SCREWDRIVER)) + to_chat(user, SPAN_NOTICE("You are unable to modify it.")) + return + /obj/item/attachable/magnetic_harness name = "magnetic harness" desc = "A magnetically attached harness kit that attaches to the rail mount of a weapon. When dropped, the weapon will sling to any set of USCM armor." diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index 98d1be3a9c64..d8ea29cd92f8 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -143,7 +143,7 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w /obj/item/weapon/gun/dropped(mob/user) . = ..() - turn_off_light(user) + disconnect_light_from_mob(user) var/delay_left = (last_fired + fire_delay + additional_fire_group_delay) - world.time if(fire_delay_group && delay_left > 0) @@ -160,7 +160,8 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w for(var/group in fire_delay_group) LAZYSET(user.fire_delay_next_fire, group, world.time + delay_left) -/obj/item/weapon/gun/proc/turn_off_light(mob/bearer) +/// This function disconnects the luminosity from the mob and back to the gun +/obj/item/weapon/gun/proc/disconnect_light_from_mob(mob/bearer) if (!(flags_gun_features & GUN_FLASHLIGHT_ON)) return FALSE for (var/slot in attachments) @@ -172,6 +173,18 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w return TRUE return FALSE +/// This function actually turns the lights on the gun off +/obj/item/weapon/gun/proc/turn_off_light(mob/bearer) + if (!(flags_gun_features & GUN_FLASHLIGHT_ON)) + return FALSE + for (var/slot in attachments) + var/obj/item/attachable/attachment = attachments[slot] + if (!attachment || !attachment.light_mod) + continue + attachment.activate_attachment(src, bearer) + return TRUE + return FALSE + /obj/item/weapon/gun/pickup(mob/user) ..() diff --git a/code/modules/projectiles/guns/lever_action.dm b/code/modules/projectiles/guns/lever_action.dm index d611605cd0e5..259c6170ae48 100644 --- a/code/modules/projectiles/guns/lever_action.dm +++ b/code/modules/projectiles/guns/lever_action.dm @@ -71,7 +71,7 @@ their unique feature is that a direct hit will buff your damage and firerate /obj/item/weapon/gun/lever_action/dropped(mob/user) . = ..() - reset_hit_buff() + reset_hit_buff(user) addtimer(VARSET_CALLBACK(src, cur_onehand_chance, reset_onehand_chance), 4 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/item/weapon/gun/lever_action/proc/direct_hit_buff(mob/user, mob/target, one_hand_lever = FALSE) @@ -110,7 +110,7 @@ their unique feature is that a direct hit will buff your damage and firerate if(!(flags_gun_lever_action & USES_STREAKS)) return apply_hit_buff(user, target, one_hand_lever) //this is a separate proc so it's configgable - addtimer(CALLBACK(src, PROC_REF(reset_hit_buff), one_hand_lever), hit_buff_reset_cooldown, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(reset_hit_buff), user, one_hand_lever), hit_buff_reset_cooldown, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/item/weapon/gun/lever_action/proc/apply_hit_buff(mob/user, mob/target, one_hand_lever = FALSE) lever_sound = lever_super_sound @@ -126,7 +126,7 @@ their unique feature is that a direct hit will buff your damage and firerate fire_delay += AM.delay_mod wield_delay = 0 //for one-handed levering -/obj/item/weapon/gun/lever_action/proc/reset_hit_buff(one_hand_lever) //why does this need a user arg when it doesn't use user at all? +/obj/item/weapon/gun/lever_action/proc/reset_hit_buff(mob/user, one_hand_lever) if(!(flags_gun_lever_action & USES_STREAKS)) return SIGNAL_HANDLER @@ -513,10 +513,12 @@ their unique feature is that a direct hit will buff your damage and firerate levered = FALSE return empty_chamber(user) -/obj/item/weapon/gun/lever_action/xm88/reset_hit_buff(one_hand_lever) //why does this need a user arg when it doesn't use user at all? +/obj/item/weapon/gun/lever_action/xm88/reset_hit_buff(mob/user, one_hand_lever) if(!(flags_gun_lever_action & USES_STREAKS)) return SIGNAL_HANDLER + if(streak > 0) + to_chat(user, SPAN_WARNING("[src] beeps as it loses its targeting data, and returns to normal firing procedures.")) streak = 0 lever_sound = initial(lever_sound) lever_message = initial(lever_message) @@ -531,7 +533,6 @@ their unique feature is that a direct hit will buff your damage and firerate lever_delay = FIRE_DELAY_TIER_3 damage_mult = BASE_BULLET_DAMAGE_MULT recalculate_attachment_bonuses() //stock wield delay - visible_message(SPAN_WARNING("\The [src] beeps as it loses its targeting data, and returns to normal firing procedures."), max_distance = 1) // tell them they've lost stacks if(one_hand_lever) addtimer(VARSET_CALLBACK(src, cur_onehand_chance, reset_onehand_chance), 4 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index d6ab3e6aa866..e7e20526b31f 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -578,7 +578,7 @@ /obj/item/weapon/gun/pistol/vp78 name = "\improper VP78 pistol" - desc = "A massive, formidable automatic handgun chambered in 9mm squash-head rounds. Commonly seen in the hands of wealthy Weyland-Yutani members." + desc = "A massive, formidable semi-automatic handgun chambered in 9mm squash-head rounds. A common sight throughout both UA and 3WE space, often held by both Weyland-Yutani PMC units and corporate executives. This weapon is also undergoing limited field testing as part of the USCM's next generation pistol program. The slide is engraved with the Weyland-Yutani logo reminding you who's really in charge." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "vp78" item_state = "vp78" @@ -595,14 +595,14 @@ /obj/item/attachable/reflex, /obj/item/attachable/flashlight, /obj/item/attachable/compensator, - /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/laser_light_combo, /obj/item/attachable/extended_barrel, /obj/item/attachable/heavy_barrel, ) /obj/item/weapon/gun/pistol/vp78/handle_starting_attachment() ..() - var/obj/item/attachable/lasersight/VP = new(src) + var/obj/item/attachable/flashlight/laser_light_combo/VP = new(src) VP.flags_attach_features &= ~ATTACH_REMOVABLE VP.hidden = FALSE VP.Attach(src) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 9b8986896265..ab2602204f72 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -257,6 +257,10 @@ map_specific_decoration = FALSE starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible) +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock //for PMC nightmares. + desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. This one had its IFF electronics removed." + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER + /obj/item/weapon/gun/rifle/m41a/corporate/detainer //for chem ert current_mag = /obj/item/ammo_magazine/rifle/ap random_spawn_rail = list( diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm index 7d8378d8c5c7..c73d9c0f6423 100644 --- a/code/modules/projectiles/guns/smartgun.dm +++ b/code/modules/projectiles/guns/smartgun.dm @@ -18,11 +18,11 @@ force = 20 wield_delay = WIELD_DELAY_FAST aim_slowdown = SLOWDOWN_ADS_SPECIALIST - var/powerpack = null - /// Whether the smartgun drains the powerpack battery (Ignored if requires_powerpack is false) + var/obj/item/smartgun_battery/battery = null + /// Whether the smartgun drains the battery (Ignored if requires_battery is false) var/requires_power = TRUE - /// Whether the smartgun requires a powerpack to be worn - var/requires_powerpack = TRUE + /// Whether the smartgun requires a battery + var/requires_battery = TRUE /// Whether the smartgun requires a harness to use var/requires_harness = TRUE ammo = /datum/ammo/bullet/smartgun @@ -69,6 +69,7 @@ ammo_primary = GLOB.ammo_list[ammo_primary] //Gun initialize calls replace_ammo() so we need to set these first. ammo_secondary = GLOB.ammo_list[ammo_secondary] MD = new(src) + battery = new /obj/item/smartgun_battery(src) . = ..() update_icon() @@ -76,6 +77,7 @@ ammo_primary = null ammo_secondary = null QDEL_NULL(MD) + QDEL_NULL(battery) . = ..() /obj/item/weapon/gun/smartgun/set_gun_attachment_offsets() @@ -88,7 +90,7 @@ burst_delay = FIRE_DELAY_TIER_9 fa_delay = FIRE_DELAY_TIER_SG fa_scatter_peak = FULL_AUTO_SCATTER_PEAK_TIER_8 - fa_max_scatter = SCATTER_AMOUNT_TIER_3 + fa_max_scatter = SCATTER_AMOUNT_TIER_9 if(accuracy_improvement) accuracy_mult += HIT_ACCURACY_MULT_TIER_3 else @@ -116,6 +118,9 @@ . += message . += "The restriction system is [iff_enabled ? "on" : "off"]." + if(battery && get_dist(user, src) <= 1) + . += "A small gauge on [battery] reads: Power: [battery.power_cell.charge] / [battery.power_cell.maxcharge]." + /obj/item/weapon/gun/smartgun/clicked(mob/user, list/mods) if(mods["alt"]) if(!CAN_PICKUP(user, src)) @@ -138,6 +143,20 @@ else return ..() +/obj/item/weapon/gun/smartgun/attackby(obj/item/attacking_object, mob/user) + if(istype(attacking_object, /obj/item/smartgun_battery)) + var/obj/item/smartgun_battery/new_cell = attacking_object + visible_message("[user] swaps out the power cell in the [src].","You swap out the power cell in the [src] and drop the old one.") + to_chat(user, SPAN_NOTICE("The new cell contains: [new_cell.power_cell.charge] power.")) + battery.update_icon() + battery.forceMove(get_turf(user)) + battery = new_cell + user.drop_inv_item_to_loc(new_cell, src) + playsound(src, 'sound/machines/click.ogg', 25, 1) + return + + return ..() + /obj/item/weapon/gun/smartgun/replace_magazine(mob/user, obj/item/ammo_magazine/magazine) if(!cover_open) to_chat(user, SPAN_WARNING("\The [src]'s feed cover is closed! You can't put a new drum in! (alt-click to open it)")) @@ -166,8 +185,6 @@ var/mob/living/carbon/human/H = owner if(H.is_mob_incapacitated() || G.get_active_firearm(H, FALSE) != holder_item) return - if(!G.powerpack) - G.link_powerpack(usr) /datum/action/item_action/smartgun/update_button_icon() return @@ -313,8 +330,6 @@ /obj/item/weapon/gun/smartgun/unique_action(mob/user) if(isobserver(usr) || isxeno(usr)) return - if(!powerpack) - link_powerpack(usr) toggle_ammo_type(usr) /obj/item/weapon/gun/smartgun/proc/toggle_ammo_type(mob/user) @@ -346,45 +361,38 @@ remove_bullet_trait("iff") drain -= 10 MD.iff_signal = null - if(!powerpack) - link_powerpack(usr) /obj/item/weapon/gun/smartgun/Fire(atom/target, mob/living/user, params, reflex = 0, dual_wield) - if(!requires_powerpack) + if(!requires_battery) ..() return - if(!powerpack || (powerpack && user.back != powerpack)) - if(!link_powerpack(user)) - to_chat(user, SPAN_WARNING("You need a powerpack to be able to fire \the [src]...")) - unlink_powerpack() - return - if(powerpack) + if(battery) if(!requires_power) ..() return - var/obj/item/smartgun_powerpack/pp = user.back - if(istype(pp)) - var/obj/item/cell/c = pp.pcell - var/d = drain - if(flags_gun_features & GUN_BURST_ON) - d = drain*burst_amount*1.5 - if(pp.drain_powerpack(d, c)) - ..() - - -/obj/item/weapon/gun/smartgun/proc/link_powerpack(mob/user) - if(!requires_powerpack) - return TRUE + if(drain_battery()) + ..() - if(!QDELETED(user) && !QDELETED(user.back)) - if(istype(user.back, /obj/item/smartgun_powerpack)) - powerpack = user.back - return TRUE - return FALSE +/obj/item/weapon/gun/smartgun/proc/drain_battery(override_drain) + + var/actual_drain = (rand(drain / 2, drain) / 25) -/obj/item/weapon/gun/smartgun/proc/unlink_powerpack() - powerpack = null + if(override_drain) + actual_drain = (rand(override_drain / 2, override_drain) / 25) + + if(battery && battery.power_cell.charge > 0) + if(battery.power_cell.charge > actual_drain) + battery.power_cell.charge -= actual_drain + else + battery.power_cell.charge = 0 + to_chat(usr, SPAN_WARNING("[src] emits a low power warning and immediately shuts down!")) + return FALSE + return TRUE + if(!battery || battery.power_cell.charge == 0) + to_chat(usr, SPAN_WARNING("[src] emits a low power warning and immediately shuts down!")) + return FALSE + return FALSE /obj/item/weapon/gun/smartgun/proc/toggle_recoil_compensation(mob/user) to_chat(user, "[icon2html(src, usr)] You [recoil_compensation? "disable" : "enable"] \the [src]'s recoil compensation.") @@ -704,5 +712,30 @@ /obj/item/weapon/gun/smartgun/admin requires_power = FALSE - requires_powerpack = FALSE + requires_battery = FALSE requires_harness = FALSE + +/obj/item/smartgun_battery + name = "smartgun DV9 battery" + desc = "A standard-issue 9-volt lithium dry-cell battery, most commonly used within the USCMC to power smartguns. Per the manual, one battery is good for up to 50000 rounds and plugs directly into the smartgun's power receptacle, which is only compatible with this type of battery. Various auxiliary modes usually bring the round count far lower. While this cell is incompatible with most standard electrical system, it can be charged by common rechargers in a pinch. USCMC smartgunners often guard them jealously." + + icon = 'icons/obj/structures/machinery/power.dmi' + icon_state = "smartguncell" + + force = 5 + throwforce = 5 + throw_speed = SPEED_VERY_FAST + throw_range = 5 + w_class = SIZE_SMALL + + var/obj/item/cell/high/power_cell + +/obj/item/smartgun_battery/Initialize(mapload) + . = ..() + + power_cell = new(src) + +/obj/item/smartgun_battery/get_examine_text(mob/user) + . = ..() + + . += SPAN_NOTICE("The power indicator reads [power_cell.charge] charge out of [power_cell.maxcharge] total.") diff --git a/code/modules/projectiles/item_to_box_mapping.dm b/code/modules/projectiles/item_to_box_mapping.dm index 85e11bad7612..45277d194b38 100644 --- a/code/modules/projectiles/item_to_box_mapping.dm +++ b/code/modules/projectiles/item_to_box_mapping.dm @@ -29,7 +29,7 @@ /datum/item_to_box_mapping/New() //Ammo magazine boxes, minus loose ammo boxes - for(var/obj/item/ammo_box/magazine/ammo_box as anything in typesof(/obj/item/ammo_box/magazine)) + for(var/obj/item/ammo_box/magazine/ammo_box as anything in typesof(/obj/item/ammo_box/magazine) - /obj/item/ammo_box/magazine/misc) if(initial(ammo_box.empty)) //Ignore all the empty boxes continue diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm index 782b6bfe8910..787a0585640a 100644 --- a/code/modules/projectiles/magazines/flamer.dm +++ b/code/modules/projectiles/magazines/flamer.dm @@ -58,6 +58,7 @@ reagents.clear_reagents() + playsound(loc, 'sound/effects/refill.ogg', 25, 1, 3) to_chat(usr, SPAN_NOTICE("You empty out [src]")) update_icon() @@ -71,22 +72,21 @@ G.update_icon() /obj/item/ammo_magazine/flamer_tank/afterattack(obj/target, mob/user , flag) //refuel at fueltanks when we run out of ammo. - if(!istype(target, /obj/structure/reagent_dispensers/fueltank) && !istype(target, /obj/item/tool/weldpack) && !istype(target, /obj/item/storage/backpack/marine/engineerpack)) - return ..() if(get_dist(user,target) > 1) return ..() + if(!istype(target, /obj/structure/reagent_dispensers/fueltank) && !istype(target, /obj/item/tool/weldpack) && !istype(target, /obj/item/storage/backpack/marine/engineerpack)) + return ..() - var/obj/O = target - if(!O.reagents || O.reagents.reagent_list.len < 1) - to_chat(user, SPAN_WARNING("[O] is empty!")) + if(!target.reagents || target.reagents.reagent_list.len < 1) + to_chat(user, SPAN_WARNING("[target] is empty!")) return if(!reagents) create_reagents(max_rounds) - var/datum/reagent/to_add = O.reagents.reagent_list[1] + var/datum/reagent/to_add = target.reagents.reagent_list[1] - if(!istype(to_add) || (length(reagents.reagent_list) && flamer_chem != to_add.id) || length(O.reagents.reagent_list) > 1) + if(!istype(to_add) || (length(reagents.reagent_list) && flamer_chem != to_add.id) || length(target.reagents.reagent_list) > 1) to_chat(user, SPAN_WARNING("You can't mix fuel mixtures!")) return @@ -96,10 +96,11 @@ var/fuel_amt_to_remove = Clamp(to_add.volume, 0, max_rounds - reagents.get_reagent_amount(to_add.id)) if(!fuel_amt_to_remove) - to_chat(user, SPAN_WARNING("[O] is empty!")) + if(!max_rounds) + to_chat(user, SPAN_WARNING("[target] is empty!")) return - O.reagents.remove_reagent(to_add.id, fuel_amt_to_remove) + target.reagents.remove_reagent(to_add.id, fuel_amt_to_remove) reagents.add_reagent(to_add.id, fuel_amt_to_remove) playsound(loc, 'sound/effects/refill.ogg', 25, 1, 3) caliber = to_add.name diff --git a/code/modules/reagents/chemistry_properties/prop_special.dm b/code/modules/reagents/chemistry_properties/prop_special.dm index cec04ca66616..7c96169d199f 100644 --- a/code/modules/reagents/chemistry_properties/prop_special.dm +++ b/code/modules/reagents/chemistry_properties/prop_special.dm @@ -96,7 +96,7 @@ H.contract_disease(new /datum/disease/xeno_transformation(0),1) //This is the real reason PMCs are being sent to retrieve it. /datum/chem_property/special/DNA_Disintegrating/trigger() - SSticker.mode.get_specific_call("Weyland-Yutani Goon (Chemical Investigation Squad)", TRUE, FALSE, holder.name) + SSticker.mode.get_specific_call("Weyland-Yutani Goon (Chemical Investigation Squad)", FALSE, FALSE, holder.name, TRUE) chemical_data.update_credits(10) message_admins("The research department has discovered DNA_Disintegrating in [holder.name] adding 10 bonus tech points.") var/datum/techtree/tree = GET_TREE(TREE_MARINE) diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index e1da6d4431e0..f69d1b952c43 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -205,7 +205,7 @@ /datum/reagent/medical/russianred name = "Russian Red" id = "russianred" - description = "An emergency radiation treatment, however it has extreme side effects." + description = "An emergency radiation treatment. The list of potential side effects include retinal damage and unconsciousness." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 custom_metabolism = AMOUNT_PER_TIME(1, 2 SECONDS) @@ -251,7 +251,7 @@ /datum/reagent/medical/bicaridine // yes it cures IB, it's located in some other part of wound code for whatever reason name = "Bicaridine" id = "bicaridine" - description = "Bicaridine is an analgesic medication and can be used to treat severe external blunt trauma and to stabilize patients. Overdosing will cause caustic burns, but can mend internal broken bloodvessels." + description = "Bicaridine is an analgesic medication and can be used to treat severe external blunt trauma and to stabilize patients. Overdosing on Bicaridine will cause caustic burns and toxins." reagent_state = LIQUID color = "#E8756C" overdose = REAGENTS_OVERDOSE @@ -339,7 +339,7 @@ /datum/reagent/medical/rezadone name = "Rezadone" id = "rezadone" - description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." + description = "A powder derived from fish toxin, this substance can effectively treat genetic damage in humanoids. Excessive consumption may cause disastrous side effects." reagent_state = SOLID color = "#669900" // rgb: 102, 153, 0 overdose = REAGENTS_OVERDOSE @@ -405,7 +405,7 @@ /datum/reagent/medical/antized name = "Anti-Zed" id = "antiZed" - description = "Destroy the zombie virus in living humans and prevents regeneration for those who have already turned." + description = "An experimental drug that destroys the zombie virus in living humans and prevents regeneration for those who have already turned." reagent_state = LIQUID color = "#C8A5DC" custom_metabolism = AMOUNT_PER_TIME(1, 200 SECONDS) diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm index 77c3cbe59af6..a7f0a1143428 100644 --- a/code/modules/reagents/chemistry_reagents/other.dm +++ b/code/modules/reagents/chemistry_reagents/other.dm @@ -162,13 +162,13 @@ /datum/reagent/sleen name = "Sleen" id = "sleen" - description = " A favorite of marine medics, it is an addictive, illicit mixture of name brand lime soda and oxycodone, known for it's distinct red hue. Overdosing can cause hallucinations, loss of coordination, seizures, brain damage, respiratory failure, and death." + description = " A favorite of marine medics, it is an illicit mixture of name brand lime soda and oxycodone, known for it's distinct red hue. Overdosing can cause hallucinations, loss of coordination, seizures, brain damage, respiratory failure, and death." reagent_state = LIQUID color = "#C21D24" // rgb: 194, 29, 36 overdose = MED_REAGENTS_OVERDOSE overdose_critical = MED_REAGENTS_OVERDOSE_CRITICAL chemclass = CHEM_CLASS_UNCOMMON - properties = list(PROPERTY_PAINKILLING = 6, PROPERTY_ADDICTIVE = 2) + properties = list(PROPERTY_PAINKILLING = 6) /datum/reagent/serotrotium name = "Serotrotium" diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index d8f61c11a3e6..be087444c99e 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -16,32 +16,32 @@ switch(level) if(SEC_LEVEL_GREEN) if(announce) - ai_announcement("Attention: Security level lowered to GREEN - all clear.", no_sound ? null : 'sound/AI/code_green.ogg') + ai_announcement("Attention: Security level lowered to GREEN - all clear.", no_sound ? null : 'sound/AI/code_green.ogg', ARES_LOG_SECURITY) security_level = SEC_LEVEL_GREEN if(SEC_LEVEL_BLUE) if(security_level < SEC_LEVEL_BLUE) if(announce) - ai_announcement("Attention: Security level elevated to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_elevated.ogg') + ai_announcement("Attention: Security level elevated to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_elevated.ogg', ARES_LOG_SECURITY) else if(announce) - ai_announcement("Attention: Security level lowered to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_lowered.ogg') + ai_announcement("Attention: Security level lowered to BLUE - potentially hostile activity on board.", no_sound ? null : 'sound/AI/code_blue_lowered.ogg', ARES_LOG_SECURITY) security_level = SEC_LEVEL_BLUE if(SEC_LEVEL_RED) if(security_level < SEC_LEVEL_RED) if(announce) - ai_announcement("Attention: Security level elevated to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_elevated.ogg') + ai_announcement("Attention: Security level elevated to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_elevated.ogg', ARES_LOG_SECURITY) else if(announce) - ai_announcement("Attention: Security level lowered to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_lowered.ogg') + ai_announcement("Attention: Security level lowered to RED - there is an immediate threat to the ship.", no_sound ? null : 'sound/AI/code_red_lowered.ogg', ARES_LOG_SECURITY) security_level = SEC_LEVEL_RED if(SEC_LEVEL_DELTA) if(announce) var/name = "SELF-DESTRUCT SYSTEMS ACTIVE" var/input = "DANGER, THE EMERGENCY DESTRUCT SYSTEM IS NOW ACTIVATED. PROCEED TO THE SELF-DESTRUCT CHAMBER FOR CONTROL ROD INSERTION." - marine_announcement(input, name, 'sound/AI/selfdestruct_short.ogg') + marine_announcement(input, name, 'sound/AI/selfdestruct_short.ogg', logging = ARES_LOG_SECURITY) security_level = SEC_LEVEL_DELTA EvacuationAuthority.enable_self_destruct() diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index a41f1944f565..ea4a7fdbc79d 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -243,7 +243,7 @@ hijack(xeno) return -/obj/structure/machinery/computer/shuttle/dropship/flight/proc/hijack(mob/user) +/obj/structure/machinery/computer/shuttle/dropship/flight/proc/hijack(mob/user, force = FALSE) // select crash location var/turf/source_turf = get_turf(src) @@ -251,11 +251,11 @@ var/result = tgui_input_list(user, "Where to 'land'?", "Dropship Hijack", almayer_ship_sections , timeout = 10 SECONDS) if(!result) return - if(result) - if(!user.Adjacent(source_turf)) - return + if(!user.Adjacent(source_turf) && !force) + return if(dropship.is_hijacked) return + var/datum/dropship_hijack/almayer/hijack = new() dropship.hijack = hijack hijack.shuttle = dropship @@ -267,12 +267,15 @@ hijack.fire() GLOB.alt_ctrl_disabled = TRUE - marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg') + marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg', logging = ARES_LOG_SECURITY) var/mob/living/carbon/xenomorph/xeno = user - xeno_message(SPAN_XENOANNOUNCE("The Queen has commanded the metal bird to depart for the metal hive in the sky! Rejoice!"), 3, xeno.hivenumber) - xeno_message(SPAN_XENOANNOUNCE("The hive swells with power! You will now steadily gain pooled larva over time."), 2, xeno.hivenumber) - xeno.hive.abandon_on_hijack() + var/hivenumber = XENO_HIVE_NORMAL + if(istype(xeno)) + hivenumber = xeno.hivenumber + xeno_message(SPAN_XENOANNOUNCE("The Queen has commanded the metal bird to depart for the metal hive in the sky! Rejoice!"), 3, hivenumber) + xeno_message(SPAN_XENOANNOUNCE("The hive swells with power! You will now steadily gain pooled larva over time."), 2, hivenumber) + GLOB.hive_datum[hivenumber].abandon_on_hijack() // Notify the yautja too so they stop the hunt message_all_yautja("The serpent Queen has commanded the landing shuttle to depart.") diff --git a/code/modules/shuttle/dropship_hijack.dm b/code/modules/shuttle/dropship_hijack.dm index 4798279a8b94..ce151c14324c 100644 --- a/code/modules/shuttle/dropship_hijack.dm +++ b/code/modules/shuttle/dropship_hijack.dm @@ -1,3 +1,5 @@ +#define HIJACK_CRASH_SITE_OFFSET_X -5 +#define HIJACK_CRASH_SITE_OFFSET_Y -11 /datum/dropship_hijack var/obj/docking_port/mobile/shuttle @@ -83,18 +85,17 @@ /datum/dropship_hijack/almayer/proc/target_crash_site(ship_section) target_ship_section = ship_section - var/area/target_area = get_crashsite_area(ship_section) - // spawn crash location - var/turf/target = pick(get_area_turfs(target_area)) + var/turf/target = get_crashsite_turf(ship_section) if(!target) to_chat(usr, SPAN_WARNING("No area available")) return var/obj/docking_port/stationary/marine_dropship/crash_site/target_site = new() crash_site = target_site - crash_site.x = target.x - 5 - crash_site.y = target.y - 11 - crash_site.z = target.z + var/turf/offset_target = locate(target.x + HIJACK_CRASH_SITE_OFFSET_X, target.y + HIJACK_CRASH_SITE_OFFSET_Y, target.z) + if(!offset_target) + offset_target = target // Welp the offsetting failed so... + target_site.forceMove(offset_target) target_site.name = "[shuttle] crash site" target_site.id = "crash_site_[shuttle.id]" @@ -117,11 +118,12 @@ var/list/remaining_crash_sites = almayer_ship_sections.Copy() remaining_crash_sites -= target_ship_section var/new_target_ship_section = pick(remaining_crash_sites) - var/area/target_area = get_crashsite_area(new_target_ship_section) - // spawn crash location - var/turf/target = pick(get_area_turfs(target_area)) - crash_site.Move(target) - marine_announcement("A hostile aircraft on course for the [target_ship_section] has been successfully deterred.", "IX-50 MGAD System") + var/turf/target = get_crashsite_turf(new_target_ship_section) + var/turf/offset_target = locate(target.x + HIJACK_CRASH_SITE_OFFSET_X, target.y + HIJACK_CRASH_SITE_OFFSET_Y, target.z) + if(!offset_target) + offset_target = target // Welp the offsetting failed so... + crash_site.forceMove(offset_target) + marine_announcement("A hostile aircraft on course for the [target_ship_section] has been successfully deterred.", "IX-50 MGAD System", logging = ARES_LOG_SECURITY) target_ship_section = new_target_ship_section // TODO mobs not alerted for(var/area/internal_area in shuttle.shuttle_areas) @@ -147,7 +149,7 @@ shuttle.crashing = TRUE - marine_announcement("DROPSHIP ON COLLISION COURSE. CRASH IMMINENT." , "EMERGENCY", 'sound/AI/dropship_emergency.ogg') + marine_announcement("DROPSHIP ON COLLISION COURSE. CRASH IMMINENT." , "EMERGENCY", 'sound/AI/dropship_emergency.ogg', logging = ARES_LOG_SECURITY) announce_dchat("The dropship is about to impact [get_area_name(crash_site)]", crash_site) final_announcement = TRUE @@ -172,53 +174,55 @@ /datum/dropship_hijack/almayer/proc/disable_latejoin() enter_allowed = FALSE -/datum/dropship_hijack/almayer/proc/get_crashsite_area(ship_section) - var/list/areas = list() +/datum/dropship_hijack/almayer/proc/get_crashsite_turf(ship_section) + var/list/turfs = list() switch(ship_section) if("Upper deck Foreship") - areas += typesof(/area/almayer/shipboard/brig) - areas += list(/area/almayer/command/cichallway) - areas += list(/area/almayer/command/cic) + turfs += get_area_turfs(/area/almayer/shipboard/brig/armory) + turfs += get_area_turfs(/area/almayer/shipboard/brig/cells) + turfs += get_area_turfs(/area/almayer/shipboard/brig/cic_hallway) + turfs += get_area_turfs(/area/almayer/shipboard/brig/cryo) + turfs += get_area_turfs(/area/almayer/shipboard/brig/evidence_storage) + turfs += get_area_turfs(/area/almayer/shipboard/brig/execution) + turfs += get_area_turfs(/area/almayer/shipboard/brig/general_equipment) + turfs += get_area_turfs(/area/almayer/shipboard/brig/lobby) + turfs += get_area_turfs(/area/almayer/shipboard/brig/main_office) + turfs += get_area_turfs(/area/almayer/shipboard/brig/perma) + turfs += get_area_turfs(/area/almayer/shipboard/brig/processing) + turfs += get_area_turfs(/area/almayer/shipboard/brig/surgery) + turfs += get_area_turfs(/area/almayer/command/cichallway) + turfs += get_area_turfs(/area/almayer/command/cic) if("Upper deck Midship") - areas += list( - /area/almayer/medical/morgue, - /area/almayer/medical/upper_medical, - /area/almayer/medical/containment, - /area/almayer/medical/containment/cell, - /area/almayer/medical/medical_science, - /area/almayer/medical/testlab, - /area/almayer/medical/hydroponics, - ) + turfs += get_area_turfs(/area/almayer/medical/morgue) + turfs += get_area_turfs(/area/almayer/medical/upper_medical) + turfs += get_area_turfs(/area/almayer/medical/containment) + turfs += get_area_turfs(/area/almayer/medical/containment/cell) + turfs += get_area_turfs(/area/almayer/medical/medical_science) + turfs += get_area_turfs(/area/almayer/medical/testlab) + turfs += get_area_turfs(/area/almayer/medical/hydroponics) if("Upper deck Aftship") - areas += list( - /area/almayer/engineering/upper_engineering, - /area/almayer/command/computerlab, - /area/almayer/engineering/laundry, - ) + turfs += get_area_turfs(/area/almayer/engineering/upper_engineering) + turfs += get_area_turfs(/area/almayer/engineering/laundry) if("Lower deck Foreship") - areas += list( - /area/almayer/hallways/hangar, - /area/almayer/hallways/vehiclehangar - ) + turfs += get_area_turfs(/area/almayer/hallways/hangar) + turfs += get_area_turfs(/area/almayer/hallways/vehiclehangar) if("Lower deck Midship") - areas += list( - /area/almayer/medical/chemistry, - /area/almayer/medical/lower_medical_lobby, - /area/almayer/medical/lockerroom, - /area/almayer/medical/lower_medical_medbay, - /area/almayer/medical/operating_room_one, - /area/almayer/medical/operating_room_two, - /area/almayer/medical/operating_room_three, - /area/almayer/medical/operating_room_four, - /area/almayer/living/briefing, - /area/almayer/squads/req, - - ) + turfs += get_area_turfs(/area/almayer/medical/chemistry) + turfs += get_area_turfs(/area/almayer/medical/lower_medical_lobby) + turfs += get_area_turfs(/area/almayer/medical/lockerroom) + turfs += get_area_turfs(/area/almayer/medical/lower_medical_medbay) + turfs += get_area_turfs(/area/almayer/medical/operating_room_one) + turfs += get_area_turfs(/area/almayer/medical/operating_room_two) + turfs += get_area_turfs(/area/almayer/medical/operating_room_three) + turfs += get_area_turfs(/area/almayer/medical/operating_room_four) + turfs += get_area_turfs(/area/almayer/living/briefing) + turfs += get_area_turfs(/area/almayer/squads/req) if("Lower deck Aftship") - areas += list( - /area/almayer/living/cryo_cells, - /area/almayer/engineering/engineering_workshop, - ) + turfs += get_area_turfs(/area/almayer/living/cryo_cells) + turfs += get_area_turfs(/area/almayer/engineering/engineering_workshop) else CRASH("Crash site [ship_section] unknown.") - return pick(areas) + return pick(turfs) + +#undef HIJACK_CRASH_SITE_OFFSET_X +#undef HIJACK_CRASH_SITE_OFFSET_Y diff --git a/code/modules/shuttle/helpers.dm b/code/modules/shuttle/helpers.dm index 14cfcc3cd691..1d841581faa0 100644 --- a/code/modules/shuttle/helpers.dm +++ b/code/modules/shuttle/helpers.dm @@ -8,7 +8,8 @@ /datum/door_controller/aggregate/Destroy(force, ...) . = ..() - QDEL_NULL_LIST(door_controllers) + QDEL_LIST_ASSOC_VAL(door_controllers) + door_controllers = null /datum/door_controller/aggregate/proc/set_label(label) for(var/datum/door_controller/single/cont in door_controllers) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 0582c1dbcc06..7e181ed470cb 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -180,18 +180,20 @@ if(P) return P.id -/obj/docking_port/proc/is_in_shuttle_bounds(atom/A) - var/turf/T = get_turf(A) - if(T.z != z) +/obj/docking_port/proc/is_in_shuttle_bounds(atom/target) + if(!target) + return FALSE + var/turf/target_turf = get_turf(target) + if(!target_turf || target_turf.z != z) return FALSE var/list/bounds = return_coords() var/x0 = bounds[1] var/y0 = bounds[2] var/x1 = bounds[3] var/y1 = bounds[4] - if(!ISINRANGE(T.x, min(x0, x1), max(x0, x1))) + if(!ISINRANGE(target_turf.x, min(x0, x1), max(x0, x1))) return FALSE - if(!ISINRANGE(T.y, min(y0, y1), max(y0, y1))) + if(!ISINRANGE(target_turf.y, min(y0, y1), max(y0, y1))) return FALSE return TRUE @@ -626,15 +628,15 @@ /obj/docking_port/mobile/proc/intoTheSunset() // Loop over mobs - for(var/t in return_turfs()) - var/turf/T = t - for(var/mob/living/L in T.GetAllContents()) + for(var/turf/turf as anything in return_turfs()) + for(var/mob/living/mob in turf.GetAllContents()) // Ghostize them and put them in nullspace stasis (for stat & possession checks) - //L.notransform = TRUE - var/mob/dead/observer/O = L.ghostize(FALSE) - if(O) - O.timeofdeath = world.time - L.moveToNullspace() + //mob.notransform = TRUE + var/mob/dead/observer/obs = mob.ghostize(FALSE) + if(obs) + obs.timeofdeath = world.time + obs.client?.larva_queue_time = world.time + mob.moveToNullspace() // Now that mobs are stowed, delete the shuttle jumpToNullSpace() diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 458fca5b3bd9..12f33d779661 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -77,10 +77,29 @@ /obj/docking_port/mobile/marine_dropship/proc/is_door_locked(direction) return door_control.is_door_locked(direction) +/obj/docking_port/mobile/marine_dropship/enterTransit() + . = ..() + if(SSticker?.mode && !(SSticker.mode.flags_round_type & MODE_DS_LANDED)) //Launching on first drop. + SSticker.mode.ds_first_drop(src) + /obj/docking_port/mobile/marine_dropship/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock) . = ..() control_doors("force-lock-launch", "all", force=TRUE, asynchronous = FALSE) + if(is_hijacked) + return + + for(var/area/checked_area in shuttle_areas) + for(var/mob/living/carbon/xenomorph/checked_xeno in checked_area) + if(checked_xeno.stat == DEAD) + continue + + var/name = "Unidentified Lifesigns" + var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation." + shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg') + set_security_level(SEC_LEVEL_RED) + return + /obj/docking_port/mobile/marine_dropship/alamo name = "Alamo" id = DROPSHIP_ALAMO @@ -196,11 +215,12 @@ console?.update_equipment() if(is_ground_level(z) && !SSobjectives.first_drop_complete) SSticker.mode.ds_first_landed(src) + SSticker.mode.flags_round_type |= MODE_DS_LANDED + if(xeno_announce) xeno_announcement(SPAN_XENOANNOUNCE("The dropship has landed."), "everything") xeno_announce = FALSE - /obj/docking_port/stationary/marine_dropship/on_dock_ignition(obj/docking_port/mobile/departing_shuttle) . = ..() turn_on_landing_lights() diff --git a/code/modules/shuttle/shuttles/escape_shuttle.dm b/code/modules/shuttle/shuttles/escape_shuttle.dm index d1dc52dd8465..a4bce9910bb7 100644 --- a/code/modules/shuttle/shuttles/escape_shuttle.dm +++ b/code/modules/shuttle/shuttles/escape_shuttle.dm @@ -1,3 +1,5 @@ +#define CRASH_LAND_PROBABILITY 50 + /obj/docking_port/mobile/escape_shuttle name = "Escape Pod" id = ESCAPE_SHUTTLE @@ -5,13 +7,13 @@ width = 4 height = 5 preferred_direction = SOUTH - callTime = DROPSHIP_TRANSIT_DURATION rechargeTime = SHUTTLE_RECHARGE ignitionTime = 8 SECONDS ignition_sound = 'sound/effects/escape_pod_warmup.ogg' var/datum/door_controller/single/door_handler = new() var/launched = FALSE + var/crash_land = FALSE var/evac_set = FALSE /obj/docking_port/mobile/escape_shuttle/Initialize(mapload) @@ -46,12 +48,14 @@ if(mode == SHUTTLE_CRASHED) return + if(launched) + return + var/obj/structure/machinery/computer/shuttle/escape_pod_panel/panel = getControlConsole() if(panel.pod_state == STATE_DELAYED) return door_handler.control_doors("force-lock-launch") - destination = null var/occupant_count = 0 var/list/cryos = list() for(var/area/interior_area in shuttle_areas) @@ -71,11 +75,103 @@ door_handler.control_doors("force-unlock") return + destination = null + if(prob(CRASH_LAND_PROBABILITY)) + create_crash_point() + set_mode(SHUTTLE_IGNITING) on_ignition() setTimer(ignitionTime) launched = TRUE +/obj/docking_port/mobile/escape_shuttle/proc/create_crash_point() + for(var/i = 1 to 10) + var/list/all_ground_levels = SSmapping.levels_by_trait(ZTRAIT_GROUND) + var/ground_z_level = all_ground_levels[1] + + var/list/area/potential_areas = SSmapping.areas_in_z["[ground_z_level]"] + + var/area/area_picked = pick(potential_areas) + + var/list/potential_turfs = list() + + for(var/turf/turf_in_area in area_picked) + potential_turfs += turf_in_area + + if(!length(potential_turfs)) + continue + + var/turf/turf_picked = pick(potential_turfs) + + var/obj/docking_port/stationary/escape_pod/crash_land/temp_escape_pod_port = new(turf_picked) + temp_escape_pod_port.width = width + temp_escape_pod_port.height = height + temp_escape_pod_port.id = id + + if(!check_crash_point(temp_escape_pod_port)) + qdel(temp_escape_pod_port) + continue + + destination = temp_escape_pod_port + break + + if(destination) + crash_land = TRUE + +/obj/docking_port/mobile/escape_shuttle/proc/check_crash_point(obj/docking_port/stationary/escape_pod/crash_land/checked_escape_pod_port) + for(var/turf/found_turf as anything in checked_escape_pod_port.return_turfs()) + var/area/found_area = get_area(found_turf) + if(found_area.flags_area & AREA_NOTUNNEL) + return FALSE + + if(!found_area.can_build_special) + return FALSE + + if(istype(found_turf, /turf/closed/wall)) + var/turf/closed/wall/found_closed_turf = found_turf + if(found_closed_turf.hull) + return FALSE + + if(istype(found_turf, /turf/closed/shuttle)) + return FALSE + + return TRUE + +/obj/docking_port/mobile/escape_shuttle/enterTransit() + . = ..() + + if(!crash_land) + return + + for(var/area/shuttle_area in shuttle_areas) + shuttle_area.flags_alarm_state |= ALARM_WARNING_FIRE + shuttle_area.updateicon() + for(var/mob/evac_mob in shuttle_area) + if(evac_mob.client) + playsound_client(evac_mob.client, 'sound/effects/bomb_fall.ogg', vol = 50) + + for(var/turf/found_turf as anything in destination.return_turfs()) + if(istype(found_turf, /turf/closed)) + found_turf.ChangeTurf(/turf/open/floor) + + cell_explosion(destination.return_center_turf(), 300, 25, EXPLOSION_FALLOFF_SHAPE_LINEAR, null, create_cause_data("evac pod crash")) + +/obj/docking_port/mobile/escape_shuttle/on_prearrival() + . = ..() + + if(!crash_land) + return + + movement_force = list("KNOCKDOWN" = 0, "THROW" = 5) + + for(var/area/shuttle_area in shuttle_areas) + for(var/mob/evac_mob in shuttle_area) + shake_camera(evac_mob, 20, 2) + if(evac_mob.client) + playsound_client(evac_mob.client, get_sfx("bigboom"), vol = 50) + + door_handler.control_doors("force-unlock") + /obj/docking_port/mobile/escape_shuttle/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() playsound(src,'sound/effects/escape_pod_launch.ogg', 50, 1) @@ -138,6 +234,23 @@ width = 4 height = 5 +/obj/docking_port/stationary/escape_pod/crash_land + name = "Crash Escape Pod Dock" + +/obj/docking_port/stationary/escape_pod/crash_land/on_arrival(obj/docking_port/mobile/arriving_shuttle) + . = ..() + + if(istype(arriving_shuttle, /obj/docking_port/mobile/escape_shuttle)) + var/obj/docking_port/mobile/escape_shuttle/escape_shuttle = arriving_shuttle + escape_shuttle.door_handler.control_doors("force-unlock") + + for(var/area/shuttle_area in arriving_shuttle.shuttle_areas) + shuttle_area.SetDynamicLighting() + shuttle_area.SetLightLevel(0) + + shuttle_area.flags_alarm_state &= ~ALARM_WARNING_FIRE + shuttle_area.updateicon() + /datum/map_template/shuttle/escape_pod_w name = "Escape Pod W" shuttle_id = ESCAPE_SHUTTLE_WEST @@ -157,3 +270,6 @@ /datum/map_template/shuttle/escape_pod_e_cl name = "Escape Pod E CL" shuttle_id = ESCAPE_SHUTTLE_EAST_CL + + +#undef CRASH_LAND_PROBABILITY diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index 48a6c176293e..17caccde207e 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -414,7 +414,7 @@ // At halftime, we announce whether or not the AA forced the dropship to divert // The rounding is because transit time is decreased by 10 each loop. Travel time, however, might not be a multiple of 10 if(in_transit_time_left == round(travel_time / 2, 10) && true_crash_target_section != crash_target_section) - marine_announcement("A hostile aircraft on course for the [true_crash_target_section] has been successfully deterred.", "IX-50 MGAD System") + marine_announcement("A hostile aircraft on course for the [true_crash_target_section] has been successfully deterred.", "IX-50 MGAD System", logging = ARES_LOG_SECURITY) var/area/shuttle_area for(var/turf/T in turfs_int) @@ -438,7 +438,7 @@ //This is where things change and shit gets real - marine_announcement("DROPSHIP ON COLLISION COURSE. CRASH IMMINENT." , "EMERGENCY", 'sound/AI/dropship_emergency.ogg') + marine_announcement("DROPSHIP ON COLLISION COURSE. CRASH IMMINENT." , "EMERGENCY", 'sound/AI/dropship_emergency.ogg', logging = ARES_LOG_SECURITY) for(var/mob/dead/observer/observer as anything in GLOB.observer_list) to_chat(observer, SPAN_DEADSAY(FONT_SIZE_LARGE("The dropship is about to impact [get_area_name(T_trg)]" + " [OBSERVER_JMP(observer, T_trg)]"))) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index e765851c3b29..ecf1bacf080b 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -291,7 +291,7 @@ GLOBAL_LIST_EMPTY(shuttle_controls) if(round_statistics) round_statistics.track_hijack() - marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg') + marine_announcement("Unscheduled dropship departure detected from operational area. Hijack likely. Shutting down autopilot.", "Dropship Alert", 'sound/AI/hijack.ogg', logging = ARES_LOG_SECURITY) shuttle.alerts_allowed-- to_chat(Q, SPAN_DANGER("A loud alarm erupts from [src]! The fleshy hosts must know that you can access it!")) diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index c6ffb9e52a41..f87caaa54758 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -128,6 +128,7 @@ tools = list( /obj/item/tool/surgery/bonesetter = SURGERY_TOOL_MULT_IDEAL, /obj/item/tool/wrench = SURGERY_TOOL_MULT_SUBSTITUTE, + /obj/item/maintenance_jack = SURGERY_TOOL_MULT_BAD_SUBSTITUTE, ) time = 4 SECONDS preop_sound = 'sound/surgery/hemostat1.ogg' diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 4a44c3ce7b67..767f50fc9750 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -176,9 +176,25 @@ SPAN_NOTICE("[user] clamps bleeders in your [parse_zone(target_zone)]."), SPAN_NOTICE("[user] clamps bleeders in [target]'s [parse_zone(target_zone)].")) - surgery.affected_limb.remove_all_bleeding(TRUE, FALSE) log_interact(user, target, "[key_name(user)] clamped bleeders in [key_name(target)]'s [surgery.affected_limb.display_name], possibly ending [surgery].") + var/surface_modifier = target.buckled?.surgery_duration_multiplier + if(!surface_modifier) + surface_modifier = SURGERY_SURFACE_MULT_AWFUL + for(var/obj/surface in get_turf(target)) + if(surface_modifier > surface.surgery_duration_multiplier) + surface_modifier = surface.surgery_duration_multiplier + + if(surface_modifier == SURGERY_SURFACE_MULT_IDEAL) + surgery.affected_limb.remove_all_bleeding(TRUE, FALSE) + return + + var/bleeding_multiplier_bad_surface = surface_modifier - 1 + for(var/datum/effects/bleeding/external/external_bleed in surgery.affected_limb.bleeding_effects_list) + external_bleed.blood_loss *= bleeding_multiplier_bad_surface + to_chat(user, SPAN_WARNING("Stopping blood loss is less effective in these conditions.")) + + /datum/surgery_step/clamp_bleeders_step/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) user.affected_message(target, SPAN_WARNING("Your hand slips, tearing blood vessels in [target]'s [surgery.affected_limb.display_name] and causing massive bleeding!"), diff --git a/code/modules/surgery/surgery_steps.dm b/code/modules/surgery/surgery_steps.dm index ee6a0b1056e8..b58c62b57f68 100644 --- a/code/modules/surgery/surgery_steps.dm +++ b/code/modules/surgery/surgery_steps.dm @@ -114,6 +114,10 @@ affected_limb, or location vars. Also, in that case there may be a wait between step_duration *= surface_modifier + var/list/human_modifiers = list("surgery_speed" = 1.0, "pain_reduction" = 0) + SEND_SIGNAL(user, COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS, human_modifiers) + step_duration *= human_modifiers["surgery_speed"] + var/try_to_fail if(user.a_intent != INTENT_HELP) try_to_fail = TRUE @@ -145,7 +149,7 @@ affected_limb, or location vars. Also, in that case there may be a wait between to_chat(user, SPAN_WARNING("[capitalize(english_list(message, final_comma_text = ","))].")) var/advance //Whether to continue to the next step afterwards. - var/pain_failure_chance = max(0, target.pain?.feels_pain ? surgery.pain_reduction_required - target.pain.reduction_pain : 0) * 2 //Each extra pain unit increases the chance by 2 + var/pain_failure_chance = max(0, (target.pain?.feels_pain ? surgery.pain_reduction_required - target.pain.reduction_pain : 0) * 2 - human_modifiers["pain_reduction"]) //Each extra pain unit increases the chance by 2 play_preop_sound(user, target, target_zone, tool, surgery) diff --git a/code/modules/tents/blockers.dm b/code/modules/tents/blockers.dm new file mode 100644 index 000000000000..3301768d9147 --- /dev/null +++ b/code/modules/tents/blockers.dm @@ -0,0 +1,38 @@ +/// Invisible Blocker Walls, they link up with the main tent and collapse with it +/obj/structure/blocker/tent + name = "Tent Blocker" + icon = 'icons/obj/structures/barricades.dmi' + icon_state = "folding_0" // for map editing only + flags_atom = ON_BORDER + invisibility = INVISIBILITY_MAXIMUM + density = TRUE + opacity = FALSE // Unfortunately this doesn't behave as we'd want with ON_BORDER so we can't make tent opaque + /// The tent this blocker relates to, will be destroyed along with it + var/obj/structure/tent/linked_tent + +/obj/structure/blocker/tent/Initialize(mapload, ...) + . = ..() + icon_state = null + linked_tent = locate(/obj/structure/tent) in loc + if(!linked_tent) + return INITIALIZE_HINT_QDEL + RegisterSignal(linked_tent, COMSIG_PARENT_QDELETING, PROC_REF(collapse)) + +/obj/structure/blocker/tent/Destroy(force) + . = ..() + linked_tent = null + +/obj/structure/blocker/tent/proc/collapse() + SIGNAL_HANDLER + qdel(src) + +/obj/structure/blocker/tent/initialize_pass_flags(datum/pass_flags_container/PF) + ..() + if (PF) + PF.flags_can_pass_all = NONE + PF.flags_can_pass_front = NONE + PF.flags_can_pass_behind = NONE + +/obj/structure/blocker/tent/get_projectile_hit_boolean(obj/item/projectile/P) + . = ..() + return FALSE // Always fly through the tent diff --git a/code/modules/tents/deployed_tents.dm b/code/modules/tents/deployed_tents.dm new file mode 100644 index 000000000000..c81beb318d5a --- /dev/null +++ b/code/modules/tents/deployed_tents.dm @@ -0,0 +1,124 @@ +/// Structures serving as landmarks and providing a buff to its users. +/// A notable code feature is that they use a separate roof image that phases out when you enter the tent. +/obj/structure/tent + name = "tent" + icon = 'icons/obj/structures/tents_deployed_classic.dmi' + opacity = FALSE // Seems only the initial turf blocks light, not all of the multitile. Therefore, useless. + layer = INTERIOR_WALL_SOUTH_LAYER // This should be below FLY_LAYER but just thank chairs and other bs + health = 200 + appearance_flags = TILE_BOUND + + /// Turf dimensions along the X axis, beginning from left, at ground level + var/x_dim = 2 + /// Turf dimensions along the Y axis, beginning from bottom, at ground level + var/y_dim = 3 + + /// How much cold protection to add to entering humans - Full body clothing means complete (1) protection + var/cold_protection_factor = 0.4 + + /// Roof display icon_state or null to disable + var/roof_state + /// Roof image displayed on the roof plane + var/image/roof_image + +/obj/structure/tent/Initialize(mapload, ...) + . = ..() + bound_width = x_dim * world.icon_size + bound_height = y_dim * world.icon_size + register_turf_signals() + RegisterSignal(src, COMSIG_ATOM_TURF_CHANGE, PROC_REF(register_turf_signals)) + + switch(SSmapping.configs[GROUND_MAP].camouflage_type) + if("jungle") + icon = 'icons/obj/structures/tents_deployed_jungle.dmi' + if("desert") + icon = 'icons/obj/structures/tents_deployed_desert.dmi' + if("snow") + icon = 'icons/obj/structures/tents_deployed_snow.dmi' + if("urban") + icon = 'icons/obj/structures/tents_deployed_urban.dmi' + + if(roof_state) + roof_image = image(icon, src, roof_state) + roof_image.plane = ROOF_PLANE + roof_image.appearance_flags = KEEP_APART + src.overlays += roof_image + +/obj/structure/tent/proc/register_turf_signals() + SIGNAL_HANDLER + for(var/turf/turf in locs) + RegisterSignal(turf, COMSIG_TURF_ENTERED, PROC_REF(movable_entering_tent), override = TRUE) + +/obj/structure/tent/proc/movable_entering_tent(turf/hooked, atom/movable/subject) + SIGNAL_HANDLER + if(!ismob(subject)) + return + var/mob/subject_mob = subject + RegisterSignal(subject_mob, list(COMSIG_MOVABLE_TURF_ENTERED, COMSIG_GHOST_MOVED), PROC_REF(mob_moved), override = TRUE) // Must override because we can't know if mob was already inside tent without keeping an awful ref list + var/atom/movable/screen/plane_master/roof/roof_plane = subject_mob.hud_used.plane_masters["[ROOF_PLANE]"] + roof_plane?.invisibility = INVISIBILITY_MAXIMUM + if(ishuman(subject)) + RegisterSignal(subject, COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS, PROC_REF(cold_protection), override = TRUE) + +/obj/structure/tent/proc/cold_protection(mob/source, list/protection_data) + SIGNAL_HANDLER + protection_data["protection"] += cold_protection_factor + +/obj/structure/tent/proc/mob_moved(mob/subject, turf/target_turf) + SIGNAL_HANDLER + if(!(target_turf in locs)) // Exited the tent + mob_exited_tent(subject) + +/obj/structure/tent/proc/mob_exited_tent(mob/subject) + UnregisterSignal(subject, list(COMSIG_MOVABLE_TURF_ENTERED, COMSIG_GHOST_MOVED, COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS)) + var/atom/movable/screen/plane_master/roof/roof_plane = subject.hud_used.plane_masters["[ROOF_PLANE]"] + roof_plane?.invisibility = 0 + +/obj/structure/tent/attack_alien(mob/living/carbon/xenomorph/M) + if(unslashable) + return + health -= 20 + if(health <= 0) + visible_message(SPAN_BOLDWARNING("The [src] collapses!")) + qdel(src) + +/// Command tent, providing basics for field command: a phone, and an overwatch console +/obj/structure/tent/cmd + icon_state = "cmd_interior" + roof_state = "cmd_top" + desc = "A standard USCM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. It is very frail, do not burn, expose to sharp objects, or explosives." + +/// Medical tent, procures a buff to surgery speed +/obj/structure/tent/med + icon_state = "med_interior" + roof_state = "med_top" + desc = "A standard USCM Medical Tent. This one comes equipped with advanced field surgery facilities. It is very fragile however and won't withstand the rigors of war." + var/surgery_speed_mult = 0.9 + var/surgery_pain_reduction = 5 + +/obj/structure/tent/med/movable_entering_tent(turf/hooked, atom/movable/subject) + . = ..() + if(ishuman(subject)) + RegisterSignal(subject, COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS, PROC_REF(apply_surgery_modifiers), override = TRUE) + +/obj/structure/tent/med/mob_exited_tent(mob/subject) + . = ..() + UnregisterSignal(subject, COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS) + +/obj/structure/tent/med/proc/apply_surgery_modifiers(mob/living/carbon/human/source, list/surgery_data) + SIGNAL_HANDLER + surgery_data["surgery_speed"] *= surgery_speed_mult + surgery_data["pain_reduction"] += surgery_pain_reduction + +/// Big Tent. It's just Big. Use it for shelter or organization! +/obj/structure/tent/big + icon_state = "big_interior" + roof_state = "big_top" + x_dim = 3 + y_dim = 3 + +/obj/structure/tent/reqs + icon_state = "reqs_interior" + roof_state = "reqs_top" + x_dim = 4 + y_dim = 3 diff --git a/code/modules/tents/equipment.dm b/code/modules/tents/equipment.dm new file mode 100644 index 000000000000..f2f9175a240e --- /dev/null +++ b/code/modules/tents/equipment.dm @@ -0,0 +1,113 @@ +/// Component to handle power requirements following removal of the tent +/datum/component/tent_powered_machine + dupe_mode = COMPONENT_DUPE_HIGHLANDER + var/obj/structure/tent/linked_tent + +/datum/component/tent_powered_machine/Initialize(...) + . = ..() + if(!istype(parent, /obj/structure/machinery)) + return COMPONENT_INCOMPATIBLE + var/obj/structure/machinery/machine = parent + var/obj/structure/tent/located_tent = locate(/obj/structure/tent) in machine.loc + if(located_tent) + linked_tent = located_tent + machine.needs_power = FALSE + RegisterSignal(linked_tent, COMSIG_PARENT_QDELETING, PROC_REF(enable_power_requirement)) + +/datum/component/tent_powered_machine/proc/enable_power_requirement() + SIGNAL_HANDLER + var/obj/structure/machinery/machine = parent + machine.needs_power = TRUE + +/// Component to handle destruction of objects following removal of the tent +/datum/component/tent_supported_object + dupe_mode = COMPONENT_DUPE_HIGHLANDER + var/obj/structure/tent/linked_tent + +/datum/component/tent_supported_object/Initialize(...) + . = ..() + if(!istype(parent, /atom/movable)) + return COMPONENT_INCOMPATIBLE + var/atom/movable/source = parent + var/obj/structure/tent/located_tent = locate(/obj/structure/tent) in source.loc + if(located_tent) + linked_tent = located_tent + RegisterSignal(linked_tent, COMSIG_PARENT_QDELETING, PROC_REF(tent_collapse)) + +/datum/component/tent_supported_object/proc/tent_collapse() + SIGNAL_HANDLER + qdel(parent) + +/// Groundside console +/obj/structure/machinery/computer/overwatch/tent/Initialize(mapload, ...) + AddComponent(/datum/component/tent_supported_object) + return ..() + +/// Telephone +/obj/structure/transmitter/tent + layer = INTERIOR_WALLMOUNT_LAYER +/obj/structure/transmitter/tent/Initialize(mapload, ...) + AddComponent(/datum/component/tent_supported_object) + return ..() + +/// ASRS request console +/obj/structure/machinery/computer/ordercomp/tent + icon_state = "request_wall" + density = FALSE + deconstructible = FALSE + needs_power = FALSE + indestructible = TRUE // Goes with the tent instead + layer = INTERIOR_WALLMOUNT_LAYER +/obj/structure/machinery/computer/ordercomp/tent/Initialize() + AddComponent(/datum/component/tent_supported_object) + return ..() + +/// NanoMED +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/tent + unacidable = FALSE + layer = INTERIOR_WALLMOUNT_LAYER + needs_power = FALSE +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/tent/Initialize() + AddComponent(/datum/component/tent_supported_object) + return ..() + +/// Closeable curtains +/obj/structure/tent_curtain + icon = 'icons/obj/structures/tents_equipment.dmi' + icon_state = "curtains-classic-o" + desc = "USCM Curtains for USCM Tents used by USCM Personnel. Close this with right-click to ensure USCM Contents are contained." + flags_atom = ON_BORDER + layer = INTERIOR_DOOR_INSIDE_LAYER + dir = SOUTH + density = FALSE + alpha = 180 + +/obj/structure/tent_curtain/Initialize(mapload, ...) + . = ..() + AddComponent(/datum/component/tent_supported_object) + update_icon() + +/obj/structure/tent_curtain/get_projectile_hit_boolean(obj/item/projectile/P) + return FALSE + +/obj/structure/tent_curtain/update_icon() + . = ..() + var/camo = SSmapping.configs[GROUND_MAP].camouflage_type + if(density) + icon_state = "curtains-[camo]" + else + icon_state = "curtains-[camo]-o" + +/obj/structure/tent_curtain/attack_hand(mob/user) + . = ..() + if(!.) + playsound(loc, "rustle", 10, TRUE, 4) + density = !density + update_icon() + return TRUE + +/obj/structure/tent_curtain/attack_alien(mob/living/carbon/xenomorph/M) + if(unslashable) + return + visible_message(SPAN_BOLDWARNING("[src] gets torn to shreds!")) + qdel(src) diff --git a/code/modules/tents/folded_tents.dm b/code/modules/tents/folded_tents.dm new file mode 100644 index 000000000000..d1f922703500 --- /dev/null +++ b/code/modules/tents/folded_tents.dm @@ -0,0 +1,165 @@ +/obj/item/folded_tent + name = "Folded Abstract Tent" + icon = 'icons/obj/structures/tents_folded.dmi' + w_class = SIZE_LARGE + /// Required cleared area along X axis + var/dim_x = 1 + /// Required cleared area along Y axis + var/dim_y = 1 + /// Deployment X offset + var/off_x = 0 + /// Deployment Y offset + var/off_y = 0 + /// Map Template to use for the tent + var/template + +/// Check an area is clear for deployment of the tent +/obj/item/folded_tent/proc/check_area(turf/ref_turf, mob/message_receiver, display_error = FALSE) + SHOULD_NOT_SLEEP(TRUE) + . = TRUE + var/list/turf_block = get_deployment_area(ref_turf) + for(var/turf/turf as anything in turf_block) + var/area/area = get_area(turf) + if(!area.can_build_special) + if(message_receiver) + to_chat(message_receiver, SPAN_WARNING("You cannot deploy tents on restricted areas.")) + if(display_error) + new /obj/effect/overlay/temp/tent_deployment_area/error(turf) + return FALSE + if(istype(turf, /turf/open/shuttle)) + if(message_receiver) + to_chat(message_receiver, SPAN_BOLDWARNING("What are you doing?!! Don't build that on the shuttle please!")) + return FALSE + if(turf.density) + if(message_receiver) + to_chat(message_receiver, SPAN_WARNING("You cannot deploy the [src] here, something ([turf]) is in the way.")) + if(display_error) + new /obj/effect/overlay/temp/tent_deployment_area/error(turf) + return FALSE + for(var/atom/movable/atom as anything in turf) + if(isliving(atom) || (atom.density && atom.can_block_movement) || istype(atom, /obj/structure/tent)) + if(message_receiver) + to_chat(message_receiver, SPAN_WARNING("You cannot deploy the [src] here, something ([atom.name]) is in the way.")) + if(display_error) + new /obj/effect/overlay/temp/tent_deployment_area/error(turf) + return FALSE + return TRUE + +/obj/item/folded_tent/proc/unfold(turf/ref_turf) + var/datum/map_template/template_instance = new template() + template_instance.load(ref_turf, FALSE, FALSE) + +/obj/item/folded_tent/proc/get_deployment_area(turf/ref_turf) + RETURN_TYPE(/list/turf) + var/turf/block_end_turf = locate(ref_turf.x + dim_x - 1, ref_turf.y + dim_y - 1, ref_turf.z) + return block(ref_turf, block_end_turf) + +/obj/item/folded_tent/attack_self(mob/living/user) + . = ..() + var/turf/deploy_turf = user.loc + if(!istype(deploy_turf)) + return // In a locker or something. Get lost you already have a home. + + switch(user.dir) // Fix up offset deploy location so tent is better centered + can be deployed under all angles + if(NORTH) + deploy_turf = locate(deploy_turf.x + off_x, deploy_turf.y + 1, deploy_turf.z) + if(SOUTH) + deploy_turf = locate(deploy_turf.x + off_x, deploy_turf.y - dim_y, deploy_turf.z) + if(EAST) + deploy_turf = locate(deploy_turf.x + 1, deploy_turf.y + off_y, deploy_turf.z) + if(WEST) + deploy_turf = locate(deploy_turf.x - dim_x, deploy_turf.y + off_y, deploy_turf.z) + + if(!istype(deploy_turf) || (deploy_turf.x + dim_x > world.maxx) || (deploy_turf.y + dim_y > world.maxy)) // Map border basically + return + + if(!is_ground_level(deploy_turf.z)) + to_chat(user, SPAN_WARNING("USCM Operational Tents are intended for operations, not ship or space recreation.")) + return + + var/list/obj/effect/overlay/temp/tent_deployment_area/turf_overlay = list() + var/list/turf/deployment_area = get_deployment_area(deploy_turf) + + if(!check_area(deploy_turf, user, TRUE)) + for(var/turf/turf in deployment_area) + new /obj/effect/overlay/temp/tent_deployment_area(turf) // plus error in check_area + return + + for(var/turf/turf in deployment_area) + turf_overlay += new /obj/effect/overlay/temp/tent_deployment_area/casting(turf) + + user.visible_message(SPAN_INFO("[user] starts deploying the [src]..."), \ + SPAN_WARNING("You start assembling the [src]... Stand still, it might take a bit to figure it out...")) + if(!do_after(user, 6 SECONDS, INTERRUPT_ALL, BUSY_ICON_BUILD)) + to_chat(user, SPAN_WARNING("You were interrupted!")) + for(var/gfx in turf_overlay) + qdel(gfx) + return + + if(!check_area(deploy_turf, user, TRUE)) + for(var/gfx in turf_overlay) + QDEL_IN(gfx, 1.5 SECONDS) + return + + unfold(deploy_turf) + user.visible_message(SPAN_INFO("[user] finishes deploying the [src]!"), SPAN_INFO("You finish deploying the [src]!")) + for(var/gfx in turf_overlay) + qdel(gfx) + qdel(src) // Success! + +/obj/item/folded_tent/cmd + name = "folded USCM Command Tent" + icon_state = "cmd" + desc = "A standard USCM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. Unfold in a suitable location to maximize usefulness. Staff Officer not included. ENTRANCE TO THE SOUTH." + dim_x = 2 + dim_y = 3 + off_x = -1 + template = /datum/map_template/tent/cmd + +/obj/item/folded_tent/med + name = "folded USCM Medical Tent" + icon_state = "med" + desc = "A standard USCM Medical Tent. This one comes equipped with advanced field surgery facilities. Unfold in a suitable location to maximize health gains. Surgical Tray not included. ENTRANCE TO THE SOUTH." + dim_x = 2 + dim_y = 3 + template = /datum/map_template/tent/med + +/obj/item/folded_tent/reqs + name = "folded USCM Requisitions Tent" + icon_state = "req" + desc = "A standard USCM Requisitions Tent. Now, you can enjoy req line anywhere you go! Unfold in a suitable location to maximize resource distribution. ASRS not included. ENTRANCE TO THE SOUTH." + dim_x = 4 + dim_y = 3 + off_x = -2 + template = /datum/map_template/tent/reqs + +/obj/item/folded_tent/big + name = "folded USCM Big Tent" + icon_state = "big" + desc = "A standard USCM Tent. This one is just a bigger, general purpose version. Unfold in a suitable location for maximum FOB vibes. Mess Tech not included. ENTRANCE TO THE SOUTH." + dim_x = 3 + dim_y = 3 + off_x = -2 + template = /datum/map_template/tent/big + +/obj/effect/overlay/temp/tent_deployment_error + icon = 'icons/effects/effects.dmi' + icon_state = "placement_zone" + color = "#bb0000" + effect_duration = 1.5 SECONDS + layer = ABOVE_FLY_LAYER + +/obj/effect/overlay/temp/tent_deployment_area + icon = 'icons/effects/effects.dmi' + icon_state = "placement_zone" + color = "#f39e00" + effect_duration = 1.5 SECONDS + layer = FLY_LAYER + +/obj/effect/overlay/temp/tent_deployment_area/casting + effect_duration = 10 SECONDS + color = "#228822" + +/obj/effect/overlay/temp/tent_deployment_area/error + layer = ABOVE_FLY_LAYER + color = "#bb0000" diff --git a/code/modules/tents/templates.dm b/code/modules/tents/templates.dm new file mode 100644 index 000000000000..c32c0214999e --- /dev/null +++ b/code/modules/tents/templates.dm @@ -0,0 +1,23 @@ +/datum/map_template/tent + name = "Base Tent" + var/map_id = "change this" + +/datum/map_template/tent/New() + mappath = "maps/tents/[map_id].dmm" + return ..() + +/datum/map_template/tent/cmd + name = "CMD Tent" + map_id = "tent_cmd" + +/datum/map_template/tent/med + name = "MED Tent" + map_id = "tent_med" + +/datum/map_template/tent/big + name = "Big Tent" + map_id = "tent_big" + +/datum/map_template/tent/reqs + name = "Reqs Tent" + map_id = "tent_reqs" diff --git a/code/modules/tgs/LICENSE b/code/modules/tgs/LICENSE index 221f9e1deb21..2bedf9a63aa0 100644 --- a/code/modules/tgs/LICENSE +++ b/code/modules/tgs/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017 Jordan Brown +Copyright (c) 2017-2023 Jordan Brown Permission is hereby granted, free of charge, to any person obtaining a copy of this software and diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index 6ef7c86ef75b..5d3d491a7362 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.6.0" +"5.6.1" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index a3f949081f16..c7213cc24699 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -75,7 +75,7 @@ #define DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED 4 #define DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE 5 #define DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE 6 -#define DMAPI5_TOPIC_COMMAND_HEARTBEAT 7 +#define DMAPI5_TOPIC_COMMAND_HEALTHCHECK 7 #define DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH 8 #define DMAPI5_TOPIC_COMMAND_SEND_CHUNK 9 #define DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK 10 diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index 3779db6237a3..56c1824fd97d 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -137,7 +137,9 @@ server_port = new_port return TopicResponse() - if(DMAPI5_TOPIC_COMMAND_HEARTBEAT) + if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK) + if(event_handler?.receive_health_checks) + event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK) return TopicResponse() if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH) diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index e3455b69d1c6..c679737dfc49 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -75,7 +75,7 @@ #undef DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED #undef DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE #undef DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE -#undef DMAPI5_TOPIC_COMMAND_HEARTBEAT +#undef DMAPI5_TOPIC_COMMAND_HEALTHCHECK #undef DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH #undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE diff --git a/code/modules/vehicles/interior/interactable/vendors.dm b/code/modules/vehicles/interior/interactable/vendors.dm index 717e9d131987..96a6f6b49c0f 100644 --- a/code/modules/vehicles/interior/interactable/vendors.dm +++ b/code/modules/vehicles/interior/interactable/vendors.dm @@ -252,7 +252,7 @@ list("M44 Heavy Speed Loader (.44)", 0, /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR), list("M44 Marksman Speed Loader (.44)", 0, /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR), list("M4A3 HP Magazine (9mm)", 0, /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR), - list("M56 Powerpack", 0, /obj/item/smartgun_powerpack, VENDOR_ITEM_REGULAR), + list("M56 Battery", 0, /obj/item/smartgun_battery, VENDOR_ITEM_REGULAR), list("M56 Smartgun Drum", 0, /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR), list("M56D Drum Magazine",0, /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR), list("SU-6 Smartpistol Magazine (.45)", round(scale * 2), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR), @@ -382,3 +382,78 @@ updateUsrDialog() return TRUE//We found our item, no reason to go on. + +/// Modified Restockable APC-based vendor for use by Req in the deployable tent +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent + desc = "An automated restockable storage vendor for use in organizing FOB supplies." + req_access = list(ACCESS_MARINE_CARGO) + density = TRUE + indestructible = TRUE // Deleted with the tent instead + needs_power = FALSE + +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent/Initialize() + . = ..() + var/obj/structure/tent/located_tent = locate(/obj/structure/tent) in loc + if(!located_tent) + return INITIALIZE_HINT_QDEL + RegisterSignal(located_tent, COMSIG_PARENT_QDELETING, PROC_REF(begin_unloading)) + +//combined from req guns and ammo vendors +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent/populate_product_list(scale) + listed_products = list( + list("BUILDING MATERIALS", -1, null, null), + list("Cardboard x10", 1, /obj/item/stack/sheet/cardboard/small_stack, VENDOR_ITEM_REGULAR), + list("Barbed Wire x10", 0, /obj/item/stack/barbed_wire/small_stack, VENDOR_ITEM_REGULAR), + list("Metal x10", 0, /obj/item/stack/sheet/metal/small_stack, VENDOR_ITEM_REGULAR), + list("Plasteel x10", 0, /obj/item/stack/sheet/plasteel/small_stack, VENDOR_ITEM_REGULAR), + list("Sandbags (empty) x10", 0, /obj/item/stack/sandbags_empty/small_stack, VENDOR_ITEM_REGULAR), + list("Sandbags (full) x5", 0, /obj/item/stack/sandbags/small_stack, VENDOR_ITEM_REGULAR), + + list("AMMUNITION", -1, null, null), + list("Box Of Buckshot Shells", 0, /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), + list("Box Of Flechette Shells", 0, /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), + list("Box Of Shotgun Slugs", 0, /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR), + list("M4RA Magazine (10x24mm)", 0, /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR), + list("M41A MK2 Magazine (10x24mm)", 0, /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR), + list("M39 HV Magazine (10x20mm)", 0, /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), + list("M44 Speed Loader (.44)", 0, /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), + list("M4A3 Magazine (9mm)", 0, /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), + list("M56D Drum Magazine", 0, /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR), + list("M2C Box Magazine", 0, /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR), + + list("ARMOR", -1, null, null), + list("M10 Pattern Marine Helmet", 0, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), + list("M3 Pattern Carrier Marine Armor", 0, /obj/item/clothing/suit/storage/marine/carrier, VENDOR_ITEM_REGULAR), + list("M3 Pattern Padded Marine Armor", 0, /obj/item/clothing/suit/storage/marine/padded, VENDOR_ITEM_REGULAR), + list("M3 Pattern Padless Marine Armor", 0, /obj/item/clothing/suit/storage/marine/padless, VENDOR_ITEM_REGULAR), + list("M3 Pattern Ridged Marine Armor", 0, /obj/item/clothing/suit/storage/marine/padless_lines, VENDOR_ITEM_REGULAR), + list("M3 Pattern Skull Marine Armor", 0, /obj/item/clothing/suit/storage/marine/skull, VENDOR_ITEM_REGULAR), + list("M3-EOD Pattern Heavy Armor", 0, /obj/item/clothing/suit/storage/marine/heavy, VENDOR_ITEM_REGULAR), + list("M3-L Pattern Light Armor", 0, /obj/item/clothing/suit/storage/marine/light, VENDOR_ITEM_REGULAR), + + list("MISCELLANEOUS", -1, null, null), + list("Box Of MREs", 0, /obj/item/ammo_box/magazine/misc/mre, VENDOR_ITEM_REGULAR), + list("Box Of M94 Marking Flare Packs", 0, /obj/item/ammo_box/magazine/misc/flares, VENDOR_ITEM_REGULAR), + list("M89-S Signal Flare Pack", 0, /obj/item/storage/box/m94/signal, VENDOR_ITEM_REGULAR), + list("M94 Marking Flare Pack", 0, /obj/item/storage/box/m94, VENDOR_ITEM_REGULAR), + list("Flashlights", 1, /obj/item/device/flashlight, VENDOR_ITEM_REGULAR), + list("MB-6 Folding Barricades (x3)", 0, /obj/item/stack/folding_barricade/three, VENDOR_ITEM_REGULAR), + list("Entrenching Tool", 0, /obj/item/tool/shovel/etool, VENDOR_ITEM_REGULAR), + list("Roller Bed", 0, /obj/item/roller, VENDOR_ITEM_REGULAR), + list("Table", 3, /obj/item/frame/table, VENDOR_ITEM_REGULAR), + list("Rack", 3, /obj/item/frame/rack, VENDOR_ITEM_REGULAR), + list("Cliboard", 4, /obj/item/clipboard, VENDOR_ITEM_REGULAR), + list("Pen", 4, /obj/item/tool/pen, VENDOR_ITEM_REGULAR), + list("Chair", 2, /obj/item/weapon/twohanded/folded_metal_chair, VENDOR_ITEM_REGULAR), + + list("AMMUNITION BOXES", -1, null, null), + list("Shotgun Shell Box (Buckshot x 100)", 0, /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Box (Flechette x 100)", 0, /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR), + list("Shotgun Shell Box (Slugs x 100)", 0, /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR), + list("Rifle Ammunition Box (10x24mm)", 0, /obj/item/ammo_box/rounds, VENDOR_ITEM_REGULAR), + list("SMG Ammunition Box (10x20mm HV)", 0, /obj/item/ammo_box/rounds/smg, VENDOR_ITEM_REGULAR), + ) + +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent/proc/begin_unloading() + SIGNAL_HANDLER + INVOKE_ASYNC(src, PROC_REF(catastrophic_failure), TRUE, TRUE) diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 38c95d93881d..0681b7df05ac 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -126,6 +126,27 @@ /obj/vehicle/attack_remote(mob/user as mob) return +/obj/vehicle/attack_alien(mob/living/carbon/xenomorph/attacking_xeno) + if(attacking_xeno.a_intent == INTENT_HELP) + return XENO_NO_DELAY_ACTION + + if(attacking_xeno.mob_size < MOB_SIZE_XENO) + to_chat(attacking_xeno, SPAN_XENOWARNING("You're too small to do any significant damage to this vehicle!")) + return XENO_NO_DELAY_ACTION + + attacking_xeno.animation_attack_on(src) + + attacking_xeno.visible_message(SPAN_DANGER("[attacking_xeno] slashes [src]!"), SPAN_DANGER("You slash [src]!")) + playsound(attacking_xeno, pick('sound/effects/metalhit.ogg', 'sound/weapons/alien_claw_metal1.ogg', 'sound/weapons/alien_claw_metal2.ogg', 'sound/weapons/alien_claw_metal3.ogg'), 25, 1) + + var/damage = (attacking_xeno.melee_vehicle_damage + rand(-5,5)) * brute_dam_coeff + + health -= damage + + healthcheck() + + return XENO_NONCOMBAT_ACTION + //------------------------------------------- // Vehicle procs //------------------------------------------- diff --git a/code/span_macros.dm b/code/span_macros.dm index 110da044e74a..d5e9cdcb9c36 100644 --- a/code/span_macros.dm +++ b/code/span_macros.dm @@ -102,3 +102,5 @@ #define SPAN_ORANGE(X) "[X]" #define SPAN_PURPLE(X) "[X]" #define SPAN_MAROON(X) "[X]" + +#define SPAN_STAFF_IC(X) "[X]" diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 60fe1c0f9917..8e1ce4069b10 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -30,6 +30,7 @@ em {font-style: normal; font-weight: bold;} .mentorhelp {color: #009900; font-weight: bold;} .mentorstaff {color: #b5850d; font-weight: bold;} .staffsay {color: #b5850d; font-weight: bold;} +.staff_ic {color: #000099;} .name { font-weight: bold;} diff --git a/colonialmarines.dme b/colonialmarines.dme index fb138da60d54..ebd73b3544dd 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -31,6 +31,7 @@ #include "code\__DEFINES\_tick.dm" #include "code\__DEFINES\access.dm" #include "code\__DEFINES\admin.dm" +#include "code\__DEFINES\ARES.dm" #include "code\__DEFINES\atmospherics.dm" #include "code\__DEFINES\autolathe.dm" #include "code\__DEFINES\blood.dm" @@ -41,6 +42,7 @@ #include "code\__DEFINES\chat.dm" #include "code\__DEFINES\chemistry.dm" #include "code\__DEFINES\clans.dm" +#include "code\__DEFINES\client_prefs.dm" #include "code\__DEFINES\colours.dm" #include "code\__DEFINES\combat.dm" #include "code\__DEFINES\configuration.dm" @@ -455,6 +457,7 @@ #include "code\datums\emergency_calls\dutch.dm" #include "code\datums\emergency_calls\emergency_call.dm" #include "code\datums\emergency_calls\feral_xenos.dm" +#include "code\datums\emergency_calls\forsaken_xenos.dm" #include "code\datums\emergency_calls\goons.dm" #include "code\datums\emergency_calls\hefa_knight.dm" #include "code\datums\emergency_calls\inspection.dm" @@ -571,6 +574,7 @@ #include "code\datums\statistics\random_facts\damage_fact.dm" #include "code\datums\statistics\random_facts\kills_fact.dm" #include "code\datums\statistics\random_facts\random_fact.dm" +#include "code\datums\statistics\random_facts\revives_fact.dm" #include "code\datums\supply_packs\_supply_packs.dm" #include "code\datums\supply_packs\ammo.dm" #include "code\datums\supply_packs\attachments.dm" @@ -771,6 +775,10 @@ #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\washing_machine.dm" #include "code\game\machinery\weather_siren.dm" +#include "code\game\machinery\ARES\ARES.dm" +#include "code\game\machinery\ARES\ARES_procs.dm" +#include "code\game\machinery\ARES\ARES_records.dm" +#include "code\game\machinery\ARES\ARES_step_triggers.dm" #include "code\game\machinery\atmoalter\canister.dm" #include "code\game\machinery\atmoalter\meter.dm" #include "code\game\machinery\atmoalter\portable_atmospherics.dm" @@ -948,7 +956,6 @@ #include "code\game\objects\effects\spawners\vaultspawner.dm" #include "code\game\objects\effects\spawners\wo_spawners\players.dm" #include "code\game\objects\effects\spawners\wo_spawners\supplies.dm" -#include "code\game\objects\items\artifacts.dm" #include "code\game\objects\items\ashtray.dm" #include "code\game\objects\items\backpack_sprayers.dm" #include "code\game\objects\items\bodybag.dm" @@ -1380,6 +1387,7 @@ #include "code\modules\asset_cache\assets\tgui.dm" #include "code\modules\asset_cache\assets\vending.dm" #include "code\modules\asset_cache\transports\asset_transport.dm" +#include "code\modules\asset_cache\transports\webroot_transport.dm" #include "code\modules\buildmode\bm-mode.dm" #include "code\modules\buildmode\buildmode.dm" #include "code\modules\buildmode\buttons.dm" @@ -1553,6 +1561,7 @@ #include "code\modules\cm_tech\techs\marine\tier1\points.dm" #include "code\modules\cm_tech\techs\marine\tier2\orbital_ammo.dm" #include "code\modules\cm_tech\techs\marine\tier3\cryorine.dm" +#include "code\modules\cm_tech\techs\marine\tier4\nuke.dm" #include "code\modules\cm_tech\trees\marine.dm" #include "code\modules\customitems\item_spawning.dm" #include "code\modules\decorators\admin_runtime_decorator.dm" @@ -2166,6 +2175,11 @@ #include "code\modules\teleporters\teleporter_admin_verbs.dm" #include "code\modules\teleporters\teleporter_console.dm" #include "code\modules\teleporters\teleporter_landmarks.dm" +#include "code\modules\tents\blockers.dm" +#include "code\modules\tents\deployed_tents.dm" +#include "code\modules\tents\equipment.dm" +#include "code\modules\tents\folded_tents.dm" +#include "code\modules\tents\templates.dm" #include "code\modules\tgchat\cm_shims.dm" #include "code\modules\tgchat\message.dm" #include "code\modules\tgchat\to_chat.dm" diff --git a/config/example/resources.txt b/config/example/resources.txt new file mode 100644 index 000000000000..0f9aaf021aa5 --- /dev/null +++ b/config/example/resources.txt @@ -0,0 +1,40 @@ +# External resources +# Set this to the location of a .zip with the server's .rsc inside of it. +# If you set this mutiple times, the server will rotate between the links. +# To use this, the compile option PRELOAD_RSC must be set to 0 to keep byond from preloading resources +# Resource urls can not be encrypted (https://), as they are downloaded by byond, not IE, and byond can't into encryption + +EXTERNAL_RSC_URLS http://rsc.cm-ss13.com/ + + +######################## +# Browser Asset Config # +######################## +# Browser assets are any file included in interfaces. css, images, javascript, etc. +# This handles configuring how we get these to the player so interfaces can access them. + +# Asset Transport +# The normal way of getting assets to clients is to use the internal byond system. This can be slow and delay the opening of interface windows. It also doesn't allow the internal IE windows byond uses to cache anything. +# You can instead have the server save them to a website via a folder within the game server that the web server can read. This could be a simple webserver or something backed by a CDN. +# Valid values: simple, webroot. Simple is the default. +#ASSET_TRANSPORT webroot + + +# Simple asset transport configurable values. + +# Uncomment this to have the server passively send all browser assets to each client in the background. (instead of waiting for them to be needed) +# This should be uncommented in production and commented in development +#ASSET_SIMPLE_PRELOAD + + +# Webroot asset transport configurable values. + +# Local folder to save assets to. +# Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/ as ASSET_FILE_NAME or asset.MD5HASH.EXT +#ASSET_CDN_WEBROOT data/asset-store/ + +# URL the folder from above can be accessed from. +# for best results the webserver powering this should return a long cache validity time, as all assets sent via this transport use hash based urls +# Encryption (https) is supported here, but linux clients will have issues if you require higher then tls 1.0. Windows clients down to windows 7 can handle tls 1.2 no issue. +# if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script to host assets stored in `data/asset-store/` via http://localhost:58715/ +#ASSET_CDN_URL http://localhost:58715/ diff --git a/html/changelogs/AutoChangeLog-pr-3298.yml b/html/changelogs/AutoChangeLog-pr-3298.yml new file mode 100644 index 000000000000..0a75d2215043 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3298.yml @@ -0,0 +1,15 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "Added an admin button for an ARES bioscan. Slightly refactored how Bioscans trigger for marines, relying on an ARES processor." + - rscadd: "Added individual proccessors for ARES systems. These are WIP and will eventually have damage and repair interactions." + - rscadd: "Added an ARES interaction console in the AI Core room, which holds logs for most ARES functions." + - rscadd: "Added the ability for ARES console to call ERT or Distress." + - rscadd: "Added motion triggers in ARES core and shipside comms that send alerts over Apollo." + - rscadd: "Added a 1to1 conversation feature between ARES and users of the interface console." + - rscadd: "Added preset open versions of blended poddoors." + - rscadd: "Added a console for directing Working Joes. This is largely WIP for future PR(s)." + - rscadd: "Added subtypes of air pipes that don't explode on hijack, used these in ARES core." + - maptweak: "Remodelled ARES Core onto a fake-z, and added the new processors." + - bugfix: "door_control buttons now respect being indestructable when processing explosions." + - maptweak: "Fixed the M39s overflowing in brig armory due to use of landmarks." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3432.yml b/html/changelogs/AutoChangeLog-pr-3432.yml deleted file mode 100644 index 49c85e171ea1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3432.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Morrow" -delete-after: True -changes: - - balance: "Without a hive core Xenos no longer get stored larva from latejoin marines or bursts" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3435.yml b/html/changelogs/AutoChangeLog-pr-3435.yml deleted file mode 100644 index 4a408f4f89f1..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3435.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Khadd" -delete-after: True -changes: - - bugfix: "fixed upp synths having 2 different names and clf synths now get a name when they're given the equipment preset" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3666.yml b/html/changelogs/AutoChangeLog-pr-3666.yml new file mode 100644 index 000000000000..d7d8860c237e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3666.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - balance: "Xenos no longer can pull dead xenos" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3717.yml b/html/changelogs/AutoChangeLog-pr-3717.yml new file mode 100644 index 000000000000..6d6327ea63a7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3717.yml @@ -0,0 +1,4 @@ +author: "Drathek" +delete-after: True +changes: + - bugfix: "Fixed the crashsite offset for a hijack shuttle that gets deterred by the MGAD System" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3718.yml b/html/changelogs/AutoChangeLog-pr-3718.yml new file mode 100644 index 000000000000..41f5322a2493 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3718.yml @@ -0,0 +1,4 @@ +author: "TheGamerdk" +delete-after: True +changes: + - balance: "Queen boosted building no longer has 2 second cooldown when far from hive" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3723.yml b/html/changelogs/AutoChangeLog-pr-3723.yml new file mode 100644 index 000000000000..987b7eeec708 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3723.yml @@ -0,0 +1,4 @@ +author: "TheGamerdk" +delete-after: True +changes: + - bugfix: "Communications intel objective now actually works" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3730.yml b/html/changelogs/AutoChangeLog-pr-3730.yml new file mode 100644 index 000000000000..9ae18e6bc788 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3730.yml @@ -0,0 +1,4 @@ +author: "fira" +delete-after: True +changes: + - bugfix: "Fixed a MC crash related to NPC huggers rebounding logic." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3731.yml b/html/changelogs/AutoChangeLog-pr-3731.yml new file mode 100644 index 000000000000..21fd76664d2b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3731.yml @@ -0,0 +1,4 @@ +author: "blackdragonTOW" +delete-after: True +changes: + - maptweak: "Added a small light to unlit rooms." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3736.yml b/html/changelogs/AutoChangeLog-pr-3736.yml new file mode 100644 index 000000000000..c1eba0beabfd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3736.yml @@ -0,0 +1,4 @@ +author: "Morrow" +delete-after: True +changes: + - rscdel: "Removed toxin mags on shivas" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3742.yml b/html/changelogs/AutoChangeLog-pr-3742.yml new file mode 100644 index 000000000000..7319ac52f8d9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3742.yml @@ -0,0 +1,6 @@ +author: "SpartanBobby" +delete-after: True +changes: + - maptweak: "Minor decal changes to LV522" + - maptweak: "Buffed sec armory on LV522" + - maptweak: "LV522 Breaching charge moved to the PROP APC made UNACIDABLE" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3743.yml b/html/changelogs/AutoChangeLog-pr-3743.yml new file mode 100644 index 000000000000..084e74fc2c2e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3743.yml @@ -0,0 +1,4 @@ +author: "Katskan" +delete-after: True +changes: + - balance: "Removed G8A storage from various snow suits and parkas" \ No newline at end of file diff --git a/html/changelogs/archive/2023-05.yml b/html/changelogs/archive/2023-05.yml index b4d31b4c42bc..12389c68cd12 100644 --- a/html/changelogs/archive/2023-05.yml +++ b/html/changelogs/archive/2023-05.yml @@ -505,3 +505,81 @@ - rscadd: anyone with the skills of a doctor or a pilot can manage the medevac by interacting with the system itself. - qol: medical stretcher automatically activates when deployed. +2023-05-29: + Huffie56: + - bugfix: Fix Inconsistencies with text when toggling lights while being inside + a closet for example. + Khadd: + - bugfix: fixed upp synths having 2 different names and clf synths now get a name + when they're given the equipment preset + Morrow: + - balance: Without a hive core Xenos no longer get stored larva from latejoin marines + or bursts + NewyearnewmeUwu: + - rscadd: Added armor preference as an option in the preferences menu + - code_imp: Changed the way armor variation is handled upon initializing. Also, + surplus uniform vendors now use an essentials set to randomly pick an armor + set regardless of your preferences. +2023-05-30: + BeagleGaming1: + - admin: Deferring to mentorhelp gives a specific message instead of a generic resolution + message + Drathek: + - bugfix: Fixed non-queen xeno overwatch persisting on a dead xeno + LynxSolstice, Sionnach: + - rscadd: Adds a new IMP framed back item, the Ammo Rack. + - balance: Added the new Ammo Rack to the Req vendor. At a scaling of (round*1), + it should be pretty scarce. The ammo rack also is unthrowable and adds a flat + .5 second increase to movement delay. + - imageadd: Added icons for Ammo_Pack_ and onmobs for each state (0, 1, 2, and 3) + Morrow: + - rscadd: Adds buyable blood bags to corpsmen vendors + - rscadd: Adds a revive fun fact + SpartanBobby: + - rscadd: Adds Laser-Light Combo attachment unique to VP78 + - rscadd: Adds new description to VP78 + fira: + - bugfix: XvX end and Admin ending round won't play nuclear detonation sequence + music anymore. + - bugfix: Fixed a bug in radio signaling cleanup that was notably preventing signallers + from working as intended, and likely caused issues for other devices. + ghostsheet: + - rscadd: Added ARES conclusion announcement for marine major. + - rscadd: Added a harmless smoke cloud to Acid Runner's "For the Hive" ability. + - rscadd: Added a M89-S Signal Flare pack to SL essential kit. + harryob: + - bugfix: there's less random vendors on WO +2023-05-31: + BeagleGaming1: + - admin: Allows auto rename VV to not be encoded + - rscdel: Removes certain parts of the black market + Drathek: + - balance: Acid Runner's For the Hive ability now clears its slowdown effect when + canceled + - admin: USCM cryo spawns (Foxtrot) that normally inject into the manifest will + now also get their money accounts set up automatically + Huffie56: + - bugfix: trijent shuttle apc can now be properly fixed... + - maptweak: added a scenery around the fix to make it look more natural. + LynxSolstice: + - rscadd: Field kit for all roles. (spawner with a map). Sandbags and E-Tool buyable + in the rifleman vendor. + - code_imp: Moved the map from a _KIT bitflag to a new bitflag, added the fieldkit + to all squad roles. + - balance: Added half stacks of sandbags to the rifleman vendor, buyable for one + stack each for 5 points. + Morrow: + - admin: Adds logging for buying tech + - balance: Made more areas in LV522 reactor OB-able + - balance: Removes addictive from sleen + NewyearnewmeUwu: + - bugfix: You can restock vendors with armors again. + Segrain: + - bugfix: Removed an exploit involving closets/crates. + TenguHangover: + - bugfix: Corrected the nurse's starting descriptor in line with IB changes. + ihatethisengine: + - spellcheck: damage taken fun fact now correctly states that player "took" so many + damage instead of "did". + realforest2001: + - bugfix: SG vendor no longer has Burstfire Adapter as SG cannot use it diff --git a/html/changelogs/archive/2023-06.yml b/html/changelogs/archive/2023-06.yml new file mode 100644 index 000000000000..71aeb035f4b8 --- /dev/null +++ b/html/changelogs/archive/2023-06.yml @@ -0,0 +1,385 @@ +2023-06-02: + Drathek: + - bugfix: Fix runtime with a timer to fade out on screen orders again? + Morrow: + - rscadd: Added tunnels to the xeno tracker + - bugfix: Fixed xeno trackers on some maps + - balance: Placed resin walls now destroy nodes underneath them. +2023-06-03: + Drathek: + - admin: Admin get log verbs now use FTP instead of run (offers save location rather + than just opening) + Khadd: + - bugfix: fix xenos being able to build over tunnels + Morrow: + - balance: Removes warrior cooldown reduction on slash + - balance: Warrior slightly lowered fling and punch cooldowns + - balance: Lowers fling stun to a micro stun and adds a slow + - balance: Decreases warrior lunge range to 4 tiles + NewyearnewmeUwu: + - bugfix: fixed armor prefs not giving the right thing + - bugfix: ERTs now use their arrivals messages. + ihatethisengine: + - spellcheck: direction tip now uses the correct order. +2023-06-04: + Huffie56: + - bugfix: remove items anchored and on the LZ's on fiorina map. + Morrow: + - rscdel: Removed field kits + - rscdel: removed recommend tag from etool/sandbags + - rscdel: Removed the change stone + fira: + - bugfix: Fixed incorrect coordinates in Admin Niche log for signal flares. +2023-06-05: + Drathek: + - admin: Fixed the force dropship verb (now known as Force Hijack) requiring the + admin to be adjacent to the console and runtiming. + - bugfix: Fixed xenos being able to use abilities on their UI; They will target + the turf under it. + - bugfix: Clients should hopefully avoid disconnection when observing someone that + is deleted. + Khadd: + - bugfix: largecrates now take damage and break if hit enough times by a projectile + - bugfix: construction nodes cant be placed inside of walls and such anymore + - bugfix: sandbags cant be fully built up with just one bag anymore + LynxSolstice: + - maptweak: Replaced the IFF locked M41As in the PMC nightmare that spawn on the + ground with the new no_lock variant. + Morrow: + - bugfix: Increases amount of survivor spawns on shivas to required level + - rscadd: Added automatic forsaken spawns groundside during hijack + NewyearnewmeUwu: + - balance: Headbite has a 10 second cooldown. + SpartanBobby: + - maptweak: LZ1 Bigred and west medical warehouse now has a glass ceiling + - maptweak: More sidewalks and pathways on big red + - maptweak: various minor turf edits to big red + - maptweak: places warning stripes tile under all doors on big red + - maptweak: adds glass ceilings to multiple fringe buildings on the outskirts of + LV624 + fira: + - bugfix: Fixed going down ASRS elevator spamming computer messages. + - bugfix: To the joy of conspiracy theorists everywhere, USCM dropships can now + be caught on tape again. +2023-06-06: + Huffie56: + - qol: increase minimum paygrade for every marines + Segrain: + - rscadd: Expanded the list of custom loadout items. + - qol: Custom loadout is now sorted into sections. + realforest2001: + - rscadd: Adds a staff to IC chat tab setting for faxes and prayers. +2023-06-07: + Morrow: + - balance: HPR is now only found in requisitions. +2023-06-08: + BeagleGaming1: + - balance: Maintenance Jack can pry flooring and do wrench surgery + Khadd: + - qol: transfer direction & rate are now listed in the description of reagent tanks + - bugfix: fixes being able to make others pick up chairs + Morrow: + - balance: Hand and feet now cannot get IB + Segrain: + - bugfix: Queen Eye no longer repeatedly throws runtime errors. + Steelpoint: + - maptweak: Fixed landing strip lights on most maps + fira: + - bugfix: Lobby Music is a bit quieter and should now stop properly when you spawn + in. + - bugfix: Fixed signallers hijacking radio headsets filters, bricking the frequency + for radio usage. They now have their own radio filter. + nauticall: + - imageadd: 'Resprited the following items: large colony floodlights, the large + colony floodlight switch, newscasters, and ATMs.' + realforest2001: + - rscadd: Adds an admin button for global blurb alerts. (Visual on game screen) + wHO_TOOKthejam: + - rscadd: gives DCC and PO the same armor choices +2023-06-09: + Al-1ce: + - bugfix: Bicaridine no-longer says it can fix IB. + - spellcheck: RR, Bica, Rezadone and Anti-Zed are now more informative about their + side effects. + Drathek: + - bugfix: Fix xenos being unable to point and marines unable to open bags with MMB + - bugfix: Fix ghosts interacting with ghost join abilities and teleporting to UI + icons. + - bugfix: Disabled xenos transferring plasma to self (it just wasted plasma) + - ui: Vanguard dash now uses a different icon state while waiting for second use + (or timeout) + fira: + - qol: Reduced USCM SG max scattering on Full Auto fire so you don't have to periodically + let go of the fire button to keep it from firing way wide. +2023-06-10: + Firartix , Thwomper and Sammy: + - rscadd: Added four types of tents to liven up FOB. They provide cold protection + and benefits depending on their type. The tents spawn in Requisitions roundstart + near the mortar. They're vulnerable to explosives and xenomorphs, and NON REPLACEABLE. + Mind where you put them! + - rscadd: The Command tent comes equipped with an overwatch console and a phone. + - rscadd: The Medical tent provides a small boost to surgery speed/pain carried + out inside it. + - rscadd: The Requisitions tent provides a restockable vendor, desk, and furniture + for organization. + - rscadd: The Big tent is just a big tent, and provides you a slate to organize + the way you want. + Huffie56: + - refactor: create many sub-type for item to clean the code. + Morrow: + - rscadd: Brought back the USCM blurb on first drop + - rscadd: Drop pouch is now buyable by riflemen + - rscadd: Reintroduced auto red alert when xenos are aboard a dropship + - rscdel: Removes fourth awkward LZ2 Soro communication relay + - balance: Burrowers are now unable to burrow while inside a non-burrow area + - rscadd: You can now find internal bleeding via Health Scanner + fira: + - rscadd: Added optional adaptive client zooming to match in-game zoom. This allows + display to be pixel perfect on most monitors if enabled, it removes blurring + of game introduced by Stretch to Fit mode, at the cost of slightly reduced vertical + size. It is best used with Auto Fit viewport feature enabled. +2023-06-11: + Al-1ce: + - spellcheck: Polykevlon no-longer uses an underscore in its name. + BeagleGaming1: + - bugfix: Acid pillars can now target crit burning friendly xenos + Morrow: + - rscadd: Forsaken ERT is now weighted by type + - bugfix: Fixed medical holocards + - rscadd: Escape pods now have a 50% chance to crash land to the surface + - bugfix: Escape pods will no longer relaunch when evacuation is complete + - rscadd: Cryopods now give a slight glow when occupied + - rscdel: Removed ability to high toss over ultra reinforced windows + - balance: Clamping bleeding in surgery is now less effective in bad conditions + - bugfix: Removed some broken forsaken ERT code + NewyearnewmeUwu: + - bugfix: fixed a bug with armor prefs +2023-06-12: + Segrain: + - rscadd: Jobs can now be assigned specific character slots, which will be automatically + loaded when joining as that role. + TheGamerdk: + - bugfix: Your fluff security record from preferences is now visible to MPs. + - bugfix: You can now plant hardy weeds on colony turfs on Chances Claim + - bugfix: Data detector no longer triggers on empty vial boxes + - bugfix: Sentries now work correctly on dropships. + - bugfix: Xenos are no longer notified each time a sister destroys a large crate. + fira: + - bugfix: Handling C4 and Breaching Charges should not zealously trigger antigrief + protection anymore + - rscadd: Added a map override for Admins allowing them to load in maps directly + as ground or ship during the next round. + ihatethisengine: + - bugfix: MMB cannot be used to attack again +2023-06-13: + Al-1ce: + - rscadd: Backstories have been added to various interesting drinks. + Hopek: + - balance: Huggers no longer lose health over time on weeds. + Huffie56: + - bugfix: restore some object back to original to keep them compatible with older + map. + Morrow: + - bugfix: Added missing Fiorina Sciannex groundside xeno landmarks + - bugfix: Made nukes get those pesky closet/tunnel hiders + - balance: Crippling Strike is now forced harm intent + Morrow, Triiodine: + - rscadd: Added a smartgun specific battery that you use with the smartgun itself. + - rscdel: Removed the smartgun powerpack. You no longer need it for the smartgun. + TheGamerdk: + - bugfix: You'll now be allowed to reenter your nested body when freed, even if + you used the ghost verb. + realforest2001: + - code_imp: Updated all the Get_Access() procs, and removed some procs where they + completely overlapped with others in presets. +2023-06-15: + Drathek: + - bugfix: Fixed a runtime in shuttles when a mob is non-existent or has no turf + location. + Huffie56: + - rscadd: Added a Empty canister verb to the Pyrotechnician fuel tanks + - bugfix: prevent fuel backpacks to be filled via reagent tank with improper chemical(welding + fuel). + Jackie_Estegado: + - bugfix: The Burrower's burrow ability will no longer be not cancelled just because + you clicked on a tile that you wouldn't have been able to burrow to. + - bugfix: Burrowing will no longer complete even though you cancelled it. + Morrow: + - balance: Grass (and other flora) will no longer eat your bullets. + - bugfix: Fixed a runtime when observing before roundstart + SpartanBobby: + - bugfix: fixes invisible walls on LV522 + - bugfix: fixes unweedable tiles on LV522 + - bugfix: 'fixes invisible windows on LV522 (if you spot any invisible windows send + a picture of them to the SS13: CM discord #mapperchannel @spartanbobby' + - bugfix: fixes LV522 OOB area in the W-Y vault + - maptweak: moves sandbags and a breaching charge on LV522 + - maptweak: fixes bigred tileset inconsistencies in the expanded filt nightmare + - maptweak: Replaces LV522 ceramic plates with MRE crate + fira: + - bugfix: Fixed an internal error when scanning turfs with Black Market scanner. + realforest2001: + - spellcheck: Weapon Stats examine UI now shows 'accurate range' rather than 'accuracy' +2023-06-16: + Morrow: + - balance: Shipside roles now weight even less for xeno counts. + Nanu, Spartanbobby, Julian56: + - mapadd: Added W-Y Station, UPP Station, CLF Station and... + - admin: Admins can now use the custom ERT stations for events or even base of operations. + Steelpoint: + - rscadd: Adds a M41A Mk2 kit to the Squad Leaders vendor. +2023-06-17: + Drathek: + - bugfix: Fix grab delay after a tackle for xenos + - spellcheck: Added Commander Code of Conduct link to XO entry description and fixed + CO capitalization. + - code_imp: Replaced sting usage for USS Almayer to MAIN_SHIP_DEFAULT_NAME for Souto + ERT, CMB ERT, Provost ERT reporters, XO, and CO. + Steelpoint: + - bugfix: Larva who spawn in containment in Trijent will now have weeds to grow + on. + TheGamerdk, ihatethisengine: + - bugfix: player can no longer come back in their bodies after ghosting +2023-06-18: + BeagleGaming1: + - bugfix: fixes a runtime with paygrades and round start prosthetics + realforest2001: + - rscadd: Added WY, PMC and UPP faction specific listings for crew monitors. + - rscadd: Changed the assignment/job define for Standard PMCs, Detainers and Crewmen + to use their manual assignments. + - bugfix: Fixes name error for Division Manager. + - bugfix: FIxes incorrect faction assignment for CLF corpses. + thwompa: + - imageadd: new diamond sprite +2023-06-19: + Morrow: + - balance: Double barrel shotgun acquisition removal + QuickLoad,Frans_Feiffer,nauticall: + - rscadd: Adds The Hazmat Joe with two minor variations. This is a Working Joe equipped + to handle hazardous situations, dangerous repairs and firefighting! They are + complete with their own gear, tasks, job and purpose. Forget the trashbag, get + that wall fixed before we get spaced! + - imageadd: Adds a new Working Joe model made by Frans Feiffer! + - imageadd: Adds two variations of the Working Joe, aka the Hazmat Joe. Complete + with accessories! Beautiful sprites by Frans Feiffer! + - rscadd: Android Maintenance Stations / Synthetic Repair Stations will remove shrapnel + & fix organ damage. Working Joes no longer have knives, and should report to + the stations for repair. Gigantic thanks to nauticall for her work on this!! + - imagedel: Removes(replaces) the old Working Joe model. + - rscadd: Working Joes receive some basic equipment, and are slightly resilient + to disarms. + - rscadd: Working Joes will start at 3, with a maximum of 6 depending on population. + - rscadd: Joes can access a Synthetic vendor to replace their uniform if it is damaged. + - bugfix: Minor changes to PO Uniform. + SpypigDev: + - bugfix: Completed the teleporting pipeline delivery system between OT workshop + and Requisitions + TheGamerdk: + - rscdel: Chem goons only give 1 announcement instead of 3 + Ultimate-Fluff: + - bugfix: Corrected outdated information about one of Dancer's abilities in its + strain description. + - bugfix: Fixed the erroneously-named copper coin from gold coin. + - bugfix: Paper flags with writing on them will not say they are blank in the examine + text. + ihatethisengine: + - bugfix: folding barricade now takes 15% less acid damage instead of 15% extra + acid damage, as the description hints. + - bugfix: folding barricade now blocks pounces from behind. + - qol: collapsing folding barricade by hand is no longer interrupted by taking an + item. +2023-06-20: + Morrow: + - balance: Xenos can slash trolleys now + - balance: Generators can no longer be blown up + - balance: Bonus evolution slowly deteriorates over time when all castes are unlocked + - balance: Portable Generators can now be turned off/unanchored by xeno slashes +2023-06-21: + BeagleGaming1: + - rscadd: Melting flares makes the flares burn out faster, instead of melting like + normal + - balance: Flares last ~10 mins, and flares in the air last ~5 mins + Morrow: + - rscadd: Re-added the nuke that you can buy via intel at tier 4. Only purchasable + past 120 minutes. Requires holding both groundside comms towers for authorization + decryption before being able to be armed. + TheGamerdk: + - bugfix: Forsaken no longer announce themselves as a distress signal +2023-06-22: + Al-1ce: + - rscadd: Adds various magazines and a crayon to loadout selection. + Drathek Firartix: + - bugfix: Fixed a crash with hijack code possibly picking a non-existent brig area, + and weighting smaller areas heavier. + Morrow: + - bugfix: Flashlight gun attachments turn off when they should + sg2002: + - bugfix: XM88 now correctly notifies the user on the hit streak end. +2023-06-23: + harryob: + - server: server's can now support using a cdn for web assets +2023-06-24: + Drathek: + - rscadd: The selection to become a xeno larva is now based on timeofdeath rather + than random and also sends a message to all candidates when the queue moves. + Playing as a facehugger or on admin z-levels (thunderdome) will not affect your + relative place in queue. The join xeno action will also display the last queue + message for you when you allow xeno candidacy. + - bugfix: Fixed gibbed humans not properly setting their timeofdeath when on an + admin z-level. + - bugfix: Fixed a bad del on shuttle doors when a shuttle deletes (such as intoTheSunset). + - bugfix: Fixed erroneous is empty messages when inserting tanks into a flamer pack. + - soundadd: Added the refill sfx when using the empty canister verb on flamer tanks. + Morrow: + - bugfix: Prevented some light bugs with devouring marines + - bugfix: Fixed two gun light attachment issues + Steelpoint: + - rscadd: Synthetics may now vend Ponchos. + realforest2001: + - admin: Improves logging for admin deadchat. + - admin: Adds logging for xeno evolution. + theselfish: + - qol: Added the Corpsman Helmet to Req's surplus vendor. +2023-06-25: + Sargeantmuffinman: + - rscadd: Added two new emails to the Almayer's personal computers and rewrote 3 + other emails. + Segrain: + - bugfix: Hive core now always correctly absorbs hive's dead larvas. + - bugfix: Preview dummy in character setup once again can be rotated. +2023-06-26: + Drathek: + - bugfix: Fixed the yank object verb not testing who is actually performing the + action has a free hand + - rscadd: Player facehugging gets 2nd dibs on the burst (the original marine gets + first dibs still) + - bugfix: Fix a possibility of banished larva refunding double the larva + blackdragonTOW: + - spellcheck: multiple typos and grammar changes in the round start tooltips. +2023-06-27: + TeDGamer Drathek: + - bugfix: Boilers from other hives generate proper colored IFFed gas + - bugfix: Fixes some death causes with boiler acid gas (for bombard, shroud, and + gibbing), neurotoxin gas/stabs, acid shotgun, and xeno spits + - balance: Neurotoxin stops processing only in dead mobs + TheGamerdk: + - bugfix: The game will no longer falsely claim there is no CO + realforest2001: + - rscadd: Changed min and max Predator ages from 20 - 10000 to 175 - 3000 +2023-06-28: + Drathek: + - admin: Mentors can now eavesdrop on mentor messages, and the responder to a mhelp + doesn't get double logging from eavesdropping. + Morrow, Thwomper: + - rscadd: Added three new uniforms and a snow jacket for the CL. + TheGamerdk: + - balance: Cluster OBs will now no longer hit turfs that have gotten OB protection + after the initial OB was fired. + ihatethisengine: + - balance: larva surge is limited by marines/xenos ratio + - bugfix: xenos no longer get free larva from abandoned facehuggers during hijack + - balance: explosive barricade upgrade provides better protection against explosions + (25% to 50%) + - balance: explosive barricade upgrade provides strong protection against brute-based + projectiles (50%) + - balance: explosive barricade upgrade provides strong protection against fire (50%) diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index c2fd9c2d6263..692fc5e49405 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/effects/techtree/tech.dmi b/icons/effects/techtree/tech.dmi index a255a0d0e544..d88106f82d11 100644 Binary files a/icons/effects/techtree/tech.dmi and b/icons/effects/techtree/tech.dmi differ diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index fa06d7c8bc8f..fe04c9d66dc3 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/hands.dmi b/icons/mob/humans/onmob/hands.dmi index 971fdb887148..c8da787cee04 100644 Binary files a/icons/mob/humans/onmob/hands.dmi and b/icons/mob/humans/onmob/hands.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 60451b7006af..0fb5700225e3 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index 4d63b7abd7f1..5cccc4c2e0e0 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index bd6adc7ab88e..df588b9b59ca 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 26993223a9d4..cac9869c9034 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/mob/humans/species/r_synthetic.dmi b/icons/mob/humans/species/r_synthetic.dmi index 9252fa3e9146..b619cbda6412 100644 Binary files a/icons/mob/humans/species/r_synthetic.dmi and b/icons/mob/humans/species/r_synthetic.dmi differ diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index c8cb85a7914a..8dbba91502fe 100644 Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ diff --git a/icons/obj/items/clothing/gloves.dmi b/icons/obj/items/clothing/gloves.dmi index 7ce4b146d176..44798f4f727e 100644 Binary files a/icons/obj/items/clothing/gloves.dmi and b/icons/obj/items/clothing/gloves.dmi differ diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi index 47d06bc2cc10..cff4b5d48c17 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 6d203ca69fea..254c9e8b67c9 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi index ec1209a3bf68..1f74fc09b9ea 100644 Binary files a/icons/obj/items/items.dmi and b/icons/obj/items/items.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index cb9ff5107d6a..8cbf735ac96b 100644 Binary files a/icons/obj/items/weapons/guns/attachments/under.dmi and b/icons/obj/items/weapons/guns/attachments/under.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 08a5c5fa8ef1..b62860559b16 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/obj/structures/machinery/ares.dmi b/icons/obj/structures/machinery/ares.dmi new file mode 100644 index 000000000000..77dd304310f6 Binary files /dev/null and b/icons/obj/structures/machinery/ares.dmi differ diff --git a/icons/obj/structures/machinery/big_floodlight.dmi b/icons/obj/structures/machinery/big_floodlight.dmi index db12877f329f..b76f63956a2c 100644 Binary files a/icons/obj/structures/machinery/big_floodlight.dmi and b/icons/obj/structures/machinery/big_floodlight.dmi differ diff --git a/icons/obj/structures/machinery/computer.dmi b/icons/obj/structures/machinery/computer.dmi index e214d7bf29d9..54c99e3186d9 100644 Binary files a/icons/obj/structures/machinery/computer.dmi and b/icons/obj/structures/machinery/computer.dmi differ diff --git a/icons/obj/structures/machinery/power.dmi b/icons/obj/structures/machinery/power.dmi index a2f37647bbea..76ca47047b63 100644 Binary files a/icons/obj/structures/machinery/power.dmi and b/icons/obj/structures/machinery/power.dmi differ diff --git a/icons/obj/structures/machinery/terminals.dmi b/icons/obj/structures/machinery/terminals.dmi index ab3d80a03c42..1318babb5b22 100644 Binary files a/icons/obj/structures/machinery/terminals.dmi and b/icons/obj/structures/machinery/terminals.dmi differ diff --git a/icons/obj/structures/tents_deployed_classic.dmi b/icons/obj/structures/tents_deployed_classic.dmi new file mode 100644 index 000000000000..4a7575aff833 Binary files /dev/null and b/icons/obj/structures/tents_deployed_classic.dmi differ diff --git a/icons/obj/structures/tents_deployed_desert.dmi b/icons/obj/structures/tents_deployed_desert.dmi new file mode 100644 index 000000000000..60269580d208 Binary files /dev/null and b/icons/obj/structures/tents_deployed_desert.dmi differ diff --git a/icons/obj/structures/tents_deployed_jungle.dmi b/icons/obj/structures/tents_deployed_jungle.dmi new file mode 100644 index 000000000000..429377c4d9ed Binary files /dev/null and b/icons/obj/structures/tents_deployed_jungle.dmi differ diff --git a/icons/obj/structures/tents_deployed_snow.dmi b/icons/obj/structures/tents_deployed_snow.dmi new file mode 100644 index 000000000000..106ca3f1e997 Binary files /dev/null and b/icons/obj/structures/tents_deployed_snow.dmi differ diff --git a/icons/obj/structures/tents_deployed_urban.dmi b/icons/obj/structures/tents_deployed_urban.dmi new file mode 100644 index 000000000000..a73d79eb3cbe Binary files /dev/null and b/icons/obj/structures/tents_deployed_urban.dmi differ diff --git a/icons/obj/structures/tents_equipment.dmi b/icons/obj/structures/tents_equipment.dmi new file mode 100644 index 000000000000..d1dfb64309df Binary files /dev/null and b/icons/obj/structures/tents_equipment.dmi differ diff --git a/icons/obj/structures/tents_folded.dmi b/icons/obj/structures/tents_folded.dmi new file mode 100644 index 000000000000..e9f4555ae6a1 Binary files /dev/null and b/icons/obj/structures/tents_folded.dmi differ diff --git a/icons/turf/ground_map.dmi b/icons/turf/ground_map.dmi index d5a8d73e4a04..1970ad966106 100644 Binary files a/icons/turf/ground_map.dmi and b/icons/turf/ground_map.dmi differ diff --git a/maps/bigredv2.json b/maps/bigredv2.json index 26bb4ef3d6f1..ecb2e1472c57 100644 --- a/maps/bigredv2.json +++ b/maps/bigredv2.json @@ -35,6 +35,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 100 }, + "camouflage": "desert", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/corsat.json b/maps/corsat.json index 7b6068b2b801..e8192644054a 100644 --- a/maps/corsat.json +++ b/maps/corsat.json @@ -42,6 +42,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, + "camouflage": "snow", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/desert_dam.json b/maps/desert_dam.json index 792ba07d5b1d..b4e535e893d6 100644 --- a/maps/desert_dam.json +++ b/maps/desert_dam.json @@ -36,6 +36,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 100 }, + "camouflage": "desert", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index 4941a1c124fd..dfc73655414d 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -33,6 +33,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 0 }, + "camouflage": "classic", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/ice_colony_v2.json b/maps/ice_colony_v2.json index 51c3d607b308..d8baaab7dcd4 100644 --- a/maps/ice_colony_v2.json +++ b/maps/ice_colony_v2.json @@ -35,6 +35,7 @@ "xeno_hive_delta": 0 }, "nightmare_path": "maps/Nightmare/maps/Ice_Colony_v2/", + "camouflage": "snow", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/kutjevo.json b/maps/kutjevo.json index f8184e048c5e..83a0ff90c575 100644 --- a/maps/kutjevo.json +++ b/maps/kutjevo.json @@ -29,6 +29,7 @@ ], "traits": [{ "Ground": true }], "nightmare_path": "maps/Nightmare/maps/Kutjevo/", + "camouflage": "desert", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index 581a2555800d..077596d14eca 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -37,6 +37,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, + "camouflage": "classic", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/lv624.json b/maps/lv624.json index 9259ab8bb3df..bec99892a347 100644 --- a/maps/lv624.json +++ b/maps/lv624.json @@ -32,6 +32,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 70 }, + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index bd8669081641..29e43dc9e128 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -308,7 +308,7 @@ name = "\improper Spaceport" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/space_port) "aaX" = ( @@ -935,7 +935,7 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/telecomm) "acS" = ( @@ -1054,7 +1054,9 @@ /area/bigredv2/outside/marshal_office) "adi" = ( /obj/item/shard, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "adj" = ( /obj/item/shard, @@ -1358,7 +1360,7 @@ name = "\improper Telecommunications" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/telecomm) "aed" = ( @@ -1441,8 +1443,7 @@ name = "\improper Marshal Office Prison" }, /turf/open/floor{ - dir = 5; - icon_state = "whitegreenfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "aen" = ( @@ -1452,8 +1453,7 @@ name = "\improper Marshal Office Prison" }, /turf/open/floor{ - dir = 5; - icon_state = "whitegreenfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "aeo" = ( @@ -1462,7 +1462,7 @@ name = "\improper Marshal Office Prison Toilet" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "aep" = ( @@ -1718,17 +1718,6 @@ /obj/structure/window/framed/solaris/reinforced, /turf/open/floor/plating, /area/bigredv2/caves/lambda/xenobiology) -"afe" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/machinery/door/poddoor/almayer/closed{ - id = "eta"; - name = "Eta Lockdown" - }, -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lz2_south_cas) "aff" = ( /obj/effect/decal/cleanable/mucus, /obj/structure/surface/table, @@ -1990,8 +1979,7 @@ name = "\improper Marshal Office Prison" }, /turf/open/floor{ - dir = 5; - icon_state = "whitegreenfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "afQ" = ( @@ -2002,8 +1990,7 @@ name = "\improper Marshal Office Prison" }, /turf/open/floor{ - dir = 5; - icon_state = "whitegreenfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "afR" = ( @@ -2088,7 +2075,9 @@ dir = 1; name = "\improper Lambda Lab Storage" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/xenobiology) "agf" = ( /obj/structure/surface/table/reinforced, @@ -2110,7 +2099,7 @@ name = "\improper Lambda Lab Chemistry Lab" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "agh" = ( @@ -2170,32 +2159,23 @@ }, /area/bigredv2/outside/space_port) "agq" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ dir = 9; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/space_port) +/area/bigredv2/outside/n) "agr" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, +/turf/open/floor/plating, /area/bigredv2/outside/space_port) "ags" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ dir = 5; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/space_port) +/area/bigredv2/outside/n) "agt" = ( /obj/structure/surface/table/woodentable/fancy, /turf/open/floor{ @@ -2317,7 +2297,7 @@ name = "\improper Marshal Head Office" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "agK" = ( @@ -2341,7 +2321,7 @@ name = "\improper Lambda Lab Surgery" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "agN" = ( @@ -2473,7 +2453,7 @@ dir = 8; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/space_port) +/area/bigredv2/outside/n) "ahf" = ( /obj/structure/surface/table, /turf/open/floor, @@ -2611,7 +2591,7 @@ name = "\improper Lambda Lab Surgery" }, /turf/open/floor{ - icon_state = "darkpurple2" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "ahC" = ( @@ -2674,9 +2654,9 @@ /area/bigredv2/caves/lambda/xenobiology) "ahK" = ( /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, -/area/bigredv2/caves/lambda/xenobiology) +/area/bigredv2/outside/space_port) "ahL" = ( /turf/open/floor{ dir = 4; @@ -2689,7 +2669,7 @@ name = "\improper Lambda Lab Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "ahN" = ( @@ -2718,11 +2698,11 @@ }, /area/bigredv2/outside/nw) "ahS" = ( -/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/n) "ahT" = ( /turf/open/floor{ dir = 6; @@ -2743,7 +2723,9 @@ "ahW" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/nw) "ahX" = ( /obj/effect/decal/cleanable/dirt, @@ -2753,13 +2735,17 @@ /obj/item/stack/sheet/metal, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/nw) "ahZ" = ( /obj/item/stack/rods, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/nw) "aia" = ( /obj/structure/machinery/door_control{ @@ -2817,7 +2803,7 @@ name = "\improper Marshal Office Armory" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "aii" = ( @@ -2825,7 +2811,9 @@ dir = 1; name = "\improper Marshal Office Equipment" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "aij" = ( /obj/effect/landmark/hunter_secondary, @@ -2866,7 +2854,9 @@ dir = 1; name = "\improper Lambda Lab Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/xenobiology) "aio" = ( /turf/open/floor{ @@ -3066,7 +3056,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Marshal Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "aiR" = ( /obj/structure/machinery/light{ @@ -3081,7 +3073,7 @@ /obj/effect/landmark/corpsespawner/scientist, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/caves/lambda/xenobiology) "aiT" = ( @@ -3096,7 +3088,7 @@ name = "\improper Lambda Lab Prison Restroom" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "aiV" = ( @@ -3251,7 +3243,7 @@ name = "\improper Lambda Lab Prisoner Room" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/xenobiology) "ajs" = ( @@ -3399,7 +3391,7 @@ name = "\improper Marshal Office Armory" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "ajL" = ( @@ -3457,8 +3449,8 @@ /turf/open/floor, /area/bigredv2/outside/marshal_office) "ajT" = ( +/obj/structure/barricade/wooden, /turf/open/floor{ - dir = 5; icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) @@ -3637,7 +3629,9 @@ name = "\improper Marshal Office" }, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "akw" = ( /obj/effect/decal/cleanable/dirt, @@ -3785,7 +3779,9 @@ dir = 1; name = "\improper Marshal Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "akS" = ( /obj/structure/bed/chair, @@ -3927,7 +3923,7 @@ name = "\improper Marshal Office Evidence Room" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "alq" = ( @@ -4192,8 +4188,7 @@ dir = 4 }, /turf/open/floor{ - dir = 8; - icon_state = "red" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "ame" = ( @@ -4290,7 +4285,9 @@ /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "\improper Marshal Office Courtroom" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "amu" = ( /obj/structure/bed/chair{ @@ -4524,8 +4521,7 @@ name = "\improper Marshal Office" }, /turf/open/floor{ - dir = 8; - icon_state = "red" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "anb" = ( @@ -4627,11 +4623,13 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Lambda Lab Maintenance Storage" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/xenobiology) "anp" = ( /turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "anq" = ( /obj/structure/machinery/light{ dir = 8 @@ -4690,7 +4688,7 @@ name = "\improper Marshal Office Holding Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "any" = ( @@ -4699,8 +4697,7 @@ name = "\improper Marshal Office Checkpoint" }, /turf/open/floor{ - dir = 9; - icon_state = "redfull" + icon_state = "delivery" }, /area/bigredv2/outside/marshal_office) "anz" = ( @@ -4709,7 +4706,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Marshal Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "anB" = ( /obj/structure/machinery/light{ @@ -5252,7 +5251,9 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Dormitories EVA Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_offices) "apk" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -5278,7 +5279,7 @@ name = "\improper Dormitories EVA" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/general_offices) "apn" = ( @@ -5404,15 +5405,13 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - dir = 1; - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "apF" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - dir = 1; - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "apG" = ( @@ -5423,7 +5422,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Marshal Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/marshal_office) "apI" = ( /turf/closed/wall/solaris/reinforced/hull, @@ -5455,7 +5456,7 @@ name = "\improper Dormitories Lavatory" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/general_offices) "apN" = ( @@ -5795,7 +5796,8 @@ dir = 5 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/n) "aqH" = ( @@ -5807,28 +5809,23 @@ }, /area/bigredv2/outside/n) "aqI" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ dir = 6; icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) "aqJ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/mars_cave{ icon_state = "mars_dirt_4" }, -/area/bigredv2/outside/n) +/area/bigredv2/outside/nw) "aqK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" +/turf/open/floor{ + icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) "aqL" = ( @@ -5837,8 +5834,8 @@ }, /area/bigredv2/outside/n) "aqM" = ( -/turf/open/mars{ - icon_state = "mars_dirt_12" +/turf/open/floor{ + icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) "aqN" = ( @@ -5848,7 +5845,9 @@ health = 25000 }, /obj/structure/barricade/wooden, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/n) "aqO" = ( /obj/structure/barricade/wooden, @@ -6300,14 +6299,9 @@ icon_state = "mars_dirt_9" }, /area/bigredv2/outside/n) -"asb" = ( -/turf/open/mars{ - icon_state = "mars_dirt_11" - }, -/area/bigredv2/outside/n) "asc" = ( /turf/open/floor{ - dir = 9; + dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) @@ -6327,9 +6321,9 @@ }, /area/bigredv2/outside/n) "asf" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, /turf/open/floor{ - dir = 5; + dir = 4; icon_state = "asteroidwarning" }, /area/bigredv2/outside/n) @@ -6344,7 +6338,10 @@ dir = 8; health = 25000 }, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/n) "ash" = ( /obj/structure/barricade/wooden{ @@ -6352,7 +6349,10 @@ dir = 1; health = 25000 }, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/n) "asi" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -6360,7 +6360,9 @@ dir = 1; name = "\improper Dormitories Tool Storage Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_offices) "asj" = ( /obj/structure/window/framed/solaris, @@ -6377,7 +6379,7 @@ name = "\improper Dormitories EVA" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/general_offices) "asl" = ( @@ -6755,12 +6757,12 @@ }, /area/bigredv2/caves_lambda) "atl" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, /turf/open/floor{ - dir = 9; + dir = 8; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/n) "atm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -6925,8 +6927,7 @@ name = "\improper Lambda Lab Secure Storage" }, /turf/open/floor{ - dir = 1; - icon_state = "elevatorshaft" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/breakroom) "atJ" = ( @@ -6943,7 +6944,9 @@ dir = 1; name = "\improper Lambda Lab Administration Office" }, -/turf/open/floor/wood, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/breakroom) "atL" = ( /obj/structure/bed/chair{ @@ -7030,7 +7033,7 @@ name = "\improper Medical Clinic CMO's Office" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "atW" = ( @@ -7040,7 +7043,7 @@ name = "\improper Medical Clinic Morgue" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "atX" = ( @@ -7063,7 +7066,7 @@ name = "\improper Dormitories Bedroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aua" = ( @@ -7150,7 +7153,9 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Lambda Lab Administration Office" }, -/turf/open/floor/wood, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/breakroom) "aun" = ( /obj/structure/closet/firecloset/full, @@ -7290,12 +7295,12 @@ }, /area/bigredv2/caves/lambda/breakroom) "auE" = ( -/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 1; + dir = 8; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/n) "auF" = ( /turf/open/floor{ dir = 5; @@ -7408,20 +7413,22 @@ name = "\improper Dormitories Bedroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "auV" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Dormitories Tool Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_offices) "auW" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/outside/c) "auX" = ( -/obj/structure/window/framed/solaris/reinforced/hull, +/obj/structure/window/framed/solaris/reinforced, /turf/open/floor/plating, /area/bigredv2/outside/c) "auY" = ( @@ -7476,7 +7483,7 @@ name = "\improper Lambda Lab Administration Wing" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/breakroom) "avf" = ( @@ -7584,26 +7591,19 @@ /obj/structure/window_frame/solaris, /turf/open/floor/plating, /area/bigredv2/outside/office_complex) -"avs" = ( -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" - }, -/area/bigredv2/outside/nw) "avt" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" +/turf/open/floor{ + icon_state = "delivery" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "avu" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ dir = 1; name = "\improper Medical Clinic Chemistry" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "avv" = ( @@ -7732,7 +7732,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{ name = "\improper Lambda Lab Relaxation Room" }, -/turf/open/floor/wood, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/breakroom) "avP" = ( /obj/structure/machinery/light{ @@ -7769,17 +7771,17 @@ /area/bigredv2/outside/office_complex) "avT" = ( /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "avU" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "avV" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "avW" = ( /obj/structure/surface/table, /obj/item/trash/burger, @@ -7891,7 +7893,7 @@ name = "\improper Medical Clinic Scanner Room" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "awk" = ( @@ -8211,7 +8213,9 @@ dir = 1; name = "\improper Dormitories" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "axi" = ( /obj/structure/machinery/light, @@ -8311,11 +8315,10 @@ }, /area/bigredv2/outside/nw) "axv" = ( -/turf/open/floor/plating{ - dir = 8; - icon_state = "warnplate" +/turf/open/floor{ + icon_state = "delivery" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "axw" = ( /obj/structure/surface/table, /obj/item/storage/firstaid/adv, @@ -8336,7 +8339,7 @@ name = "\improper Medical Clinic Treatment" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "axz" = ( @@ -8382,7 +8385,10 @@ "axF" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden, -/turf/open/mars, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/n) "axG" = ( /obj/structure/machinery/camera/autoname{ @@ -8461,7 +8467,7 @@ name = "\improper Dormitories Bedroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/general_offices) "axS" = ( @@ -8469,7 +8475,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Dormitories" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_offices) "axT" = ( /obj/effect/landmark/xeno_spawn, @@ -8490,14 +8498,11 @@ }, /area/bigredv2/caves_lambda) "axW" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, /turf/open/floor{ - dir = 8; + dir = 6; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/c) "axX" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/engineering) @@ -8505,28 +8510,27 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "warnplate" +/turf/open/floor{ + icon_state = "delivery" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "axZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "aya" = ( /obj/effect/landmark/hunter_primary, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "ayb" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "ayc" = ( /obj/structure/window/framed/solaris/reinforced/hull, /turf/open/floor/plating, @@ -8540,7 +8544,7 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aye" = ( @@ -8794,8 +8798,7 @@ /area/bigredv2/outside/medical) "ayN" = ( /turf/open/floor{ - dir = 4; - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "ayO" = ( @@ -8986,11 +8989,11 @@ dir = 8 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "azo" = ( /obj/structure/cargo_container/horizontal/blue/top, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "azp" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood, @@ -9083,8 +9086,7 @@ name = "\improper Medical Clinic Treatment" }, /turf/open/floor{ - dir = 4; - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "azA" = ( @@ -9141,9 +9143,8 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Medical Clinic Power Station" }, -/turf/open/floor/plating{ - dir = 8; - icon_state = "warnplate" +/turf/open/floor{ + icon_state = "delivery" }, /area/bigredv2/outside/medical) "azK" = ( @@ -9270,7 +9271,9 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Bar Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "aAd" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -9350,14 +9353,14 @@ "aAq" = ( /obj/structure/cargo_container/horizontal/blue/middle, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "aAr" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ - name = "\improper Medical Clinic Operating Theatre"; - dir = 2 + dir = 2; + name = "\improper Medical Clinic Operating Theatre" }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aAs" = ( @@ -9443,7 +9446,7 @@ name = "\improper Dormitories Restroom" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aAE" = ( @@ -9452,7 +9455,7 @@ name = "\improper Recreation" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aAF" = ( @@ -9602,11 +9605,11 @@ "aAZ" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "aBa" = ( /obj/structure/machinery/light, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "aBb" = ( /obj/structure/bed/chair, /turf/open/floor{ @@ -9634,7 +9637,7 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aBf" = ( @@ -9776,7 +9779,9 @@ dir = 1; name = "\improper Greenhouse" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aBy" = ( /obj/structure/window/framed/solaris/reinforced, @@ -9905,8 +9910,9 @@ /turf/open/mars, /area/bigredv2/outside/c) "aBS" = ( +/obj/effect/landmark/hunter_secondary, /turf/open/floor{ - dir = 9; + dir = 4; icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) @@ -9914,7 +9920,9 @@ /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dormitories Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "aBU" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -10052,7 +10060,9 @@ /area/bigredv2/caves/lambda/research) "aCr" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor/engine, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/lambda/research) "aCs" = ( /obj/effect/decal/warning_stripes{ @@ -10111,14 +10121,10 @@ }, /area/bigredv2/caves/lambda/research) "aCy" = ( -/obj/structure/machinery/door/airlock/almayer/research/glass/colony{ - dir = 1; - name = "\improper Lambda Lab Anomaly Chamber" - }, /turf/open/floor{ - icon_state = "podhatchfloor" + icon_state = "delivery" }, -/area/bigredv2/caves/lambda/research) +/area/bigredv2/caves/lambda/xenobiology) "aCz" = ( /obj/structure/machinery/power/port_gen/pacman, /obj/effect/decal/warning_stripes{ @@ -10158,7 +10164,7 @@ name = "\improper Medical Clinic Storage" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aCD" = ( @@ -10193,7 +10199,7 @@ name = "\improper Medical Clinic Storage" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aCH" = ( @@ -10245,7 +10251,7 @@ name = "\improper Dormitories Restroom" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aCR" = ( @@ -10275,7 +10281,9 @@ dir = 1; name = "\improper Bar Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/bar) "aCV" = ( /obj/effect/landmark/hunter_primary, @@ -10348,7 +10356,7 @@ name = "\improper Library Backroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/library) "aDg" = ( @@ -10493,9 +10501,9 @@ }, /turf/open/floor{ dir = 1; - icon_state = "asteroidwarning" + icon_state = "asteroidfloor" }, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/e) "aDz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ @@ -10503,7 +10511,7 @@ }, /turf/open/floor{ dir = 1; - icon_state = "asteroidwarning" + icon_state = "asteroidfloor" }, /area/bigredv2/outside/nw) "aDA" = ( @@ -10511,7 +10519,7 @@ dir = 10 }, /turf/open/floor{ - dir = 5; + dir = 4; icon_state = "asteroidwarning" }, /area/bigredv2/outside/nw) @@ -10696,7 +10704,7 @@ name = "\improper Bar Backroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/bar) "aEa" = ( @@ -10964,7 +10972,7 @@ name = "\improper Dormitories Toilet" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/dorms) "aEO" = ( @@ -11233,7 +11241,7 @@ name = "\improper Medical Clinic Operating Theatre" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aFB" = ( @@ -11332,7 +11340,9 @@ /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dormitories Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "aFP" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -11428,7 +11438,9 @@ dir = 1; name = "\improper Greenhouse Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aGb" = ( /obj/effect/decal/cleanable/dirt, @@ -11445,7 +11457,7 @@ name = "\improper Greenhouse Storage" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/library) "aGd" = ( @@ -11685,7 +11697,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Dormitories" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/dorms) "aGG" = ( /obj/structure/surface/table/woodentable, @@ -11762,7 +11776,8 @@ dir = 1 }, /turf/open/floor{ - icon_state = "darkish" + dir = 4; + icon_state = "darkpurplecorners2" }, /area/bigredv2/caves/lambda/research) "aGV" = ( @@ -12045,7 +12060,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Kitchen Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aHM" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -12076,7 +12093,8 @@ /area/bigredv2/caves/lambda/research) "aHQ" = ( /turf/open/floor{ - icon_state = "darkish" + dir = 4; + icon_state = "darkpurplecorners2" }, /area/bigredv2/caves/lambda/research) "aHR" = ( @@ -12208,8 +12226,7 @@ name = "Virology Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aIi" = ( @@ -12430,7 +12447,7 @@ dir = 1 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/caves/lambda/research) "aIP" = ( @@ -12629,7 +12646,7 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/medical) "aJm" = ( @@ -12677,7 +12694,7 @@ name = "\improper Bar Backroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/bar) "aJs" = ( @@ -12694,17 +12711,6 @@ icon_state = "freezerfloor" }, /area/bigredv2/outside/hydroponics) -"aJu" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Kitchen Storage" - }, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/bigredv2/outside/hydroponics) "aJv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -12733,7 +12739,7 @@ "aJy" = ( /obj/structure/surface/table/woodentable, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "aJz" = ( @@ -12744,7 +12750,7 @@ name = "\improper Kitchen Storage" }, /turf/open/floor{ - icon_state = "yellowfull" + icon_state = "delivery" }, /area/bigredv2/outside/hydroponics) "aJA" = ( @@ -13044,8 +13050,8 @@ pixel_x = 32 }, /turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aKn" = ( @@ -13072,8 +13078,8 @@ pixel_x = -32 }, /turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aKr" = ( @@ -13087,7 +13093,7 @@ /area/bigredv2/outside/c) "aKv" = ( /obj/structure/bed/chair/wood/normal, -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor{ icon_state = "wood" }, @@ -13353,7 +13359,7 @@ name = "\improper Medical Command Complex" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aLf" = ( @@ -13792,8 +13798,7 @@ name = "\improper Lambda Lab" }, /turf/open/floor{ - dir = 8; - icon_state = "darkpurple2" + icon_state = "delivery" }, /area/bigredv2/caves/lambda/research) "aMr" = ( @@ -13869,17 +13874,6 @@ icon_state = "whitegreen" }, /area/bigredv2/caves/lambda/virology) -"aMA" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/research/colony{ - dir = 1; - name = "\improper Virology Lab Decontamination" - }, -/turf/open/floor{ - dir = 1; - icon_state = "warnwhite" - }, -/area/bigredv2/outside/virology) "aMB" = ( /obj/structure/surface/table, /obj/effect/decal/cleanable/dirt, @@ -13896,7 +13890,9 @@ dir = 1; name = "\improper General Store" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_store) "aMF" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -13904,7 +13900,7 @@ name = "\improper Operations" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aMG" = ( @@ -14146,12 +14142,6 @@ "aNo" = ( /turf/open/floor, /area/bigredv2/outside/general_store) -"aNp" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ - name = "\improper General Store" - }, -/turf/open/floor, -/area/bigredv2/outside/general_store) "aNq" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -14295,7 +14285,7 @@ dir = 4 }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aNI" = ( @@ -14717,7 +14707,7 @@ name = "\improper Operations Bedroom" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aOO" = ( @@ -14764,7 +14754,9 @@ dir = 1; name = "\improper Crew Habitation Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aOV" = ( /obj/structure/bed/chair{ @@ -14980,7 +14972,7 @@ name = "\improper Virology Lab Decontamination" }, /turf/open/floor{ - icon_state = "warnwhite" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aPu" = ( @@ -15657,7 +15649,6 @@ /area/bigredv2/outside/admin_building) "aRf" = ( /obj/structure/surface/table, -/obj/item/changestone, /turf/open/floor{ icon_state = "wood" }, @@ -15722,7 +15713,7 @@ name = "\improper Bar" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/bar) "aRp" = ( @@ -15731,7 +15722,7 @@ name = "\improper Kitchen" }, /turf/open/floor{ - icon_state = "yellowfull" + icon_state = "delivery" }, /area/bigredv2/outside/hydroponics) "aRq" = ( @@ -15763,7 +15754,7 @@ name = "\improper Library" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/library) "aRv" = ( @@ -16006,21 +15997,25 @@ dir = 1; name = "\improper Operations EVA" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "aSc" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Bar" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/bar) "aSe" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Kitchen" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/hydroponics) "aSf" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -16170,7 +16165,7 @@ name = "\improper Virology Lab Cell" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aSB" = ( @@ -16316,7 +16311,7 @@ name = "\improper General Store Security" }, /turf/open/floor{ - icon_state = "yellowfull" + icon_state = "delivery" }, /area/bigredv2/outside/general_store) "aSQ" = ( @@ -16325,7 +16320,7 @@ name = "\improper Operations" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aSR" = ( @@ -16419,8 +16414,8 @@ "aTe" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/limb, /turf/open/floor{ - dir = 10; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTf" = ( @@ -16428,7 +16423,8 @@ dir = 5 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTg" = ( @@ -16439,8 +16435,8 @@ dir = 4 }, /turf/open/floor{ - dir = 6; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTh" = ( @@ -16456,7 +16452,8 @@ dir = 1 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTj" = ( @@ -16465,7 +16462,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aTk" = ( @@ -16482,7 +16480,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) "aTo" = ( @@ -16515,12 +16514,10 @@ }, /area/bigredv2/outside/e) "aTs" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" + icon_state = "delivery" }, -/area/bigredv2/outside/e) +/area/bigred/ground/garage_workshop) "aTt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, @@ -16810,8 +16807,9 @@ /area/bigredv2/outside/c) "aUi" = ( /obj/effect/decal/cleanable/blood/xeno, -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aUk" = ( @@ -16893,8 +16891,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/lambda_cave_cas) "aUv" = ( @@ -16917,8 +16914,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/lambda_cave_cas) "aUx" = ( @@ -17038,9 +17034,10 @@ }, /area/bigredv2/outside/virology) "aUQ" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 9; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/w) "aUS" = ( @@ -17221,8 +17218,9 @@ /area/bigredv2/outside/admin_building) "aVn" = ( /obj/effect/landmark/hunter_primary, -/turf/open/mars{ - icon_state = "mars_dirt_10" +/turf/open/floor{ + dir = 9; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "aVo" = ( @@ -17365,7 +17363,7 @@ name = "\improper General Store" }, /turf/open/floor{ - icon_state = "bar" + icon_state = "delivery" }, /area/bigredv2/outside/general_store) "aVK" = ( @@ -17645,7 +17643,9 @@ dir = 1; name = "\improper Operations Armory" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "aWD" = ( /obj/structure/machinery/computer3/server, @@ -17684,7 +17684,7 @@ /area/bigredv2/outside/admin_building) "aWI" = ( /turf/open/floor{ - dir = 6; + dir = 9; icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) @@ -17734,7 +17734,7 @@ name = "\improper Virology Lab Chemistry" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aWQ" = ( @@ -17793,11 +17793,12 @@ }, /area/bigredv2/outside/w) "aWW" = ( +/obj/effect/landmark/crap_item, /turf/open/floor{ - dir = 10; + dir = 1; icon_state = "asteroidwarning" }, -/area/bigredv2/outside/w) +/area/bigredv2/outside/c) "aWX" = ( /obj/structure/surface/table, /obj/item/toy/prize/ripley, @@ -17901,7 +17902,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Office Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "aXr" = ( /turf/open/floor, @@ -17929,7 +17932,7 @@ name = "\improper Virology Lab Cell" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aXy" = ( @@ -18089,8 +18092,9 @@ }, /area/bigredv2/outside/e) "aXY" = ( -/turf/open/mars{ - icon_state = "mars_dirt_3" +/turf/open/floor{ + dir = 10; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/w) "aXZ" = ( @@ -18099,7 +18103,9 @@ dir = 1; name = "\improper General Store Maintenance" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/general_store) "aYc" = ( /obj/structure/machinery/light, @@ -18149,7 +18155,7 @@ name = "\improper Operations Office" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aYo" = ( @@ -18157,7 +18163,7 @@ name = "\improper Operations Toilet" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "aYp" = ( @@ -18406,12 +18412,12 @@ name = "\improper Chapel" }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, /area/bigredv2/outside/chapel) "aZi" = ( /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, /area/bigredv2/outside/chapel) "aZj" = ( @@ -18431,7 +18437,7 @@ name = "\improper Virology Lab Decontamination" }, /turf/open/floor{ - icon_state = "white" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "aZl" = ( @@ -18569,7 +18575,7 @@ dir = 6 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "aZK" = ( @@ -18577,7 +18583,7 @@ dir = 9 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "aZL" = ( @@ -18586,7 +18592,9 @@ dir = 1; name = "\improper General Store Maintenance" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "aZM" = ( /obj/effect/landmark/crap_item, @@ -18682,8 +18690,8 @@ "baa" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "bac" = ( @@ -18875,7 +18883,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ name = "\improper Operations" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "baJ" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -19000,7 +19010,9 @@ dir = 1; name = "\improper Cargo Bay" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bbh" = ( /obj/effect/landmark/survivor_spawner, @@ -19204,13 +19216,13 @@ dir = 4 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bbG" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bbH" = ( @@ -19219,7 +19231,7 @@ }, /obj/effect/landmark/crap_item, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bbI" = ( @@ -19227,7 +19239,7 @@ dir = 8 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bbJ" = ( @@ -19235,22 +19247,6 @@ icon_state = "mars_dirt_14" }, /area/bigredv2/outside/w) -"bbK" = ( -/turf/open/floor{ - dir = 9; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/cargo) -"bbL" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/cargo) "bbM" = ( /obj/structure/machinery/camera/autoname{ dir = 4 @@ -19396,7 +19392,9 @@ dir = 1; name = "\improper Private Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "bcl" = ( /obj/structure/bed/chair/wood/normal{ @@ -19429,14 +19427,15 @@ /area/bigredv2/outside/w) "bcq" = ( /obj/effect/landmark/crap_item, -/turf/open/mars{ - icon_state = "mars_dirt_10" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/w) "bcr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 8; + dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/cargo) @@ -19453,7 +19452,10 @@ dir = 8; health = 25000 }, -/turf/open/floor/plating, +/turf/open/floor{ + dir = 4; + icon_state = "loadingarea" + }, /area/bigredv2/outside/cargo) "bcu" = ( /obj/structure/barricade/wooden{ @@ -19523,7 +19525,9 @@ dir = 1; name = "\improper Cargo Bay Offices" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bcE" = ( /obj/structure/surface/table, @@ -19588,7 +19592,7 @@ name = "\improper Operations Office" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "bcL" = ( @@ -19729,7 +19733,9 @@ dir = 1; name = "\improper Cargo Bay Offices" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bdk" = ( /obj/effect/landmark/crap_item, @@ -19756,7 +19762,9 @@ /obj/structure/machinery/door/airlock/almayer/command/colony{ name = "\improper Operations Meeting Room" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "bdo" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -19844,7 +19852,9 @@ /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Private Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "bdD" = ( /obj/structure/machinery/light{ @@ -19869,13 +19879,13 @@ "bdF" = ( /obj/structure/machinery/light, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bdG" = ( /obj/structure/machinery/power/apc, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bdI" = ( @@ -19884,7 +19894,7 @@ pixel_y = -30 }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "dark" }, /area/bigredv2/outside/chapel) "bdK" = ( @@ -20002,11 +20012,15 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ name = "\improper Operations" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "bek" = ( /obj/structure/machinery/deployable/barrier, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/admin_building) "bel" = ( /obj/structure/machinery/autolathe, @@ -20025,7 +20039,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Robotics" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "bep" = ( /turf/open/floor{ @@ -20056,20 +20072,17 @@ "beu" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, /area/bigredv2/outside/w) "bev" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, /area/bigredv2/outside/w) "bew" = ( /turf/open/floor{ - dir = 8; icon_state = "asteroidwarning" }, /area/bigredv2/outside/cargo) @@ -20118,7 +20131,8 @@ dir = 9 }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "beF" = ( @@ -20186,8 +20200,8 @@ /area/bigredv2/outside/office_complex) "beP" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "asteroidwarning" +/turf/open/mars_cave{ + icon_state = "mars_dirt_4" }, /area/bigredv2/outside/w) "beQ" = ( @@ -20196,9 +20210,8 @@ }, /area/bigredv2/outside/w) "beR" = ( -/turf/open/floor{ - dir = 10; - icon_state = "asteroidwarning" +/turf/open/mars_cave{ + icon_state = "mars_dirt_4" }, /area/bigredv2/outside/cargo) "beS" = ( @@ -20207,6 +20220,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ + dir = 8; icon_state = "asteroidwarning" }, /area/bigredv2/outside/cargo) @@ -20226,10 +20240,13 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Cargo Offices" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "beW" = ( /obj/structure/machinery/computer/cameras, +/obj/structure/surface/table, /turf/open/floor, /area/bigredv2/outside/cargo) "beX" = ( @@ -20314,7 +20331,9 @@ /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Office Complex Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "bfj" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -20552,8 +20571,7 @@ name = "\improper Office Complex Janitor Room" }, /turf/open/floor{ - dir = 4; - icon_state = "whiteyellowfull" + icon_state = "delivery" }, /area/bigredv2/outside/office_complex) "bfR" = ( @@ -20620,7 +20638,9 @@ /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "\improper Cargo Bay Security" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bgb" = ( /obj/structure/surface/table, @@ -21185,25 +21205,19 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, +/turf/open/mars, /area/bigredv2/outside/c) "bhP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, +/turf/open/mars, /area/bigredv2/outside/c) "bhQ" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "bhR" = ( @@ -21219,9 +21233,8 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/floor{ - dir = 5; - icon_state = "asteroidwarning" +/turf/open/mars{ + icon_state = "mars_dirt_12" }, /area/bigredv2/outside/c) "bhT" = ( @@ -21229,13 +21242,15 @@ icon_state = "gib6" }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "bhU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "bhX" = ( @@ -21334,7 +21349,9 @@ dir = 4; health = 25000 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bix" = ( /obj/structure/closet/secure_closet/freezer/fridge, @@ -21374,13 +21391,17 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Office Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "biE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Office Complex Janitor Room" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/office_complex) "biH" = ( /obj/structure/machinery/landinglight/ds2{ @@ -21432,8 +21453,7 @@ dir = 5 }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "biT" = ( @@ -21468,7 +21488,7 @@ "biY" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - dir = 4; + dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) @@ -21717,7 +21737,9 @@ dir = 1; name = "\improper Cargo Bay Quartermaster" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bjX" = ( /turf/open/floor/plating{ @@ -21730,11 +21752,12 @@ }, /area/bigredv2/outside/s) "bjZ" = ( +/obj/structure/barricade/wooden, /turf/open/floor{ - dir = 6; - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, -/area/bigredv2/outside/s) +/area/bigredv2/outside/c) "bka" = ( /turf/open/mars{ icon_state = "mars_dirt_3" @@ -21762,16 +21785,18 @@ "bke" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" +/turf/open/mars{ + icon_state = "mars_dirt_12" }, /area/bigredv2/outside/c) "bkf" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_y = -32 }, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/bigredv2/outside/c) "bkg" = ( /obj/structure/machinery/light, @@ -21809,7 +21834,9 @@ dir = 1; name = "\improper Cargo Bay Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bkp" = ( /turf/open/mars{ @@ -21838,14 +21865,18 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bkw" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bkx" = ( /obj/effect/spawner/gibspawner/human, @@ -21854,7 +21885,9 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bky" = ( /turf/open/mars_cave{ @@ -21865,7 +21898,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Cargo Bay Quartermaster" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/cargo) "bkA" = ( /obj/structure/bed/chair/office/dark, @@ -22163,18 +22198,10 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) -"blK" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Engineering Complex" - }, -/turf/open/floor{ - icon_state = "dark" - }, -/area/bigredv2/outside/engineering) "blL" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/engineering) "blT" = ( @@ -22513,7 +22540,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Atmospherics Condenser Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bnl" = ( /obj/effect/decal/cleanable/dirt, @@ -22542,6 +22571,7 @@ /area/bigredv2/outside/filtration_plant) "bnp" = ( /obj/structure/machinery/computer/area_atmos/area, +/obj/structure/surface/table, /turf/open/floor, /area/bigredv2/outside/filtration_plant) "bnq" = ( @@ -22558,7 +22588,9 @@ dir = 1; name = "\improper Engineering SMES" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bnt" = ( /obj/effect/decal/cleanable/dirt, @@ -22618,7 +22650,9 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bnB" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -22704,7 +22738,9 @@ /obj/structure/machinery/door/airlock/almayer/secure/colony{ name = "\improper Engineering Secure Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bnV" = ( /obj/structure/sign/safety/electronics{ @@ -22892,14 +22928,18 @@ dir = 1; name = "\improper Chief Engineer's Office" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "boV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "boW" = ( /obj/structure/closet/secure_closet/atmos_personal, @@ -22964,7 +23004,9 @@ dir = 1; name = "\improper Engineering Tool Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bpl" = ( /obj/structure/machinery/light{ @@ -23033,7 +23075,9 @@ dir = 1; name = "\improper Engineering Lockers" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bpA" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -23041,7 +23085,9 @@ dir = 1; name = "\improper Engineering Lockers" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bpC" = ( /obj/structure/reagent_dispensers/fueltank, @@ -23228,7 +23274,9 @@ dir = 1; name = "\improper Engineering Break Room" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bqg" = ( /turf/open/floor/plating{ @@ -23313,7 +23361,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engineering Workshop" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bqM" = ( /obj/effect/decal/cleanable/dirt, @@ -23335,7 +23385,9 @@ name = "\improper Engine Reactor Control" }, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bqT" = ( /obj/effect/decal/cleanable/dirt, @@ -23387,7 +23439,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engineering Workshop" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "brg" = ( /obj/structure/machinery/light{ @@ -23487,9 +23541,7 @@ /turf/open/floor, /area/bigredv2/outside/filtration_plant) "brD" = ( -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor/plating, /area/bigredv2/outside/filtration_cave_cas) "brE" = ( /turf/open/floor/greengrid, @@ -23682,9 +23734,7 @@ /area/bigredv2/outside/filtration_plant) "bsH" = ( /obj/effect/landmark/hunter_primary, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) "bsI" = ( /turf/open/mars{ @@ -23739,13 +23789,17 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bsY" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Atmospherics Condenser" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bsZ" = ( /obj/structure/janitorialcart, @@ -23860,7 +23914,9 @@ dir = 1; name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "btJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -23890,7 +23946,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "bub" = ( /turf/open/mars_cave{ @@ -23943,7 +24001,10 @@ /area/bigredv2/caves_sw) "buB" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/bigredv2/outside/n) "buJ" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -23986,13 +24047,6 @@ icon_state = "mars_cave_16" }, /area/bigredv2/outside/s) -"bvm" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/colony{ - dir = 1; - name = "\improper Power Substation" - }, -/turf/open/floor, -/area/bigredv2/outside/lz2_south_cas) "bvv" = ( /obj/structure/machinery/light{ dir = 1 @@ -24012,8 +24066,7 @@ name = "Eta Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/eta) "bvD" = ( @@ -24041,7 +24094,9 @@ dir = 1; name = "\improper Power Substation" }, -/turf/open/floor/plating, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/lz2_south_cas) "bvO" = ( /turf/open/mars{ @@ -24166,12 +24221,12 @@ name = "\improper Eta Lab Storage Bay" }, /turf/open/floor{ - icon_state = "loadingarea" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bwH" = ( /turf/open/floor{ - icon_state = "loadingarea" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bwI" = ( @@ -24180,7 +24235,7 @@ name = "\improper Eta Lab Decontamination" }, /turf/open/floor{ - icon_state = "freezerfloor" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "bwK" = ( @@ -24192,7 +24247,8 @@ dir = 5 }, /turf/open/floor{ - icon_state = "delivery" + dir = 1; + icon_state = "loadingarea" }, /area/bigredv2/caves/eta/storage) "bwM" = ( @@ -24200,7 +24256,8 @@ dir = 4 }, /turf/open/floor{ - icon_state = "delivery" + dir = 1; + icon_state = "loadingarea" }, /area/bigredv2/caves/eta/storage) "bwN" = ( @@ -24399,7 +24456,9 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Eta Lab Robotics" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/eta/storage) "bxs" = ( /obj/effect/decal/cleanable/dirt, @@ -24814,7 +24873,7 @@ name = "\improper Eta Lab Technical Storage" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "byF" = ( @@ -24824,7 +24883,7 @@ name = "\improper Eta Lab Dormitories" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "byG" = ( @@ -25139,7 +25198,7 @@ name = "\improper Eta Lab Armory" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "bzt" = ( @@ -25327,7 +25386,7 @@ name = "\improper Eta Lab Server" }, /turf/open/floor{ - icon_state = "darkish" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bzR" = ( @@ -25337,7 +25396,7 @@ name = "\improper Eta Lab Security Office" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bzT" = ( @@ -25578,7 +25637,7 @@ name = "\improper Eta Lab Director's Office" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "bAE" = ( @@ -25865,7 +25924,7 @@ name = "\improper Eta Lab Maintenance Storage" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/storage) "bBA" = ( @@ -25896,7 +25955,7 @@ name = "\improper Eta Lab Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/research) "bBI" = ( @@ -25956,7 +26015,7 @@ name = "\improper Eta Lab Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/xenobiology) "bBT" = ( @@ -26206,7 +26265,7 @@ name = "\improper Eta Lab Xenobiology Lab" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/xenobiology) "bCA" = ( @@ -26306,7 +26365,7 @@ name = "\improper Eta Lab" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/living) "bCS" = ( @@ -26660,7 +26719,7 @@ name = "\improper Eta Lab Research Office" }, /turf/open/floor{ - icon_state = "wood" + icon_state = "delivery" }, /area/bigredv2/caves/eta/living) "bDP" = ( @@ -26668,7 +26727,9 @@ dir = 1; name = "\improper Eta Lab Canteen" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/eta/living) "bDQ" = ( /turf/open/floor{ @@ -26798,7 +26859,7 @@ name = "\improper Eta Lab Restroom" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/living) "bEk" = ( @@ -26962,7 +27023,9 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Eta Lab Relaxation" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/caves/eta/living) "bEI" = ( /obj/structure/bed/chair/comfy/orange{ @@ -27047,6 +27110,11 @@ /obj/structure/machinery/light, /turf/open/floor, /area/bigredv2/caves/eta/living) +"bET" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/office_complex) "bFh" = ( /obj/structure/surface/table, /turf/open/floor{ @@ -27110,6 +27178,12 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"bMz" = ( +/turf/open/floor{ + dir = 5; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/ne) "bNl" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -27232,7 +27306,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "bZL" = ( /obj/effect/landmark/monkey_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -27282,6 +27356,11 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"cgt" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/dorms) "chq" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -27341,17 +27420,6 @@ icon_state = "mars_cave_2" }, /area/space) -"cnm" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "eta"; - name = "Eta Lockdown" - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lz2_south_cas) "cns" = ( /obj/effect/landmark/nightmare{ insert_tag = "se-checkpoint" @@ -27589,6 +27657,12 @@ icon_state = "dark" }, /area/bigredv2/outside/marshal_office) +"cNH" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/bar) "cOl" = ( /turf/open/mars_cave{ icon_state = "mars_cave_18" @@ -27598,6 +27672,14 @@ /obj/structure/sign/poster/clf, /turf/closed/wall/solaris/reinforced, /area/bigredv2/caves/mining) +"cOJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/caves/eta/research) "cPZ" = ( /obj/structure/window/framed/solaris/reinforced, /obj/effect/decal/cleanable/dirt, @@ -27660,6 +27742,14 @@ "cVY" = ( /turf/open/mars, /area/bigredv2/outside/space_port_lz2) +"cYI" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/hydroponics) "cYJ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -27818,6 +27908,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"dvC" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/filtration_plant) "dwL" = ( /obj/structure/bed/chair{ buckling_y = 5; @@ -27849,7 +27945,6 @@ "dzY" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - dir = 6; icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) @@ -27955,6 +28050,9 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"dIb" = ( +/turf/open/floor, +/area/bigredv2/caves) "dIz" = ( /turf/open/mars_cave{ icon_state = "mars_cave_8" @@ -28085,7 +28183,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "dSg" = ( /obj/effect/landmark/crap_item, @@ -28116,6 +28216,12 @@ icon_state = "mars_cave_5" }, /area/bigredv2/outside/lz2_south_cas) +"dWg" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/mars{ + icon_state = "mars_dirt_12" + }, +/area/bigredv2/outside/c) "dWl" = ( /obj/structure/closet/toolcloset, /turf/open/floor, @@ -28300,6 +28406,9 @@ icon_state = "mars_cave_9" }, /area/bigredv2/caves/mining) +"erf" = ( +/turf/closed/wall/solaris, +/area/bigredv2/outside/c) "ers" = ( /obj/effect/landmark/nightmare{ insert_tag = "etatunnel" @@ -28696,8 +28805,8 @@ /obj/structure/machinery/door/airlock/almayer/research/glass/colony{ name = "\improper Lambda Lab Server Room" }, -/turf/open/floor/bluegrid{ - icon_state = "bcircuitoff" +/turf/open/floor{ + icon_state = "delivery" }, /area/bigredv2/caves/lambda/research) "fgE" = ( @@ -28731,7 +28840,7 @@ /area/bigredv2/outside/w) "fjP" = ( /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves) "fmd" = ( @@ -28819,6 +28928,17 @@ icon_state = "mars_cave_7" }, /area/bigredv2/caves_virology) +"fwD" = ( +/obj/structure/barricade/wooden{ + desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; + dir = 4; + health = 25000 + }, +/turf/open/floor{ + dir = 8; + icon_state = "loadingarea" + }, +/area/bigredv2/outside/cargo) "fwO" = ( /obj/structure/prop/almayer/cannon_cables{ name = "\improper Cables" @@ -28834,9 +28954,7 @@ /area/bigredv2/oob) "fwV" = ( /obj/structure/surface/table, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/caves) "fxh" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -28886,6 +29004,9 @@ /obj/structure/pipes/standard/tank/phoron, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"fCb" = ( +/turf/open/floor, +/area/bigredv2/outside/filtration_cave_cas) "fDr" = ( /turf/open/floor{ dir = 1; @@ -29060,6 +29181,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"fSJ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/space_port) "fST" = ( /obj/structure/machinery/light, /turf/open/floor{ @@ -29117,6 +29244,11 @@ icon_state = "mars_dirt_10" }, /area/bigredv2/outside/eta) +"gad" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/filtration_plant) "gan" = ( /obj/structure/platform_decoration/shiva{ dir = 1 @@ -29189,6 +29321,16 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"gkD" = ( +/obj/structure/barricade/wooden{ + desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; + dir = 4; + health = 25000 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/cargo) "glB" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/solaris/reinforced, @@ -29218,6 +29360,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"gpt" = ( +/obj/effect/landmark/crap_item, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/c) "gpB" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_6" @@ -29245,8 +29393,7 @@ name = "Virology Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "gsW" = ( @@ -29494,8 +29641,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/caves_lambda) "heU" = ( @@ -29518,16 +29664,6 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/outside/lz1_north_cas) -"hhW" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "eta"; - name = "Eta Lockdown" - }, -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lz2_south_cas) "hiP" = ( /obj/structure/sign/safety/one{ pixel_x = 16 @@ -29853,8 +29989,7 @@ name = "Virology Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/virology) "hUh" = ( @@ -29879,6 +30014,7 @@ /area/bigredv2/caves/mining) "hYI" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "white" }, @@ -30134,6 +30270,11 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/lambda_cave_cas) +"iyd" = ( +/obj/structure/machinery/computer/general_air_control, +/obj/structure/surface/table, +/turf/open/floor, +/area/bigredv2/outside/filtration_plant) "iyY" = ( /turf/open/mars_cave{ icon_state = "mars_cave_13" @@ -30298,6 +30439,7 @@ /area/bigredv2/caves/eta/research) "iRG" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, @@ -30368,9 +30510,7 @@ /area/bigredv2/outside/lambda_cave_cas) "iZA" = ( /obj/structure/surface/rack, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/caves) "jbU" = ( /obj/effect/decal/cleanable/blood{ @@ -30400,7 +30540,10 @@ /obj/effect/landmark/nightmare{ insert_tag = "crashlanding-offices" }, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/bigredv2/outside/c) "jdQ" = ( /obj/structure/prop/dam/truck/mining{ @@ -30413,6 +30556,12 @@ icon_state = "mars_dirt_3" }, /area/bigredv2/outside/s) +"jfr" = ( +/turf/open/floor{ + dir = 5; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/se) "jgw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -30755,8 +30904,7 @@ name = "Eta Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/lz2_south_cas) "jOS" = ( @@ -30920,6 +31068,14 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"jZp" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/dorms) "jZy" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -31118,6 +31274,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"kmm" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/admin_building) "knN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31400,9 +31561,7 @@ /area/bigredv2/outside/filtration_cave_cas) "kTs" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) "kVS" = ( /obj/effect/landmark/crap_item, @@ -31598,17 +31757,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/mars, /area/bigredv2/outside/se) -"lvX" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/machinery/door/poddoor/almayer/closed{ - id = "eta"; - name = "Eta Lockdown" - }, -/turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lz2_south_cas) "lwT" = ( /obj/structure/machinery/light{ dir = 8 @@ -31700,17 +31848,6 @@ icon_state = "redfull" }, /area/bigredv2/caves/eta/research) -"lEb" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda"; - name = "Lambda Lockdown" - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/lambda_cave_cas) "lEw" = ( /obj/item/tool/pickaxe{ pixel_y = -3 @@ -31720,6 +31857,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"lGt" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/caves/eta/living) "lIe" = ( /obj/item/weapon/twohanded/folded_metal_chair, /obj/effect/decal/cleanable/dirt, @@ -31906,6 +32048,11 @@ icon_state = "mars_cave_23" }, /area/bigredv2/caves/mining) +"maD" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "maF" = ( /obj/item/frame/rack, /obj/effect/landmark/good_item, @@ -32111,6 +32258,11 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) +"myY" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/filtration_cave_cas) "mzV" = ( /turf/open/mars, /area/bigredv2/outside/filtration_plant) @@ -32156,7 +32308,9 @@ /area/bigredv2/outside/lz1_north_cas) "mGS" = ( /obj/effect/landmark/static_comms/net_one, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/admin_building) "mHp" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -32237,9 +32391,7 @@ "mRD" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/atmos_alert, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/caves) "mSn" = ( /obj/effect/decal/cleanable/blood/oil/streak, @@ -32259,7 +32411,7 @@ name = "\improper Operations" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/outside/admin_building) "mWt" = ( @@ -32397,6 +32549,13 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves_research) +"nnK" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/e) "npz" = ( /obj/structure/surface/table, /obj/item/spacecash/c100, @@ -32554,8 +32713,7 @@ name = "Filtration Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) "nKL" = ( @@ -32610,6 +32768,11 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"nRT" = ( +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/chapel) "nSP" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_7" @@ -32732,6 +32895,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/bigredv2/caves/eta/research) +"ocA" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/library) "ocG" = ( /obj/structure/bookcase/manuals/research_and_development, /obj/item/storage/fancy/vials/random, @@ -32963,13 +33131,10 @@ }, /area/bigredv2/caves/mining) "ovq" = ( -/obj/structure/window/framed/solaris/reinforced, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Engineering"; - name = "\improper Engineering Shutters" +/turf/open/floor{ + icon_state = "delivery" }, -/turf/open/floor, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/general_offices) "ovB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -33034,6 +33199,7 @@ /area/bigredv2/caves_virology) "ozQ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, @@ -33612,9 +33778,7 @@ "pQv" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/caves) "pQE" = ( /obj/effect/decal/cleanable/dirt, @@ -33726,7 +33890,7 @@ }, /area/bigredv2/caves_sw) "pYE" = ( -/obj/item/weapon/gun/shotgun/double/sawn, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/shuttle/escapepod{ icon_state = "floor5" }, @@ -33759,7 +33923,7 @@ "qaR" = ( /obj/vehicle/powerloader/ft, /turf/open/floor/plating, -/area/bigredv2/outside/nw) +/area/bigredv2/outside/nw/ceiling) "qez" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ @@ -33982,8 +34146,7 @@ name = "Eta Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/lz2_south_cas) "qzY" = ( @@ -34013,8 +34176,7 @@ name = "\improper Workshop Garage" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigred/ground/garage_workshop) "qFg" = ( @@ -34314,9 +34476,7 @@ /area/bigredv2/caves/mining) "rjw" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) "rjF" = ( /obj/structure/sign/safety/bathunisex{ @@ -34533,7 +34693,10 @@ /area/bigredv2/outside/filtration_plant) "rHD" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/bigredv2/outside/c) "rIl" = ( /turf/closed/wall/solaris/reinforced/hull, @@ -35023,7 +35186,9 @@ dir = 1; name = "\improper Engineering Workshop" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigred/ground/garage_workshop) "svp" = ( /obj/structure/surface/table, @@ -35074,8 +35239,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/caves_lambda) "szw" = ( @@ -35226,6 +35390,14 @@ icon_state = "mars_cave_10" }, /area/bigredv2/caves_east) +"sPv" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/bar) "sQw" = ( /turf/open/mars_cave{ icon_state = "mars_cave_23" @@ -35534,6 +35706,20 @@ icon_state = "mars_cave_14" }, /area/bigredv2/outside/lz2_south_cas) +"tuu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/barricade/wooden{ + desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; + dir = 4; + health = 25000 + }, +/turf/open/floor{ + dir = 8; + icon_state = "loadingarea" + }, +/area/bigredv2/outside/cargo) "tuN" = ( /obj/structure/machinery/light/small, /turf/open/mars_cave, @@ -35560,8 +35746,8 @@ "tAW" = ( /obj/effect/landmark/lv624/xeno_tunnel, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 4; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/ne) "tBb" = ( @@ -35716,6 +35902,11 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"tKR" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/hydroponics) "tLt" = ( /turf/open/mars_cave{ icon_state = "mars_cave_14" @@ -35925,8 +36116,7 @@ name = "Filtration Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) "ujU" = ( @@ -35979,6 +36169,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigred/ground/garage_workshop) +"upV" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/admin_building) "usg" = ( /obj/item/tool/warning_cone, /turf/open/floor{ @@ -36275,8 +36471,8 @@ /area/bigredv2/caves_sw) "vbi" = ( /turf/open/floor{ - dir = 4; - icon_state = "darkpurplecorners2" + dir = 5; + icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) "vcm" = ( @@ -36355,6 +36551,15 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"vis" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/c) "viN" = ( /obj/structure/machinery/door_control{ id = "workshop_br_g"; @@ -36368,7 +36573,7 @@ dir = 1; icon_state = "asteroidwarning" }, -/area/bigred/ground/garage_workshop) +/area/bigredv2/outside/nw) "vjc" = ( /obj/item/tool/warning_cone{ pixel_x = -13; @@ -36404,6 +36609,13 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"vmm" = ( +/obj/structure/barricade/wooden, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/c) "vmI" = ( /obj/item/device/flashlight/lantern, /turf/open/mars_cave{ @@ -36451,8 +36663,7 @@ name = "Eta Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/eta) "vqY" = ( @@ -36477,7 +36688,7 @@ name = "\improper Eta Lab Cell" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigredv2/caves/eta/xenobiology) "vuz" = ( @@ -36729,7 +36940,7 @@ /turf/open/floor{ icon_state = "asteroidwarning" }, -/area/bigred/ground/garage_workshop) +/area/bigredv2/outside/nw) "vYw" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -36825,6 +37036,7 @@ /area/bigredv2/caves/eta/research) "wfC" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -37119,6 +37331,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"wLU" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/cargo) "wMg" = ( /obj/item/tool/warning_cone{ pixel_x = 5; @@ -37134,17 +37354,6 @@ icon_state = "mars_cave_9" }, /area/bigredv2/caves_north) -"wMP" = ( -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "lambda"; - name = "Lambda Lockdown" - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/bigredv2/outside/lambda_cave_cas) "wMQ" = ( /obj/structure/largecrate/random/secure, /turf/open/floor, @@ -37156,7 +37365,7 @@ name = "Lambda Lockdown" }, /turf/open/floor{ - icon_state = "asteroidwarning" + icon_state = "delivery" }, /area/bigredv2/outside/lambda_cave_cas) "wNA" = ( @@ -37611,9 +37820,22 @@ icon_state = "platingdmg3" }, /area/bigredv2/oob) +"xDW" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "xFZ" = ( /turf/open/mars_cave, /area/bigredv2/caves_lambda) +"xGT" = ( +/turf/open/floor{ + dir = 9; + icon_state = "asteroidwarning" + }, +/area/bigredv2/outside/w) "xIo" = ( /obj/structure/window/framed/solaris/reinforced/hull, /turf/open/floor/plating{ @@ -37697,13 +37919,21 @@ pixel_y = 7 }, /obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/weapon/gun/shotgun/double/sawn, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/item/reagent_container/food/snacks/packaged_burger, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"xNL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/caves/lambda/research) "xPg" = ( /obj/structure/barricade/handrail/wire, /turf/open/mars_cave{ @@ -37959,6 +38189,14 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"yhV" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/filtration_plant) "yjU" = ( /obj/item/weapon/broken_bottle, /turf/open/floor/plating{ @@ -42424,7 +42662,7 @@ aJg aJg aJg aLU -aMA +aPt aNb aOr aPt @@ -43254,7 +43492,7 @@ aae aao qsE qsE -vLd +aTs suV qsE qsE @@ -43479,7 +43717,7 @@ clB uIB shV qsE -vLd +aTs suV qsE qsE @@ -45219,9 +45457,9 @@ pdN aeI aeI aeI -aiz -ahP -atl +aoO +aiw +aqp aqp aqp aiw @@ -45421,37 +45659,37 @@ aam aam ago aae -aeI +ahR aeI aeI aeI aeI auF -aiy -akd -aiy -aiy +ajx +aoN +ajx +ajx ahT aeI aeI aeI aeI -aiA -aoO -aoN -aoN +ajy +ajx aoN akd +akd +akd aiy aoN ajx amc aix aix -alm -alm -alm -alm +aix +aix +aix +aix aDx aDw ahP @@ -45638,7 +45876,7 @@ aah aah aeG aae -aeI +ahR aeI aeI aeI @@ -45653,23 +45891,23 @@ aeI aeI aeI aiz -aoO -ajx -ajx +ajy ajx -atm -ahP -ahP -aoO -aiw -axW -aiw -ahQ -ahP +ahR ahP +aqJ ahP ahP -aDy +ajy +ajx +ajY +ajx +ajx +ajx +ajx +ajx +ajx +ajY akK ahP auF @@ -45701,14 +45939,14 @@ aSB aSB aSB aSB -aVF -aVI -aVI -aWk -aWk -aWk -aWk -aWk +beP +beP +beP +aSB +aSB +aSB +aSB +aSB bgX bhz bie @@ -45855,7 +46093,7 @@ aah aah aeG aae -ahO +ahR aeI aeI aeI @@ -45872,20 +46110,20 @@ aeI aiA ajy aoN -aoN -atm -ahP -ahP -ahP -ajy +akK +aqJ +aoO +aiw +aiw +ajx ajx ajY ajx -ahR -ahP -ahP -ahP -ahP +ajx +ajx +ajx +ajx +ajx aDz aEv ahP @@ -45918,15 +46156,15 @@ aWk aVI aWk aWk -aVH -bdZ -bdZ -bev -bev -bdZ -bdZ -bdZ -bgX +aVI +aWk +aWk +aVI +aVI +aWk +aWk +aWk +eWd bhA bie bie @@ -46072,7 +46310,7 @@ aah aah aeG aae -ahP +ahR ahO aeI aeI @@ -46091,7 +46329,7 @@ ajz ajx akK ahP -ahV +ajy anp anp anp @@ -46102,8 +46340,8 @@ anp anp anp anp -ahP -aDy +ajx +ajY akK ahP ahP @@ -46133,17 +46371,17 @@ aXA aWV bba aXA -aXA -aWV -aVG +bdZ +aUQ bdZ bdZ bdZ +aXA aWV aXA aXA aXA -bgX +eWd bhv bie bie @@ -46289,7 +46527,7 @@ aah aah aeG aae -ahQ +ahR ahP ahO aeI @@ -46308,7 +46546,7 @@ ajy ajx akK aln -aeI +ajy anp avT bZp @@ -46319,8 +46557,8 @@ azn avT avT anp -ahP -aDy +ajx +ajY ahR ahP ahP @@ -46350,10 +46588,10 @@ aYE aYE aYE aSB -aSB -aSB aVG bdZ +bdZ +bdZ beu beP aSB @@ -46525,7 +46763,7 @@ ajy ajx ahR aln -aeI +ajy bFw bjj bjj @@ -46536,8 +46774,8 @@ azo aAq aAZ anp -ahP -aDy +ajx +ajY ajx aiw aiw @@ -46555,21 +46793,21 @@ aEu aEu aEu aEu +aWk aUQ -aVI +bdZ +aWk +aWk +aWk +aWk +aWk aWk -aWW -aSB aXY aYF -aYF -aYF -aYF -aYF bbJ -aSB -aSB -aVH +aVG +bdZ +aUQ bdZ bev beP @@ -46721,9 +46959,9 @@ aah aah aah aah -agq -ahe -ahQ +aeG +ahK +ajx aiw aiw aiw @@ -46742,7 +46980,7 @@ ajx ajx akK aln -aeI +ajy bFw kRo joi @@ -46753,7 +46991,7 @@ avT avT avT anp -ahP +ajx aDA alm alm @@ -46781,12 +47019,12 @@ aoH asK asK asK +beQ aYF aYF -aYF -bcp -aSB -aVH +aVG +bdZ +aUQ bdZ bev beP @@ -46939,8 +47177,8 @@ aah aah aah agr -aeg -ahS +fSJ +aix aix aix aix @@ -46959,7 +47197,7 @@ ajx aoN ahR aln -aeI +ajy bFw kRo kRo @@ -46970,7 +47208,7 @@ avT avT avT anp -ahV +ahR ahV ahV ahV @@ -46998,20 +47236,20 @@ aoH aXH aXH asK +beQ aYF aYF -aYF -bcp -aSB -aVH +aVG +bdZ +aUQ bdZ bev -beQ -aSB aSB aSB aSB -bgX +xGT +aWk +eWd eWd kHK kHK @@ -47155,9 +47393,9 @@ aah acx aah aah -ags -aam -ahT +aeG +ahK +ajx aiy aiy ajx @@ -47176,7 +47414,7 @@ aiy akd atm aln -aeI +ajy bFw rhx bjv @@ -47187,7 +47425,7 @@ azo aAq aAZ anp -aeI +ahR aeI aeI ahi @@ -47215,22 +47453,22 @@ aoH aXH aXH asK -aYF +beQ aYF aYF bcq -aSB -aVG +bdZ +bdZ bdZ bev -beQ aSB aSB aSB +aVG asK asK asK -aZu +bdg bbg asK atw @@ -47349,7 +47587,7 @@ pXu rgp aae aaw -aaO +ahK aaW aaw aaw @@ -47393,7 +47631,7 @@ ahP ahP ahP ahP -aog +ajy anp avT avT @@ -47404,7 +47642,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -47432,18 +47670,18 @@ aoH aXH aXH asK -aYF +beQ bbb aYF -bcp -aSB aVG bdZ +bdZ +bdZ bev -beQ aSB -bfU aSB +bfU +aVG asK svp svp @@ -47591,7 +47829,7 @@ aah aah aeG aae -ahT +ahR ahP ahP ajy @@ -47610,7 +47848,7 @@ ahP ahP ahP ahP -aoO +ajy anp avU avT @@ -47621,7 +47859,7 @@ avT avT aBa anp -aeI +ahR aeI aeI aeI @@ -47649,18 +47887,18 @@ aoH aXH aXH asK -aYF +beQ aYF bbc -aSB -aSB aVG bdZ bdZ +bdZ beQ aSB aSB aSB +aVG asK bhb bhb @@ -47808,7 +48046,7 @@ afg afg adl aae -ahV +ahR ahV ahP ajy @@ -47827,8 +48065,8 @@ aiw aiw aiw aiw -ajy -avs +ajx +axv avT avT avT @@ -47838,7 +48076,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -47866,18 +48104,18 @@ aXZ aYG aXH asK -aYF +beQ bbc aSB -aSB -aSB aVG bdZ bdZ +bdZ beQ aSB aSB aSB +aVG asK bhc bbe @@ -47908,7 +48146,7 @@ brG brG brG brG -lvX +qzO cHn cHn cHn @@ -48044,8 +48282,8 @@ ajx ajx ajx ajx -ajy -avs +ajx +axv avT avT avT @@ -48055,7 +48293,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -48083,18 +48321,18 @@ aoH aYH aXH asK -bax +beQ aSB -bbK -bcr -bcr -bcr +beR bcr +bcs +bcs +bcs bew beR aSB aSB -aSB +aVG asK bhd bhD @@ -48242,7 +48480,7 @@ aah afM agw agv -ahX +akK ahX aiA ajy @@ -48261,7 +48499,7 @@ alm alm alm alm -auE +aix avt avV avV @@ -48272,7 +48510,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -48300,18 +48538,18 @@ aoH aYI aXH asK -aSB -aSB -bbL +bdZ +aWk +beS bcs bdf bdf beb bdf beS -aSB -aSB -aSB +aWk +aWk +bdZ asK oEJ oEJ @@ -48342,7 +48580,7 @@ heU heU heU heU -afe +qzO bGL bGL bGL @@ -48478,7 +48716,7 @@ ahV ahP ahP ahP -auF +ajy anp avT avT @@ -48489,7 +48727,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -48532,7 +48770,7 @@ atw asK asK asK -baz +wLU bbg asK asK @@ -48564,7 +48802,7 @@ rJJ bGL bGL bGL -bvm +bvK rdR rdR bvK @@ -48676,7 +48914,7 @@ aah aah afM agw -aeI +ahR ahX aiA ajy @@ -48695,7 +48933,7 @@ aeI aiB ahV ahV -ahV +ajy anp avU avT @@ -48706,7 +48944,7 @@ avT avT aBa anp -aeI +ahR aeI aeI aeI @@ -48912,7 +49150,7 @@ aeI aeI aeI aeI -aeI +ajy anp avT avT @@ -48923,7 +49161,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -48994,10 +49232,10 @@ bme bme aao glB -cnm jOc jOc -hhW +jOc +jOc keg xIP xIP @@ -49110,7 +49348,7 @@ aah aah afM ahh -ahX +akK aeI aiA ajy @@ -49129,7 +49367,7 @@ aeI aeI aeI aeI -aeI +ajy anp qaR avT @@ -49140,7 +49378,7 @@ azo aAq aAZ anp -aeI +ahR aeI aeI aeI @@ -49327,7 +49565,7 @@ aae aae aae aae -ahX +atm aeI aiA ajz @@ -49346,7 +49584,7 @@ aeI aeI aeI aeI -aeI +ajy anp avT avT @@ -49357,7 +49595,7 @@ avT avT avT anp -aeI +ahR aeI aeI aeI @@ -49563,18 +49801,18 @@ aeI aeI aeI aeI -aeI +ajy anp anp alX -aqw +ayN ayd alX anp anp anp anp -aeI +ahR aeI aeI ahi @@ -49780,18 +50018,18 @@ aeI aeI aeI aeI -aeI -aeI -aeI +ajy +ajx +ajx alu aqw azv alu -aeI -aeI -aeI -aeI -aeI +ajx +ajx +ajx +ajx +ahR aeI aeI aeI @@ -49997,18 +50235,18 @@ aiw aiw aiw aiw -aiw -aiw -aiw +ajx +ajx +ajx alu aqw aye alu -aiw -aiw -aiw -aiw -aiw +ajx +ajx +ajx +ajx +ajx aiw aiw aiw @@ -50073,7 +50311,7 @@ bmi bmi brI bmi -ovq +azb bpx bpx bpx @@ -50218,7 +50456,7 @@ alu alu alu alu -aqw +ayN ayd alu alu @@ -50290,7 +50528,7 @@ bmi bmi bmg bmi -ovq +azb kdh aao aao @@ -50470,7 +50708,7 @@ aXH asK asK atA -aZu +bdg bbg auk asK @@ -50493,7 +50731,7 @@ bfz aZO aZu bli -blK +bsX bmg bmO bmy @@ -51105,8 +51343,8 @@ aBR aBR aMc aoH -aNp -aNp +aVJ +aVJ aoH aQO aOC @@ -51121,7 +51359,7 @@ aXH asK asK atA -aZu +bdg bbg auk asK @@ -51709,13 +51947,13 @@ adi adz adz acp -agu -aeI -aeI -aeI -aeI -aeI -aeI +aao +aiw +aiw +aiw +aiw +aiw +ahQ aeI aeI aeI @@ -51756,8 +51994,8 @@ aBR aBR aMc aoH -aNp -aNp +aVJ +aVJ aoH aQR aNo @@ -51932,7 +52170,7 @@ acp agy agy acp -aeI +ahR aeI aeI aeI @@ -51997,11 +52235,11 @@ asK aZu beh aZO -aZu +bdg aZO bbO aZu -aZu +bdg aZu aZO biq @@ -52149,7 +52387,7 @@ afO adk adS acp -aeI +ahR aeI aeI aeI @@ -52171,7 +52409,7 @@ auK aqw azv arR -aqw +ayN arR arR azu @@ -52366,8 +52604,8 @@ aeJ adS adk acp -aeI -aeI +ajx +ahQ aeI aeI aiz @@ -52584,13 +52822,13 @@ agz ahj acp acp +ajx aiw aiw aiw aiw -aiw -aiw -aiw +ajx +ajx aiw aiw ajx @@ -53087,8 +53325,8 @@ bfH bgb bei asK -aZu -bbi +bdg +gkD biw asK eLq @@ -53293,7 +53531,7 @@ atw atw atw asK -aZu +bdg bcD asK atw @@ -53304,9 +53542,9 @@ asK asK asK asK -bbi -bbi -biw +fwD +fwD +tuu asK asK asK @@ -53525,12 +53763,12 @@ bgF bgF bhR biR -aHF +aMg +bjx +bjx +bjx +bjx bjw -bjY -bka -bjA -bjA axX dWl bmi @@ -53742,12 +53980,12 @@ aVo aIn biy biS -aMg -bjx -bjZ +aIn +bjy +bjy bjy bjB -bjA +blq axX bmp bmi @@ -53964,7 +54202,7 @@ bjy bjy bjy bkp -bjA +blq axX bmq bmi @@ -54138,11 +54376,11 @@ aFG aFG aHz alu -aHD -aBR -aBR -aBR -aBS +aHF +aFM +aFM +aFM +aFM aFM aOE aFM @@ -54181,7 +54419,7 @@ bjz bjz bkp bjA -bjA +blq axX trr bmg @@ -54355,11 +54593,11 @@ aqw aqw awO alu -aHD -aBR -aLd -aKl -aMc +aHF +aHF +aHF +aHF +aHF apC apC apC @@ -54398,7 +54636,7 @@ bjA bjA bjA bjA -bkC +blq axX bms bmg @@ -54572,10 +54810,10 @@ aEE aGB aHA alu -aHD -aKl -aIn -aIn +aHF +aHF +aHF +aHF apC apC aOF @@ -54615,7 +54853,7 @@ bjB bjA bjA bkC -bkd +blq axX axX axX @@ -54791,8 +55029,8 @@ alu alu alu aKm -aFM -aFM +aHF +aHF uRE aGD aMf @@ -55440,11 +55678,11 @@ arR arl arR aDN -aqw +ayN aKp aQW aMf -aMf +kmm aNA aMf aMf @@ -55830,7 +56068,7 @@ aao aao aao aao -acP +alF buB acp afl @@ -55876,8 +56114,8 @@ aqw aIk alu aKq -aMg -aMg +aHF +aHF apC aNC aMf @@ -56048,7 +56286,7 @@ aao aao aao acP -acP +asc acp afm afS @@ -56092,9 +56330,9 @@ aqw arl aqw alu -aIn -aIn -aKt +aHF +aHF +aHF apD aND aMf @@ -56265,7 +56503,7 @@ aao aao aao acP -acP +asc acp xyu afS @@ -56309,9 +56547,9 @@ arl aqw aIl alu -aIn -aIp -aBR +aHF +aHF +aHF apD aNE aOH @@ -56352,13 +56590,13 @@ bkc bkc bkc blt -bmz +xDW bmz bna bmz boc bmz -bmz +xDW bop bpO bop @@ -56482,7 +56720,7 @@ aao aao acP acP -acP +asc acp afn afT @@ -56526,9 +56764,9 @@ alu alu alu alu -aIp -aBR -aBR +aHF +aHF +aHF apC aOM aOM @@ -56699,7 +56937,7 @@ aao acP acP acP -acP +asc acp afo afT @@ -56734,18 +56972,18 @@ ayV ayV bBg alu -aBR -aBR -aBR -aBR -aCM -aBR -aBR -aBR -aBR -aBR -aBR -aBR +aHF +aMg +aMg +aMg +aBS +aMg +aMg +aMg +aMg +aMg +aMg +aHF apC aOM aOM @@ -56795,7 +57033,7 @@ bjx bjx bjx bjx -bjx +bjw axX bru bmg @@ -56806,7 +57044,7 @@ axX axX axX axX -bjA +bjY bjA bjA bjA @@ -56916,7 +57154,7 @@ acP acP acP acP -acP +asc acp afp afT @@ -56951,7 +57189,7 @@ ayW ayV bBg alu -aBR +aHD aBR aBR aBR @@ -56962,7 +57200,7 @@ aBR aBR aBR aFL -aBS +aMc apC aNG aOI @@ -57012,7 +57250,7 @@ bjA bjA bjA bjA -bjA +blq axX brv bmi @@ -57023,7 +57261,7 @@ bop bop boq axX -bjA +bjY bjA bjA bjA @@ -57133,7 +57371,7 @@ acP acP acP acP -acP +asc acp afo afT @@ -57168,7 +57406,7 @@ alu alu alu alu -aBR +aHD aBR aBR aBR @@ -57229,7 +57467,7 @@ bjA bjA bjA bjA -bjA +blq axX brw bmi @@ -57240,7 +57478,7 @@ bpC bmi bor axX -bjA +bjY bjA bjA bkC @@ -57347,10 +57585,10 @@ aao aao aao acP -acP -acP -acP -acP +agq +ahe +ahe +ahS acp afq afS @@ -57370,22 +57608,22 @@ aoj aoj apH aqG -aqL -aqL -asa -acP -acP -acP -acP -acP -acP +alF +alF +alF +alF +alF +alF +alF +alF +alF axF -aqO -acP -azK -acP -acP -aBR +asf +alF +akw +alF +alF +axW aBR aBR aBR @@ -57446,7 +57684,7 @@ bjA bjA bjA bjA -bjA +blq axX axX axX @@ -57454,10 +57692,10 @@ axX axX axX axX -bmi +maD btH axX -bjA +bjY bjA bkC bjy @@ -57564,7 +57802,7 @@ aao aao aao acP -acP +asc acp acp acp @@ -57582,10 +57820,10 @@ acp alv amq ahj -adS +aeJ adS aoW -adS +aeJ aqH aqL arZ @@ -57663,18 +57901,18 @@ bjA bjA bjA bjA -bjA -blv -bjy -bjy -bjy +blu +bjx +bjx +bjx +bjw ayr bmq bmq bmi bor ayr -bkr +bjY bkr bjy bjy @@ -57781,7 +58019,7 @@ aao aao aao acP -acP +asc acp adQ aep @@ -57803,7 +58041,7 @@ acp acp acp acp -aqI +aqH aqL asa acP @@ -57862,8 +58100,8 @@ aBR aBR aBR aBR -aBS -aHF +aBR +aMc aHD aIn bjD @@ -57884,14 +58122,14 @@ bjA bjA bjH bjy -bkd +blq ayr bmq bqo bmi btJ ayr -bkb +bjw bun btD btD @@ -57998,7 +58236,7 @@ aao aao acP acP -acP +asc acp adR aeq @@ -58020,23 +58258,23 @@ aer afS cLZ acp -aqJ +aqH arp -acP -acP -acP -acP -acP -acP -acP -acP -acP -aqO -acP -acP -azK -acP -aBS +agq +ahe +ahe +ahe +ahe +ahe +ahe +ahe +ahe +atl +ahe +ahe +auE +ahe +aFM aCN aCN aCN @@ -58080,7 +58318,7 @@ aBR aBR aBR bhO -aVp +biY dzY bpT bjG @@ -58215,7 +58453,7 @@ aao aao acP acP -acP +asc acp adS adS @@ -58237,9 +58475,9 @@ anx afS akM acp -aqJ +aqH arp -acP +asc amn amV amV @@ -58297,8 +58535,8 @@ aBR aBR aBR bhP -aHD -bdk +aMc +gpt aKt bjy bjy @@ -58319,12 +58557,12 @@ bjy bjy bjy blq -bmi +maD bmi bmi bsu bor -bmi +maD bjw bjw bjx @@ -58432,7 +58670,7 @@ aao aao acP acP -acP +asc acp adT adT @@ -58454,9 +58692,9 @@ aer afS aoT acp -aqJ +aqH aqL -asb +asc amn vti atY @@ -58514,8 +58752,8 @@ aBR aBR aBR bhP +aMc aHD -aWJ aBR bjH bkd @@ -58649,7 +58887,7 @@ aao aao aao acP -acP +asc acp acr aer @@ -58671,9 +58909,9 @@ acp acp acp acp -aqJ -aqL +aqH aqL +asc amn aty atY @@ -58731,18 +58969,18 @@ bfI bfI bfI bhQ -aHD -aWJ -aBR -aVo -aMc +aHF +aHF +aFM +aFM +aHF awp awp axr axr axr awp -bkE +gad bnA awp awp @@ -58866,7 +59104,7 @@ aao aao aao acP -acP +asc acp acl aes @@ -58888,9 +59126,9 @@ anB alx alx acr -aqJ -aqL +aqH aqL +asc amn atY atY @@ -58947,12 +59185,12 @@ aNw aNw aMg aMg -bhR +vis aHF -aFM -aFM -aFM aHF +aMg +aMg +aMg awp bkD blx @@ -59083,7 +59321,7 @@ aao aao aao acP -acP +asc acq acv adW @@ -59105,7 +59343,7 @@ adk alx alx alZ -aqJ +aqH aqL asc amn @@ -59150,7 +59388,7 @@ aOM aOM aOM aZZ -baJ +upV baJ bcb bcR @@ -59163,12 +59401,12 @@ aIn aIn aKt aKt -aIn +aKt bhS biY -biY -biY -biY +dzY +dWg +dWg bke bku bmF @@ -59300,7 +59538,7 @@ aao aao aao acP -acP +asc adG adW aet @@ -59379,14 +59617,14 @@ aIn aKt aIp aBR -aBR -aYK -aKt -aKt -aKt -aKt -aKt -aKt +aWI +aFM +aFM +aHF +aHF +aFM +aFM +aFM awp bkE bly @@ -59404,7 +59642,7 @@ bnF bry bnF bof -bmF +dvC bmF bmF btB @@ -59517,7 +59755,7 @@ aao aao aao acP -acP +asc acq adX aeu @@ -59539,7 +59777,7 @@ anC alz alz amb -aqL +aqM aqL ase asJ @@ -59596,14 +59834,14 @@ aWJ aBR aBR aBR -aBR -auW +aMc +erf auX auX auX auX -auW -aBR +erf +aHF awp bkG blX @@ -59734,7 +59972,7 @@ aao aao aao acP -acP +asc acp adY jGn @@ -59758,7 +59996,7 @@ alA acr aqM aqL -asf +ase amn amn amn @@ -59811,9 +60049,9 @@ apC aTh aIn aKl -aKl aIm aBR +aMc auX gpR gpR @@ -59951,7 +60189,7 @@ aao aao aao acP -acP +asc acp acp acp @@ -59973,9 +60211,9 @@ adk adk adS alZ -acP +aqM arr -aqL +asc amI aty atY @@ -59994,7 +60232,7 @@ asJ aua aua asJ -asJ +cgt aHD aIn aIn @@ -60028,16 +60266,16 @@ bej beE aFM aFM -aFM aHC aBR +aMc auX gpR gpR gpR gpR auX -aBR +aHF awM awM awM @@ -60049,7 +60287,7 @@ awM awM awp awp -bpo +yhV bnA awp awp @@ -60168,13 +60406,13 @@ aao aao aao acP -acP -acP -acP -acP -acP -acP -acP +ags +alF +alF +alF +alF +alF +ahS acr ahu adS @@ -60190,9 +60428,9 @@ anE aok adk acr +aqM acP -acP -arr +asc amI atB atY @@ -60242,19 +60480,19 @@ aYO aTa aYO bek -beF -aMg +bjZ aMg aHF aHD aBR +aMc auX gpR gpR gpR gpR auX -aBR +aHF awM bkI bkI @@ -60391,7 +60629,7 @@ acP acP acP acP -acP +asc acr ahu adS @@ -60407,9 +60645,9 @@ anF aol adS acr +aqM acP -acP -acP +asc amn atz atY @@ -60450,7 +60688,7 @@ apJ apC apC apC -aOM +kmm mWg apC apC @@ -60461,17 +60699,17 @@ apC apC beF bfb -aIn aMc aHD aIm +aMc auX gpR gpR gpR gpR auX -aBR +aHF awM bkJ bkJ @@ -60608,7 +60846,7 @@ acP acP acP acP -acP +asc acr acr acr @@ -60624,9 +60862,9 @@ acr acr acr acr +aqM acP -acP -acP +asc amn aty atY @@ -60667,8 +60905,8 @@ aMg aMg aMg aMg -aMg -aMg +aHF +aHF aMg aMg aMg @@ -60678,17 +60916,17 @@ aMg aMg beG aIn -bfb -aMc -aHD -aIn -auW +vmm +aHF +aFM +aHF +erf auX auX auX auX -auW -aBR +erf +aHF awM awM awM @@ -60825,10 +61063,10 @@ acP acP acP acP -acP -acP -acP -acP +ags +alF +alF +ahS acr adS ajL @@ -60841,9 +61079,9 @@ aom aoX apb acr +aqM acP -acP -acP +asc amn tmH atY @@ -60884,8 +61122,8 @@ aVo aIn aWJ aBR -aBR -aBR +aMc +aHD aBR aBR aVo @@ -60895,17 +61133,17 @@ aWJ aBR aBR bfc -bfb -aMc -aHD -aIn -aBR -aBR -aBR -aBR -aBR -aBR -aBR +vmm +aHF +aMg +aHF +aHF +aHF +aHF +aHF +aHF +aHF +aHF awp bkK blB @@ -61045,7 +61283,7 @@ acP acP acP acP -acP +asc acr adS ajR @@ -61058,7 +61296,7 @@ alB alB adW acr -acP +aqM acP asg amI @@ -61101,8 +61339,8 @@ aIn aIn aIn aKl -aKl -aKl +aMc +aHD aKl aKl aIn @@ -61112,17 +61350,17 @@ aIn aKl aKl aIn -aIn aMc aHD aIn -auW +aMc +erf auX auX auX auX -auW -aBR +erf +aHF awp bkK blX @@ -61262,7 +61500,7 @@ acP acP acP acP -acP +asc acr adS ajS @@ -61275,7 +61513,7 @@ alC aon aoY acr -acP +aqM acP ash amI @@ -61312,13 +61550,13 @@ aBR aBR aBR aVn -aBS aFM aFM aFM aFM aFM aFM +aHF baa aFM aFM @@ -61329,17 +61567,17 @@ aFM aFM aFM aFM -aFM aHF aHD aWJ +aMc auX gpR gpR gpR gpR auX -aBR +aHF awp bkL bkE @@ -61407,7 +61645,7 @@ xpl bCs xpl xpl -ioS +lGt ioS ioS ioS @@ -61479,7 +61717,7 @@ acP acP acP acP -acP +asc aiQ adS adk @@ -61528,7 +61766,6 @@ aBR aBR aBR aBR -aVo aMc aHF aMg @@ -61548,15 +61785,16 @@ aMg aMg aMg aMg -aWI +axW aIp +aMc auX gpR gpR gpR gpR auX -aBR +aHF awp bkM bkE @@ -61696,8 +61934,8 @@ acP acP acP acP -acP -adS +asc +aeJ adS adk akc @@ -61709,9 +61947,9 @@ anH agt apa acr -aqO -acP +ajT acP +asc amI aty atY @@ -61745,7 +61983,6 @@ aBR aBR aBR aBR -aVo aMc aHD aIn @@ -61754,6 +61991,7 @@ aIn aIn aIn aIn +aIn aKt aKt aKt @@ -61766,14 +62004,14 @@ aKt aKt aIp aBR -aBR +aMc auX gpR gpR gpR gpR auX -aBR +aHF awp qeK ccP @@ -61784,8 +62022,8 @@ bnH bkE box bkE -bnH -bnH +iyd +iyd eKU bkE bkE @@ -61834,7 +62072,7 @@ bAR aBv aBA aCh -qZo +cOJ aCh aBA aBA @@ -61913,7 +62151,7 @@ acP acP acP acP -acP +asc acr ajj adk @@ -61926,9 +62164,9 @@ akS agO aCk acr +aqM acP -acP -acP +asc amI atB atY @@ -61962,9 +62200,9 @@ aFM aFM aHC aBR -aVo aMc aHD +aIn aXo aKt aKt @@ -61983,14 +62221,14 @@ aBR aBR aBR aBR -aFL +aWW auX gpR gpR gpR gpR auX -aBR +aHF awp awp awp @@ -62130,7 +62368,7 @@ aao acP acP acP -acP +asc acr acr acr @@ -62143,9 +62381,9 @@ akj akj akj acr +aqM acP -acP -acP +asc amn atB atY @@ -62179,9 +62417,9 @@ anJ anJ aHD aBR -aVo aMc aHD +aIn aWJ aBR aBR @@ -62200,14 +62438,14 @@ aBR aBR aBR aBR -aBR -auW +aMc +erf auX auX auX auX -auW -aBR +erf +aHF awp bkO blC @@ -62347,10 +62585,10 @@ aao aao acP acP -acP -acP -acP -ajT +ags +alF +alF +alF akw akw alF @@ -62359,10 +62597,10 @@ akw akw akw akw -acP -acP +alF +aqI amD -acP +asc amn aty atY @@ -62396,13 +62634,11 @@ aEO anJ aTc aBR -aVo aMc aHD +aIn aWJ -aBR -aBS -aFM +aWI aFM aFM aFM @@ -62419,12 +62655,14 @@ aFM aFM aFM aFM -aHC -aBR -aBR +aHF +aHF +aHF +aHF +aHF jdj -aBR -aBR +aHF +aHF awp bkE hsF @@ -62579,7 +62817,7 @@ acP acP acP acP -acP +asc amn lyx atY @@ -62613,11 +62851,11 @@ aEO aqz aHD aKl -aIn aMc aHD +aIn aWJ -aBR +aMc asv asv asv @@ -62636,9 +62874,9 @@ atJ atJ asv asv -aHD -aBR -aBR +aHF +aHF +aHF asv awf awf @@ -62796,7 +63034,7 @@ acP acP acP acP -acP +asc amI vti atY @@ -62830,11 +63068,11 @@ aEO anJ aTd aIn -aIn aMc aHD +aIn aWJ -aBR +aMc asv aYX aZE @@ -62853,9 +63091,9 @@ bgc bfe bgI asv -aHD -aBR -aBR +aHF +aHF +aHF asv bjJ bgx @@ -63006,14 +63244,14 @@ acP acP acP acP -acP -acP -acP -acP -acP -acP -acP -acP +agq +ahe +ahe +ahe +ahe +ahe +ahe +ahS amI aty atY @@ -63047,11 +63285,11 @@ aRj aqz aHD aUh -aIn aMc aHD +aIn aWJ -aFL +aWW asH aYY aZE @@ -63070,9 +63308,9 @@ bgd bgd aLf asH -aHD -aBR -aBR +aHF +aHF +aHF asv beI bgx @@ -63223,7 +63461,7 @@ acP akV acP acP -acP +asc ako ako ako @@ -63264,11 +63502,11 @@ aEO anJ aHD aIn -aIn aMc aHD +aIn aWJ -aBR +aMc asH aYZ aZE @@ -63288,8 +63526,8 @@ bgs bfM avr bhT -aBR -aBR +aHF +aHF asv beI bgx @@ -63440,7 +63678,7 @@ acP acP acP acP -acP +asc aku aoo apc @@ -63453,7 +63691,7 @@ atC ars amn amn -aws +jZp axh amn amn @@ -63481,11 +63719,11 @@ aRk anJ aTe aFM -aFM aHF aHD +aIn aWJ -aBR +aMc asH aZa aZE @@ -63504,9 +63742,9 @@ bgc bgc bgK asH -aHD -aBR -aBR +aHF +aHF +aHF asv bjK aZF @@ -63657,7 +63895,7 @@ acP acP acP acP -acP +asc aku aop apc @@ -63696,13 +63934,13 @@ aLr aPY aEO aSc -aHD aHF aHF aHF aHD +aIn aWJ -aBR +aMc asv aYY aZE @@ -63722,7 +63960,7 @@ bgt bgL asv bhU -aBR +aHF rHD asv bjL @@ -63874,7 +64112,7 @@ acP acP acP acP -acP +asc aku aop apc @@ -63912,14 +64150,14 @@ aNU aEO aEO aRl -aER +cNH aTf aHF aHF -aHF aHD +aIn aWJ -aBR +aMc asv aZb aZE @@ -64091,7 +64329,7 @@ acP acP acP acP -acP +asc aku aoq apd @@ -64131,12 +64369,12 @@ aDW aRm anJ aTg -aMg aHF aHF -aWI +aHD +aIn aWJ -aBR +aMc asv asv asv @@ -64308,7 +64546,7 @@ aao acP acP acP -acP +asc ako ako ako @@ -64347,15 +64585,15 @@ aEO aNS aEO anJ -aTh +bhR aUi -aMc +aHF aHD aIn aIp -aBR -aBR -aBR +aMc +aHF +aHF asv baf bac @@ -64525,7 +64763,7 @@ aao acP acP acP -acP +asc ako aor ape @@ -64564,15 +64802,15 @@ aKx aNS aRn aqz -aTh -aIn -aMc -aHD -aWJ -aBR -aBR -aBR -aBR +bhR +aHF +aHF +aHF +aFM +aFM +aHF +aHF +aHF asv bag bac @@ -64742,7 +64980,7 @@ aao aao acP acP -acP +asc ako aos ape @@ -64781,11 +65019,11 @@ aKx aNS aEO anJ -aTh -aIn -aMc -aHD -aIn +bhR +aHF +aHF +aHF +aHF asv asv asv @@ -64798,7 +65036,7 @@ aZE aXr aXr aXU -aXr +bET beI bft asv @@ -64808,10 +65046,10 @@ bgN bgg bhX asv -bja -bfw -bfw -bfw +bqa +bep +bep +bqa awp bkU bkU @@ -64959,7 +65197,7 @@ aao aao aao acP -acP +asc ako aos ape @@ -64998,11 +65236,11 @@ aKx aNS aRk anJ -aTh -aIn -aMc -aHD -aIn +bhR +aHF +aHF +aHF +aHF asv aXS aYs @@ -65026,9 +65264,9 @@ bgf bgg asH bjb -bes -bes -bes +bfw +bfw +bpX awp bkT blG @@ -65176,7 +65414,7 @@ aao aao aao acP -acP +asc ako aos apf @@ -65216,10 +65454,10 @@ aNS aEO aqz aTi -bfI aVp aVp -bfI +aVp +aVp aXq bcX bcX @@ -65245,7 +65483,7 @@ asv bjb bes bes -bes +bpX awp awp awp @@ -65429,15 +65667,15 @@ anJ anJ anJ anJ -aNS +sPv aRo anJ aTj aMg aMg aMg -aMg -aXr +aHF +bET aXr aXr aXU @@ -65462,16 +65700,16 @@ asH bjb bjl bes -bes -bki -bes -bes -bes -bes -bes -bes -bes -bpX +jfr +bep +bep +bep +bep +bep +bep +bep +bep +bqa bWk bMf xJC @@ -65621,7 +65859,7 @@ ako asQ atE atE -apc +ovq apc aop apc @@ -65653,7 +65891,7 @@ aTk aQu aQu aQu -aQu +aTr asH aXU aYt @@ -65870,7 +66108,7 @@ aTk aQu aVq aVq -aQu +aTr asv aXV aYu @@ -66087,7 +66325,7 @@ aTk aUk aKP aKP -aWK +aTr asv asv asv @@ -66297,16 +66535,16 @@ anT anT anT anT -aQc +cYI aRp anT aTk aUk aKP aVY -aKP -aSh -aTr +aXW +aSg +aTq aTq aTq asv @@ -66326,7 +66564,7 @@ bfP bfP bhl bbB -aXr +bET bqa bja beq @@ -66518,11 +66756,11 @@ aQd aIE anT aTk -aUl -aOk -aOk -aOk -aQu +aUk +aKP +aKP +aKP +aSh aTr aTq aTq @@ -66735,11 +66973,11 @@ aQe aQm aqU aTk -aTu -aTu -aTu -aTu -aTu +aUl +aOk +aOk +aOk +aQu aTr aTq aTq @@ -66927,7 +67165,7 @@ ako avJ apc axl -apc +ovq ayz ayz aAh @@ -66952,12 +67190,12 @@ aQf aQh aqU aTl -aSg -aSg -aSg -aSg -aSg -aTr +aTu +aTu +aTu +aTu +aTu +aTq aTq aTq asv @@ -67168,13 +67406,13 @@ aOY aQg aCo aqU -aTk -aQu -aVq -aVq -aVq -aQu -aTr +aDy +aSg +aSg +aSg +aSg +aSg +aTq aTq aTq asv @@ -67386,11 +67624,11 @@ aMQ aMN aqU aTk -aUk -aKP -aKP -aKP -aSh +aQu +aVq +aVq +aVq +aQu aTr aTq aTq @@ -67411,7 +67649,7 @@ bgA bgU bhn bgB -aXr +bET gSg bja bjm @@ -67622,7 +67860,7 @@ aXr asv beI bbB -bfR +bET bfR bgB bgB @@ -67642,11 +67880,11 @@ ujD ujD vVZ rjw -brD +fCb aao -brD -brD -brD +fCb +fCb +fCb aao pcF kBn @@ -67858,17 +68096,17 @@ uij uij uVe brD -brD -brD +fCb +fCb rjw -brD -brD +fCb +fCb rjw -brD +fCb pcF kBn iZA -fjP +dIb pQv fwV fwV @@ -68035,7 +68273,7 @@ aOd aPb aQj aRr -aCZ +tKR aTk aQu aUk @@ -68077,17 +68315,17 @@ iXp aao aao rjw -brD +fCb aao aao aao aao pcF fjP -fjP -fjP -fjP -fjP +dIb +dIb +dIb +dIb fwV kBn aao @@ -68238,7 +68476,7 @@ anT anY anY anY -aQa +cYI aGa anY anT @@ -68293,19 +68531,19 @@ ujD ujD vVZ brE -brD -brD +fCb +fCb rjw -brD +fCb aao aao pcF kBn -fjP -fjP -fjP -fjP -fjP +dIb +dIb +dIb +dIb +dIb kBn aao aao @@ -68460,7 +68698,7 @@ aCo aGL anT anT -aJu +aJz anT anT aIE @@ -68512,16 +68750,16 @@ vVZ vVZ vVZ vVZ -brD +fCb vVZ vVZ vVZ pcF kBn -fjP -fjP -fjP -fjP +dIb +dIb +dIb +dIb iZA kBn aao @@ -68726,19 +68964,19 @@ mDs mDs ooD vVZ -brD -brD -brD -brD -brD -brD +fCb +fCb +fCb +fCb +fCb +fCb aao pcF kBn -fjP -fjP -fjP -fjP +dIb +dIb +dIb +dIb kBn kBn kSL @@ -68942,20 +69180,20 @@ cAs mDs mDs ooD -brD +myY kTs -brD +fCb bsH -brD -brD +fCb +fCb aao aao pcF kBn fwV -fjP -fjP -fjP +dIb +dIb +dIb ssE kSL fOx @@ -69109,7 +69347,7 @@ aDa aFa aEU aCZ -aCZ +tKR aIC aJx aKH @@ -69159,10 +69397,10 @@ cAs mDs mDs ooD -brD -brD -brD -brD +myY +fCb +fCb +fCb aao aao aao @@ -69170,9 +69408,9 @@ aao pcF kBn mRD -fjP -fjP -fjP +dIb +dIb +dIb ssE kSL fOx @@ -69377,7 +69615,7 @@ mDs mDs ooD vVZ -brD +fCb kTs kTs aao @@ -69387,8 +69625,8 @@ aao pcF kBn fwV -fjP -fjP +dIb +dIb kBn kBn fOx @@ -69595,11 +69833,11 @@ bpZ qkC vVZ kTs -brD -brD -brD -brD -brD +fCb +fCb +fCb +fCb +fCb brE pcF kBn @@ -70222,8 +70460,8 @@ aZe aTu aZe aZe -aVv -bes +aTu +kwQ bes bes bes @@ -70404,7 +70642,7 @@ arD arD arD arD -arD +aMk anW aDc aEi @@ -70422,8 +70660,8 @@ aDc aEi aQr anW -aQu -aTr +aTq +aTq aTk aUk aKP @@ -70440,7 +70678,7 @@ atP atP atb iIp -bes +bja bes bes bes @@ -70621,7 +70859,7 @@ arD arD arD arD -arD +aMk anW aDc aEi @@ -70639,8 +70877,8 @@ aDc aEi aEi aqx -aQu -aTr +aTq +aTq aUp aUk aKP @@ -70657,7 +70895,7 @@ bal bal bdE atb -bes +bja bes bes bes @@ -70838,7 +71076,7 @@ arD arD arD arD -arD +aMk anW aDc aEi @@ -70856,8 +71094,8 @@ aLF aPk aEi aqx -aQu -aTr +aTq +aTq aUp aQu aVr @@ -70866,15 +71104,15 @@ aKP aKP aTr atd -aZi +nRT bam bal bbD bal bdd -aZi +nRT atb -bes +bja bes bes bes @@ -71055,7 +71293,7 @@ arD arD arD arD -arD +aMk anW aDc aEi @@ -71073,8 +71311,8 @@ aOi aPl aQs anW -aQu -aTs +aTq +aTp aUp aQu aUk @@ -71083,15 +71321,15 @@ aKP aKP aTr atd -aZi +nRT ban baR bbE baR baR -aZi +nRT atb -bes +bja bes bes bes @@ -71272,7 +71510,7 @@ arD arD arD arD -arD +aMk anW aDd aEi @@ -71290,7 +71528,7 @@ aOj aPm aQt aRu -aSf +nnK aTt aUq aQu @@ -71300,7 +71538,7 @@ aKP aMR aTr atb -aZi +nRT bao baS bbF @@ -71308,7 +71546,7 @@ bao baS bdF atb -bes +bja bes bes aEX @@ -71489,7 +71727,7 @@ arD arD arD arD -arD +aMk anW aDe aQt @@ -71506,8 +71744,8 @@ aEi aOj aPn aEi -aEi -aSg +ocA +aTq aTp aUr aQu @@ -71517,15 +71755,15 @@ aOk aQu aTr atd -aZi +nRT bap baT bbF bap baT -aZi +nRT atb -bes +bja bes bes aEX @@ -71706,7 +71944,7 @@ arD arD arD arD -arD +aMk anW aDf anW @@ -71724,8 +71962,8 @@ aOj aPo aQs anW -aQu -aTr +aTq +aTq aUs aSf aSf @@ -71734,15 +71972,15 @@ aSf aSf aYv atd -aZi +nRT baq baU bbF bar baU -aZi +nRT atb -bes +bja bes bes bes @@ -71923,7 +72161,7 @@ aao arD arD arD -arD +aMk anW aDg aEk @@ -71941,8 +72179,8 @@ aGO aPp aEi aqx -aQu -aTr +aTq +aTq foT aSg aSg @@ -71951,15 +72189,15 @@ aSg aSg qhl atb -aZi +nRT bap baT bbF bcl baT -aZi +nRT atb -bes +bja bes bes bes @@ -72140,7 +72378,7 @@ aao arD arD arD -arD +aMk anW aDh aEl @@ -72158,8 +72396,8 @@ aEi aEi aEi aqx -aQu -aTr +aTq +aTq aUp aQu aVq @@ -72168,15 +72406,15 @@ aQu aQu aYx atd -aZi +nRT bar baU bbF bar baU -aZi +nRT atb -bes +bja bes bes bes @@ -72357,7 +72595,7 @@ aao aao aao arD -arD +aMk anW anW anW @@ -72375,8 +72613,8 @@ aoc aoc anW anW -aQu -aTs +aTq +aTp aUp aUk aKP @@ -72385,7 +72623,7 @@ aWK aQu aYx atd -aZi +nRT bap baT bbF @@ -72393,7 +72631,7 @@ bap baT bdG atb -bes +bja bes bes bes @@ -72574,26 +72812,26 @@ aao aao aao arD -arD -arD -arD -arD -arD -arD -arD -arD -arD -arD -aKP -aKP -aKP -aKP -aKP -aKP -aKP -aKP -aSh -aTs +bMz +aqa +aqa +aqa +aqa +aqa +aqa +aqa +aqa +aqa +aSg +aSg +aSg +aSg +aSg +aSg +aSg +aSg +aSg +aTp aUp aUk aKP @@ -72608,9 +72846,9 @@ baV bbG bar baU -aZi +nRT atb -bes +bja bes bes bes @@ -72825,9 +73063,9 @@ baT bbF bap baT -aZi +nRT atb -bes +bja bes bes bes @@ -73042,9 +73280,9 @@ baU bbH bar baU -aZi +nRT atb -bes +bja bes bes aEX @@ -73243,8 +73481,8 @@ aOk aOk aQu kYd -lEb -wMP +wNw +wNw aUu wNw kYd @@ -73261,7 +73499,7 @@ bap baT bdF atb -bes +bja bes aEX aEX @@ -73476,9 +73714,9 @@ baS bbF bao baS -aZi +nRT atb -bes +bja bes aEX aEX @@ -73677,8 +73915,8 @@ aao aao aao apI -lEb -wMP +wNw +wNw aUw wNw apI @@ -73687,15 +73925,15 @@ aXt aXX aTr aZi -aZi +nRT bat baW bbI bat baW -aZi +nRT atb -bes +bja bes aEX bes @@ -73904,15 +74142,15 @@ aXt aXt aTr atb -aZi +nRT aJy aJy -aZi +nRT aJy aJy bdI atb -bes +bja bes bes bes @@ -74129,7 +74367,7 @@ atb atb atb atb -bes +bja bes bes bes @@ -75582,7 +75820,7 @@ adZ adZ adZ adZ -agQ +aCy ahB adZ aev @@ -75821,7 +76059,7 @@ aev adZ aup agd -aqc +auy auY aqc aqc @@ -76263,7 +76501,7 @@ amk amk anI anL -aAO +hmm aCr anL anI @@ -76926,7 +77164,7 @@ aIK aJE aKQ aKQ -aKQ +hmm aMT aOn aOn @@ -77338,7 +77576,7 @@ aao azm amk amk -agd +auy ave amk amk @@ -77753,7 +77991,7 @@ adZ adZ adZ agX -ahK +agc aio adZ adZ @@ -77971,7 +78209,7 @@ aao adZ adZ ahL -ahK +agc aiR adZ adZ @@ -78440,7 +78678,7 @@ poF aFk aGg aGU -aGU +xNL aIO tkN anI @@ -78623,7 +78861,7 @@ adZ adZ adZ adZ -agc +aCy ajr adZ afd @@ -78658,7 +78896,7 @@ anI anI vbi aHQ -aHQ +hWa wko anI aao @@ -79953,7 +80191,7 @@ eFh anL aAT aAY -aCy +aPq aDq hWa aFm @@ -81472,7 +81710,7 @@ eFh anL aAY aAU -aCy +aPq aDq hWa aFo diff --git a/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm b/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm index 1f5792284797..7acf197b3ddb 100644 --- a/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm +++ b/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm @@ -52,7 +52,6 @@ }, /area/bigredv2/outside/chapel) "aj" = ( -/obj/item/changestone, /turf/open/floor{ icon_state = "darkish" }, diff --git a/maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm b/maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm index bc1eae13052e..47984a920749 100644 --- a/maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm +++ b/maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm @@ -94,14 +94,13 @@ "av" = ( /obj/item/tool/warning_cone, /turf/open/floor{ - dir = 9; + dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/se) "aw" = ( -/turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" +/turf/open/mars{ + icon_state = "mars_dirt_6" }, /area/bigredv2/outside/se) "ax" = ( @@ -124,14 +123,18 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Atmospherics Condenser Storage" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "aB" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "aC" = ( /obj/effect/decal/cleanable/dirt, @@ -146,7 +149,9 @@ name = "\improper Atmospherics Condenser" }, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "aE" = ( /obj/effect/decal/cleanable/dirt, @@ -158,8 +163,9 @@ /turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) "aG" = ( -/turf/open/mars{ - icon_state = "mars_dirt_13" +/turf/open/floor{ + dir = 4; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/se) "aH" = ( @@ -169,12 +175,6 @@ }, /turf/open/floor, /area/bigredv2/outside/filtration_plant) -"aI" = ( -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/se) "aJ" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -182,7 +182,7 @@ /area/bigredv2/outside/se) "aK" = ( /turf/open/mars{ - icon_state = "mars_dirt_10" + icon_state = "mars_dirt_3" }, /area/bigredv2/outside/se) "aL" = ( @@ -319,7 +319,9 @@ dir = 1; name = "\improper Filtration Facility" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bm" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -327,7 +329,9 @@ name = "\improper Filtration Facility" }, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bn" = ( /obj/structure/closet/firecloset/full, @@ -361,7 +365,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/filtration_plant) "bt" = ( /obj/effect/decal/cleanable/dirt, @@ -500,12 +506,6 @@ }, /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/filtration_plant) -"bY" = ( -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/filtration_plant) "bZ" = ( /turf/open/floor{ dir = 1; @@ -521,9 +521,6 @@ /obj/structure/machinery/light, /turf/open/floor, /area/bigredv2/outside/filtration_plant) -"cc" = ( -/turf/closed/wall/solaris/rock, -/area/bigredv2/outside/filtration_plant) "ce" = ( /obj/structure/machinery/light, /turf/open/floor{ @@ -574,18 +571,14 @@ /area/bigredv2/outside/filtration_cave_cas) "cl" = ( /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + dir = 8; + icon_state = "asteroidwarning" }, -/area/bigredv2/outside/s) -"cm" = ( -/turf/closed/wall/solaris, -/area/bigredv2/outside/s) +/area/bigredv2/outside/filtration_plant) "cn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_plant) "jh" = ( @@ -653,8 +646,7 @@ /area/bigredv2/outside/filtration_cave_cas) "US" = ( /turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_plant) "VW" = ( @@ -700,8 +692,6 @@ ah bI bw bw -bw -bw bZ cl cl @@ -710,7 +700,9 @@ cl cl cl cl -cm +cl +cl +aa "} (2,1,1) = {" ak @@ -726,8 +718,8 @@ az az bJ bw -cc -cc +bw +bw bw bZ bZ @@ -756,14 +748,14 @@ bw bw bw bw -bY -bY -bY -bY +US +US +US +US cn -bY -bY -bY +US +US +US aY "} (4,1,1) = {" @@ -1118,11 +1110,11 @@ bO bO "} (17,1,1) = {" -bK -bK -bK -bK -bK +am +am +am +am +am aY bf bj @@ -1146,18 +1138,18 @@ bO "} (18,1,1) = {" av -aw -aw -aw -aw -az +am +am +am +am +US az az az az bu ad -ad +cn WD bO bO @@ -1177,14 +1169,14 @@ am am am am -az +US az az aP aO by az -az +US WD bO bO @@ -1202,16 +1194,16 @@ bO ax am am -aI -aI -az +am +am +US az az ad bo az bT -az +US WD bO bO @@ -1228,9 +1220,9 @@ bO (21,1,1) = {" ax am -aJ +am +aG aG -bK aY bf ka @@ -1256,8 +1248,8 @@ bO am am aJ -bK -bK +aw +aK aY aY aY diff --git a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm index 01e35b6a6faf..8907ab630fcb 100644 --- a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm +++ b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm @@ -5,18 +5,14 @@ pixel_y = 28; start_charge = 0 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "aN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data{ dir = 8 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "bp" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ @@ -24,16 +20,12 @@ locked = 0; name = "\improper Checkpoint Office" }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "bx" = ( /obj/structure/surface/table/almayer, /obj/item/device/motiondetector, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "cO" = ( /obj/effect/decal/cleanable/dirt, @@ -53,9 +45,7 @@ "el" = ( /obj/structure/surface/table/almayer, /obj/item/handcuffs, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "ge" = ( /obj/structure/closet/secure_closet/marshal, @@ -68,7 +58,7 @@ }, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigred/ground/security) "ie" = ( @@ -81,8 +71,8 @@ /obj/structure/surface/table/almayer, /obj/structure/transmitter/colony_net/rotary{ phone_category = "Solaris Ridge"; - phone_id = "Filtration Checkpoint"; - phone_color = "red" + phone_color = "red"; + phone_id = "Filtration Checkpoint" }, /turf/open/floor/greengrid, /area/bigred/ground/security) @@ -133,9 +123,7 @@ "pV" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "qg" = ( /obj/effect/decal/cleanable/dirt, @@ -146,17 +134,13 @@ "qy" = ( /obj/item/device/radio, /obj/structure/surface/table/almayer, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "rD" = ( /obj/structure/machinery/camera/autoname{ dir = 8 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "rF" = ( /obj/structure/machinery/deployable/barrier, @@ -169,15 +153,12 @@ name = "Filtration Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) "uk" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "uF" = ( /obj/structure/surface/table/almayer, @@ -190,21 +171,17 @@ name = "\improper Checkpoint Office" }, /turf/open/floor{ - icon_state = "dark" + icon_state = "delivery" }, /area/bigred/ground/security) "vH" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "vO" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal/small_stack, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "wi" = ( /obj/effect/decal/cleanable/dirt, @@ -220,9 +197,7 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "xr" = ( /obj/structure/surface/rack, @@ -231,9 +206,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "zE" = ( /obj/effect/decal/cleanable/dirt, @@ -250,9 +223,7 @@ }, /area/bigredv2/outside/filtration_cave_cas) "AY" = ( -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "AZ" = ( /turf/open/floor{ @@ -309,18 +280,14 @@ "KO" = ( /obj/item/trash/sosjerky, /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "LX" = ( /obj/structure/machinery/light{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "Mq" = ( /obj/structure/surface/table/almayer, @@ -335,9 +302,7 @@ dir = 8 }, /obj/structure/machinery/vending/security, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "OD" = ( /turf/open/floor{ @@ -355,9 +320,7 @@ "Pf" = ( /obj/effect/decal/cleanable/blood, /obj/effect/spawner/gibspawner/human, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "PS" = ( /turf/open/mars, @@ -370,8 +333,7 @@ name = "Filtration Lockdown" }, /turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" + icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) "Qo" = ( @@ -384,9 +346,7 @@ }, /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "SF" = ( /obj/structure/window/framed/solaris/reinforced, @@ -413,9 +373,7 @@ /area/bigred/ground/security) "VI" = ( /obj/structure/largecrate, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "Wa" = ( /turf/open/floor{ @@ -432,9 +390,7 @@ "Yo" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) "YZ" = ( /obj/structure/surface/table/almayer, @@ -456,9 +412,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor{ - icon_state = "dark" - }, +/turf/open/floor, /area/bigred/ground/security) (1,1,1) = {" @@ -522,7 +476,7 @@ uk AY uk uk -xa +AY hz "} (5,1,1) = {" diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm index 622307f8e8e9..e712260a4947 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm @@ -1,15 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/turf/open/floor{ - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/c) "ab" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 6 + dir = 5; + icon_state = "asteroidwarning" }, -/area/bigredv2/outside/c) +/area/bigredv2/outside/e) "ac" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_4" @@ -23,14 +18,8 @@ "ae" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 - }, -/area/bigredv2/outside/c) -"af" = ( -/turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 4 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "ag" = ( @@ -39,10 +28,11 @@ }, /area/bigredv2/outside/e) "ah" = ( -/turf/open/mars{ - icon_state = "mars_dirt_14" +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" }, -/area/bigredv2/outside/e) +/area/bigredv2/outside/c) "ai" = ( /turf/open/mars, /area/bigredv2/outside/e) @@ -53,14 +43,14 @@ /area/bigredv2/outside/e) "ak" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) "al" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 4 + dir = 4; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) "am" = ( @@ -74,7 +64,10 @@ }, /area/bigredv2/outside/c) "ao" = ( -/turf/open/mars, +/turf/open/floor{ + dir = 9; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/c) "ap" = ( /turf/closed/wall/solaris, @@ -108,7 +101,10 @@ /area/bigredv2/outside/e) "au" = ( /obj/effect/landmark/crap_item, -/turf/open/mars, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/c) "av" = ( /obj/structure/machinery/vending/snack, @@ -152,14 +148,15 @@ /area/bigredv2/outside/office_complex) "aA" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 1 + dir = 1; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/e) "aB" = ( +/obj/effect/landmark/lv624/xeno_tunnel, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 9 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "aC" = ( @@ -184,14 +181,14 @@ /area/bigredv2/outside/office_complex) "aG" = ( /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) "aH" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "aI" = ( @@ -439,8 +436,8 @@ "bx" = ( /obj/item/shard, /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) "by" = ( @@ -556,8 +553,8 @@ "bR" = ( /obj/item/shard, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "bS" = ( @@ -604,8 +601,8 @@ /area/bigredv2/outside/office_complex) "bY" = ( /turf/open/floor{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/bigredv2/outside/office_complex) "bZ" = ( @@ -768,8 +765,8 @@ /area/bigredv2/outside/office_complex) "cw" = ( /obj/item/weapon/gun/rifle/nsg23/no_lock/stripped{ - name = "smashed NSG 23 assault rifle"; - desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close. This one seems to have been heavily damaged from impact, you can still see some debris that resembles a scope and underbarrel attachment point on it." + desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close. This one seems to have been heavily damaged from impact, you can still see some debris that resembles a scope and underbarrel attachment point on it."; + name = "smashed NSG 23 assault rifle" }, /turf/open/shuttle/dropship{ icon_state = "rasputin12" @@ -936,8 +933,8 @@ "cV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "redcorner"; - dir = 4 + dir = 4; + icon_state = "redcorner" }, /area/bigredv2/outside/office_complex) "cW" = ( @@ -950,8 +947,8 @@ /area/bigredv2/outside/office_complex) "cX" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 10 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "cY" = ( @@ -959,13 +956,15 @@ icon_state = "gib6" }, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "cZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidwarning" + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) "da" = ( @@ -1083,7 +1082,9 @@ "dt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/mars, +/turf/open/mars{ + icon_state = "mars_dirt_12" + }, /area/bigredv2/outside/se) "du" = ( /obj/effect/decal/cleanable/dirt, @@ -1099,15 +1100,15 @@ /area/bigredv2/outside/se) "dw" = ( /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 10 + dir = 10; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/se) "dx" = ( /obj/item/tool/warning_cone, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 6 + dir = 6; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/se) "dz" = ( @@ -1146,8 +1147,8 @@ /area/bigredv2/outside/office_complex) "dE" = ( /obj/effect/decal/cleanable/blood{ - icon_state = "gib6"; - dir = 1 + dir = 1; + icon_state = "gib6" }, /turf/open/shuttle/dropship{ icon_state = "rasputin3" @@ -1286,15 +1287,15 @@ "dW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 1 + dir = 4; + icon_state = "asteroidwarning" }, -/area/bigredv2/outside/e) +/area/bigredv2/outside/se) "dX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) "dY" = ( @@ -1359,8 +1360,8 @@ "eg" = ( /obj/item/stack/rods, /turf/open/floor{ - icon_state = "asteroidwarning"; - dir = 8 + dir = 8; + icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) "eh" = ( @@ -1435,8 +1436,8 @@ /area/bigredv2/outside/office_complex) "jx" = ( /obj/effect/decal/cleanable/blood{ - icon_state = "gib6"; - dir = 1 + dir = 1; + icon_state = "gib6" }, /obj/item/limb/leg/l_leg, /turf/open/shuttle/dropship{ @@ -1506,11 +1507,9 @@ /area/bigredv2/outside/office_complex) "uC" = ( /obj/effect/spawner/gibspawner/human, -/obj/item/weapon/gun/rifle/m41a/corporate{ - current_mag = /obj/item/ammo_magazine/rifle/rubber; - name = "battered M41A pulse rifle MK2"; - pixel_x = 4; - desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. It seems to be pretty battered and broken up." +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock{ + desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. The IFF electronics appear to be non-functional."; + name = "battered M41A pulse rifle Mk2" }, /turf/open/shuttle/dropship{ icon_state = "rasputin3" @@ -1570,11 +1569,9 @@ }, /area/bigredv2/outside/office_complex) "GG" = ( -/obj/item/weapon/gun/rifle/m41a/corporate{ - current_mag = /obj/item/ammo_magazine/rifle/rubber; - name = "battered M41A pulse rifle MK2"; - pixel_x = 4; - desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. It seems to be pretty battered and broken up." +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock{ + desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. The IFF electronics appear to be non-functional."; + name = "battered M41A pulse rifle Mk2" }, /turf/open/shuttle/dropship{ icon_state = "rasputin3" @@ -1583,8 +1580,8 @@ "Ha" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/se) "Lk" = ( @@ -1607,8 +1604,8 @@ /area/bigredv2/outside/office_complex) "PR" = ( /turf/open/floor{ - icon_state = "asteroidfloor"; - dir = 1 + dir = 1; + icon_state = "asteroidfloor" }, /area/bigredv2/outside/se) "Qc" = ( @@ -1635,18 +1632,12 @@ icon_state = "floor8" }, /area/bigredv2/outside/office_complex) -"ZG" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/mars_cave{ - icon_state = "mars_dirt_4" - }, -/area/bigredv2/outside/e) (1,1,1) = {" -aa +ac ad ao -aB +aH aH aH aH @@ -1662,17 +1653,17 @@ bR aH eg aH -aH -aH cX -ao -ao -ao +cX +cX +cX +cX +cX "} (2,1,1) = {" -aa +ac ad -ao +ah ap ap ap @@ -1691,15 +1682,15 @@ ax aY ap ap -aa -ao -ao +cX +cX +cX ap "} (3,1,1) = {" -aa +ac ad -ao +ah ap aI aR @@ -1718,13 +1709,13 @@ cq ca cH ap -aa -ao -ao +cX +cX +cX ap "} (4,1,1) = {" -aa +ac ad au as @@ -1745,15 +1736,15 @@ ck ej cI as -aa -ao -ao +cX +cX +cX ap "} (5,1,1) = {" -aa +ac ad -ao +ah as aK bB @@ -1773,14 +1764,14 @@ ek cm cR cY -ao -ao +cX +cX ap "} (6,1,1) = {" -aa +ac ad -ao +ah as aL aR @@ -1799,15 +1790,15 @@ eh aS ed as -aa -ao -ao +cX +cX +cX ap "} (7,1,1) = {" -aa +ac ad -ao +ah ap aJ aR @@ -1827,14 +1818,14 @@ cr cr ap cZ -ao -ao +cX +aB ap "} (8,1,1) = {" -aa +ac ad -ao +ah ap aM aS @@ -1859,9 +1850,9 @@ ap ap "} (9,1,1) = {" -ab +ac ad -ao +ah ap ap ap @@ -1888,9 +1879,9 @@ dr (10,1,1) = {" ac an -ao -ao -ao +ah +cX +cX ap aC bj @@ -1913,11 +1904,11 @@ bu ar "} (11,1,1) = {" -ad -ao -ao -ao -ao +aH +aH +cX +cX +cX by aN id @@ -1940,7 +1931,7 @@ bI bI "} (12,1,1) = {" -ac +cX ap ap ap @@ -1964,10 +1955,10 @@ id yS cE dm -ds +dW "} (13,1,1) = {" -ac +cX ap av ar @@ -2021,7 +2012,7 @@ do ds "} (15,1,1) = {" -af +cX ar bt aD @@ -2048,7 +2039,7 @@ dp du "} (16,1,1) = {" -ag +aA ba bb aE @@ -2075,7 +2066,7 @@ dm dv "} (17,1,1) = {" -ZG +aA ap az bu @@ -2102,7 +2093,7 @@ dn dw "} (18,1,1) = {" -ah +aA ap ap ap @@ -2129,11 +2120,11 @@ do dq "} (19,1,1) = {" -ai -at -dW -dX -dX +ab +al +aG +aG +aG dY aN fv diff --git a/maps/map_files/BigRed/standalone/lambda-graveyard.dmm b/maps/map_files/BigRed/standalone/lambda-graveyard.dmm index 42e8b1d8b683..8dc12acf8d53 100644 --- a/maps/map_files/BigRed/standalone/lambda-graveyard.dmm +++ b/maps/map_files/BigRed/standalone/lambda-graveyard.dmm @@ -2,28 +2,16 @@ "a" = ( /turf/open/mars, /area/bigredv2/outside/se) -"b" = ( -/obj/structure/prop/dam/wide_boulder/boulder1, -/turf/open/mars, -/area/bigredv2/outside/se) -"c" = ( -/turf/open/mars{ - icon_state = "mars_dirt_13" - }, -/area/bigredv2/outside/se) -"d" = ( -/turf/open/mars{ - icon_state = "mars_dirt_10" - }, -/area/bigredv2/outside/se) "e" = ( -/turf/open/mars{ - icon_state = "mars_dirt_14" +/turf/open/floor{ + icon_state = "asteroidwarning" }, /area/bigredv2/outside/se) "f" = ( /obj/item/stool, -/turf/open/mars, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, /area/bigredv2/outside/se) "g" = ( /turf/open/mars{ @@ -103,7 +91,7 @@ /area/bigredv2/caves) (1,1,1) = {" -a +e a a a @@ -115,7 +103,7 @@ a D "} (2,1,1) = {" -a +e a a a @@ -127,7 +115,7 @@ a s "} (3,1,1) = {" -a +e a a a @@ -139,7 +127,7 @@ a a "} (4,1,1) = {" -a +e a a a @@ -151,7 +139,7 @@ a a "} (5,1,1) = {" -b +e a a o @@ -163,7 +151,7 @@ a a "} (6,1,1) = {" -a +e a a o @@ -175,7 +163,7 @@ o a "} (7,1,1) = {" -a +e a a a @@ -187,7 +175,7 @@ o o "} (8,1,1) = {" -c +e g l a @@ -199,7 +187,7 @@ a t "} (9,1,1) = {" -d +e h m a @@ -223,7 +211,7 @@ a t "} (11,1,1) = {" -a +e a a a @@ -235,7 +223,7 @@ a t "} (12,1,1) = {" -a +e a a a @@ -247,7 +235,7 @@ a t "} (13,1,1) = {" -a +e a a o @@ -259,7 +247,7 @@ r t "} (14,1,1) = {" -a +e a o o @@ -271,7 +259,7 @@ a t "} (15,1,1) = {" -a +e j o o @@ -295,7 +283,7 @@ s s "} (17,1,1) = {" -a +e a p a @@ -307,7 +295,7 @@ s s "} (18,1,1) = {" -a +e a a a diff --git a/maps/map_files/BigRed/standalone/medbay-passage.dmm b/maps/map_files/BigRed/standalone/medbay-passage.dmm index a8dbb6c719e5..75d323f0116d 100644 --- a/maps/map_files/BigRed/standalone/medbay-passage.dmm +++ b/maps/map_files/BigRed/standalone/medbay-passage.dmm @@ -2,12 +2,6 @@ "a" = ( /turf/template_noop, /area/template_noop) -"b" = ( -/turf/open/floor{ - dir = 8; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/c) "c" = ( /obj/structure/sign/safety/medical{ pixel_x = 0; @@ -43,12 +37,6 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/c) -"g" = ( -/turf/open/floor{ - dir = 4; - icon_state = "asteroidwarning" - }, -/area/bigredv2/outside/c) "h" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -99,9 +87,9 @@ (1,1,1) = {" a a -b -b -b +l +l +l R "} (2,1,1) = {" @@ -139,8 +127,8 @@ R (6,1,1) = {" a a -g -g -g +l +l +l R "} diff --git a/maps/map_files/BigRed/standalone/medbay-v3.dmm b/maps/map_files/BigRed/standalone/medbay-v3.dmm index e14dc4671a7e..aded8e8bb7cb 100644 --- a/maps/map_files/BigRed/standalone/medbay-v3.dmm +++ b/maps/map_files/BigRed/standalone/medbay-v3.dmm @@ -20,15 +20,15 @@ name = "\improper Medical Clinic" }, /turf/open/floor{ - icon_state = "warnwhite"; - dir = 1 + dir = 1; + icon_state = "warnwhite" }, /area/bigredv2/outside/medical) "ae" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "warnwhite"; - dir = 1 + dir = 1; + icon_state = "warnwhite" }, /area/bigredv2/outside/medical) "af" = ( @@ -37,8 +37,8 @@ "ag" = ( /obj/structure/closet/secure_closet/chemical, /turf/open/floor{ - icon_state = "whitepurplecorner"; - dir = 1 + dir = 1; + icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) "ah" = ( @@ -60,8 +60,8 @@ /area/bigredv2/outside/medical) "ak" = ( /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "al" = ( @@ -78,16 +78,16 @@ "an" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "ao" = ( /obj/structure/machinery/chem_master, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "ap" = ( @@ -137,14 +137,14 @@ "aw" = ( /obj/structure/machinery/chem_dispenser, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "ax" = ( /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "ay" = ( @@ -158,15 +158,15 @@ "az" = ( /obj/structure/bed, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "aA" = ( /obj/structure/surface/table, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "aB" = ( @@ -196,8 +196,8 @@ /obj/item/storage/box/beakers, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitepurplecorner"; - dir = 1 + dir = 1; + icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) "aF" = ( @@ -242,8 +242,8 @@ amount = 1 }, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "aL" = ( @@ -254,8 +254,8 @@ /area/bigredv2/outside/medical) "aM" = ( /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "aN" = ( @@ -284,8 +284,8 @@ "aQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "aR" = ( @@ -309,30 +309,30 @@ /area/bigredv2/outside/medical) "aU" = ( /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "aV" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "aX" = ( /obj/structure/window_frame/solaris, /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "aY" = ( /obj/item/shard, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "aZ" = ( @@ -376,15 +376,15 @@ "bf" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bg" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bh" = ( @@ -396,8 +396,8 @@ "bi" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bj" = ( @@ -411,8 +411,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/frame/table, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "bl" = ( @@ -490,22 +490,22 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "bw" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "bx" = ( /obj/item/stack/rods, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "by" = ( @@ -517,8 +517,8 @@ /area/bigredv2/outside/medical) "bz" = ( /turf/open/floor{ - icon_state = "whitegreen"; - dir = 5 + dir = 5; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "bA" = ( @@ -584,8 +584,8 @@ /obj/item/shard, /obj/item/frame/table, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bJ" = ( @@ -605,8 +605,8 @@ /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 1 + dir = 1; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "bM" = ( @@ -618,8 +618,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 1 + dir = 1; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "bN" = ( @@ -647,8 +647,8 @@ "bQ" = ( /obj/structure/machinery/light, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "bR" = ( @@ -769,8 +769,8 @@ "cj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "ck" = ( @@ -820,15 +820,15 @@ "cq" = ( /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "cr" = ( /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "cs" = ( @@ -846,15 +846,15 @@ "cu" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cv" = ( /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cw" = ( @@ -868,15 +868,15 @@ "cx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "cy" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "cz" = ( @@ -885,8 +885,8 @@ }, /obj/item/shard, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 1 + dir = 1; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "cA" = ( @@ -910,8 +910,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "cC" = ( @@ -920,8 +920,8 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "cD" = ( @@ -934,8 +934,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cE" = ( @@ -954,8 +954,8 @@ "cF" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 1 + dir = 1; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "cH" = ( @@ -965,8 +965,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "cI" = ( @@ -979,8 +979,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "cJ" = ( @@ -992,8 +992,8 @@ icon_state = "coil2" }, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "cK" = ( @@ -1008,8 +1008,8 @@ }, /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "cL" = ( @@ -1052,8 +1052,8 @@ "cR" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cS" = ( @@ -1067,8 +1067,8 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "cU" = ( @@ -1091,16 +1091,16 @@ "cW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "cX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "cY" = ( @@ -1115,8 +1115,8 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "db" = ( @@ -1193,8 +1193,8 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "dn" = ( @@ -1225,8 +1225,8 @@ }, /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "dq" = ( @@ -1241,8 +1241,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "ds" = ( @@ -1264,8 +1264,8 @@ pixel_x = 30 }, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "du" = ( @@ -1312,8 +1312,8 @@ }, /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "dA" = ( @@ -1337,16 +1337,16 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/objective_landmark/science, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "dD" = ( /obj/structure/surface/table, /obj/item/device/autopsy_scanner, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "dE" = ( @@ -1391,8 +1391,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "dL" = ( @@ -1436,8 +1436,8 @@ /obj/structure/surface/table, /obj/item/reagent_container/food/snacks/sliceable/pizza/margherita, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "dT" = ( @@ -1466,8 +1466,8 @@ /obj/structure/machinery/body_scanconsole, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 6 + dir = 6; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "dX" = ( @@ -1485,8 +1485,8 @@ "dZ" = ( /obj/structure/bed/chair, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "ea" = ( @@ -1528,15 +1528,15 @@ /area/bigredv2/outside/medical) "ef" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; + icon_state = "sink"; pixel_x = -12; pixel_y = 2 }, /obj/item/tool/surgery/scalpel/manager, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "eg" = ( @@ -1634,20 +1634,20 @@ /obj/structure/bed/chair, /obj/item/shard, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "es" = ( /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "et" = ( /obj/item/reagent_container/spray/cleaner{ - name = "Surgery Cleaner"; - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back." + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" }, /turf/open/floor{ icon_state = "white" @@ -1675,8 +1675,8 @@ "ew" = ( /obj/structure/surface/table, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "ex" = ( @@ -1684,23 +1684,23 @@ /obj/item/storage/box/masks, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "ey" = ( /obj/effect/decal/cleanable/dirt, /obj/item/frame/table, /turf/open/floor{ - icon_state = "whitepurplecorner"; - dir = 1 + dir = 1; + icon_state = "whitepurplecorner" }, /area/bigredv2/outside/medical) "ez" = ( /obj/item/device/healthanalyzer, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "eA" = ( @@ -1742,15 +1742,15 @@ "eE" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "eF" = ( /obj/structure/closet/secure_closet/medical1, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "eG" = ( @@ -1758,8 +1758,8 @@ stored_metal = 1000 }, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "eH" = ( @@ -1774,8 +1774,8 @@ "eI" = ( /obj/structure/curtain/medical, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "eJ" = ( @@ -1798,8 +1798,8 @@ }, /obj/item/shard, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "eM" = ( @@ -1820,16 +1820,16 @@ "eO" = ( /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "eP" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing/bullet, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "eQ" = ( @@ -1838,8 +1838,8 @@ /obj/effect/decal/cleanable/dirt, /obj/item/frame/table, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 9 + dir = 9; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "eR" = ( @@ -1889,16 +1889,16 @@ dir = 6 }, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "eY" = ( /obj/structure/bed, /obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/bigredv2/outside/medical) "eZ" = ( @@ -1906,8 +1906,8 @@ dir = 5 }, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "fa" = ( @@ -1918,8 +1918,8 @@ name = "\improper Medical Clinic Operating Theatre" }, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) "fb" = ( @@ -1978,8 +1978,8 @@ "fj" = ( /obj/effect/decal/cleanable/vomit, /turf/open/floor{ - icon_state = "damaged4"; - dir = 8 + dir = 8; + icon_state = "damaged4" }, /area/bigredv2/outside/medical) "fk" = ( @@ -2019,8 +2019,8 @@ /obj/structure/machinery/light, /obj/item/tool/surgery/cautery, /turf/open/floor{ - icon_state = "whitebluefull"; - dir = 5 + dir = 5; + icon_state = "whitebluefull" }, /area/bigredv2/outside/medical) "fp" = ( @@ -2050,6 +2050,12 @@ icon_state = "platingdmg1" }, /area/bigredv2/outside/medical) +"hn" = ( +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/bigredv2/outside/medical) "om" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor{ @@ -2066,27 +2072,27 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor{ - icon_state = "damaged3"; - dir = 8 + dir = 8; + icon_state = "damaged3" }, /area/bigredv2/outside/medical) "MK" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor{ - icon_state = "damaged5"; - dir = 8 + dir = 8; + icon_state = "damaged5" }, /area/bigredv2/outside/medical) "Xh" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Solaris Ridge"; phone_color = "green"; - phone_id = "Clinic Labs" + phone_id = "Clinic Labs"; + pixel_y = 24 }, /turf/open/floor{ - icon_state = "damaged2"; - dir = 8 + dir = 8; + icon_state = "damaged2" }, /area/bigredv2/outside/medical) @@ -2620,7 +2626,7 @@ ai ai dP ab -eU +hn "} (20,1,1) = {" af @@ -2648,7 +2654,7 @@ fg fg dP aa -eU +hn "} (21,1,1) = {" af @@ -2676,7 +2682,7 @@ eY fn fq aa -eU +hn "} (22,1,1) = {" af diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 216b5aeb51d5..bddc64a61ad2 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -634,7 +634,7 @@ /obj/structure/window/reinforced{ layer = 3.8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "ace" = ( /obj/structure/machinery/landinglight/ds1/delayone{ @@ -829,7 +829,7 @@ /obj/structure/window/reinforced{ layer = 3.8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "acB" = ( /obj/structure/machinery/door/window/southleft{ @@ -1448,7 +1448,7 @@ /obj/structure/window/reinforced{ layer = 3.8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "aew" = ( /obj/effect/landmark/teleporter_loc/corsat_sigma_remote{ @@ -2506,7 +2506,7 @@ layer = 3.8 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "ahw" = ( /turf/closed/wall/biodome, @@ -2530,7 +2530,7 @@ /obj/structure/window/reinforced{ layer = 3.8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/hallwaysouth) "ahz" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, @@ -5960,11 +5960,11 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arC" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arE" = ( /obj/structure/window/reinforced{ @@ -5973,7 +5973,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arF" = ( /obj/structure/machinery/light/small{ @@ -6017,7 +6017,7 @@ dir = 8 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arN" = ( /turf/closed/wall/biodome, @@ -6051,7 +6051,7 @@ "arT" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "arU" = ( /obj/structure/machinery/washing_machine, @@ -6078,7 +6078,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asa" = ( /turf/open/floor/corsat{ @@ -6130,7 +6130,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asi" = ( /obj/structure/window/reinforced{ @@ -6138,7 +6138,7 @@ health = 80 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asj" = ( /obj/structure/machinery/power/apc/hyper{ @@ -6161,7 +6161,7 @@ "asn" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "aso" = ( /turf/open/floor/corsat{ @@ -6263,7 +6263,7 @@ layer = 3.8 }, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asJ" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, @@ -6276,7 +6276,7 @@ layer = 3.8 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asM" = ( /obj/structure/window/reinforced{ @@ -6288,7 +6288,7 @@ }, /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/sigma/north) "asN" = ( /obj/structure/surface/table/woodentable, @@ -12923,7 +12923,7 @@ }, /area/corsat/theta/airlock/control) "aJZ" = ( -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "aKa" = ( /obj/structure/window/framed/corsat/security, @@ -12967,48 +12967,31 @@ /turf/open/floor/plating, /area/corsat/theta/airlock/control) "aKh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "aKi" = ( /turf/open/gm/dirt, /area/corsat/theta/biodome) "aKj" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "aKk" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "aKl" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "aKm" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "aKn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "aKo" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "aKp" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "aKq" = ( /turf/closed/wall/biodome, @@ -14979,10 +14962,8 @@ /area/corsat/gamma/foyer) "aPG" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "aPH" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -14994,11 +14975,8 @@ /area/corsat/gamma/hangar/checkpoint) "aPJ" = ( /obj/structure/flora/jungle/alienplant1, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "aPK" = ( /obj/structure/surface/table/reinforced, @@ -15031,7 +15009,7 @@ "aPN" = ( /obj/effect/landmark/yautja_teleport, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "aPO" = ( /obj/structure/window/framed/corsat/security, @@ -18748,7 +18726,7 @@ "aZm" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "aZn" = ( /obj/structure/platform{ @@ -20305,60 +20283,43 @@ }, /area/corsat/theta/biodome/complex) "bcD" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "bcE" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "bcF" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "bcG" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "bcH" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "bcI" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/gm/dirt, /area/corsat/theta/biodome) "bcJ" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "bcK" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "bcL" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "bcM" = ( /obj/structure/fence, @@ -20367,7 +20328,7 @@ "bcN" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bcO" = ( /obj/structure/sign/safety/airlock{ @@ -20399,35 +20360,22 @@ /area/corsat/gamma/freezer) "bcR" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/corsat/theta/biodome) "bcS" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "bcT" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/corsat/theta/biodome) "bcU" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "bcV" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "bcW" = ( /obj/structure/fence, @@ -20437,38 +20385,31 @@ /obj/structure/machinery/colony_floodlight{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "bcY" = ( /obj/structure/machinery/colony_floodlight{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "bcZ" = ( /obj/structure/machinery/colony_floodlight{ dir = 8 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "bda" = ( /obj/structure/machinery/colony_floodlight{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "bdb" = ( /obj/structure/machinery/colony_floodlight{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "bdc" = ( /obj/structure/fence, @@ -20585,114 +20526,72 @@ }, /area/corsat/sigma/biodome/gunrange) "bdx" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "bdy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "bdz" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/corsat/theta/biodome) "bdA" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/corsat/theta/biodome) "bdB" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/corsat/theta/biodome) "bdC" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/corsat/theta/biodome) "bdD" = ( /turf/open/gm/river, /area/corsat/theta/biodome) "bdE" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/corsat/theta/biodome) "bdF" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/corsat/theta/biodome) "bdG" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/corsat/theta/biodome) "bdI" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/corsat/theta/biodome) "bdJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "bdK" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "bdL" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/corsat/theta/biodome) "bdM" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, -/area/corsat/theta/biodome) -"bdN" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner/south_west, /area/corsat/theta/biodome) "bdO" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/corsat/theta/biodome) "bdP" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass/weedable, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bdQ" = ( /turf/closed/gm/dense, /area/corsat/theta/biodome) "bdR" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bdS" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bdT" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "bdU" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -20700,65 +20599,45 @@ /area/corsat/theta/biodome) "bdV" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "bdW" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "bdX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "bdY" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "bdZ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bea" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "beb" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "bec" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "bed" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "bee" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "bef" = ( /turf/open/mars_cave{ @@ -20767,15 +20646,15 @@ /area/corsat/sigma/biodome/gunrange) "beg" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "beh" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bei" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bej" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -20802,19 +20681,16 @@ /area/corsat/theta/biodome) "bem" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "ben" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "beo" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bep" = ( /obj/structure/flora/jungle/planttop1, @@ -20853,19 +20729,15 @@ /area/corsat/sigma/biodome/gunrange) "bev" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "bew" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "bex" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/corsat/theta/biodome) "bey" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -20885,48 +20757,35 @@ /area/corsat/theta/biodome) "beD" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "beE" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "beF" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/dirt, /area/corsat/theta/biodome) "beG" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "beH" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "beI" = ( -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass/weedable, +/obj/structure/flora/jungle/vines/light_1, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "beJ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "beK" = ( /turf/open/mars_cave{ @@ -20960,16 +20819,11 @@ /area/corsat/gamma/biodome) "beQ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "beR" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "beS" = ( /obj/structure/machinery/colony_floodlight, @@ -20977,10 +20831,7 @@ /area/corsat/theta/biodome) "beT" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "beU" = ( /obj/structure/target, @@ -21004,10 +20855,7 @@ /area/corsat/gamma/biodome) "beY" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "beZ" = ( /turf/closed/ice_rock/corners, @@ -24135,9 +23983,7 @@ /obj/structure/sign/safety/airlock{ pixel_x = -32 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "boA" = ( /obj/structure/sign/safety/airlock{ @@ -24154,9 +24000,7 @@ /obj/effect/landmark/nightmare{ insert_tag = "lockdown-theta-east" }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "boD" = ( /obj/structure/machinery/disposal, @@ -34214,7 +34058,7 @@ "bUJ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bUK" = ( /obj/structure/flora/jungle/plantbot1, @@ -34451,7 +34295,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bVG" = ( /obj/structure/machinery/door_control{ @@ -34467,7 +34311,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bVI" = ( /obj/structure/pipes/standard/manifold/hidden/green, @@ -34562,7 +34406,7 @@ "bVX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "bWb" = ( /obj/structure/surface/table/almayer, @@ -36141,7 +35985,7 @@ /area/corsat/gamma/residential/west) "cbW" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "cce" = ( /obj/effect/landmark/survivor_spawner, @@ -36152,10 +35996,7 @@ /area/corsat/gamma/residential/showers) "ccq" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "cec" = ( /turf/open/floor/corsat{ @@ -36644,7 +36485,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "cvW" = ( /obj/structure/machinery/door/window/westleft, @@ -36923,7 +36764,7 @@ "cMa" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "cMv" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ @@ -37308,9 +37149,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "ddo" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -37462,7 +37301,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "diI" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -37825,6 +37664,7 @@ dir = 4 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -37960,7 +37800,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "dzX" = ( /turf/open/floor/corsat{ @@ -38267,9 +38107,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "dOq" = ( /obj/structure/bed/chair/office/light{ @@ -38351,6 +38189,7 @@ dir = 4 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -38780,7 +38619,7 @@ "ehg" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/vents/pump, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "ehj" = ( /obj/structure/flora/pottedplant, @@ -38832,15 +38671,13 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "eiG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eiQ" = ( /obj/structure/machinery/power/apc/high{ @@ -38938,6 +38775,7 @@ /area/corsat/gamma/airlock/south/id) "elG" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -39092,7 +38930,7 @@ "eql" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eqt" = ( /obj/structure/pipes/vents/pump{ @@ -39401,9 +39239,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/corsat/theta/biodome) "eBl" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -39468,10 +39304,8 @@ /area/corsat/omega/complex) "eDM" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "eDP" = ( /obj/structure/bed/chair/office/light, @@ -39537,10 +39371,7 @@ /area/corsat/sigma/cargo) "eIL" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "eJg" = ( /turf/open/floor/corsat{ @@ -39628,7 +39459,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eMI" = ( /obj/structure/showcase{ @@ -39671,7 +39502,7 @@ "eNM" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "eOe" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -39696,7 +39527,7 @@ /area/corsat/gamma/medbay) "eOZ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "ePL" = ( /obj/structure/closet/l3closet/general, @@ -39971,9 +39802,7 @@ "eZQ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "fax" = ( /obj/structure/machinery/light{ @@ -40215,7 +40044,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "fkn" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -40277,7 +40106,7 @@ health = 80 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/foyer) "flt" = ( /obj/vehicle/train/cargo/trolley, @@ -40418,11 +40247,11 @@ }, /area/corsat/gamma/foyer) "fpI" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "fpL" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -40487,6 +40316,7 @@ /area/corsat/gamma/hallwaysouth) "fst" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -40581,9 +40411,9 @@ }, /area/corsat/omega/airlocknorth/id) "fwq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "fwQ" = ( /turf/open/floor/corsat{ @@ -40647,10 +40477,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "fzm" = ( /obj/structure/surface/table/almayer, @@ -40974,7 +40801,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "fOh" = ( /obj/effect/landmark/corpsespawner/prisoner, @@ -41062,9 +40889,7 @@ /area/corsat/gamma/hallwaysouth) "fSA" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "fSB" = ( /turf/open/floor/corsat{ @@ -41403,10 +41228,7 @@ /area/corsat/gamma/airlock/south) "geN" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "geV" = ( /obj/effect/landmark/corpsespawner/scientist, @@ -41438,10 +41260,7 @@ dir = 4; network = list("theta") }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "gfM" = ( /obj/structure/machinery/smartfridge/seeds, @@ -41627,10 +41446,7 @@ /area/corsat/gamma/airlock/south/id) "glr" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "gne" = ( /turf/open/floor/corsat{ @@ -41720,7 +41536,7 @@ /area/corsat/sigma/south/engineering) "gpP" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "gqd" = ( /obj/structure/surface/table/reinforced, @@ -41776,11 +41592,11 @@ "gqT" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/vents/pump, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "gqV" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "gra" = ( /turf/open/floor/corsat{ @@ -41823,7 +41639,7 @@ "grD" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "grK" = ( /turf/open/floor/corsat{ @@ -42165,18 +41981,14 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "gEU" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "gEV" = ( /turf/open/floor/corsat{ @@ -42370,11 +42182,9 @@ }, /area/corsat/sigma/north) "gOk" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "gOx" = ( /obj/structure/machinery/light{ @@ -42962,10 +42772,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "hfG" = ( /obj/structure/bed/chair{ @@ -43065,13 +42872,11 @@ /turf/open/floor/wood, /area/corsat/theta/biodome/complex) "hkp" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "hkZ" = ( /turf/open/floor/corsat{ @@ -43140,7 +42945,7 @@ "hnR" = ( /obj/structure/flora/jungle/plantbot1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "hoh" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -43225,10 +43030,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "hqX" = ( /turf/open/floor/corsat, @@ -43686,13 +43488,11 @@ /turf/open/floor/corsat, /area/corsat/gamma/cargo/disposal) "hDO" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "hDX" = ( /turf/open/floor/corsat{ @@ -43777,10 +43577,7 @@ /area/corsat/omega/security) "hGf" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "hGg" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -43871,9 +43668,7 @@ /area/corsat/gamma/hangar/flightcontrol) "hJw" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "hJG" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -43926,7 +43721,7 @@ "hKH" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "hKZ" = ( /obj/structure/largecrate/random/barrel, @@ -43996,7 +43791,7 @@ /obj/structure/tunnel{ id = "hole3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "hOb" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -44544,10 +44339,7 @@ /area/corsat/omega/checkpoint) "iiI" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "iiS" = ( /obj/structure/surface/table/reinforced, @@ -44680,10 +44472,7 @@ /area/corsat/gamma/biodome) "imz" = ( /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "imK" = ( /obj/structure/surface/table/reinforced, @@ -44868,6 +44657,7 @@ "iuD" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "retrosquareslight" }, @@ -45026,7 +44816,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "iBo" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -45148,7 +44938,7 @@ /obj/structure/pipes/vents/pump{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "iEN" = ( /obj/structure/surface/table/almayer, @@ -45200,9 +44990,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "iHY" = ( /turf/open/floor/corsat{ @@ -45319,9 +45107,7 @@ /area/corsat/gamma/administration) "iNk" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "iNl" = ( /obj/structure/machinery/constructable_frame, @@ -45432,9 +45218,9 @@ }, /area/corsat/gamma/residential/researcher) "iQH" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "iQL" = ( /obj/structure/closet/wardrobe/robotics_black, @@ -45501,10 +45287,7 @@ /area/corsat/gamma/airlock/north/id) "iTW" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "iVp" = ( /obj/structure/machinery/light, @@ -45902,7 +45685,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "jnb" = ( /obj/structure/machinery/light{ @@ -45981,7 +45764,7 @@ /area/corsat/theta/airlock/west) "jqz" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "jrQ" = ( /obj/structure/bed/stool{ @@ -46399,6 +46182,7 @@ /area/corsat/omega/hallways) "jJm" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating{ dir = 8; icon_state = "platingdmg3" @@ -46868,10 +46652,7 @@ /area/corsat/theta/biodome/hydroeast) "keE" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "kfc" = ( /obj/structure/flora/pottedplant{ @@ -47123,7 +46904,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "koV" = ( /obj/structure/bed/chair/office/light{ @@ -47291,7 +47072,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "kuO" = ( /obj/structure/surface/table/reinforced, @@ -47388,9 +47169,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "kzN" = ( /obj/structure/bed/chair, @@ -47465,7 +47244,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "kCq" = ( /turf/open/floor/corsat{ @@ -47483,17 +47262,12 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "kDL" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "kEj" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -47541,10 +47315,7 @@ /area/corsat/gamma/biodome/toxins) "kFZ" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "kGi" = ( /obj/structure/barricade/handrail{ @@ -47599,10 +47370,7 @@ /area/corsat/sigma/airlock/control) "kHP" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "kIz" = ( /turf/open/floor/corsat{ @@ -48073,7 +47841,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "laV" = ( /obj/structure/surface/table/almayer, @@ -48372,9 +48140,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "lko" = ( /obj/structure/pipes/vents/pump{ @@ -48585,7 +48351,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "lsH" = ( /obj/structure/pipes/vents/pump{ @@ -49104,7 +48870,7 @@ /area/corsat/sigma/hangar) "lKy" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "lKC" = ( /obj/structure/pipes/vents/pump{ @@ -49409,9 +49175,7 @@ /area/corsat/sigma/hangar/checkpoint) "lVF" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "lVW" = ( /obj/structure/platform, @@ -49484,10 +49248,7 @@ "lYc" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "lYd" = ( /obj/structure/surface/table/reinforced, @@ -50044,7 +49805,7 @@ /area/corsat/gamma/cargo/disposal) "msP" = ( /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "msY" = ( /turf/open/floor/corsat{ @@ -50466,10 +50227,7 @@ "mIY" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "mJa" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -50708,10 +50466,7 @@ /area/corsat/gamma/residential/east) "mSo" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "mSz" = ( /obj/structure/machinery/chem_master, @@ -50742,6 +50497,7 @@ "mTz" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/floor/corsat{ icon_state = "retrosquareslight" @@ -50948,11 +50704,11 @@ /area/corsat/theta/biodome) "nck" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "ncR" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -51136,14 +50892,14 @@ "nlm" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "nln" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "nls" = ( /obj/structure/bed/sofa/south/grey/right, @@ -51480,9 +51236,7 @@ /area/corsat/gamma/residential/east) "nwj" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "nws" = ( /turf/open/floor/corsat{ @@ -51750,7 +51504,7 @@ /area/corsat/gamma/medbay/morgue) "nFc" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "nFt" = ( /obj/structure/surface/table/reinforced, @@ -51821,10 +51575,7 @@ "nIy" = ( /obj/structure/flora/bush/ausbushes/grassybush, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "nIF" = ( /obj/structure/surface/table/almayer, @@ -51950,9 +51701,7 @@ /area/corsat/gamma/biodome/toxins) "nMk" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "nMP" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -52428,7 +52177,7 @@ "oge" = ( /obj/structure/flora/jungle/vines/heavy, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "ohe" = ( /turf/open/floor/corsat{ @@ -52613,11 +52362,11 @@ }, /area/corsat/gamma/sigmaremote) "ooX" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "opf" = ( /obj/structure/prop/almayer/computers/sensor_computer1{ @@ -52722,9 +52471,7 @@ /area/corsat/sigma/south/complex) "osY" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "otC" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -53163,9 +52910,7 @@ /area/corsat/sigma/biodome/gunrange) "oLe" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "oLg" = ( /obj/effect/alien/weeds/node, @@ -53336,7 +53081,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "oQO" = ( /turf/open/floor/corsat{ @@ -53409,9 +53154,9 @@ }, /area/corsat/gamma/cargo) "oUJ" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "oVe" = ( /obj/structure/machinery/light{ @@ -53440,7 +53185,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "oVM" = ( /obj/structure/bed/sofa/vert/grey/bot, @@ -53578,17 +53323,14 @@ /area/corsat/gamma/residential/west) "oZW" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "paH" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "pbS" = ( /turf/open/floor/corsat{ @@ -53747,7 +53489,7 @@ "pgO" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "pgV" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -53871,9 +53613,7 @@ /obj/structure/machinery/light/small{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "pmf" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -53897,10 +53637,7 @@ /area/corsat/omega/complex) "pnQ" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "pov" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -54043,7 +53780,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "pwd" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -54679,10 +54416,7 @@ /area/corsat/sigma/south/complex) "pWR" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "pXp" = ( /obj/effect/landmark/corpsespawner/scientist, @@ -54693,9 +54427,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "pXU" = ( /obj/structure/barricade/handrail{ @@ -54866,9 +54598,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "qcR" = ( /obj/structure/surface/table/woodentable, @@ -55616,7 +55346,7 @@ dir = 8; network = list("theta") }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "qFp" = ( /obj/structure/bed/chair/office/light{ @@ -55668,9 +55398,7 @@ "qGz" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "qGF" = ( /obj/structure/janitorialcart, @@ -55709,6 +55437,7 @@ /area/corsat/omega/airlocknorth) "qIr" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -56071,9 +55800,7 @@ dir = 1; network = list("theta") }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "qVz" = ( /obj/effect/landmark/corpsespawner/pmc, @@ -56795,10 +56522,8 @@ }, /area/corsat/sigma/hangar/security) "rzy" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "rzU" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ @@ -57031,7 +56756,7 @@ "rJo" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "rJu" = ( /obj/effect/landmark/corpsespawner/scientist, @@ -57114,6 +56839,7 @@ /area/corsat/omega/maint) "rMq" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/ice, /area/corsat/gamma/biodome) "rMD" = ( @@ -57265,10 +56991,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "rSz" = ( /obj/structure/closet/wardrobe/white, @@ -57323,11 +57046,11 @@ }, /area/corsat/gamma/residential/west) "rTj" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "rTo" = ( /turf/open/floor/corsat{ @@ -57360,18 +57083,18 @@ }, /area/corsat/gamma/medbay/lobby) "rUq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "rUH" = ( /obj/structure/pipes/vents/pump{ dir = 4 }, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "rUK" = ( /obj/structure/machinery/light{ @@ -57663,9 +57386,7 @@ /area/corsat/gamma/biodome/complex) "sem" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "sez" = ( /obj/structure/surface/table/reinforced, @@ -57794,9 +57515,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/corsat/theta/biodome) "siU" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -57935,7 +57654,7 @@ /area/corsat/sigma/hangar/office) "smP" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "snc" = ( /obj/structure/morgue, @@ -58050,21 +57769,17 @@ /area/corsat/gamma/biodome/virology) "spU" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "sqn" = ( /obj/structure/machinery/colony_floodlight{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "sqr" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "sqY" = ( /turf/open/floor/corsat{ @@ -58112,7 +57827,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "sum" = ( /turf/open/floor/corsat{ @@ -58392,9 +58107,7 @@ /area/corsat/gamma/rnr/library) "sGQ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "sGV" = ( /obj/structure/machinery/door/airlock/almayer/command/colony{ @@ -58926,10 +58639,7 @@ /area/corsat/gamma/biodome/virology) "sZg" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "tad" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -59086,10 +58796,7 @@ /area/corsat/gamma/hallwaysouth) "tfu" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "tfz" = ( /obj/structure/surface/table/almayer, @@ -59339,10 +59046,7 @@ /area/corsat/sigma/hangar/office) "tpF" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "tpH" = ( /obj/structure/pipes/vents/pump{ @@ -59466,10 +59170,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "tvG" = ( /obj/structure/pipes/vents/pump{ @@ -59511,7 +59212,7 @@ "twS" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/vents/pump/on, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "twW" = ( /obj/structure/window/framed/corsat, @@ -59582,14 +59283,14 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "tAF" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "tBh" = ( /turf/open/floor/corsat{ @@ -59679,11 +59380,8 @@ }, /area/corsat/gamma/hangar/checkpoint) "tDK" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "tDQ" = ( /obj/structure/bed/chair{ @@ -59731,10 +59429,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/corsat/theta/biodome) "tGq" = ( /obj/structure/largecrate/random/barrel/green, @@ -59758,16 +59453,14 @@ /area/corsat/gamma/medbay/lobby) "tGV" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/corsat/theta/biodome) "tHy" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/structure/pipes/vents/pump{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "tHC" = ( /obj/structure/bed/chair{ @@ -59810,10 +59503,7 @@ /area/corsat/gamma/residential/west) "tJf" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "tJs" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -59911,10 +59601,10 @@ }, /area/corsat/sigma/biodome) "tNp" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/vents/pump, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "tNJ" = ( /obj/structure/surface/table/reinforced, @@ -60008,10 +59698,7 @@ /area/corsat/gamma/biodome) "tQk" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "tQs" = ( /obj/effect/landmark/corpsespawner/scientist, @@ -60084,9 +59771,7 @@ /area/corsat/sigma/southeast/datamaint) "tTd" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "tTf" = ( /obj/structure/machinery/light{ @@ -60511,7 +60196,7 @@ /area/corsat/sigma/south/robotics) "ukb" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "ukf" = ( /obj/effect/landmark/monkey_spawn, @@ -60547,7 +60232,7 @@ /area/corsat/gamma/residential/west) "uli" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "ulq" = ( /turf/open/floor/corsat{ @@ -60646,11 +60331,11 @@ dir = 4 }, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "upr" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "upA" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -60719,9 +60404,7 @@ /area/corsat/sigma/checkpoint) "usK" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "usS" = ( /obj/structure/flora/jungle/vines/heavy, @@ -60731,7 +60414,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "usW" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -60980,12 +60663,9 @@ }, /area/corsat/gamma/residential/showers) "uBH" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "uCn" = ( /obj/structure/fence, @@ -61123,10 +60803,7 @@ /area/corsat/sigma/south/engineering) "uIh" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/corsat/theta/biodome) "uIJ" = ( /obj/structure/fence, @@ -61227,6 +60904,7 @@ /area/corsat/sigma/dorms) "uLV" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "squares" }, @@ -61388,10 +61066,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "uRC" = ( /obj/structure/machinery/botany{ @@ -61476,10 +61151,7 @@ /area/corsat/gamma/residential/researcher) "uTf" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/corsat/theta/biodome) "uTg" = ( /obj/structure/safe, @@ -61736,16 +61408,16 @@ }, /area/corsat/theta/biodome/complex) "vcx" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/vents/pump, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "vcy" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "vcJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -61875,11 +61547,8 @@ }, /area/corsat/theta/airlock/control) "vhZ" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "vic" = ( /obj/structure/showcase{ @@ -62033,10 +61702,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/corsat/theta/biodome) "vnF" = ( /obj/structure/bed/chair/office/light{ @@ -62302,7 +61968,7 @@ /obj/structure/flora/jungle/vines/heavy, /obj/structure/pipes/vents/pump, /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "vzc" = ( /obj/structure/machinery/light, @@ -62338,7 +62004,7 @@ /area/corsat/sigma/hangar/id) "vzK" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "vzV" = ( /obj/structure/machinery/disposal, @@ -62609,9 +62275,7 @@ /area/corsat/gamma/hangar/cargo) "vKH" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/corsat/theta/biodome) "vKN" = ( /turf/open/floor/corsat{ @@ -62766,7 +62430,7 @@ "vQg" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "vQs" = ( /obj/structure/surface/table/reinforced, @@ -62982,10 +62646,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/corsat/theta/biodome) "wbK" = ( /obj/structure/flora/pottedplant{ @@ -63123,9 +62784,7 @@ /area/corsat/gamma/biodome) "wiJ" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "wiQ" = ( /obj/structure/machinery/light{ @@ -63195,10 +62854,7 @@ /area/corsat/sigma/hangar/office) "wkm" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "wkr" = ( /obj/structure/reagent_dispensers/water_cooler, @@ -63243,10 +62899,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/corsat/theta/biodome) "wmf" = ( /obj/effect/landmark/hunter_secondary, @@ -63420,9 +63073,7 @@ /obj/structure/pipes/vents/pump{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "wrR" = ( /obj/structure/largecrate/random, @@ -63594,10 +63245,7 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "wxi" = ( /mob/living/carbon/human/yiren, @@ -63713,11 +63361,11 @@ }, /area/corsat/gamma/medbay/morgue) "wCI" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "wCJ" = ( /obj/structure/closet/emcloset, @@ -64122,17 +63770,13 @@ /area/corsat/sigma/cargo) "wSb" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "wSg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/corsat/theta/biodome) "wSq" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -64407,7 +64051,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "xdB" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -64743,7 +64387,7 @@ /area/corsat/gamma/sigmaremote) "xsU" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "xsZ" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -64868,10 +64512,7 @@ /area/corsat/gamma/hangar) "xxO" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/corsat/theta/biodome) "xxZ" = ( /turf/open/floor/corsat{ @@ -65176,7 +64817,7 @@ health = 80 }, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/corsat/gamma/hallwaysouth) "xKC" = ( /obj/structure/machinery/camera/autoname{ @@ -65365,10 +65006,7 @@ /area/corsat/gamma/hallwaysouth) "xRq" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/corsat/theta/biodome) "xRM" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -65679,10 +65317,8 @@ }, /area/corsat/gamma/airlock/control) "yfH" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/east, /area/corsat/theta/biodome) "yfO" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -65819,9 +65455,7 @@ /area/corsat/omega/control) "yle" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "ylo" = ( /turf/open/space, @@ -88800,7 +88434,7 @@ bdD bdD bdD bdD -bdN +bcT vnc aKi aKi diff --git a/maps/map_files/CORSAT/standalone/lockdown_thetaeast.dmm b/maps/map_files/CORSAT/standalone/lockdown_thetaeast.dmm index f44a5f1cebc1..61645f5a5b3b 100644 --- a/maps/map_files/CORSAT/standalone/lockdown_thetaeast.dmm +++ b/maps/map_files/CORSAT/standalone/lockdown_thetaeast.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/corsat/theta/biodome) "b" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, @@ -74,9 +74,7 @@ /obj/structure/sign/safety/airlock{ pixel_x = 32 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/corsat/theta/biodome) "n" = ( /obj/structure/window/framed/corsat/security, diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 978d61ddfbed..1c4017a163a3 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -108,11 +108,13 @@ /turf/open/floor/plating, /area/desert_dam/building/substation/northwest) "aav" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached9" }, -/area/desert_dam/exterior/landing_pad_one) +/area/desert_dam/exterior/landing_pad_two) "aaw" = ( /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached1" @@ -135,11 +137,11 @@ }, /area/desert_dam/interior/caves/east_caves) "aaA" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal11" }, -/area/desert_dam/exterior/landing_pad_one) +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_northwest) "aaB" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal9" @@ -300,9 +302,7 @@ }, /area/desert_dam/exterior/river/riverside_central_north) "aba" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt{ dir = 4; icon_state = "desert_transition_edge1" @@ -546,9 +546,7 @@ }, /area/desert_dam/exterior/valley/valley_labs) "abN" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt{ dir = 5; icon_state = "desert_transition_edge1" @@ -567,9 +565,9 @@ }, /area/desert_dam/exterior/valley/valley_labs) "abQ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/ds1/delayone, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/landing_pad_one) "abR" = ( @@ -581,11 +579,11 @@ }, /area/desert_dam/exterior/valley/valley_labs) "abS" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" }, -/area/desert_dam/exterior/landing_pad_one) +/area/desert_dam/exterior/landing_pad_two) "abT" = ( /obj/structure/machinery/conveyor{ id = "anomalybelt" @@ -934,7 +932,7 @@ /area/desert_dam/interior/dam_interior/hanger) "adb" = ( /obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 8 }, /turf/open/floor{ @@ -956,13 +954,11 @@ }, /area/desert_dam/exterior/valley/valley_labs) "adf" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, +/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached9" + icon_state = "cement_sunbleached12" }, -/area/desert_dam/exterior/landing_pad_one) +/area/desert_dam/exterior/landing_pad_two) "adg" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/cement_sunbleached{ @@ -1891,9 +1887,7 @@ }, /area/desert_dam/building/administration/control_room) "afX" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) "afY" = ( @@ -1919,15 +1913,11 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_northwest) "agb" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "agc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) "agd" = ( @@ -2058,9 +2048,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "agw" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) "agx" = ( @@ -2077,9 +2065,7 @@ /area/desert_dam/exterior/valley/valley_northwest) "agz" = ( /obj/structure/disposalpipe/segment, -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "agA" = ( @@ -3518,9 +3504,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_excavation) "akJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt{ icon_state = "dirt2" }, @@ -3678,13 +3662,13 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_excavation) "alh" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 8 +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached2" + icon_state = "cement_sunbleached12" }, -/area/desert_dam/exterior/landing_pad_one) +/area/desert_dam/exterior/landing_pad_two) "ali" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -3950,9 +3934,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "alU" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt{ icon_state = "dirt2" }, @@ -4260,7 +4242,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_wilderness) "amN" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "amO" = ( @@ -4360,9 +4342,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_containment) "anb" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt{ icon_state = "dirt2" }, @@ -4577,15 +4557,11 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "anE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) "anF" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "anG" = ( @@ -5059,9 +5035,7 @@ }, /area/desert_dam/interior/dam_interior/hanger) "apc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "apd" = ( @@ -5277,9 +5251,7 @@ }, /area/desert_dam/exterior/valley/valley_northwest) "apP" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_7" - }, +/obj/structure/flora/grass/desert/lightgrass_7, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "apR" = ( @@ -5497,9 +5469,7 @@ }, /area/desert_dam/exterior/valley/valley_northwest) "aqz" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "aqA" = ( @@ -6287,9 +6257,7 @@ /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/floodgate_control) "asP" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt{ icon_state = "dirt2" }, @@ -6876,9 +6844,7 @@ }, /area/desert_dam/interior/dam_interior/west_tunnel) "auu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/rock, /area/desert_dam/interior/dam_interior/west_tunnel) "auv" = ( @@ -7535,9 +7501,7 @@ }, /area/desert_dam/exterior/valley/valley_mining) "awp" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/rock/deep{ icon_state = "rock3" }, @@ -8736,9 +8700,7 @@ /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "azW" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "azX" = ( @@ -9776,7 +9738,7 @@ /area/desert_dam/interior/dam_interior/east_tunnel_entrance) "aDq" = ( /obj/structure/surface/table/woodentable, -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/interior/wood/alt, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) "aDr" = ( @@ -10408,13 +10370,11 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) "aFb" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFd" = ( @@ -10463,9 +10423,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aFk" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_7" - }, +/obj/structure/flora/grass/desert/lightgrass_7, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFl" = ( @@ -10611,9 +10569,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "aFG" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt{ dir = 6; icon_state = "desert_transition_edge1" @@ -10687,13 +10643,11 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFS" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aFT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aFU" = ( @@ -10728,9 +10682,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) "aFZ" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "aGa" = ( @@ -10741,9 +10693,7 @@ /turf/open/asphalt, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "aGb" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_7" - }, +/obj/structure/flora/grass/desert/lightgrass_7, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aGc" = ( @@ -10819,9 +10769,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) "aGp" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aGq" = ( @@ -10829,9 +10777,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aGr" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aGs" = ( @@ -10939,9 +10885,7 @@ }, /area/desert_dam/interior/caves/central_caves) "aGJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aGK" = ( @@ -10972,9 +10916,7 @@ /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aGO" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aGP" = ( @@ -11222,9 +11164,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aHz" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHA" = ( @@ -11239,9 +11179,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aHC" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHD" = ( @@ -11263,9 +11201,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "aHG" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHH" = ( @@ -11317,9 +11253,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aHN" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aHO" = ( @@ -11349,9 +11283,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHS" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aHT" = ( @@ -11371,9 +11303,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aHW" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "aHX" = ( @@ -11469,9 +11399,7 @@ /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) "aIk" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aIl" = ( @@ -11492,9 +11420,7 @@ /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) "aIp" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aIq" = ( @@ -11519,9 +11445,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aIu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aIv" = ( @@ -11940,9 +11864,7 @@ }, /area/desert_dam/interior/caves/central_caves) "aJS" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aJT" = ( @@ -12172,9 +12094,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aKD" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) "aKE" = ( @@ -12195,9 +12115,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) "aKH" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) "aKI" = ( @@ -12323,9 +12241,7 @@ /obj/effect/decal/sand_overlay/sand1{ dir = 9 }, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached20" - }, +/turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/landing_pad_two) "aKZ" = ( /turf/open/floor{ @@ -12334,14 +12250,11 @@ }, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) "aLa" = ( -/obj/structure/machinery/landinglight/ds2, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached2" + icon_state = "cement_sunbleached4" }, -/area/desert_dam/exterior/landing_pad_two) +/area/desert_dam/exterior/landing_pad_one) "aLb" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -12541,11 +12454,10 @@ /area/desert_dam/exterior/valley/valley_crashsite) "aLy" = ( /obj/effect/decal/sand_overlay/sand1{ - dir = 1 + dir = 4 }, -/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached9" + icon_state = "cement_sunbleached1" }, /area/desert_dam/exterior/landing_pad_two) "aLz" = ( @@ -12637,7 +12549,7 @@ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached20" + icon_state = "cement_sunbleached1" }, /area/desert_dam/exterior/landing_pad_two) "aLL" = ( @@ -14608,6 +14520,7 @@ /area/desert_dam/exterior/valley/valley_crashsite) "aRV" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/desert/dirt{ icon_state = "desert_transition_corner1" }, @@ -18032,9 +17945,7 @@ /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/hallway) "bdc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_wilderness) "bdd" = ( @@ -18359,9 +18270,7 @@ }, /area/desert_dam/building/administration/meetingrooom) "bej" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "bek" = ( @@ -18479,9 +18388,7 @@ /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_telecoms) "beD" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "beE" = ( @@ -18593,15 +18500,11 @@ /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) "beU" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_10" - }, +/obj/structure/flora/grass/desert/heavygrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "beV" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_6" - }, +/obj/structure/flora/grass/desert/heavygrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "beW" = ( @@ -18737,9 +18640,7 @@ }, /area/desert_dam/exterior/landing_pad_one) "bfp" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_9" - }, +/obj/structure/flora/grass/desert/heavygrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "bfq" = ( @@ -20948,7 +20849,7 @@ /turf/open/floor/plating, /area/desert_dam/exterior/valley/valley_crashsite) "bmC" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" }, @@ -21071,9 +20972,7 @@ /turf/open/floor/interior/wood, /area/desert_dam/building/security/marshals_office) "bmY" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "bnb" = ( @@ -21218,9 +21117,7 @@ }, /area/desert_dam/exterior/river/filtration_a) "bny" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "bnz" = ( @@ -22091,12 +21988,11 @@ }, /area/desert_dam/exterior/valley/valley_telecoms) "bqk" = ( -/obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 }, -/turf/open/floor{ - icon_state = "asteroidplating" +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/landing_pad_one) "bql" = ( @@ -22626,11 +22522,11 @@ }, /area/desert_dam/interior/dam_interior/engine_west_wing) "brW" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached15" + icon_state = "cement_sunbleached9" }, /area/desert_dam/exterior/landing_pad_one) "brX" = ( @@ -24175,7 +24071,7 @@ }, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "bxj" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -25173,7 +25069,7 @@ /turf/open/floor/wood, /area/desert_dam/building/administration/overseer_office) "bAF" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -25707,9 +25603,7 @@ }, /area/desert_dam/exterior/valley/valley_mining) "bCK" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_mining) "bCM" = ( @@ -26044,7 +25938,7 @@ /turf/open/floor/prison, /area/desert_dam/building/security/staffroom) "bDO" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -26506,7 +26400,7 @@ }, /area/desert_dam/building/security/holding) "bFg" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/ds1{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -30003,9 +29897,7 @@ /turf/open/gm/river/desert/shallow, /area/desert_dam/interior/dam_interior/western_dam_cave) "bQQ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt{ dir = 10; icon_state = "desert_transition_edge1" @@ -30989,7 +30881,7 @@ }, /area/desert_dam/interior/dam_interior/primary_tool_storage) "bTR" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/north_valley_dam) "bTU" = ( @@ -31112,15 +31004,11 @@ }, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) "bUt" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bUu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bUv" = ( @@ -31432,21 +31320,15 @@ }, /area/desert_dam/interior/dam_interior/central_tunnel) "bVr" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bVs" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bVt" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bVu" = ( @@ -31721,21 +31603,15 @@ }, /area/desert_dam/interior/dam_interior/central_tunnel) "bWi" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bWj" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_7" - }, +/obj/structure/flora/grass/desert/lightgrass_7, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bWk" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bWm" = ( @@ -31966,9 +31842,7 @@ }, /area/desert_dam/interior/dam_interior/central_tunnel) "bXc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "bXd" = ( @@ -34430,9 +34304,7 @@ }, /area/desert_dam/exterior/river/riverside_central_south) "cej" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) "cek" = ( @@ -37459,13 +37331,11 @@ }, /area/desert_dam/exterior/valley/valley_medical) "coI" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) "coJ" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) "coK" = ( @@ -37571,7 +37441,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) "cpa" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cpb" = ( @@ -37673,9 +37543,7 @@ }, /area/desert_dam/building/warehouse/breakroom) "cpu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/north_valley_dam) "cpv" = ( @@ -37837,9 +37705,7 @@ /turf/open/floor/prison, /area/desert_dam/building/substation/west) "cpT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cpU" = ( @@ -37981,9 +37847,7 @@ }, /area/desert_dam/exterior/valley/valley_telecoms) "cqq" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "cqr" = ( @@ -38137,9 +38001,7 @@ }, /area/desert_dam/exterior/valley/valley_wilderness) "cqT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cqU" = ( @@ -38266,15 +38128,11 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cru" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "crv" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "crw" = ( @@ -38453,21 +38311,15 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) "csa" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "csb" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "csc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cse" = ( @@ -38625,9 +38477,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "csE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "csF" = ( @@ -40145,7 +39995,7 @@ /turf/open/floor/interior/tatami, /area/desert_dam/building/bar/bar) "cxg" = ( -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/interior/tatami, /area/desert_dam/building/bar/bar) "cxh" = ( @@ -40394,9 +40244,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cxT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cxU" = ( @@ -40655,9 +40503,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cyN" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "cyP" = ( @@ -40665,9 +40511,7 @@ /turf/open/gm/river/desert/shallow_edge/covered, /area/desert_dam/exterior/river/riverside_central_north) "cyQ" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cyR" = ( @@ -40820,7 +40664,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "czv" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "czw" = ( @@ -40833,9 +40677,7 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "czx" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "czy" = ( @@ -41083,9 +40925,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "cAd" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cAe" = ( @@ -41342,9 +41182,7 @@ }, /area/desert_dam/building/medical/emergency_room) "cAL" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cAM" = ( @@ -41782,9 +41620,7 @@ }, /area/desert_dam/building/bar/bar) "cBY" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cBZ" = ( @@ -42103,36 +41939,26 @@ }, /area/desert_dam/building/mining/workshop_foyer) "cCY" = ( -/obj/structure/machinery/landinglight/ds2, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" - }, -/area/desert_dam/exterior/landing_pad_two) +/turf/open/desert/dirt, +/area/desert_dam/exterior/rock) "cCZ" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 4 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached9" }, /area/desert_dam/exterior/landing_pad_two) "cDb" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo, /obj/effect/decal/sand_overlay/sand1{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/landing_pad_two) "cDc" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cDd" = ( @@ -42353,27 +42179,20 @@ }, /area/desert_dam/building/medical/east_wing_hallway) "cDK" = ( -/obj/structure/machinery/landinglight/ds2/delayone, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, +/obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached14" }, /area/desert_dam/exterior/landing_pad_two) "cDL" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 }, -/obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached12" + icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/landing_pad_two) "cDM" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, /obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" @@ -42427,12 +42246,9 @@ }, /area/desert_dam/interior/dam_interior/CE_office) "cDV" = ( -/obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 4 - }, -/turf/open/floor{ - icon_state = "asteroidplating" +/obj/structure/machinery/landinglight/ds2/delaytwo, +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/landing_pad_two) "cDX" = ( @@ -42462,14 +42278,11 @@ }, /area/desert_dam/building/bar/bar) "cEc" = ( -/obj/structure/machinery/floodlight/landing, -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 8 - }, -/turf/open/floor{ - icon_state = "asteroidplating" +/obj/structure/machinery/landinglight/ds1, +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached4" }, -/area/desert_dam/exterior/landing_pad_two) +/area/desert_dam/exterior/landing_pad_one) "cEd" = ( /obj/structure/prop/dam/wide_boulder/boulder1, /turf/open/desert/dirt{ @@ -42759,17 +42572,16 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) "cEZ" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/floodlight/landing, +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached9" +/turf/open/floor{ + icon_state = "asteroidplating" }, /area/desert_dam/exterior/landing_pad_two) "cFa" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating, /area/desert_dam/exterior/landing_pad_two) "cFb" = ( @@ -43212,17 +43024,13 @@ }, /area/desert_dam/building/medical/treatment_room) "cGh" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/valley_cargo) "cGi" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt{ dir = 10; icon_state = "desert_transition_edge1" @@ -43484,11 +43292,9 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cGS" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ - dir = 4 - }, +/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached15" + icon_state = "cement_sunbleached12" }, /area/desert_dam/exterior/landing_pad_two) "cGT" = ( @@ -43615,9 +43421,7 @@ }, /area/desert_dam/building/medical/east_wing_hallway) "cHl" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" }, @@ -43720,7 +43524,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_cargo) "cHC" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cHD" = ( @@ -43731,9 +43535,7 @@ /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/workshop) "cHE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cHF" = ( @@ -43877,21 +43679,15 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cId" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cIe" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cIg" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) "cIh" = ( @@ -44221,9 +44017,7 @@ }, /area/desert_dam/building/church) "cJl" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cJm" = ( @@ -44777,9 +44571,7 @@ }, /area/desert_dam/building/security/deathrow) "cLa" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt{ icon_state = "desert_transition_edge1" }, @@ -44916,7 +44708,7 @@ /turf/open/asphalt, /area/desert_dam/building/warehouse/warehouse) "cLL" = ( -/obj/structure/machinery/landinglight/ds2{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached{ @@ -45126,7 +44918,7 @@ }, /area/desert_dam/exterior/landing_pad_two) "cMD" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -45140,9 +44932,7 @@ /turf/open/asphalt, /area/desert_dam/building/warehouse/loading) "cMF" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "cMI" = ( @@ -45158,7 +44948,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_cargo) "cML" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delaythree{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -45289,7 +45079,7 @@ /turf/open/floor/plating, /area/desert_dam/building/medical/virology_isolation) "cNb" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/ds2{ dir = 1 }, /turf/open/asphalt/cement_sunbleached{ @@ -45334,24 +45124,24 @@ }, /area/desert_dam/interior/dam_interior/central_tunnel) "cNh" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 1 - }, /obj/structure/desertdam/decals/road_edge, /obj/structure/desertdam/decals/road_stop{ dir = 1; icon_state = "stop_decal5" }, -/turf/open/asphalt, -/area/desert_dam/exterior/landing_pad_two) -"cNi" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 }, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) +"cNi" = ( /obj/structure/desertdam/decals/road_stop{ dir = 1; icon_state = "stop_decal5" }, +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cNj" = ( @@ -45398,9 +45188,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "cNu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "cNv" = ( @@ -45419,13 +45207,13 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_cargo) "cNx" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ - dir = 1 - }, /obj/structure/desertdam/decals/road_stop{ dir = 1; icon_state = "stop_decal5" }, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 + }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cNy" = ( @@ -45580,9 +45368,7 @@ }, /area/desert_dam/building/church) "cNV" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt{ dir = 8; icon_state = "desert_transition_edge1" @@ -46074,9 +45860,7 @@ /turf/open/asphalt, /area/desert_dam/building/warehouse/loading) "cPz" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cPB" = ( @@ -46118,13 +45902,13 @@ }, /area/desert_dam/building/substation/southwest) "cPI" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 1 - }, /obj/structure/desertdam/decals/road_stop{ dir = 1; icon_state = "stop_decal5" }, +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cPJ" = ( @@ -46222,9 +46006,6 @@ }, /area/desert_dam/exterior/valley/valley_cargo) "cPW" = ( -/obj/structure/machinery/landinglight/ds2{ - dir = 1 - }, /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" }, @@ -46232,6 +46013,9 @@ dir = 1; icon_state = "stop_decal5" }, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 1 + }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) "cPX" = ( @@ -46464,9 +46248,7 @@ }, /area/desert_dam/building/bar/bar_restroom) "cQK" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "cQL" = ( @@ -46915,9 +46697,7 @@ /turf/open/floor/plating, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) "cSp" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) "cSq" = ( @@ -47130,9 +46910,7 @@ }, /area/desert_dam/building/mining/workshop) "cTh" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_10" - }, +/obj/structure/flora/grass/desert/heavygrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "cTi" = ( @@ -52779,9 +52557,7 @@ }, /area/desert_dam/building/cafeteria/cafeteria) "dzE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) "dzO" = ( @@ -53155,9 +52931,7 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_medical) "dBQ" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) "dBR" = ( @@ -54065,9 +53839,7 @@ }, /area/desert_dam/exterior/valley/valley_civilian) "dGU" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz1, /turf/open/floor/plating, /area/desert_dam/exterior/landing_pad_one) "dGV" = ( @@ -57678,8 +57450,7 @@ "dUe" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/door/poddoor/shutters{ - dir = 2; - icon_state = "shutter1" + dir = 2 }, /turf/open/floor/prison{ icon_state = "sterile_white" @@ -57689,8 +57460,7 @@ /obj/structure/surface/table/reinforced, /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/poddoor/shutters{ - dir = 2; - icon_state = "shutter1" + dir = 2 }, /turf/open/floor/prison{ icon_state = "sterile_white" @@ -59057,7 +58827,7 @@ }, /area/desert_dam/exterior/valley/valley_civilian) "dZl" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) @@ -60937,6 +60707,7 @@ "fHX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean" @@ -60971,9 +60742,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "fSc" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_12" - }, +/obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) "fTk" = ( @@ -61603,6 +61372,7 @@ /area/desert_dam/interior/caves/temple) "hRU" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 10; icon_state = "bright_clean" @@ -61784,6 +61554,7 @@ /area/desert_dam/interior/dam_interior/garage) "isZ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ icon_state = "bright_clean2" }, @@ -61900,9 +61671,7 @@ /turf/open/desert/desert_shore/shore_edge1, /area/desert_dam/interior/caves/temple) "iOa" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "iPJ" = ( @@ -61998,9 +61767,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "jlP" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_5" - }, +/obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "jmd" = ( @@ -62098,9 +61865,7 @@ /turf/closed/wall, /area/desert_dam/building/dorms/hallway_northwing) "jFf" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "jHR" = ( @@ -62404,9 +62169,7 @@ }, /area/desert_dam/exterior/valley/south_valley_dam) "kWh" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "lcj" = ( @@ -62529,9 +62292,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "lrY" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "ltq" = ( @@ -62598,9 +62359,7 @@ }, /area/desert_dam/building/water_treatment_one/breakroom) "lDT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "lFc" = ( @@ -62663,6 +62422,13 @@ "lNu" = ( /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"lNN" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/jungle{ + bushes_spawn = 0; + icon_state = "grass_impenetrable" + }, +/area/desert_dam/interior/lab_northeast/east_lab_containment) "lOM" = ( /obj/effect/decal/sand_overlay/sand2/corner2, /turf/open/asphalt/cement, @@ -62713,9 +62479,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) "lYv" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) @@ -62804,9 +62568,7 @@ }, /area/desert_dam/interior/dam_interior/garage) "mkJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "mkU" = ( @@ -63151,9 +62913,7 @@ }, /area/desert_dam/exterior/valley/south_valley_dam) "nvr" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_3" - }, +/obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "nyN" = ( @@ -63610,7 +63370,7 @@ /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "plo" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz1_xenoflora) "poi" = ( @@ -63909,6 +63669,12 @@ icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/valley/valley_crashsite) +"qoJ" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo, +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached4" + }, +/area/desert_dam/exterior/landing_pad_one) "qqR" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -64011,9 +63777,7 @@ }, /area/desert_dam/building/administration/archives) "qHF" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "qJI" = ( @@ -64383,7 +64147,7 @@ }, /area/desert_dam/exterior/valley/valley_hydro) "rUK" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "rUZ" = ( @@ -64506,6 +64270,7 @@ /area/desert_dam/exterior/valley/valley_hydro) "smJ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/floor/prison{ dir = 10; @@ -64730,6 +64495,7 @@ "tai" = ( /obj/effect/decal/sand_overlay/sand1, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/asphalt/cement_sunbleached{ icon_state = "cement_sunbleached12" }, @@ -64779,15 +64545,11 @@ /turf/open/gm/river/desert/deep/covered, /area/desert_dam/exterior/river/riverside_south) "tii" = ( -/obj/structure/flora/grass/desert/heavy{ - icon_state = "heavygrass_4" - }, +/obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz2_storage) "tjX" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "tlh" = ( @@ -65252,9 +65014,7 @@ }, /area/desert_dam/interior/dam_interior/tech_storage) "uRz" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "uTo" = ( @@ -65344,6 +65104,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"vpn" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/obj/structure/machinery/floodlight/landing, +/turf/open/floor{ + icon_state = "asteroidplating" + }, +/area/desert_dam/exterior/landing_pad_two) "vpz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -65559,9 +65328,7 @@ }, /area/desert_dam/interior/caves/temple) "wav" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "waC" = ( @@ -65636,9 +65403,7 @@ /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/dam_interior/garage) "wpW" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "wqM" = ( @@ -65802,12 +65567,20 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) +"wRg" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached{ + icon_state = "cement_sunbleached2" + }, +/area/desert_dam/exterior/landing_pad_two) "wRi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/building/hydroponics/hydroponics_loading) "wRR" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) "wRX" = ( @@ -65875,9 +65648,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_telecoms) "xdj" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) "xgA" = ( @@ -66145,9 +65916,7 @@ }, /area/desert_dam/interior/dam_interior/garage) "xLS" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_5" - }, +/obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) "xMr" = ( @@ -66158,11 +65927,12 @@ /turf/open/asphalt, /area/desert_dam/exterior/river/riverside_central_north) "xNB" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/floodlight/landing, +/obj/structure/machinery/landinglight/ds1{ dir = 4 }, -/turf/open/asphalt/cement_sunbleached{ - icon_state = "cement_sunbleached9" +/turf/open/floor{ + icon_state = "asteroidplating" }, /area/desert_dam/exterior/landing_pad_one) "xOb" = ( @@ -69803,6 +69573,7 @@ dTs dTs cwz aKY +cMq cGu cGu cGu @@ -69815,8 +69586,7 @@ cGu cGu cGu cGu -cMq -cGu +aLy cGu cGu cGu @@ -70036,29 +69806,29 @@ cAa dTs dTs csD +alh cMC -cEZ -cGG -cGG +aav cFI cFS cGG cFc -cGG +cFI cFS cGG cFc -cGS -cDV -cEZ -cFc cFI cFS +cLe +cEZ +cCZ +cFS cGG cFc cFI cFS -cLe +cGG +cDL cMC cgh cUl @@ -70270,8 +70040,8 @@ doE crr dTs dTs -aLa -cDY +cDb +cDK cDY cDY cDY @@ -70504,7 +70274,8 @@ doE doE dTs dTs -cCZ +cDb +cDM cDY cDY cDY @@ -70526,7 +70297,6 @@ cDY cDY cDY cFa -cDY cML cBS cUl @@ -70739,7 +70509,7 @@ cSR dTs dTs cDb -cDY +cGS cDY cDY cDY @@ -70972,8 +70742,8 @@ cji ckp crr dTs -cDK -cDY +cDb +adf cDY cDY cDY @@ -71205,9 +70975,9 @@ cRM cRM dFn doE -dTs cCY -cDY +cDb +abS cDY cDY cDY @@ -71440,8 +71210,8 @@ crx dFo doE doE -cCZ -cDY +cDb +cDM cDY cDY cDY @@ -71675,7 +71445,7 @@ dFo doE doE cDb -cDY +cGS cDY cDY cDY @@ -71908,8 +71678,8 @@ crx dFo cOj doE -cDK -cDY +cDb +adf cDY cDY cDY @@ -72142,8 +71912,8 @@ crx dFo doE doE -cDL -cDY +cDb +abS cDY cDY cDY @@ -72376,6 +72146,7 @@ crx dFo doE doE +cDb cDM cDY cDY @@ -72398,7 +72169,6 @@ cDY cDY cDY cDY -cDY cML cBS cUl @@ -72610,8 +72380,8 @@ crx dFo doE cDc -aLy -cDY +cDb +cDV cDY cDY cDY @@ -72664,6 +72434,7 @@ aSY aQg aUi aUC +aVg aQX aVg aVg @@ -72686,7 +72457,6 @@ aVg aVg aVg aVg -aVg aQX aVg aRZ @@ -72844,8 +72614,9 @@ crx dFo doE doE +alh cMC -cFb +wRg cGQ cFe cFP @@ -72857,7 +72628,7 @@ cGa cGQ cFe cHn -cEc +vpn cFb cFe cFP @@ -72865,7 +72636,6 @@ cGa cGQ cFe cFP -cGa cLL cMC cgh @@ -72897,11 +72667,10 @@ aSx aQV aQV aUi -aSa +aUD +aVh aQY -adf -bpQ -aNv +brW bhv boV bpQ @@ -72909,18 +72678,19 @@ aNv bhv boV bpQ -vRc +aNv +bhv bqk xNB -bpQ -aNv +brW bhv boV bpQ aNv bhv boV -brW +bpQ +vRc aQY aUD aVh @@ -73091,7 +72861,7 @@ cDX cDX cDX cDX -cES +cDX cDX cDX cDX @@ -73132,6 +72902,7 @@ aQV aQV aUi aUD +aVj acI aWh aWh @@ -73154,7 +72925,6 @@ aWh aWh aWh aWh -aWh bAF aVi aVh @@ -73364,9 +73134,10 @@ auy aPJ aql ara -asa -aUD -aaA +asc +auy +arZ +aLa aWh aWh aWh @@ -73388,7 +73159,6 @@ aWh aWh aWh dGU -aWh bDO aVi aVh @@ -73598,10 +73368,10 @@ aDb aqg aqg aqg +agV +aqg asa -aUD -abQ -aWh +qoJ aWh aWh aWh @@ -73832,10 +73602,10 @@ aDc aqg aqg aqg +agV +aqg asa -aUD -abS -aWh +abQ aWh aWh aWh @@ -73857,7 +73627,7 @@ aWh aWh aWh aWh -bFB +bGY aQV beT aQg @@ -74066,10 +73836,10 @@ aSc aIJ aql ara +agV +aqg asa -aUD -aav -aWh +cEc aWh aWh aWh @@ -74091,7 +73861,7 @@ aWh aWh aWh aWh -bGY +bJQ aQV beT aQg @@ -74300,10 +74070,10 @@ aSd apz aqg aqg +aqg +aqg asa -aUD -aaA -aWh +aLa aWh aWh aWh @@ -74325,7 +74095,7 @@ aWh aWh aWh aWh -bJQ +bKC aQV beT aQg @@ -74534,10 +74304,10 @@ aIa apz aqg aqg +agV +aqg asa -aUD -abQ -aWh +qoJ aWh aWh aWh @@ -74559,7 +74329,7 @@ aWh aWh aWh aWh -bKC +bFB aQV beT aQg @@ -74768,10 +74538,10 @@ aIa apz aql ara +agV +aqg asa -aUD -abS -aWh +abQ aWh aWh aWh @@ -74793,7 +74563,7 @@ aWh aWh aWh aWh -bFB +bGY aQV beT aQg @@ -75002,10 +74772,10 @@ aIa apz aqg aqg +agV +aqg asa -aUD -aav -aWh +cEc aWh aWh aWh @@ -75236,10 +75006,10 @@ aIa apz aqg aqg -asa -aUD +asd +auz aaA -aWh +aLa aWh aWh aWh @@ -75472,6 +75242,7 @@ aql ara asa aUD +aVg acJ aWh aWh @@ -75494,7 +75265,6 @@ aWh aWh aWh aWh -aWh bFg aVi aVh @@ -75705,9 +75475,10 @@ apz aqg aqg asa -aSa +aUD +aVh aQY -alh +oCD bpT aWi blD @@ -75727,7 +75498,6 @@ bpu bpT aWi blD -bpu bxj aQY aUD @@ -75940,6 +75710,7 @@ aqg aqg asa aUE +aVj aQX aVj aVj @@ -75962,7 +75733,6 @@ aVj aVj aVj aVj -aVj aQX aVj aVG @@ -105184,7 +104954,7 @@ agL amn afI akW -akW +lNN agL afG aqG diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 73369ec8bd39..9cba60a14b40 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -9954,7 +9954,7 @@ }, /area/prison/residential/north) "aBn" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/organic/grass, /area/prison/residential/north) "aBo" = ( @@ -29380,10 +29380,6 @@ }, /turf/open/floor/wood, /area/prison/residential/south) -"bHd" = ( -/obj/structure/lattice, -/turf/open/space, -/area/space) "bHf" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -33380,7 +33376,7 @@ }, /area/prison/residential/south) "bTF" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/organic/grass, /area/prison/residential/south) "bTG" = ( @@ -36181,10 +36177,6 @@ }, /turf/open/floor/wood, /area/prison/residential/south) -"ccz" = ( -/obj/structure/monorail, -/turf/open/space, -/area/space) "ccA" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "Engineering Hallway" @@ -42247,6 +42239,7 @@ dir = 10 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating, /area/prison/pirate) "cwm" = ( @@ -43520,6 +43513,7 @@ /area/prison/storage/vip) "dqf" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating, /area/prison/hanger/main) "duu" = ( @@ -44094,6 +44088,7 @@ /area/prison/cellblock/mediumsec/east) "fGf" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" @@ -48617,10 +48612,6 @@ icon_state = "bright_clean2" }, /area/prison/residential/north) -"tVW" = ( -/obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/organic/grass, -/area/prison/residential/north) "tWR" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/prison{ @@ -48821,6 +48812,7 @@ icon_state = "wood_siding2" }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "asteroid" }, @@ -49093,10 +49085,6 @@ icon_state = "yellowfull" }, /area/prison/cellblock/protective) -"vwO" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/turf/open/floor/plating/plating_catwalk/prison, -/area/prison/cellblock/mediumsec/south) "vxy" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison{ @@ -57264,7 +57252,7 @@ wUz esR aBm aBn -tVW +aDE fkx avN aFg @@ -62851,7 +62839,7 @@ bWH bXN bYJ oog -ccz +bDE btd bTP bVa @@ -73693,7 +73681,7 @@ obV cxc cyj ctW -vwO +cwL cyG obV cxc diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 9847d8f06b16..4e1f9e3437ce 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -306,7 +306,6 @@ "aif" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -894,7 +893,6 @@ "ayX" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -1481,7 +1479,6 @@ "aMM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -2255,9 +2252,7 @@ }, /area/fiorina/station/lowsec) "bju" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz1, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) "bjx" = ( @@ -3440,6 +3435,13 @@ icon_state = "kitchen" }, /area/fiorina/station/lowsec) +"bYS" = ( +/obj/structure/monorail{ + dir = 4; + name = "launch track" + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "bZu" = ( /obj/structure/sink{ dir = 8; @@ -3627,15 +3629,6 @@ icon_state = "whitepurple" }, /area/fiorina/station/research_cells) -"chQ" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/fiorina/lz/near_lzI) "chS" = ( /obj/structure/window, /turf/open/floor/prison{ @@ -4360,7 +4353,6 @@ /area/fiorina/station/civres_blue) "cDl" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -4496,7 +4488,6 @@ /area/fiorina/station/security) "cHD" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/prison, @@ -5743,7 +5734,6 @@ /area/fiorina/tumor/fiberbush) "dwT" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -6676,13 +6666,6 @@ icon_state = "floor_plate" }, /area/fiorina/station/disco) -"ebT" = ( -/obj/structure/monorail{ - dir = 6; - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "ecd" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -7437,6 +7420,12 @@ icon_state = "green" }, /area/fiorina/station/transit_hub) +"eAM" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "eAQ" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison{ @@ -7861,6 +7850,12 @@ /obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison, /area/fiorina/station/security) +"eSF" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "eSZ" = ( /obj/structure/bed/roller, /turf/open/floor/prison{ @@ -8149,7 +8144,7 @@ }, /area/fiorina/station/botany) "eZN" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, /turf/open/floor/prison{ @@ -8698,6 +8693,7 @@ icon_state = "hive_spawn"; name = "xeno_hive_spawn" }, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) "fqZ" = ( @@ -9243,6 +9239,14 @@ icon_state = "floor_plate" }, /area/fiorina/station/security) +"fHV" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) "fIj" = ( /obj/item/clothing/suit/storage/hazardvest, /turf/open/floor/prison, @@ -9780,7 +9784,7 @@ /turf/open/floor/carpet, /area/fiorina/station/security/wardens) "fZd" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 }, /turf/open/floor/plating/prison, @@ -9937,7 +9941,6 @@ "gfh" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -12484,6 +12487,13 @@ icon_state = "doubleside" }, /area/fiorina/station/chapel) +"hHh" = ( +/obj/structure/machinery/landinglight/ds1/delayone, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "hHq" = ( /obj/structure/closet/cabinet, /obj/effect/landmark/objective_landmark/close, @@ -12584,7 +12594,7 @@ /turf/closed/wall/prison, /area/fiorina/lz/near_lzII) "hLK" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2{ dir = 8 }, /turf/open/floor/prison{ @@ -12786,6 +12796,14 @@ icon_state = "squares" }, /area/fiorina/station/telecomm/lz1_cargo) +"hTm" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "floor_plate" + }, +/area/fiorina/lz/near_lzII) "hTr" = ( /obj/structure/closet, /obj/item/clothing/mask/gas/clown_hat, @@ -12879,7 +12897,6 @@ "hVG" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -12911,18 +12928,6 @@ icon_state = "darkyellow2" }, /area/fiorina/station/flight_deck) -"hWL" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 8 - }, -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) "hWU" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ @@ -14103,6 +14108,10 @@ icon_state = "darkpurplefull2" }, /area/fiorina/station/research_cells) +"iOa" = ( +/obj/structure/machinery/floodlight/landing/floor, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "iOe" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison{ @@ -14783,7 +14792,6 @@ /area/fiorina/station/transit_hub) "jjs" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -15306,7 +15314,6 @@ "jwc" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -15438,6 +15445,13 @@ icon_state = "damaged2" }, /area/fiorina/station/security) +"jCp" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "jCt" = ( /obj/structure/machinery/light/small{ dir = 4; @@ -15561,14 +15575,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"jFw" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/monorail{ - dir = 10; - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "jFN" = ( /obj/item/explosive/grenade/high_explosive/m15, /obj/effect/decal/cleanable/blood/splatter, @@ -16464,9 +16470,7 @@ }, /area/fiorina/station/power_ring) "kfE" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) "kfF" = ( @@ -18967,6 +18971,16 @@ icon_state = "floor_plate" }, /area/fiorina/station/telecomm/lz1_cargo) +"lGh" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "lGm" = ( /obj/structure/platform{ dir = 1 @@ -19101,7 +19115,7 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) "lLv" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2{ dir = 8 }, /turf/open/floor/prison, @@ -19452,6 +19466,15 @@ icon_state = "floor_plate" }, /area/fiorina/station/security) +"lYA" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "lZf" = ( /turf/closed/shuttle/elevator{ dir = 10 @@ -19551,8 +19574,7 @@ /area/fiorina/station/medbay) "mbp" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - dir = 1; - locked = 0 + dir = 1 }, /turf/open/floor/plating/prison, /area/fiorina/oob) @@ -19604,6 +19626,7 @@ icon_state = "hive_spawn"; name = "xeno_hive_spawn" }, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -19814,7 +19837,6 @@ "mhM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -22086,6 +22108,15 @@ icon_state = "bluefull" }, /area/fiorina/station/power_ring) +"nBR" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "nBV" = ( /turf/open/floor/prison{ icon_state = "darkpurple2" @@ -22187,6 +22218,15 @@ icon_state = "floor_plate" }, /area/fiorina/station/medbay) +"nGk" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "nGq" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/prison, @@ -23439,12 +23479,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) -"ovo" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzII) "ovr" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/prison, @@ -23513,6 +23547,13 @@ icon_state = "whitegreen" }, /area/fiorina/station/medbay) +"owG" = ( +/obj/structure/machinery/landinglight/ds1, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "oxg" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -24125,6 +24166,13 @@ icon_state = "redfull" }, /area/fiorina/station/lowsec) +"oSK" = ( +/obj/structure/monorail{ + dir = 9; + name = "launch track" + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "oSR" = ( /obj/item/device/flashlight, /turf/open/floor/prison{ @@ -24716,7 +24764,6 @@ /area/fiorina/lz/near_lzII) "ppI" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -25074,6 +25121,15 @@ icon_state = "floor_plate" }, /area/fiorina/station/flight_deck) +"pAN" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "pAO" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -25945,14 +26001,6 @@ /obj/effect/spawner/random/pills/highchance, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"qeR" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate" - }, -/area/fiorina/lz/near_lzII) "qeU" = ( /obj/structure/window/reinforced{ dir = 8; @@ -27373,6 +27421,7 @@ icon_state = "hive_spawn"; name = "xeno_hive_spawn" }, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 1; icon_state = "darkbrown2" @@ -28805,6 +28854,16 @@ icon_state = "darkpurplefull2" }, /area/fiorina/tumor/ice_lab) +"rPu" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "rPI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/cherry{ @@ -28926,7 +28985,6 @@ "rSr" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -29633,16 +29691,6 @@ /obj/item/tool/crowbar/red, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"ssi" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 4 - }, -/obj/structure/machinery/landinglight/ds1/delayone, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) "sso" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/bag/plants, @@ -29877,7 +29925,6 @@ "sBA" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -29937,7 +29984,6 @@ "sDL" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -30063,7 +30109,7 @@ }, /area/fiorina/tumor/civres) "sIT" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 }, /turf/open/floor/prison{ @@ -30098,13 +30144,6 @@ icon_state = "floorscorched1" }, /area/fiorina/station/chapel) -"sJI" = ( -/obj/structure/machinery/landinglight/ds1/delayone, -/turf/open/floor/prison{ - dir = 1; - icon_state = "darkyellow2" - }, -/area/fiorina/lz/near_lzI) "sJN" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -30146,6 +30185,15 @@ icon_state = "yellow" }, /area/fiorina/station/disco) +"sLo" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "sLx" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -30975,7 +31023,6 @@ /area/fiorina/station/security) "tpa" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -31102,13 +31149,13 @@ /turf/open/floor/prison, /area/fiorina/station/park) "tts" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/ds2, /turf/open/floor/prison{ icon_state = "floor_plate" }, /area/fiorina/lz/near_lzII) "ttK" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -31501,6 +31548,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"tFu" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzII) "tFA" = ( /obj/structure/platform{ dir = 4 @@ -31859,6 +31910,15 @@ icon_state = "whitegreenfull" }, /area/fiorina/station/medbay) +"tPi" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/prison{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/fiorina/lz/near_lzI) "tPz" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/candelabra{ @@ -32207,7 +32267,7 @@ /turf/open/floor/prison, /area/fiorina/station/security) "tZs" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, /turf/open/floor/prison{ @@ -32225,6 +32285,15 @@ icon_state = "platingdmg1" }, /area/fiorina/tumor/civres) +"tZV" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "tZW" = ( /obj/item/tool/wet_sign, /turf/open/floor/almayer{ @@ -32423,6 +32492,15 @@ /obj/structure/window_frame/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/station/research_cells) +"uhH" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "uin" = ( /obj/item/ammo_box/magazine/misc/flares/empty{ pixel_x = -1; @@ -32611,6 +32689,15 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"uol" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "upt" = ( /obj/structure/platform, /turf/open/floor/prison, @@ -32792,6 +32879,7 @@ icon_state = "hive_spawn"; name = "xeno_hive_spawn" }, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison{ dir = 1; icon_state = "whitegreencorner" @@ -33046,7 +33134,7 @@ }, /area/fiorina/station/security) "uEN" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor/prison{ icon_state = "floor_plate" }, @@ -33488,7 +33576,7 @@ }, /area/fiorina/tumor/ship) "uVo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delaythree{ dir = 4 }, /turf/open/floor/prison, @@ -33978,8 +34066,11 @@ }, /area/fiorina/tumor/servers) "viV" = ( -/obj/structure/machinery/floodlight/landing, -/turf/open/floor/plating/prison, +/obj/structure/monorail{ + dir = 5; + name = "launch track" + }, +/turf/open/floor/prison, /area/fiorina/lz/near_lzI) "vjl" = ( /obj/structure/closet/crate/trashcart, @@ -34391,8 +34482,8 @@ /turf/open/space/basic, /area/fiorina/oob) "vuE" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "vuW" = ( @@ -34744,7 +34835,6 @@ "vFs" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -35028,7 +35118,7 @@ }, /area/fiorina/station/botany) "vPA" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "vPM" = ( @@ -35405,14 +35495,6 @@ icon_state = "greenfull" }, /area/fiorina/station/botany) -"wdg" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/monorail{ - dir = 4; - name = "launch track" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "wdA" = ( /obj/item/trash/used_stasis_bag, /turf/open/floor/prison{ @@ -35512,7 +35594,7 @@ }, /area/fiorina/station/chapel) "wfp" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 }, /turf/open/floor/prison{ @@ -36326,6 +36408,13 @@ name = "astroturf" }, /area/fiorina/station/research_cells) +"wJf" = ( +/obj/structure/machinery/landinglight/ds1/delaythree, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "wJt" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison{ @@ -36425,7 +36514,6 @@ /area/fiorina/tumor/servers) "wMi" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -36578,6 +36666,10 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison, /area/fiorina/station/park) +"wQN" = ( +/obj/structure/machinery/floodlight/landing/floor, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "wQT" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/prison, @@ -36629,7 +36721,6 @@ "wRP" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -37005,10 +37096,6 @@ icon_state = "blue_plate" }, /area/fiorina/station/botany) -"xgl" = ( -/obj/structure/machinery/floodlight/landing, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) "xgn" = ( /obj/structure/machinery/optable, /turf/open/floor/corsat{ @@ -37050,7 +37137,6 @@ /area/fiorina/station/security) "xja" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - req_access = null; req_one_access = null }, /turf/open/floor/plating/prison, @@ -37065,6 +37151,15 @@ icon_state = "cell_stripe" }, /area/fiorina/station/power_ring) +"xjw" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/fiorina/lz/near_lzI) "xjK" = ( /turf/open/floor/prison{ dir = 10; @@ -37380,6 +37475,12 @@ /obj/structure/platform/stair_cut/alt, /turf/open/floor/plating/prison, /area/fiorina/station/disco) +"xrH" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "xrJ" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison{ @@ -38476,6 +38577,7 @@ icon_state = "hive_spawn"; name = "xeno_hive_spawn" }, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) "ybg" = ( @@ -71804,31 +71906,31 @@ hxy pax aWR hxy +tFu hxy -hxy -fpM -fpM +eZN +sIT uVo +hTm eZN sIT fpM -sIT +hTm eZN sIT fpM -fpM +hTm eZN sIT -sIT -sIT -sIT -sIT +fpM +hTm +eZN sIT uVo -sIT -eZN -ovo +hTm eZN +hxy +aWR aWR aWR aWR @@ -72018,9 +72120,9 @@ aWR aWR aWR tts +wQN wSm wSm -xnU wSm wSm wSm @@ -72037,11 +72139,11 @@ wSm wSm wSm wSm -xnU wSm +wQN +eAM wSm wSm -fZd wSm wSm vzB @@ -72232,8 +72334,9 @@ aWR ttK wSm wSm +xnU +wSm wSm -xgl wSm wSm wSm @@ -72243,19 +72346,18 @@ wSm wSm wSm wSm -xgl wSm wSm wSm wSm -xgl +xnU wSm kfE +eSF qnB fHB -hWL -hWL -hWL +fHB +fHB ssD iSi ssD @@ -72463,9 +72565,9 @@ wSm wSm wSm wSm +xrH gAS wSm -fZd wSm wSm vzB @@ -72675,9 +72777,9 @@ wSm wSm wSm wSm +fZd gAS wSm -fZd wSm wSm vzB @@ -72887,9 +72989,9 @@ wSm wSm wSm kHG +eAM gAS wSm -fZd wSm wSm vzB @@ -73099,9 +73201,9 @@ wSm wSm wSm wSm +eSF gAS wSm -fZd wSm wSm vzB @@ -73311,9 +73413,9 @@ wSm wSm wSm wSm +xrH gAS wSm -fZd wSm wSm vzB @@ -73523,9 +73625,9 @@ wSm wSm wSm wSm +fZd gAS wSm -fZd wSm wSm vzB @@ -73735,9 +73837,9 @@ wSm wSm wSm wSm +eAM kAr wSm -fZd wSm wSm vzB @@ -73928,8 +74030,9 @@ aWR ttK wSm wSm +xnU +wSm wSm -xgl wSm wSm wSm @@ -73939,19 +74042,18 @@ wSm wSm wSm wSm -xgl wSm wSm wSm wSm -xgl +xnU wSm wSm +eSF mmP fHB -hWL -hWL -hWL +fHB +fHB ssD iSi ssD @@ -74138,9 +74240,9 @@ hxy aWR aWR uEN +wQN wSm wSm -xnU wSm wSm wSm @@ -74157,11 +74259,11 @@ wSm wSm wSm wSm -xnU wSm +wQN +xrH wSm wSm -fZd wSm wSm vzB @@ -74350,32 +74452,32 @@ mxQ vMK hxy hxy +tZs hLK -hLK -qeR yfC +fHV tZs lLv -qeR yfC +fHV tZs hLK -hLK yfC +fHV tZs hLK -qeR yfC +fHV tZs hLK -qeR yfC -tZs -tZs +fHV tZs aWR aWR aWR +aWR +aWR vzB fiq vzB @@ -87621,28 +87723,28 @@ vzB gws vzB iJf +hKI +hsA wFk +nGk +uhH +uol wFk +nGk +uhH +uol wFk +nGk +uhH +uol wFk +nGk +uhH +uol wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk -wFk +nGk +uhH +uol wFk hsA hlK @@ -87832,10 +87934,12 @@ bQM vzB gws vzB -ssi +iJf +hKI +owG +iOa xeO xeO -cCx xeO xeO xeO @@ -87852,11 +87956,9 @@ xeO xeO xeO xeO -cCx -xeO xeO -xeO -aVK +iOa +nBR hlK hKI hKI @@ -88044,11 +88146,12 @@ hbC ssD iSi ssD -yls -tHU +tPi +viV +wJf xeO xeO -viV +cCx xeO xeO xeO @@ -88058,17 +88161,16 @@ xeO xeO xeO xeO -viV xeO xeO xeO xeO -viV +xeO +xeO +cCx xeO bju -ebT -yls -aVK +sLo hlK hKI iWW @@ -88256,8 +88358,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +jCp xeO xeO xeO @@ -88278,9 +88381,8 @@ xeO xeO xeO xeO -rUr xeO -aVK +pAN hlK hjW iWW @@ -88468,8 +88570,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +hHh xeO xeO xeO @@ -88490,7 +88593,6 @@ xeO xeO xeO xeO -rUr xeO aVK hlK @@ -88680,8 +88782,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +owG xeO xeO xeO @@ -88701,10 +88804,9 @@ xeO xeO xeO xeO -mUA -rUr xeO -aVK +mUA +nBR hlK hjW iWW @@ -88892,8 +88994,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +wJf xeO xeO xeO @@ -88914,9 +89017,8 @@ xeO xeO xeO xeO -rUr xeO -aVK +sLo hlK hKI iWW @@ -89104,8 +89206,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +jCp xeO xeO xeO @@ -89126,9 +89229,8 @@ xeO xeO xeO xeO -rUr xeO -aVK +pAN hlK hjW iWW @@ -89303,8 +89405,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -89316,8 +89418,9 @@ bQM vzB gws vzB -sJI -rUr +iJf +bYS +hHh xeO xeO xeO @@ -89338,7 +89441,6 @@ xeO xeO xeO xeO -rUr xeO aVK hlK @@ -89515,8 +89617,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -89528,8 +89630,9 @@ bQM vzB gws vzB -ssi -rUr +iJf +bYS +owG xeO xeO xeO @@ -89550,9 +89653,8 @@ xeO xeO xeO xeO -wdg xeO -aVK +rPu hlK hjW iWW @@ -89727,8 +89829,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -89740,11 +89842,13 @@ hbC ssD iSi ssD -yls -qDc +tPi +oSK +wJf +doA xeO +cCx xeO -viV xeO xeO xeO @@ -89754,17 +89858,15 @@ xeO xeO xeO xeO -viV xeO xeO xeO xeO -viV +xeO +cCx xeO xeO -jFw -yls -aVK +lGh hlK hKI iWW @@ -89939,8 +90041,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -89952,10 +90054,12 @@ bQM vzB gws vzB -sJI -doA +iJf +hKI +jCp +iOa +xeO xeO -cCx xeO xeO xeO @@ -89972,11 +90076,9 @@ xeO xeO xeO xeO -cCx -xeO -xeO xeO -aVK +iOa +pAN hlK hKI hKI @@ -90151,8 +90253,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -90165,29 +90267,29 @@ vzB gws vzB iJf +hKI +hsA +tZV +lYA wfp +xjw +tZV +lYA wfp +xjw +tZV +lYA wfp +xjw +tZV +lYA wfp +xjw +tZV +lYA wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -wfp -chQ -chQ +xjw +tZV hsA hlK sEi @@ -90363,8 +90465,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -90575,8 +90677,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -90787,8 +90889,8 @@ bQM bQM bQM bQM -bQM -bQM +cAW +cAW bQM bQM bQM @@ -90999,9 +91101,9 @@ bQM bQM bQM bQM -bQM -bQM -bQM +cAW +cAW +cAW bQM bQM bQM diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index 04dd3d3a8efd..7ce999271a29 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -2660,10 +2660,10 @@ /area/ice_colony/surface/hydroponics/north) "aig" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "aih" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "aii" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -2895,7 +2895,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "aiO" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -3208,7 +3208,7 @@ /area/ice_colony/surface/substation/smes) "ajF" = ( /obj/item/disk/botany, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "ajG" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -5617,7 +5617,7 @@ /area/ice_colony/exterior/surface/valley/west) "aqt" = ( /obj/item/storage/bag/plants, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/north) "aqu" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -7066,14 +7066,14 @@ /obj/structure/machinery/light{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "auk" = ( /mob/living/simple_animal/cow, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "aul" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "aum" = ( /obj/structure/bed/chair{ @@ -7177,13 +7177,13 @@ /area/ice_colony/surface/clinic/lobby) "auA" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "auB" = ( /obj/structure/machinery/light{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "auC" = ( /obj/structure/flora/pottedplant, @@ -7360,7 +7360,7 @@ /obj/item/stack/rods{ amount = 25 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "auZ" = ( /turf/open/floor{ @@ -7984,7 +7984,7 @@ /area/ice_colony/exterior/surface/valley/southeast) "awA" = ( /obj/structure/machinery/light, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/lobby) "awB" = ( /obj/structure/bed/chair{ @@ -8965,10 +8965,10 @@ /area/ice_colony/surface/disposals) "azw" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/south) "azx" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/south) "azy" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -9050,7 +9050,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/south) "azM" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ @@ -10928,7 +10928,7 @@ /area/ice_colony/exterior/surface/valley/southeast) "aED" = ( /obj/item/tool/hatchet, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/ice_colony/surface/hydroponics/south) "aEE" = ( /obj/structure/disposalpipe/segment, @@ -13859,7 +13859,7 @@ /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aOC" = ( -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/effect/decal/cleanable/blood{ icon_state = "gib6" }, @@ -34849,6 +34849,7 @@ "qEB" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating/icefloor, /area/ice_colony/surface/requesitions) "qRy" = ( @@ -34876,6 +34877,7 @@ /area/ice_colony/exterior/surface/valley/northwest) "rAm" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "dark2" }, @@ -34958,6 +34960,7 @@ /area/ice_colony/underground/hangar) "tEG" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/ice, /area/ice_colony/exterior/underground/caves/open) @@ -35021,10 +35024,12 @@ "uUv" = ( /obj/effect/alien/weeds/node, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/ice, /area/ice_colony/exterior/underground/caves/open) "vcU" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/ice, /area/ice_colony/exterior/underground/caves/open) "vhS" = ( @@ -35093,6 +35098,7 @@ /area/ice_colony/surface/tcomms) "xWm" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/ice, /area/ice_colony/exterior/surface/landing_pad_external) "ygw" = ( diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index b8a1b9eb90dc..a431aa368702 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -1337,7 +1337,7 @@ }, /area/shiva/interior/colony/research_hab) "afA" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "afC" = ( @@ -1579,6 +1579,15 @@ dir = 1 }, /area/shiva/interior/colony/medseceng) +"agF" = ( +/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "agJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/technology_scanner, @@ -1687,6 +1696,7 @@ /area/shiva/interior/colony/medseceng) "ahy" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/shiva{ dir = 1 }, @@ -3697,9 +3707,7 @@ /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/cp_camp) "atJ" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/research_alley) "atK" = ( @@ -3973,6 +3981,7 @@ /area/shiva/exterior/cp_lz2) "axd" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/shiva{ icon_state = "wredfull" }, @@ -4372,9 +4381,7 @@ }, /area/shiva/interior/garage) "azx" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "azy" = ( @@ -4879,7 +4886,6 @@ "aDS" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ id = "st_17"; - locked = 0; name = "Power Storage Unit" }, /turf/open/floor/plating, @@ -4902,9 +4908,7 @@ /turf/closed/wall/shiva/prefabricated/white, /area/shiva/interior/lz2_habs) "aEq" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aEr" = ( @@ -4917,7 +4921,7 @@ /area/shiva/exterior/cp_lz2) "aEu" = ( /obj/structure/prop/ice_colony/ground_wire, -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aEB" = ( @@ -4954,16 +4958,13 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "aEV" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aEW" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ dir = 2; id = "st_18"; - locked = 0; name = "Disposals Storage Unit" }, /turf/open/floor/plating, @@ -5043,9 +5044,7 @@ }, /area/shiva/interior/colony/botany) "aFz" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aFA" = ( @@ -5068,7 +5067,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/interior/bar) "aFJ" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "aFK" = ( @@ -5154,9 +5153,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_s_research) "aGI" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_lz2) "aHb" = ( @@ -5184,7 +5181,7 @@ }, /area/shiva/interior/bar) "aHz" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/research_alley) "aHB" = ( @@ -5199,6 +5196,14 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) +"aHQ" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "aIh" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/barbed_wire, @@ -5252,9 +5257,7 @@ }, /area/shiva/interior/colony/medseceng) "aJy" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "aJB" = ( @@ -5278,9 +5281,7 @@ }, /area/shiva/interior/bar) "aJG" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "aJM" = ( @@ -6604,6 +6605,15 @@ icon_state = "floor3" }, /area/shiva/interior/colony/research_hab) +"aWv" = ( +/obj/structure/machinery/landinglight/ds2, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "aWB" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" @@ -7259,6 +7269,14 @@ "bjv" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_colony_grounds) +"bjP" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "bks" = ( /obj/structure/morgue{ dir = 8 @@ -7337,9 +7355,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "boD" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz1, /turf/open/floor/plating, /area/shiva/exterior/lz1_valley) "boS" = ( @@ -7487,9 +7503,7 @@ }, /area/shiva/interior/lz2_habs) "bwP" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "bxb" = ( @@ -7522,6 +7536,7 @@ /area/shiva/interior/colony/research_hab) "byr" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) "byG" = ( @@ -7874,9 +7889,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/n_admin) "bRU" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "bSB" = ( @@ -7978,7 +7991,6 @@ "bXo" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating, @@ -8410,9 +8422,7 @@ }, /area/shiva/interior/caves/research_caves) "cAH" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "cAW" = ( @@ -8453,6 +8463,12 @@ icon_state = "multi_tiles" }, /area/shiva/exterior/lz2_fortress) +"cBF" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "cBG" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light/double{ @@ -8538,7 +8554,6 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{ dir = 1; name = "\improper Aurora Medical Clinic Treatment"; - req_access = null; req_one_access = null }, /turf/open/floor/plating, @@ -8651,9 +8666,7 @@ /turf/open/gm/river/no_overlay, /area/shiva/interior/caves/cp_camp) "cMr" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) "cMs" = ( @@ -8679,9 +8692,7 @@ /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/interior/oob) "cOU" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "cOX" = ( @@ -8751,8 +8762,6 @@ "cSn" = ( /obj/structure/closet/secure_closet/guncabinet, /obj/item/weapon/gun/rifle/m41aMK1, -/obj/item/ammo_magazine/rifle/m41aMK1/toxin, -/obj/item/ammo_magazine/rifle/m41aMK1/toxin, /obj/item/ammo_magazine/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1, /obj/item/ammo_magazine/rifle/m41aMK1, @@ -8893,6 +8902,17 @@ /obj/item/device/multitool, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"cYR" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "cYT" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10 @@ -8959,9 +8979,7 @@ }, /area/shiva/interior/colony/medseceng) "dcu" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "dcG" = ( @@ -9659,9 +9677,7 @@ /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) "eab" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "eal" = ( @@ -9951,7 +9967,6 @@ "esf" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; - req_access = null; req_one_access = null }, /turf/open/floor/plating, @@ -10090,9 +10105,7 @@ }, /area/shiva/interior/bar) "eCr" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "eET" = ( @@ -10370,6 +10383,14 @@ "eUT" = ( /turf/closed/wall/shiva/prefabricated/white, /area/shiva/exterior/cp_lz2) +"eVa" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 8 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "eVG" = ( /obj/structure/largecrate/random, /turf/open/floor/shiva, @@ -10442,6 +10463,7 @@ /area/shiva/interior/warehouse) "faM" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/medseceng_caves) "faR" = ( @@ -10592,9 +10614,7 @@ }, /area/shiva/interior/colony/research_hab) "fiy" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating, /area/shiva/exterior/lz2_fortress) "fiK" = ( @@ -10832,6 +10852,15 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/botany) +"fxw" = ( +/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "fxy" = ( /obj/item/lightstick/variant/planted, /turf/open/auto_turf/snow/layer1, @@ -11010,9 +11039,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) "fGG" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/colony/medseceng) "fGT" = ( @@ -11081,6 +11108,12 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/lz1_valley) +"fKx" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/shiva{ + icon_state = "greenfull" + }, +/area/shiva/interior/colony/n_admin) "fKy" = ( /obj/item/tool/pen/blue{ pixel_x = 5 @@ -11120,6 +11153,17 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) +"fLz" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "fLX" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -11189,7 +11233,6 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 8; name = "\improper Colony Power Substation"; - req_access = null; req_one_access = null }, /turf/open/floor/plating, @@ -11519,6 +11562,12 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) +"gkK" = ( +/obj/structure/machinery/landinglight/ds2/delaythree, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "gkL" = ( /obj/structure/machinery/medical_pod/sleeper, /turf/open/floor/shiva{ @@ -11789,9 +11838,7 @@ /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/interior/telecomm/lz1_biceps) "gBp" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "gBr" = ( @@ -12471,6 +12518,15 @@ }, /turf/open/gm/river/no_overlay, /area/shiva/interior/colony/central) +"hpN" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, +/obj/structure/machinery/landinglight/ds2/delaytwo, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "hqd" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 6; @@ -12572,9 +12628,7 @@ /turf/closed/wall/shiva/prefabricated/blue, /area/shiva/interior/warehouse) "huF" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "hvZ" = ( @@ -12620,9 +12674,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/central) "hxY" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "hyu" = ( @@ -12885,9 +12937,7 @@ }, /area/shiva/interior/garage) "hIM" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "hJd" = ( @@ -13017,6 +13067,14 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) +"hSq" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "hSW" = ( /obj/item/lightstick/red/spoke/planted{ layer = 2.99; @@ -13075,6 +13133,7 @@ /area/shiva/exterior/cp_lz2) "hUG" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/shiva{ dir = 8; icon_state = "multi_tiles" @@ -13170,6 +13229,17 @@ icon_state = "floor3" }, /area/shiva/interior/colony/botany) +"hZu" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "hZI" = ( /obj/structure/largecrate/random/mini/small_case/b{ pixel_x = -9 @@ -13209,9 +13279,7 @@ }, /area/shiva/interior/colony/deck) "idG" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "idR" = ( @@ -13767,9 +13835,7 @@ /turf/open/floor/wood, /area/shiva/interior/bar) "iDa" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) "iDn" = ( @@ -13838,6 +13904,13 @@ }, /turf/open/floor/shiva, /area/shiva/interior/bar) +"iHN" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "green" + }, +/area/shiva/interior/colony/botany) "iHV" = ( /obj/structure/largecrate/random{ anchored = 1; @@ -14019,6 +14092,14 @@ /obj/structure/girder, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) +"iUk" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "iVj" = ( /turf/open/floor/shiva{ dir = 4; @@ -14597,6 +14678,14 @@ dir = 1 }, /area/shiva/interior/colony/s_admin) +"jBN" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "jCe" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva{ @@ -14743,6 +14832,14 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard) +"jLc" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "jLn" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/effect/landmark/objective_landmark/far, @@ -14938,9 +15035,7 @@ }, /area/shiva/interior/lz2_habs) "jXD" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "jYO" = ( @@ -15051,6 +15146,15 @@ icon_state = "yellowfull" }, /area/shiva/interior/colony/medseceng) +"kcB" = ( +/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "kdd" = ( /obj/effect/landmark/nightmare{ insert_tag = "lz2-east-gate" @@ -15153,9 +15257,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) "kgP" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "khw" = ( @@ -15185,6 +15287,12 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/wood, /area/shiva/interior/colony/botany) +"kiv" = ( +/obj/structure/machinery/landinglight/ds2, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "kiB" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -15339,9 +15447,7 @@ /turf/open/asphalt/cement, /area/shiva/interior/warehouse) "krZ" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) "ksu" = ( @@ -15390,7 +15496,7 @@ }, /area/shiva/interior/colony/deck) "kuS" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "kuY" = ( @@ -15659,9 +15765,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "kGW" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "kHB" = ( @@ -15696,6 +15800,14 @@ icon_state = "red" }, /area/shiva/interior/colony/medseceng) +"kIH" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "kJi" = ( /obj/structure/closet/crate/hydroponics, /obj/item/reagent_container/glass/watertank, @@ -15731,6 +15843,14 @@ /obj/item/lightstick/red/variant, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/lz1_valley) +"kLa" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "kLi" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/storage/snow_suit/doctor{ @@ -15922,9 +16042,7 @@ }, /area/shiva/interior/colony/research_hab) "kSh" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "kSO" = ( @@ -16175,6 +16293,17 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/junkyard) +"lgx" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "lgN" = ( /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/junkyard/fortbiceps) @@ -16419,6 +16548,20 @@ /obj/structure/machinery/space_heater, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/fortbiceps) +"luR" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) +"lvj" = ( +/obj/structure/machinery/landinglight/ds2, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "lvq" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/far, @@ -16506,6 +16649,14 @@ /obj/item/lightstick/red/variant/planted, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) +"lBC" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "lCb" = ( /obj/item/tool/pickaxe, /turf/open/auto_turf/ice/layer0, @@ -17307,9 +17458,7 @@ }, /area/shiva/interior/colony/botany) "msh" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "msu" = ( @@ -17504,6 +17653,14 @@ }, /turf/open/floor/wood, /area/shiva/interior/colony/botany) +"mEp" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "mEw" = ( /obj/structure/cargo_container/wy/left, /turf/open/auto_turf/snow/layer3, @@ -17750,6 +17907,14 @@ /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/valley) +"mQl" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "mQs" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -17785,9 +17950,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/oob/dev_room) "mRv" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "mRU" = ( @@ -18149,6 +18312,15 @@ }, /turf/open/gm/river/no_overlay, /area/shiva/interior/caves/cp_camp) +"nlG" = ( +/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "nmi" = ( /obj/item/weapon/twohanded/spear, /turf/open/floor/shiva{ @@ -18980,7 +19152,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) "oiH" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "oiX" = ( @@ -19054,9 +19226,7 @@ /turf/open/floor/interior/plastic, /area/shiva/interior/warehouse) "opa" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/colony/central) "opM" = ( @@ -19066,9 +19236,7 @@ }, /area/shiva/interior/colony/s_admin) "oqf" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "oqt" = ( @@ -19243,9 +19411,7 @@ /turf/open/floor/plating, /area/shiva/exterior/telecomm/lz2_northeast) "oxP" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "oyc" = ( @@ -19579,7 +19745,6 @@ pixel_x = -10; pixel_y = 13 }, -/obj/item/ammo_magazine/rifle/toxin, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) "oYw" = ( @@ -19670,9 +19835,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/medseceng) "pcT" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) "pcY" = ( @@ -20129,6 +20292,15 @@ icon_state = "multi_tiles" }, /area/shiva/interior/bar) +"pBl" = ( +/obj/structure/machinery/landinglight/ds2/spoke, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "pBy" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/landmark/objective_landmark/far, @@ -20277,6 +20449,12 @@ icon_state = "wred" }, /area/shiva/interior/colony/medseceng) +"pGg" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "pGj" = ( /obj/item/weapon/ice_axe/red, /turf/open/auto_turf/snow/layer0, @@ -20473,9 +20651,7 @@ }, /area/shiva/interior/colony/medseceng) "pNs" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "pNx" = ( @@ -20595,7 +20771,7 @@ }, /area/shiva/interior/colony/central) "pUp" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) "pUx" = ( @@ -21368,9 +21544,7 @@ /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/cp_lz2) "qNj" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_5" - }, +/obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "qNn" = ( @@ -21802,7 +21976,6 @@ /area/shiva/interior/colony/research_hab) "ril" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/ammo_magazine/rifle/m41aMK1/toxin, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, @@ -21847,7 +22020,7 @@ }, /area/shiva/exterior/junkyard/fortbiceps) "rli" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) "rnz" = ( @@ -22097,9 +22270,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "rEQ" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "rEV" = ( @@ -22318,7 +22489,7 @@ }, /area/shiva/interior/bar) "rUD" = ( -/obj/item/weapon/gun/shotgun/double/sawn{ +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{ desc = "Shhhh, he's sleeping."; pixel_x = 3; pixel_y = -10 @@ -22391,6 +22562,12 @@ dir = 5 }, /area/shiva/interior/aerodrome) +"rXp" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "rXt" = ( /obj/structure/cable/heavyduty{ icon_state = "0-8" @@ -22522,9 +22699,7 @@ }, /area/shiva/interior/colony/medseceng) "sev" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) "seW" = ( @@ -22688,7 +22863,7 @@ }, /area/shiva/interior/colony/research_hab) "snN" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "snX" = ( @@ -23055,9 +23230,7 @@ /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) "sJo" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) "sJs" = ( @@ -23306,6 +23479,14 @@ /obj/item/clothing/shoes/snow, /turf/open/floor/interior/plastic/alt, /area/shiva/interior/warehouse) +"sZx" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "tad" = ( /obj/structure/platform/strata{ dir = 1 @@ -23556,7 +23737,7 @@ /area/shiva/interior/bar) "tnz" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/prison{ icon_state = "kitchen" }, @@ -23715,9 +23896,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/warehouse/caves) "tuT" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_2" - }, +/obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/cp_bar) "tvo" = ( @@ -24652,6 +24831,17 @@ icon_state = "bluefull" }, /area/shiva/interior/colony/n_admin) +"ujV" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "ukp" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_s_research) @@ -24665,7 +24855,6 @@ }, /area/shiva/interior/colony/medseceng) "ukJ" = ( -/obj/item/ammo_magazine/rifle/m41aMK1/toxin, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) "ukU" = ( @@ -24951,9 +25140,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/botany) "uCs" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_6" - }, +/obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) "uCO" = ( @@ -25340,9 +25527,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/right_spiders) "uTu" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard/cp_bar) "uTB" = ( @@ -25401,7 +25586,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) "uWj" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "uWA" = ( @@ -25634,9 +25819,7 @@ }, /area/shiva/interior/colony/botany) "vhM" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_4" - }, +/obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) "vhQ" = ( @@ -26201,9 +26384,7 @@ /turf/open/gm/river, /area/shiva/exterior/cp_lz2) "vSL" = ( -/obj/structure/flora/tree/dead{ - icon_state = "tree_3" - }, +/obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) "vTc" = ( @@ -26288,6 +26469,13 @@ dir = 1 }, /area/shiva/interior/colony/medseceng) +"vXk" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/shiva/interior/colony/botany) "vXl" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_1" @@ -26377,6 +26565,14 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"wfO" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/shiva/exterior/lz2_fortress) "wfP" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -16; @@ -26541,6 +26737,15 @@ icon_state = "multi_tiles" }, /area/shiva/interior/colony/botany) +"wpl" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo, +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "wpG" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "\improper Colony Security Checkpoint" @@ -27466,7 +27671,7 @@ /turf/closed/wall/shiva/ice, /area/shiva/interior/oob) "xAP" = ( -/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) "xAS" = ( @@ -27536,6 +27741,14 @@ icon_state = "purplefull" }, /area/shiva/interior/colony/research_hab) +"xEd" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "xEu" = ( /obj/structure/morgue, /turf/open/floor/shiva{ @@ -27999,6 +28212,12 @@ dir = 1 }, /area/shiva/interior/colony/medseceng) +"ylP" = ( +/obj/structure/machinery/landinglight/ds2/delaythree, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/shiva/exterior/lz2_fortress) "ylU" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -30454,27 +30673,27 @@ mFm mFm mhP mhP -sxD -mFm -mFm -mFm -mFm -mFm -mFm -sxD -iuK -iuK -sxD -mFm -mFm -mFm -mFm -mFm -mFm -mFm -mFm -mFm -sxD +cYR +jBN +lBC +mQl +bjP +jBN +lBC +nlG +kLa +eVa +pBl +mQl +bjP +jBN +lBC +mQl +bjP +jBN +lBC +mQl +aWv mhP mhP mFm @@ -30615,9 +30834,9 @@ caS mFm mFm mhP -sxD -mFm +hZu mFm +sxD mFm mFm mFm @@ -30635,9 +30854,9 @@ mFm mFm mFm mFm -mFm -mFm sxD +mFm +wpl mhP mFm iuK @@ -30777,8 +30996,8 @@ caS mFm mFm mhP -mFm -mFm +sZx +sxD mFm mFm mFm @@ -30798,8 +31017,8 @@ gkY gkY mFm mFm -mFm -mFm +sxD +cBF mhP mFm iuK @@ -30939,7 +31158,7 @@ mFm mFm mFm mhP -mFm +jLc mFm mFm aar @@ -30961,7 +31180,7 @@ gkY mFm aar fiy -mFm +kiv mhP mFm iuK @@ -31101,7 +31320,7 @@ mFm mFm mFm mhP -mFm +mEp mFm mFm mFm @@ -31123,7 +31342,7 @@ gkY gkY mFm gkY -mFm +ylP mhP mFm axq @@ -31263,7 +31482,7 @@ caS mFm mFm mhP -mFm +iUk gkY gkY gkY @@ -31285,7 +31504,7 @@ gkY gkY gkY gkY -mFm +pGg mhP mFm iuK @@ -31425,7 +31644,7 @@ caS mFm mFm mhP -mFm +sZx gkY gkY gkY @@ -31447,7 +31666,7 @@ gkY gkY iuK iuK -iuK +rXp mhP mFm rSL @@ -31587,7 +31806,7 @@ caS mFm mFm mhP -mFm +jLc gkY gkY gkY @@ -31609,7 +31828,7 @@ gkY gkY iuK iuK -iuK +lvj mhP mFm iuK @@ -31749,7 +31968,7 @@ caS mFm mFm mhP -mFm +mEp gkY gkY gkY @@ -31771,7 +31990,7 @@ gkY gkY iuK iuK -iuK +gkK mhP mFm iuK @@ -31911,7 +32130,7 @@ caS mFm mFm mhP -mFm +iUk gkY gkY gkY @@ -31933,7 +32152,7 @@ gkY gkY gkY gkY -mFm +pGg mhP otV iuK @@ -32073,7 +32292,7 @@ mFm mFm mFm mhP -mFm +sZx mFm mFm mFm @@ -32095,7 +32314,7 @@ gkY gkY mFm gkY -mFm +cBF mhP apY iuK @@ -32235,7 +32454,7 @@ mFm mFm mFm mhP -mFm +jLc mFm mFm aar @@ -32257,7 +32476,7 @@ gkY mFm aar gkY -mFm +kiv mhP mFm iuK @@ -32397,8 +32616,8 @@ caS mFm mFm mhP -mFm -mFm +mEp +sxD mFm mFm mFm @@ -32418,8 +32637,8 @@ gkY gkY mFm mFm -mFm -mFm +sxD +ylP mhP mFm qyC @@ -32559,9 +32778,9 @@ caS mFm mFm mhP -sxD -mFm +lgx mFm +sxD mFm mFm mFm @@ -32579,9 +32798,9 @@ mFm mFm mFm mFm -mFm -mFm sxD +mFm +hpN mhP mFm wgX @@ -32722,27 +32941,27 @@ mFm mFm mhP mhP -sxD -mFm -mFm -mFm -mFm -mFm -mFm -sxD -iuK -iuK -sxD -mFm -mFm -mFm -mFm -mFm -mFm -mFm -mFm -mFm -sxD +ujV +kIH +aHQ +luR +xEd +kIH +aHQ +fxw +hSq +wfO +kcB +luR +xEd +fLz +aHQ +luR +xEd +kIH +aHQ +luR +agF mhP mhP mFm @@ -43474,7 +43693,7 @@ rBH lmL ejt lmL -bJF +vXk gjY vHM gjY @@ -44258,7 +44477,7 @@ kJi cCI axf cCI -axf +fKx cCI axf gZG @@ -46716,7 +46935,7 @@ mqe rFA rBH joh -aUM +iHN krM nOd nOd diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index ad61580eda28..3d626437679a 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -27,9 +27,7 @@ /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) "abG" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "abS" = ( @@ -88,7 +86,7 @@ /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "brflowers_1" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "ahD" = ( /obj/structure/bed/chair{ @@ -292,9 +290,7 @@ /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) "asT" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 8 - }, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "atn" = ( @@ -537,7 +533,7 @@ /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/power) "aIu" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "aIw" = ( @@ -567,6 +563,12 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) +"aKl" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/lz_dunes) "aKH" = ( /obj/structure/machinery/light, /turf/open/floor/kutjevo/multi_tiles, @@ -1182,7 +1184,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "bGX" = ( /obj/effect/decal/cleanable/blood/oil, @@ -1466,7 +1468,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_north) "ccs" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -1672,7 +1674,7 @@ /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "fullgrass_1" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "csE" = ( /obj/structure/girder, @@ -1772,9 +1774,7 @@ /obj/structure/flora/bush/desert{ icon_state = "tree_3" }, -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "cyc" = ( @@ -1788,9 +1788,7 @@ /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) "cAK" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "cBd" = ( @@ -2102,6 +2100,7 @@ /area/kutjevo/interior/foremans_office) "cSJ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_South) "cTj" = ( @@ -2302,9 +2301,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) "ddq" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_river) "ddx" = ( @@ -2377,7 +2374,7 @@ /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/exterior/Northwest_Colony) "dhL" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -2458,6 +2455,12 @@ dir = 9 }, /area/kutjevo/exterior/runoff_river) +"dpt" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/Northwest_Colony) "dpH" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/kutjevo/tan, @@ -2486,7 +2489,7 @@ }, /area/kutjevo/interior/colony_South/power2) "dqK" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) @@ -2710,8 +2713,8 @@ /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/Northwest_Colony) "dEI" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "dFc" = ( @@ -2799,9 +2802,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/runoff_bridge) "dKr" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) "dKs" = ( @@ -2916,7 +2917,7 @@ /area/kutjevo/interior/power/comms) "dST" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) "dTn" = ( @@ -2955,9 +2956,7 @@ }, /area/kutjevo/interior/colony_South/power2) "dUE" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "dUP" = ( @@ -3328,9 +3327,7 @@ }, /area/kutjevo/interior/oob) "eqJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) "eqQ" = ( @@ -3995,7 +3992,7 @@ }, /area/kutjevo/interior/complex/med/auto_doc) "ffP" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -4488,9 +4485,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "fRu" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "fRI" = ( @@ -4501,7 +4496,7 @@ /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "brflowers_3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "fRZ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -4962,9 +4957,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) "gBV" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "gCb" = ( @@ -5047,9 +5040,7 @@ }, /area/kutjevo/interior/complex/Northwest_Flight_Control) "gHh" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_north) "gHm" = ( @@ -5176,9 +5167,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/cells) "gSr" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) @@ -5299,14 +5288,12 @@ /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) "gZj" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "gZq" = ( /obj/structure/bed/chair, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "han" = ( /obj/structure/platform_decoration/kutjevo/rock{ @@ -5895,7 +5882,7 @@ dir = 8; icon_state = "p_stair_sn_full_cap" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "hVQ" = ( /obj/structure/machinery/light{ @@ -6247,9 +6234,7 @@ }, /area/kutjevo/interior/power) "iCQ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) @@ -6285,9 +6270,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med/triage) "iIn" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "iIz" = ( @@ -7035,9 +7018,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/colony_central) "jIN" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "jIR" = ( @@ -7159,7 +7140,7 @@ }, /area/kutjevo/interior/complex/botany/east) "jUK" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -7169,7 +7150,7 @@ dir = 1; icon_state = "p_stair_full" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "jWM" = ( /obj/structure/platform/kutjevo{ @@ -7398,7 +7379,7 @@ }, /area/kutjevo/interior/construction) "kne" = ( -/obj/structure/flora/grass/desert, +/obj/structure/flora/grass/desert/lightgrass_1, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "kni" = ( @@ -7922,9 +7903,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/exterior/Northwest_Colony) "kVH" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_11" - }, +/obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "kVJ" = ( @@ -8497,6 +8476,12 @@ /obj/structure/platform_decoration/kutjevo, /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/complex/med/locks) +"lNl" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/Northwest_Colony) "lNt" = ( /obj/structure/platform/kutjevo/smooth{ dir = 8 @@ -8743,9 +8728,7 @@ /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/auto_doc) "mfd" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "mfk" = ( @@ -9251,6 +9234,10 @@ }, /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/complex/med/auto_doc) +"mIT" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/Northwest_Colony) "mJq" = ( /obj/structure/machinery/computer/cameras/telescreen/entertainment{ icon_state = "ai_bsod"; @@ -9341,9 +9328,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/complex/med/triage) "mPL" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_10" - }, +/obj/structure/flora/grass/desert/lightgrass_10, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "mPP" = ( @@ -9899,9 +9884,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/foremans_office) "nFO" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "nFY" = ( @@ -10228,9 +10211,7 @@ /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) "nZl" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "nZv" = ( @@ -10303,9 +10284,7 @@ }, /area/kutjevo/exterior/scrubland) "ofn" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "ofs" = ( @@ -10444,7 +10423,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "oor" = ( /obj/structure/surface/rack, @@ -11380,9 +11359,7 @@ /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) "pDi" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "pDk" = ( @@ -11587,9 +11564,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/complex/med/locks) "pNW" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/stonyfields) "pOi" = ( @@ -11610,7 +11585,7 @@ }, /area/kutjevo/interior/power/comms) "pPz" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -11728,7 +11703,7 @@ dir = 4; pixel_y = 13 }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "pZx" = ( /obj/structure/platform_decoration/kutjevo, @@ -12312,7 +12287,7 @@ /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) "qTI" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delaythree{ dir = 1 }, /turf/open/floor/kutjevo/multi_tiles, @@ -12394,9 +12369,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/power_pt2_electric_boogaloo) "qZO" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "raA" = ( @@ -12525,9 +12498,7 @@ }, /area/kutjevo/interior/oob) "rkt" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) @@ -12877,9 +12848,7 @@ /turf/open/floor/kutjevo/tiles, /area/kutjevo/exterior/Northwest_Colony) "rLy" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/lz_dunes) "rLD" = ( @@ -12897,9 +12866,11 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) "rMV" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 8 + }, /turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/exterior/Northwest_Colony) +/area/kutjevo/exterior/lz_dunes) "rMZ" = ( /obj/structure/platform/kutjevo{ dir = 1 @@ -13109,7 +13080,7 @@ }, /area/kutjevo/interior/colony_central) "saK" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "sbb" = ( @@ -13245,7 +13216,9 @@ }, /area/kutjevo/interior/colony_South/power2) "slB" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) "slF" = ( @@ -13631,8 +13604,8 @@ /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) "sLf" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "sLx" = ( @@ -14006,9 +13979,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "tka" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_6" - }, +/obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) "tld" = ( @@ -14201,6 +14172,7 @@ /area/kutjevo/exterior/lz_dunes) "tzQ" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) "tAQ" = ( @@ -14322,7 +14294,7 @@ /turf/open/floor/kutjevo/plate, /area/kutjevo/exterior/Northwest_Colony) "tHI" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 }, /turf/open/floor/kutjevo/multi_tiles, @@ -14352,9 +14324,7 @@ /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/complex/botany/east) "tIF" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "tIY" = ( @@ -14688,7 +14658,7 @@ /area/kutjevo/interior/complex/med) "ujo" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "ujG" = ( /obj/structure/platform_decoration/kutjevo/rock{ @@ -14817,7 +14787,7 @@ /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "fullgrass_3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "urm" = ( /obj/structure/stairs/perspective/kutjevo{ @@ -14852,6 +14822,12 @@ icon_state = "8,8" }, /area/kutjevo/interior/colony_north) +"usd" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/lz_dunes) "ush" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -15053,9 +15029,7 @@ }, /area/kutjevo/interior/complex/Northwest_Dorms) "uHo" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/construction) "uHJ" = ( @@ -15247,9 +15221,7 @@ /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/runoff_dunes) "uQJ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_2" - }, +/obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) "uRm" = ( @@ -15474,9 +15446,7 @@ /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/lz_dunes) "ven" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) "veI" = ( @@ -15864,9 +15834,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) "vGf" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_3" - }, +/obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) "vGx" = ( @@ -16347,7 +16315,7 @@ }, /area/kutjevo/exterior/complex_border/med_park) "wrk" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, @@ -16428,7 +16396,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/runoff_bridge) "wvX" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/ds2, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "wwc" = ( @@ -16591,9 +16559,7 @@ }, /area/kutjevo/interior/complex/med) "wFQ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_9" - }, +/obj/structure/flora/grass/desert/lightgrass_9, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) "wGD" = ( @@ -16612,9 +16578,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) "wJZ" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_4" - }, +/obj/structure/flora/grass/desert/lightgrass_4, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) @@ -16708,6 +16672,7 @@ /area/kutjevo/interior/construction) "wTr" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_N_East) "wTt" = ( @@ -16752,6 +16717,12 @@ "wXd" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/colony_South) +"wXf" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/Northwest_Colony) "wXy" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/auto_turf/sand/layer2, @@ -16776,7 +16747,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med) "wYp" = ( -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) "wYE" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -17036,9 +17007,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/construction) "xrT" = ( -/obj/structure/flora/grass/desert{ - icon_state = "lightgrass_8" - }, +/obj/structure/flora/grass/desert/lightgrass_8, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) "xti" = ( @@ -17570,6 +17539,7 @@ /area/kutjevo/interior/colony_South/power2) "ykY" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "ylf" = ( @@ -19565,7 +19535,6 @@ wGH cWV swZ ffP -ffP tld ptH sKo @@ -19574,18 +19543,19 @@ tld ptH sKo ffP -ffP +tld ptH sKo ffP tld -sKo +ptH sKo ffP tld ptH -ptH -ptH +sKo +ffP +tld swZ cWV wGH @@ -19730,7 +19700,7 @@ wGH wGH wGH cWV -uhO +exI nbV nbV umo @@ -19897,7 +19867,7 @@ prJ wGH wGH cWV -rPq +asT nbV nbV nbV @@ -19920,7 +19890,7 @@ nbV nbV jZJ nbV -qVc +usd cWV aRu vei @@ -20064,7 +20034,7 @@ vei wGH wGH cWV -exI +uhO nbV nbV nbV @@ -20087,7 +20057,7 @@ lAI nbV lAI nbV -qVc +slB cWV aRu wGH @@ -20254,7 +20224,7 @@ lAI lAI lAI nbV -qVc +aKl cWV aRu qnU @@ -20398,7 +20368,7 @@ wGH wGH maE cWV -uhO +exI nbV lAI lAI @@ -20565,7 +20535,7 @@ vei wGH wGH cWV -rPq +asT nbV lAI lAI @@ -20588,7 +20558,7 @@ lAI nbV nbV nbV -qVc +usd cWV aRu qnU @@ -20637,26 +20607,26 @@ oJE xBm tGE hnq -hnq -wrk dhL +wrk ccs hnq -wrk dhL +wrk ccs hnq -hnq dhL +wrk ccs hnq +dhL wrk ccs -ccs hnq -wrk -dhL dhL +wrk +ccs +hnq dhL tGE xBm @@ -20732,7 +20702,7 @@ wGH wGH wGH cWV -exI +uhO nbV lAI lAI @@ -20755,7 +20725,7 @@ lAI nbV nbV nbV -qVc +slB cWV aRu wGH @@ -20825,7 +20795,7 @@ hzN wqk hzN hzN -qTI +dpt xBm huR huR @@ -20899,7 +20869,7 @@ prJ wGH maE cWV -slB +rPq nbV lAI lAI @@ -20922,7 +20892,7 @@ lAI lAI lAI nbV -qVc +aKl cWV aRu gZj @@ -20969,7 +20939,7 @@ sVF hrz sVF xBm -rMV +sUt hzN hzN hzN @@ -20992,7 +20962,7 @@ hzN hzN kvd hzN -qTI +lNl xBm huR huR @@ -21066,7 +21036,7 @@ prJ wGH maE cWV -uhO +exI nbV nbV nbV @@ -21233,7 +21203,7 @@ dxF vei maE cWV -rPq +asT nbV nbV nbV @@ -21256,7 +21226,7 @@ nbV nbV lAI cBF -qVc +usd cWV aRu wGH @@ -21326,7 +21296,7 @@ ppX ppX ppX hzN -qTI +wXf xBm huR huR @@ -21400,7 +21370,7 @@ dxF dxF wGH cWV -exI +uhO bbc nbV umo @@ -21423,7 +21393,7 @@ nbV umo nbV nbV -qVc +slB cWV wGH wGH @@ -21493,7 +21463,7 @@ ppX hzN eBI hzN -qTI +dpt xBm huR huR @@ -21569,27 +21539,27 @@ wGH cWV swZ yaE -yaE qzr -asT +rMV dIo yaE qzr -asT +rMV dIo yaE -yaE -asT +qzr +rMV dIo yaE qzr -asT +rMV dIo yaE qzr -asT -dIo +rMV dIo +yaE +qzr swZ cWV wGH @@ -21637,7 +21607,7 @@ sVF hrz oJE xBm -rMV +sUt hzN ppX ppX @@ -21660,7 +21630,7 @@ ppX hzN hzN hzN -qTI +lNl xBm huR huR @@ -21971,7 +21941,7 @@ hrz hrz oJE xBm -sUt +mIT hzN ppX ppX @@ -21994,7 +21964,7 @@ ppX ppX ppX hzN -qTI +wXf xBm huR huR @@ -22161,7 +22131,7 @@ ppX hzN ppX eBI -qTI +dpt xBm huR huR @@ -22305,7 +22275,7 @@ hrz hrz iin xBm -rMV +sUt hzN hzN hzN @@ -22328,7 +22298,7 @@ hzN hzN ppX eBI -qTI +lNl xBm huR huR @@ -22640,28 +22610,28 @@ sVF oJE xBm tGE +pPz jUK -jUK -tHI xDR +tHI pPz jUK -tHI xDR +tHI pPz jUK -jUK xDR +tHI pPz jUK -tHI xDR +tHI pPz jUK -tHI xDR +tHI pPz -pPz +jUK tGE xBm huR diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 9c218b15f473..34eecc574c9c 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -54,8 +54,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "abX" = ( @@ -149,8 +148,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "afn" = ( @@ -233,8 +231,7 @@ "agM" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "ahH" = ( @@ -270,8 +267,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aij" = ( @@ -356,8 +352,7 @@ /area/lv522/oob) "alJ" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/oob) "amc" = ( @@ -400,8 +395,7 @@ layer = 3.1; name = "synthethic potted plant"; pixel_x = -7; - pixel_y = 9; - tag = null + pixel_y = 9 }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) @@ -454,8 +448,7 @@ "anH" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "anM" = ( @@ -481,8 +474,7 @@ /obj/structure/machinery/light, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "apc" = ( @@ -503,8 +495,7 @@ "api" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/outdoors/n_rockies) "apt" = ( @@ -547,8 +538,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/oob) "arq" = ( @@ -613,7 +603,6 @@ /area/lv522/indoors/a_block/security) "att" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ - icon_state = "closed"; layer = 2.1 }, /obj/structure/barricade/handrail{ @@ -633,8 +622,7 @@ /obj/item/tool/pickaxe/silver, /obj/item/tool/pickaxe/silver, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "atV" = ( @@ -643,8 +631,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "aut" = ( @@ -670,8 +657,7 @@ /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "awj" = ( @@ -696,8 +682,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "axC" = ( @@ -707,8 +692,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "axD" = ( @@ -765,16 +749,14 @@ /area/lv522/indoors/c_block/mining) "aAN" = ( /obj/structure/cargo_container/wy/mid{ - health = 5000; - unacidable = 0 + health = 5000 }, /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/north_east_street) "aAW" = ( /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aBm" = ( @@ -815,8 +797,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "aDf" = ( @@ -904,8 +885,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "aFf" = ( @@ -924,8 +904,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "aFN" = ( @@ -958,8 +937,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "aGE" = ( @@ -1010,8 +988,7 @@ /obj/structure/machinery/cm_vending/sorted/tech/comtech_tools, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "aIf" = ( @@ -1021,8 +998,8 @@ /obj/structure/closet/crate/weapon, /obj/item/weapon/gun/rifle/l42a, /obj/item/weapon/gun/rifle/l42a, -/obj/item/ammo_magazine/rifle/l42a, -/obj/item/ammo_magazine/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a, +/obj/item/weapon/gun/rifle/l42a, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) "aIp" = ( @@ -1035,13 +1012,11 @@ /area/lv522/indoors/c_block/mining) "aII" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aIY" = ( @@ -1069,8 +1044,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "aJT" = ( @@ -1097,8 +1071,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "aKK" = ( @@ -1113,8 +1086,7 @@ /area/lv522/atmos/north_command_centre) "aKO" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ dir = 1; @@ -1151,8 +1123,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aNr" = ( @@ -1260,8 +1231,7 @@ /obj/structure/machinery/telecomms/bus/preset_one, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "aQH" = ( @@ -1292,8 +1262,7 @@ /area/lv522/indoors/a_block/medical) "aRi" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "aRH" = ( @@ -1389,8 +1358,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "aUb" = ( @@ -1421,8 +1389,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "aVa" = ( @@ -1528,8 +1495,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "aWJ" = ( @@ -1583,8 +1549,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "aZj" = ( @@ -1663,8 +1628,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "bbL" = ( @@ -1725,8 +1689,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/t_comm) "bdj" = ( @@ -1736,8 +1699,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "bdv" = ( @@ -1787,8 +1749,7 @@ "bel" = ( /obj/structure/machinery/computer/crew/colony, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ben" = ( @@ -1866,8 +1827,7 @@ /obj/item/newspaper, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bgS" = ( @@ -1926,8 +1886,7 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bhL" = ( @@ -1959,8 +1918,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "bjF" = ( @@ -1995,8 +1953,7 @@ /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bkf" = ( @@ -2064,13 +2021,11 @@ /obj/structure/machinery/light/double, /obj/structure/window/reinforced{ dir = 1; - layer = 3; - tag = null + layer = 3 }, /obj/structure/machinery/computer3/server/rack, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/indoors/c_block/mining) "bmg" = ( @@ -2090,22 +2045,30 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "bnf" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bnz" = ( -/obj/item/stack/sandbags_empty/half, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/b_block/bridge) +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + desc = "It is made of Fiberbush(tm). It contains asbestos. Studies say that greenery calms the mind due to some sort evolved mechanism in the brain. This plant is not calming."; + icon_state = "pottedplant_21"; + layer = 3.1; + name = "synthethic potted plant"; + pixel_y = 14 + }, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/spider/spiderling/nogrow, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/security) "bnH" = ( /obj/structure/machinery/light{ dir = 1 @@ -2114,8 +2077,7 @@ /mob/living/simple_animal/mouse, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "bnP" = ( @@ -2202,8 +2164,7 @@ /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "buD" = ( @@ -2242,8 +2203,7 @@ pixel_x = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "bwd" = ( @@ -2268,8 +2228,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "bwH" = ( @@ -2285,8 +2244,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "bwU" = ( @@ -2302,8 +2260,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "bxr" = ( @@ -2339,8 +2296,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "byJ" = ( @@ -2350,8 +2306,7 @@ /obj/item/circuitboard/machine/ghettosmes, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "byR" = ( @@ -2361,8 +2316,7 @@ /obj/item/ore/silver, /obj/item/ore/silver, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "bzC" = ( @@ -2385,8 +2339,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "bAc" = ( @@ -2418,8 +2371,7 @@ dir = 10 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/oob) "bBe" = ( @@ -2495,8 +2447,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "bDn" = ( @@ -2530,8 +2481,7 @@ /obj/structure/barricade/wooden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "bDR" = ( @@ -2579,8 +2529,7 @@ /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "bGN" = ( @@ -2594,8 +2543,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "bGT" = ( @@ -2638,8 +2586,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "bIe" = ( @@ -2654,8 +2601,7 @@ }, /obj/item/tool/pen/red/clicky, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "bIr" = ( @@ -2730,8 +2676,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "bJZ" = ( @@ -2789,8 +2734,7 @@ /obj/structure/machinery/light, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "bLV" = ( @@ -2803,8 +2747,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "bMa" = ( @@ -2858,8 +2801,7 @@ "bNA" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "bNE" = ( @@ -2899,8 +2841,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "bPH" = ( @@ -2940,8 +2881,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "bQl" = ( @@ -2986,8 +2926,7 @@ /area/lv522/atmos/north_command_centre) "bRP" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) @@ -3079,8 +3018,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "bUJ" = ( @@ -3132,8 +3070,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "bVF" = ( @@ -3175,8 +3112,7 @@ pixel_y = 11 }, /obj/structure/sink/puddle{ - layer = 2.1; - name = "puddle" + layer = 2.1 }, /turf/open/organic/grass, /area/lv522/indoors/a_block/garden) @@ -3185,8 +3121,7 @@ dir = 9 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "bXl" = ( @@ -3209,8 +3144,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "bXq" = ( @@ -3262,8 +3196,7 @@ /obj/structure/cargo_container/wy/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "bYy" = ( @@ -3310,8 +3243,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "bZK" = ( @@ -3640,8 +3572,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "cjv" = ( @@ -3708,8 +3639,7 @@ /area/lv522/outdoors/colony_streets/north_west_street) "cmc" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/strata{ icon_state = "multi_tiles" @@ -3739,8 +3669,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cnN" = ( @@ -3756,8 +3685,7 @@ pixel_x = -2 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "con" = ( @@ -3769,8 +3697,7 @@ /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "cpk" = ( @@ -3865,8 +3792,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "cqr" = ( @@ -3888,8 +3814,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "cqH" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "cqL" = ( @@ -3988,8 +3913,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "ctE" = ( @@ -4000,8 +3924,7 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "cuF" = ( @@ -4014,8 +3937,7 @@ /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "cve" = ( @@ -4040,8 +3962,7 @@ /obj/structure/machinery/portable_atmospherics/canister/empty/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "cwq" = ( @@ -4059,8 +3980,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "cwO" = ( @@ -4089,8 +4009,7 @@ pixel_x = -3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "cxE" = ( @@ -4121,8 +4040,7 @@ /obj/structure/cargo_container/wy/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cys" = ( @@ -4159,8 +4077,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "cyV" = ( @@ -4186,8 +4103,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "czC" = ( @@ -4261,8 +4177,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cAy" = ( @@ -4275,8 +4190,7 @@ /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "cBi" = ( @@ -4302,8 +4216,7 @@ /obj/item/clothing/head/helmet/riot, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen) "cCC" = ( @@ -4424,8 +4337,7 @@ /obj/structure/cargo_container/wy/mid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cFP" = ( @@ -4452,8 +4364,7 @@ /obj/structure/prop/server_equipment/laptop/on, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "cGw" = ( @@ -4528,8 +4439,7 @@ }, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/dorms) "cHL" = ( @@ -4637,8 +4547,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "cIV" = ( @@ -4716,8 +4625,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cKi" = ( @@ -4753,12 +4661,11 @@ /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/west) "cKF" = ( -/obj/item/explosive/plastic/breaching_charge, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkredfull2" +/obj/item/explosive/plastic/breaching_charge{ + unacidable = 1 }, -/area/lv522/indoors/a_block/security) +/turf/open/auto_turf/shale/layer0, +/area/lv522/outdoors/n_rockies) "cKG" = ( /turf/closed/wall/strata_ice/dirty, /area/lv522/outdoors/nw_rockies) @@ -4809,8 +4716,7 @@ /area/lv522/indoors/b_block/bar) "cLx" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "cLB" = ( @@ -4841,8 +4747,7 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cMt" = ( @@ -4901,8 +4806,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "cOZ" = ( @@ -4947,8 +4851,7 @@ /area/lv522/oob) "cPO" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 1; @@ -4957,8 +4860,7 @@ /area/lv522/oob) "cPU" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 4; @@ -4973,8 +4875,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "cQc" = ( @@ -5020,8 +4921,7 @@ /obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cQW" = ( @@ -5035,8 +4935,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "cRB" = ( @@ -5072,7 +4971,6 @@ /area/lv522/atmos/north_command_centre) "cRT" = ( /obj/structure/prop/vehicles/crawler{ - density = 1; dir = 8; layer = 3.1 }, @@ -5100,8 +4998,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cTf" = ( @@ -5181,8 +5078,7 @@ pixel_y = 11 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "cVc" = ( @@ -5249,8 +5145,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "cWr" = ( @@ -5314,8 +5209,7 @@ /area/lv522/atmos/filt) "cXf" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "cXm" = ( @@ -5363,8 +5257,7 @@ /obj/structure/cargo_container/wy/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cYG" = ( @@ -5395,8 +5288,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "cZu" = ( @@ -5420,8 +5312,7 @@ /obj/structure/cargo_container/horizontal/blue/top, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "cZN" = ( @@ -5469,8 +5360,8 @@ }, /area/lv522/oob) "das" = ( -/obj/structure/machinery/landinglight/ds1/delaythree, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/plating, /area/lv522/landing_zone_1) "daz" = ( @@ -5490,16 +5381,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "daG" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "daL" = ( @@ -5520,8 +5409,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/central_streets) "dbi" = ( @@ -5663,17 +5551,16 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "ddq" = ( /obj/structure/surface/rack, /obj/item/device/analyzer, /obj/effect/landmark/objective_landmark/close, +/obj/item/stack/sandbags_empty/small_stack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "ddr" = ( @@ -5683,15 +5570,13 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ddy" = ( /turf/open/floor/prison{ dir = 1; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/atmos/cargo_intake) "ddC" = ( @@ -5848,8 +5733,7 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "dgq" = ( @@ -5869,8 +5753,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 1; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/atmos/cargo_intake) "dgO" = ( @@ -5943,8 +5826,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "dip" = ( @@ -5961,8 +5843,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "diT" = ( @@ -6101,8 +5982,7 @@ }, /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "dlM" = ( @@ -6132,8 +6012,7 @@ /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "dmx" = ( @@ -6202,8 +6081,7 @@ pixel_y = 26 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "dnA" = ( @@ -6327,8 +6205,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "dqr" = ( @@ -6361,8 +6238,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "drS" = ( @@ -6389,8 +6265,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "dsl" = ( @@ -6409,8 +6284,7 @@ /obj/item/stack/sheet/mineral/platinum, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "dsu" = ( @@ -6437,8 +6311,7 @@ /area/lv522/indoors/a_block/admin) "dsQ" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/hallway) @@ -6453,8 +6326,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "dtb" = ( @@ -6494,8 +6366,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "dua" = ( @@ -6572,8 +6443,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "dxl" = ( @@ -6590,12 +6460,10 @@ pixel_y = 16 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "dya" = ( @@ -6641,8 +6509,7 @@ /obj/item/paper, /obj/item/tool/pen/blue/clicky, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "dzv" = ( @@ -6686,8 +6553,7 @@ pixel_y = 10 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "dBb" = ( @@ -6709,8 +6575,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "dBd" = ( @@ -6727,8 +6592,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "dBo" = ( @@ -6766,8 +6630,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "dCY" = ( @@ -6797,8 +6660,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "dDC" = ( @@ -6836,12 +6698,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) -"dEu" = ( -/obj/structure/window/framed/strata/reinforced, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/dorm_north) "dEy" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/microwave{ @@ -6878,8 +6734,7 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "dEP" = ( @@ -6973,8 +6828,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "dGV" = ( @@ -7014,8 +6868,7 @@ /area/lv522/outdoors/colony_streets/north_street) "dHy" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red, /turf/open/floor/carpet, @@ -7070,8 +6923,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "dIG" = ( @@ -7085,8 +6937,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "dIK" = ( @@ -7113,18 +6964,15 @@ /area/lv522/atmos/east_reactor) "dJn" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "dJp" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "dJs" = ( @@ -7168,8 +7016,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "dKF" = ( @@ -7275,8 +7122,7 @@ "dMy" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "dMN" = ( @@ -7330,8 +7176,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security/glass) "dOa" = ( @@ -7348,8 +7193,7 @@ dir = 9 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/hydro) "dOI" = ( @@ -7361,8 +7205,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/shuttle/drop2/lv522) "dOK" = ( @@ -7413,8 +7256,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "dPP" = ( @@ -7440,8 +7282,7 @@ /area/lv522/atmos/east_reactor/west) "dQh" = ( /obj/structure/machinery/light{ - dir = 1; - tag = null + dir = 1 }, /obj/structure/machinery/disposal, /turf/open/floor/strata{ @@ -7488,8 +7329,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "dQQ" = ( @@ -7687,13 +7527,11 @@ "dWG" = ( /obj/structure/window/reinforced{ dir = 1; - layer = 3; - tag = null + layer = 3 }, /obj/structure/machinery/computer3/server/rack, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/indoors/c_block/mining) "dWT" = ( @@ -7789,8 +7627,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "dZs" = ( @@ -7830,8 +7667,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "dZP" = ( @@ -7859,22 +7695,19 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /obj/item/prop/alien/hugger, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "eai" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/outdoor) "eam" = ( @@ -7895,8 +7728,7 @@ "eaG" = ( /obj/structure/ore_box, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "ebn" = ( @@ -7919,20 +7751,6 @@ icon_state = "cement4" }, /area/lv522/outdoors/colony_streets/south_east_street) -"ebM" = ( -/obj/structure/blocker/invisible_wall, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null - }, -/area/lv522/atmos/cargo_intake) "ebP" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "2" @@ -7947,8 +7765,7 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "ecm" = ( @@ -7968,8 +7785,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "ecP" = ( @@ -8039,12 +7855,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) -"eeX" = ( -/obj/structure/blocker/invisible_wall, -/turf/open/asphalt/cement{ - icon_state = "cement1" - }, -/area/lv522/outdoors/n_rockies) "eeY" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/auto_turf/shale/layer0, @@ -8191,8 +8001,7 @@ /obj/structure/surface/table/almayer, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "egD" = ( @@ -8212,8 +8021,7 @@ pixel_y = 29 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "egP" = ( @@ -8315,8 +8123,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "ejN" = ( @@ -8350,8 +8157,7 @@ /area/lv522/oob) "ekO" = ( /obj/structure/bed/chair/wood/normal{ - dir = 8; - tag = null + dir = 8 }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) @@ -8366,8 +8172,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "elq" = ( @@ -8399,8 +8204,7 @@ /obj/structure/surface/table/almayer, /obj/item/clothing/suit/storage/CMB, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "emb" = ( @@ -8431,8 +8235,7 @@ /obj/structure/cargo_container/grant/rightmid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "emz" = ( @@ -8485,8 +8288,7 @@ "enD" = ( /obj/structure/curtain/red, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "enG" = ( @@ -8495,13 +8297,6 @@ icon_state = "browncorner" }, /area/lv522/atmos/north_command_centre) -"enJ" = ( -/obj/effect/decal/warning_stripes, -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1) "enP" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -8584,6 +8379,7 @@ /area/lv522/atmos/west_reactor) "epb" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -8647,8 +8443,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway/damage) "equ" = ( @@ -8662,8 +8457,7 @@ "eqE" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/nw_rockies) "eqM" = ( @@ -8693,8 +8487,7 @@ /obj/structure/cargo_container/watatsumi/rightmid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "erZ" = ( @@ -8734,8 +8527,7 @@ "esF" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "etn" = ( @@ -8829,8 +8621,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "evx" = ( @@ -8984,8 +8775,8 @@ }, /area/lv522/outdoors/colony_streets/central_streets) "eyy" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1, /turf/open/floor/plating, /area/lv522/landing_zone_1) "eyM" = ( @@ -9041,16 +8832,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ezH" = ( /obj/structure/cargo_container/watatsumi/rightmid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "ezU" = ( @@ -9224,8 +9013,7 @@ /obj/structure/machinery/light, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "eDL" = ( @@ -9235,8 +9023,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "eEv" = ( @@ -9328,8 +9115,7 @@ "eHu" = ( /obj/structure/closet/secure_closet/miner, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "eHy" = ( @@ -9346,8 +9132,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "eHF" = ( @@ -9357,8 +9142,7 @@ "eHI" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "eHR" = ( @@ -9382,16 +9166,14 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "eIk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "eIn" = ( @@ -9401,8 +9183,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "eIF" = ( @@ -9475,8 +9256,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "eKe" = ( @@ -9588,8 +9368,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "eMY" = ( @@ -9624,8 +9403,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "eOe" = ( @@ -9646,8 +9424,7 @@ }, /obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "eOl" = ( @@ -9656,8 +9433,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "eOn" = ( @@ -9686,8 +9462,7 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ePc" = ( @@ -9700,8 +9475,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ePl" = ( @@ -9760,8 +9534,7 @@ pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "eQY" = ( @@ -9771,8 +9544,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "eRg" = ( @@ -9825,8 +9597,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "eSQ" = ( @@ -9835,8 +9606,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "eSY" = ( @@ -9877,7 +9647,6 @@ }, /area/lv522/atmos/west_reactor) "eUf" = ( -/obj/structure/blocker/invisible_wall, /obj/item/ammo_magazine/m2c{ current_rounds = 0; layer = 4.2; @@ -9891,11 +9660,8 @@ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null - }, -/area/lv522/atmos/cargo_intake) +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "eUh" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) @@ -9934,8 +9700,7 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 28; - tag = null + pixel_y = 28 }, /turf/open/floor/plating{ icon_state = "platebot" @@ -9979,6 +9744,21 @@ icon_state = "plate" }, /area/lv522/atmos/east_reactor/east) +"eWF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/firstaid/adv{ + layer = 3.1; + pixel_x = 3; + pixel_y = -2 + }, +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv{ + pixel_y = 14 + }, +/turf/open/floor/prison{ + icon_state = "darkredfull2" + }, +/area/lv522/indoors/a_block/security) "eWK" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -10088,20 +9868,17 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "eZK" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "eZM" = ( /obj/structure/bed/chair/wood/normal{ - dir = 4; - tag = null + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -10139,8 +9916,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "faK" = ( @@ -10217,8 +9993,7 @@ "fcd" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "fcv" = ( @@ -10227,8 +10002,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fcV" = ( @@ -10285,8 +10059,7 @@ "fdT" = ( /obj/structure/closet/crate, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "fdZ" = ( @@ -10303,8 +10076,7 @@ /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "feF" = ( @@ -10318,8 +10090,7 @@ /area/lv522/atmos/east_reactor/west) "ffb" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "ffj" = ( @@ -10353,14 +10124,13 @@ /turf/open/floor/prison, /area/lv522/landing_zone_2) "fgf" = ( -/obj/structure/blocker/invisible_wall, /obj/item/ammo_magazine/m2c{ current_rounds = 0; layer = 4.2; pixel_x = 17 }, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/n_rockies) +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "fgk" = ( /obj/structure/platform_decoration{ dir = 1 @@ -10404,8 +10174,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "fhQ" = ( @@ -10422,8 +10191,7 @@ /obj/item/tool/pickaxe, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "fib" = ( @@ -10628,8 +10396,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fmL" = ( @@ -10702,8 +10469,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "foX" = ( @@ -10712,13 +10478,11 @@ pixel_y = 16 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "fpl" = ( @@ -10743,8 +10507,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "fpB" = ( @@ -10785,8 +10548,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "frc" = ( @@ -10899,8 +10661,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ftK" = ( @@ -10936,6 +10697,12 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"fuw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/auto_turf/shale/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) "fuQ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -11076,8 +10843,7 @@ "fxl" = ( /obj/vehicle/train/cargo/engine, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "fxq" = ( @@ -11121,8 +10887,7 @@ /obj/structure/barricade/wooden, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "fzf" = ( @@ -11260,8 +11025,8 @@ }, /area/lv522/outdoors/colony_streets/east_central_street) "fBL" = ( -/obj/structure/machinery/landinglight/ds1, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -11294,8 +11059,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen/glass) "fCE" = ( @@ -11325,8 +11089,7 @@ "fCU" = ( /obj/effect/decal/cleanable/blood{ desc = "Watch your step."; - icon_state = "gib6"; - tag = null + icon_state = "gib6" }, /turf/open/asphalt/cement{ icon_state = "cement12" @@ -11334,8 +11097,7 @@ /area/lv522/outdoors/colony_streets/south_west_street) "fCW" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "fDg" = ( @@ -11457,8 +11219,7 @@ pixel_y = 13 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fEY" = ( @@ -11590,15 +11351,13 @@ "fIr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "fIx" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "fII" = ( @@ -11692,7 +11451,6 @@ unacidable = 1; unslashable = 1 }, -/obj/structure/blocker/invisible_wall, /obj/effect/decal/warning_stripes{ icon_state = "W" }, @@ -11700,11 +11458,8 @@ icon_state = "E"; pixel_x = 1 }, -/turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null - }, -/area/lv522/atmos/cargo_intake) +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "fLF" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -11807,8 +11562,7 @@ pixel_y = 10 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "fMT" = ( @@ -11831,8 +11585,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "fOc" = ( @@ -11846,14 +11599,9 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) -"fOl" = ( -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/shale/layer0, -/area/lv522/outdoors/n_rockies) "fOy" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/cobweb, @@ -11871,8 +11619,7 @@ "fOX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "fPa" = ( @@ -11894,8 +11641,7 @@ /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "fPH" = ( @@ -11923,15 +11669,13 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fRc" = ( /obj/structure/machinery/mill, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "fRd" = ( @@ -11961,7 +11705,6 @@ /area/lv522/indoors/a_block/admin) "fRP" = ( /obj/structure/prop/vehicles/crawler{ - density = 1; layer = 3.3 }, /obj/structure/barricade/wooden{ @@ -11987,8 +11730,8 @@ }, /area/lv522/atmos/east_reactor/east) "fSo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -12004,8 +11747,7 @@ "fSv" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "fSR" = ( @@ -12015,8 +11757,7 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 12; - tag = null + pixel_y = 12 }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -12051,8 +11792,7 @@ icon_state = "p_stair_full" }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "fTs" = ( @@ -12127,8 +11867,7 @@ /obj/structure/closet, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "fVU" = ( @@ -12164,8 +11903,7 @@ /obj/structure/machinery/vending/snack, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "fXn" = ( @@ -12213,8 +11951,7 @@ "fXS" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "fXU" = ( @@ -12254,8 +11991,7 @@ /obj/item/clothing/glasses/meson, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "fYD" = ( @@ -12282,8 +12018,7 @@ "fZd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/t_comm) "fZy" = ( @@ -12304,8 +12039,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/mining) "gat" = ( @@ -12323,8 +12057,7 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "gaS" = ( @@ -12349,8 +12082,7 @@ /obj/structure/machinery/recharge_station, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "gbk" = ( @@ -12453,8 +12185,7 @@ /obj/structure/foamed_metal, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "gcO" = ( @@ -12568,8 +12299,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "geH" = ( @@ -12626,15 +12356,13 @@ "ggj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ggp" = ( /obj/structure/machinery/floodlight, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "ggH" = ( @@ -12693,8 +12421,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "ghy" = ( @@ -12767,8 +12494,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/t_comm) "gjV" = ( @@ -12813,8 +12539,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "gkY" = ( @@ -12895,15 +12620,13 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "gny" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges) "gnA" = ( @@ -12929,8 +12652,7 @@ "gou" = ( /turf/open/floor/prison{ dir = 9; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "goK" = ( @@ -12969,8 +12691,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "goT" = ( @@ -12984,8 +12705,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "gpp" = ( @@ -12994,8 +12714,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "gpu" = ( @@ -13138,8 +12857,7 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "gts" = ( @@ -13158,8 +12876,7 @@ pixel_y = 20 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "gug" = ( @@ -13202,8 +12919,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "guR" = ( @@ -13292,7 +13008,6 @@ /area/lv522/indoors/c_block/cargo) "gwR" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ - locked = 0; name = "\improper Marshal Office Holding Cell" }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -13315,7 +13030,7 @@ }, /area/lv522/atmos/command_centre) "gxe" = ( -/obj/item/stack/sandbags_empty/half, +/obj/item/stack/sandbags_empty/small_stack, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) "gxl" = ( @@ -13339,8 +13054,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "gxE" = ( @@ -13505,8 +13219,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "gCE" = ( @@ -13554,15 +13267,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen/glass) "gDA" = ( /obj/structure/platform, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "gDL" = ( @@ -13593,7 +13304,6 @@ "gEA" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 8; - locked = 0; name = "\improper Marshall Head Office" }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -13627,8 +13337,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "gES" = ( @@ -13705,8 +13414,7 @@ pixel_y = 18 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "gGk" = ( @@ -13789,8 +13497,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "gIa" = ( @@ -13858,8 +13565,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "gJM" = ( @@ -13869,8 +13575,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "gKg" = ( @@ -13956,6 +13661,7 @@ "gLV" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ density = 0; + layer = 3.5; pixel_y = 16 }, /obj/effect/decal/cleanable/dirt, @@ -14011,8 +13717,7 @@ /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "gNe" = ( @@ -14062,10 +13767,9 @@ /area/lv522/atmos/east_reactor) "gOC" = ( /obj/structure/pipes/vents/pump, -/obj/structure/surface/rack, -/obj/item/weapon/shield/riot, -/obj/item/weapon/classic_baton, /obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/ammo_box/magazine/shotgun/beanbag/empty, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -14148,8 +13852,7 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "gPQ" = ( @@ -14201,8 +13904,7 @@ "gRp" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "gRs" = ( @@ -14233,8 +13935,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "gRV" = ( @@ -14260,8 +13961,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "gTw" = ( @@ -14290,8 +13990,7 @@ /obj/structure/ore_box, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "gUi" = ( @@ -14332,8 +14031,7 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "gUQ" = ( @@ -14405,8 +14103,7 @@ "gWh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "gWq" = ( @@ -14422,8 +14119,7 @@ pixel_x = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "gWI" = ( @@ -14532,8 +14228,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "gYM" = ( @@ -14545,14 +14240,12 @@ /area/lv522/atmos/cargo_intake) "gYO" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "gYT" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/command_centre) @@ -14580,8 +14273,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "gZh" = ( @@ -14605,8 +14297,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "gZL" = ( @@ -14626,8 +14317,8 @@ }, /area/lv522/indoors/b_block/bridge) "haf" = ( -/obj/structure/machinery/landinglight/ds1, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/floor/plating, /area/lv522/landing_zone_1) "hag" = ( @@ -14639,8 +14330,7 @@ /area/lv522/indoors/a_block/admin) "hai" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ icon_state = "plate" @@ -14728,8 +14418,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "hbu" = ( @@ -14742,15 +14431,13 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "hbF" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 9; @@ -14792,8 +14479,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "hcx" = ( @@ -14848,8 +14534,7 @@ "hdq" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "hds" = ( @@ -14904,8 +14589,7 @@ "heC" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "heF" = ( @@ -15081,8 +14765,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "hiB" = ( @@ -15169,8 +14852,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "hku" = ( @@ -15193,8 +14875,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "hkw" = ( @@ -15295,8 +14976,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/binoculars, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "hlH" = ( @@ -15378,8 +15058,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "hnD" = ( @@ -15446,8 +15125,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "hoZ" = ( @@ -15465,8 +15143,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "hpq" = ( @@ -15483,8 +15160,7 @@ "hpH" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "hpO" = ( @@ -15523,17 +15199,15 @@ icon_state = "browncorner" }, /area/lv522/atmos/command_centre) -"hqY" = ( -/obj/effect/decal/warning_stripes, -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1) "hqZ" = ( /obj/structure/bed/chair/wheelchair, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"hra" = ( +/obj/structure/largecrate/random, +/obj/item/stack/sandbags_empty/small_stack, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "hre" = ( /obj/structure/flora/jungle/planttop1, /turf/open/organic/grass, @@ -15550,8 +15224,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "hry" = ( @@ -15566,8 +15239,7 @@ "hrU" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "hsh" = ( @@ -15580,8 +15252,7 @@ /obj/structure/machinery/floodlight, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "hsA" = ( @@ -15598,8 +15269,7 @@ }, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/admin) "htu" = ( @@ -15662,8 +15332,7 @@ "huF" = ( /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "huN" = ( @@ -15806,8 +15475,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "hyE" = ( @@ -15833,15 +15501,13 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "hzc" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "hzk" = ( @@ -15863,8 +15529,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "hzA" = ( @@ -15885,8 +15550,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "hzO" = ( @@ -15980,8 +15644,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "hAK" = ( @@ -15994,8 +15657,7 @@ /obj/item/weapon/gun/boltaction, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "hBf" = ( @@ -16013,8 +15675,7 @@ /obj/structure/dispenser/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "hBB" = ( @@ -16141,8 +15802,7 @@ /area/lv522/indoors/c_block/mining) "hFm" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin4"; - tag = null + icon_state = "rasputin4" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "hFu" = ( @@ -16154,8 +15814,7 @@ "hFG" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "hFL" = ( @@ -16211,8 +15870,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "hHN" = ( @@ -16230,8 +15888,7 @@ /area/lv522/atmos/command_centre) "hIf" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "hIp" = ( @@ -16252,8 +15909,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "hID" = ( @@ -16287,8 +15943,7 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "hJq" = ( @@ -16327,8 +15982,7 @@ /obj/item/explosive/plastic, /obj/item/explosive/plastic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "hJZ" = ( @@ -16348,15 +16002,13 @@ /obj/item/trash/ceramic_plate, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "hKy" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "hKz" = ( @@ -16395,8 +16047,7 @@ layer = 3.1; name = "synthethic potted plant"; pixel_x = -2; - pixel_y = 10; - tag = null + pixel_y = 10 }, /turf/open/floor/prison{ dir = 9; @@ -16409,8 +16060,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "hLl" = ( @@ -16420,8 +16070,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "hLm" = ( @@ -16475,8 +16124,7 @@ /obj/item/clothing/glasses/kutjevo, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "hMz" = ( @@ -16567,8 +16215,7 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "hOl" = ( @@ -16699,8 +16346,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "hQE" = ( @@ -16753,8 +16399,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "hRG" = ( @@ -16796,13 +16441,11 @@ "hTd" = ( /obj/structure/window/reinforced{ dir = 1; - layer = 3; - tag = null + layer = 3 }, /obj/structure/machinery/computer3/server/rack, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/command_centre) "hTe" = ( @@ -16849,8 +16492,7 @@ pixel_x = -4 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hTW" = ( @@ -16878,8 +16520,7 @@ /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "hUq" = ( @@ -16888,8 +16529,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "hUM" = ( @@ -16915,8 +16555,7 @@ }, /obj/structure/prop/almayer/computers/sensor_computer1, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hUZ" = ( @@ -16941,8 +16580,7 @@ "hVk" = ( /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hVu" = ( @@ -16995,8 +16633,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/casino) "hWV" = ( @@ -17088,14 +16725,12 @@ name = "weak acid" }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hYf" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "hYk" = ( @@ -17104,8 +16739,7 @@ }, /obj/item/stack/sheet/metal, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hYn" = ( @@ -17160,8 +16794,7 @@ pixel_x = -4 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hZK" = ( @@ -17172,14 +16805,12 @@ pixel_x = -16 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "hZL" = ( /obj/structure/bed/chair/wood/normal{ - dir = 4; - tag = null + dir = 4 }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17213,8 +16844,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "iam" = ( @@ -17316,8 +16946,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "idq" = ( @@ -17365,8 +16994,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "iel" = ( @@ -17378,8 +17006,7 @@ /area/lv522/oob) "ier" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 9; @@ -17391,9 +17018,10 @@ dir = 6 }, /obj/structure/prop/vehicles/crawler{ + density = 0; dir = 8; - layer = 2.9; - pixel_y = -14 + layer = 2.0; + pixel_y = -13 }, /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/nw_rockies) @@ -17450,8 +17078,7 @@ /area/lv522/outdoors/colony_streets/north_east_street) "igp" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 1; @@ -17519,8 +17146,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "ihy" = ( @@ -17537,19 +17163,9 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) -"iiz" = ( -/obj/structure/window/framed/strata/reinforced, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "Sec-Corpo-Bridge-Lockdown" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/security) "iiC" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/wy{ @@ -17628,8 +17244,7 @@ /area/lv522/indoors/a_block/corpo/glass) "ijJ" = ( /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /obj/structure/machinery/disposal, /turf/open/floor/strata{ @@ -17736,8 +17351,7 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "imh" = ( @@ -17764,8 +17378,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "imT" = ( @@ -17824,8 +17437,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "ipf" = ( @@ -17934,8 +17546,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "irx" = ( @@ -17970,16 +17581,14 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "iso" = ( /obj/structure/cargo_container/lockmart/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "iss" = ( @@ -18020,8 +17629,7 @@ "isG" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "iti" = ( @@ -18097,8 +17705,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "iuv" = ( @@ -18152,8 +17759,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ivk" = ( @@ -18187,8 +17793,7 @@ pixel_y = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "iwb" = ( @@ -18297,8 +17902,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "iyC" = ( @@ -18349,8 +17953,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/garage) "izz" = ( @@ -18387,12 +17990,11 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "iAZ" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/green, +/obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) "iBd" = ( @@ -18422,8 +18024,7 @@ /obj/item/clothing/under/overalls, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "iBr" = ( @@ -18452,8 +18053,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "iBY" = ( @@ -18487,8 +18087,7 @@ /obj/effect/landmark/survivor_spawner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "iCR" = ( @@ -18509,8 +18108,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "iDg" = ( @@ -18551,8 +18149,7 @@ /obj/structure/cargo_container/lockmart/mid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "iFB" = ( @@ -18566,16 +18163,14 @@ /obj/item/explosive/mine/active, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "iFO" = ( /obj/structure/surface/rack, /obj/item/clothing/under/colonist, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "iFV" = ( @@ -18616,8 +18211,7 @@ "iGr" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "iGD" = ( @@ -18650,8 +18244,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "iGM" = ( @@ -18694,8 +18287,7 @@ name = "inventory computer" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "iHw" = ( @@ -18958,8 +18550,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "iMS" = ( @@ -18976,8 +18567,7 @@ /obj/structure/machinery/space_heater, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "iNb" = ( @@ -19005,8 +18595,7 @@ "iNX" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security/glass) "iOi" = ( @@ -19062,8 +18651,7 @@ /obj/structure/cargo_container/lockmart/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "iPu" = ( @@ -19177,8 +18765,7 @@ /area/lv522/atmos/east_reactor) "iSc" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ dir = 5; @@ -19191,8 +18778,7 @@ /area/lv522/outdoors/colony_streets/north_west_street) "iSu" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin8"; - tag = null + icon_state = "rasputin8" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "iSF" = ( @@ -19213,9 +18799,7 @@ }, /area/lv522/indoors/c_block/mining) "iTn" = ( -/obj/structure/bed/chair/comfy{ - tag = null - }, +/obj/structure/bed/chair/comfy, /turf/open/floor/corsat{ dir = 10; icon_state = "brown" @@ -19250,16 +18834,14 @@ /obj/structure/surface/rack, /obj/item/clothing/suit/storage/hazardvest, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "iUj" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "iUk" = ( @@ -19274,8 +18856,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 6; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "iUT" = ( @@ -19307,9 +18888,7 @@ }, /area/lv522/indoors/a_block/hallway) "iVk" = ( -/obj/structure/bed/chair/comfy{ - tag = null - }, +/obj/structure/bed/chair/comfy, /turf/open/floor/corsat{ dir = 6; icon_state = "brown" @@ -19331,8 +18910,7 @@ pixel_x = 6 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/indoors/a_block/admin) "iVU" = ( @@ -19362,8 +18940,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "iWh" = ( @@ -19383,8 +18960,7 @@ /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "iWu" = ( @@ -19393,8 +18969,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "iWy" = ( @@ -19543,7 +19118,7 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "jab" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ @@ -19628,15 +19203,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jbm" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jbn" = ( @@ -19650,7 +19223,7 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "jbs" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -19687,8 +19260,7 @@ /area/lv522/outdoors/nw_rockies) "jbO" = ( /obj/structure/pipes/standard/simple/visible{ - dir = 6; - tag = null + dir = 6 }, /turf/open/floor/strata{ icon_state = "white_cyan3" @@ -19728,8 +19300,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "jdf" = ( @@ -19737,8 +19308,7 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/t_comm) "jdl" = ( @@ -19757,8 +19327,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "jdq" = ( @@ -19804,8 +19373,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "jey" = ( @@ -19828,8 +19396,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "jeI" = ( @@ -19843,8 +19410,7 @@ "jeJ" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "jft" = ( @@ -19881,8 +19447,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "jgV" = ( @@ -19905,8 +19470,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "jhl" = ( @@ -19916,7 +19480,6 @@ /area/lv522/indoors/a_block/dorms) "jhp" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ - icon_state = "closed"; layer = 2.1 }, /obj/structure/barricade/handrail{ @@ -19975,8 +19538,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "jis" = ( @@ -19985,8 +19547,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "jix" = ( @@ -20000,8 +19561,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "jiF" = ( @@ -20062,8 +19622,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "jjo" = ( @@ -20172,8 +19731,7 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "jlc" = ( @@ -20231,15 +19789,14 @@ pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jmd" = ( -/obj/item/weapon/shield/riot, -/obj/item/weapon/classic_baton, -/obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, +/obj/structure/surface/rack, +/obj/item/weapon/gun/revolver/cmb, +/obj/item/ammo_magazine/revolver/cmb, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -20291,8 +19848,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "jnb" = ( @@ -20332,8 +19888,7 @@ /obj/structure/machinery/floodlight, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jnB" = ( @@ -20398,8 +19953,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "jpa" = ( @@ -20482,8 +20036,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jru" = ( @@ -20527,8 +20080,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "jrL" = ( @@ -20540,8 +20092,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "jrT" = ( @@ -20619,8 +20170,7 @@ "jub" = ( /obj/structure/machinery/floodlight, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jud" = ( @@ -20628,8 +20178,7 @@ dir = 1 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/indoors/a_block/admin) "jur" = ( @@ -20719,8 +20268,7 @@ "jvG" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "jwM" = ( @@ -20810,8 +20358,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "jyF" = ( @@ -20820,8 +20367,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jyM" = ( @@ -20921,7 +20467,7 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "jBs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20938,8 +20484,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "jBw" = ( @@ -21004,8 +20549,7 @@ /area/lv522/landing_zone_1/tunnel) "jCq" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ icon_state = "squares" @@ -21090,7 +20634,7 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "jEk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -21161,8 +20705,7 @@ /area/lv522/atmos/east_reactor/south) "jFu" = ( /obj/structure/morgue{ - dir = 8; - tag = null + dir = 8 }, /turf/open/floor/strata{ dir = 4; @@ -21173,8 +20716,7 @@ /obj/structure/machinery/space_heater, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "jFG" = ( @@ -21206,13 +20748,13 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) "jGj" = ( -/obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, -/obj/item/ammo_magazine/revolver/cmb, -/turf/open/floor/prison{ - icon_state = "darkredfull2" +/obj/effect/decal/cleanable/dirt, +/obj/item/maintenance_jack, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan1" }, -/area/lv522/indoors/a_block/security) +/area/lv522/indoors/a_block/corpo) "jGm" = ( /obj/structure/barricade/handrail{ dir = 4 @@ -21249,8 +20791,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jHy" = ( @@ -21294,15 +20835,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jII" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/n_rockies) "jIQ" = ( @@ -21342,8 +20881,7 @@ pixel_y = 27 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "jJi" = ( @@ -21389,8 +20927,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "jKm" = ( @@ -21435,8 +20972,7 @@ "jLk" = ( /obj/structure/cargo_container/wy/left, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "jLD" = ( @@ -21445,8 +20981,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "jLF" = ( @@ -21522,8 +21057,7 @@ "jNk" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Westlock"; - welded = null + name = "\improper Westlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -21544,8 +21078,7 @@ layer = 3.1; name = "synthethic potted plant"; pixel_x = -2; - pixel_y = 16; - tag = null + pixel_y = 16 }, /turf/open/floor/prison{ dir = 1; @@ -21583,8 +21116,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jOw" = ( @@ -21649,8 +21181,7 @@ }, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jPk" = ( @@ -21686,8 +21217,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/engineering) "jQa" = ( @@ -21748,16 +21278,14 @@ /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jSG" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/engineering) "jSR" = ( @@ -21806,8 +21334,7 @@ "jTr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "jTx" = ( @@ -21840,8 +21367,7 @@ "jTJ" = ( /obj/structure/cargo_container/watatsumi/leftmid, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "jTS" = ( @@ -21849,8 +21375,7 @@ /obj/item/circuitboard/apc, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "jUe" = ( @@ -21859,11 +21384,14 @@ }, /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) +"jUg" = ( +/obj/item/ammo_box/magazine/l42a/ap/empty, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/security) "jUk" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jUn" = ( @@ -21878,24 +21406,21 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "jUy" = ( /obj/structure/machinery/power/port_gen/pacman/super, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "jUI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "jUO" = ( @@ -21946,8 +21471,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "jVC" = ( @@ -22015,8 +21539,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "jXc" = ( @@ -22051,8 +21574,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "jYr" = ( @@ -22114,8 +21636,7 @@ /obj/structure/cargo_container/watatsumi/leftmid, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "jZo" = ( @@ -22127,8 +21648,7 @@ "jZA" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "jZD" = ( @@ -22324,8 +21844,7 @@ /area/lv522/landing_zone_2) "kcS" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kdi" = ( @@ -22337,8 +21856,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "kdm" = ( @@ -22364,8 +21882,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "kdx" = ( @@ -22427,8 +21944,7 @@ /obj/structure/closet/toolcloset, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "kfq" = ( @@ -22444,8 +21960,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "kfu" = ( @@ -22536,8 +22051,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "khd" = ( @@ -22547,8 +22061,7 @@ /obj/structure/prop/server_equipment, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "kho" = ( @@ -22606,8 +22119,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "kih" = ( @@ -22642,8 +22154,7 @@ icon_state = "medium" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "kiG" = ( @@ -22671,8 +22182,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kiY" = ( @@ -22686,8 +22196,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "kjj" = ( @@ -22754,20 +22263,17 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kkP" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "kkS" = ( @@ -22789,8 +22295,7 @@ "klj" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/atmos/outdoor) "kll" = ( @@ -22805,8 +22310,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "klx" = ( @@ -22893,9 +22397,15 @@ /obj/structure/platform_decoration{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "kmH" = ( @@ -22931,8 +22441,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kne" = ( @@ -22965,8 +22474,7 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "knS" = ( @@ -23012,8 +22520,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "koG" = ( @@ -23021,8 +22528,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/corpo) "koM" = ( @@ -23054,8 +22560,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "kpB" = ( @@ -23178,8 +22683,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ksf" = ( @@ -23223,8 +22727,7 @@ }, /obj/structure/platform_decoration{ dir = 10; - layer = 3.51; - tag = null + layer = 3.51 }, /turf/open/floor/plating, /area/lv522/oob) @@ -23268,8 +22771,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/camera, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "kup" = ( @@ -23320,8 +22822,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kwc" = ( @@ -23350,8 +22851,7 @@ }, /obj/structure/platform_decoration{ dir = 6; - layer = 3.51; - tag = null + layer = 3.51 }, /turf/open/floor/plating, /area/lv522/oob) @@ -23400,16 +22900,14 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "kxW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "kyb" = ( @@ -23476,7 +22974,7 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "kze" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ @@ -23525,8 +23023,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "kAj" = ( @@ -23641,8 +23138,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "kCf" = ( @@ -23654,8 +23150,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "kCC" = ( @@ -23667,8 +23162,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "kCD" = ( @@ -23711,15 +23205,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kDH" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kDQ" = ( @@ -23762,8 +23254,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "kEl" = ( @@ -23914,7 +23405,7 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "kHy" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/flashbangs{ @@ -23967,8 +23458,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "kIj" = ( @@ -23984,8 +23474,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "kIM" = ( @@ -24015,7 +23504,7 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "kIZ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -24037,8 +23526,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kJh" = ( @@ -24064,8 +23552,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "kKc" = ( @@ -24113,8 +23600,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kLk" = ( @@ -24125,7 +23611,7 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "kLs" = ( /obj/item/clothing/mask/facehugger{ desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; @@ -24215,8 +23701,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "kNL" = ( @@ -24224,8 +23709,7 @@ /obj/item/clothing/gloves/yellow, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "kNM" = ( @@ -24243,8 +23727,7 @@ /obj/structure/closet/crate/explosives, /obj/item/storage/box/explosive_mines, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "kOa" = ( @@ -24260,16 +23743,14 @@ pixel_y = -9 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "kOz" = ( /obj/structure/machinery/vending/cigarette/colony, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kOE" = ( @@ -24312,8 +23793,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "kPG" = ( @@ -24350,8 +23830,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "kPV" = ( @@ -24360,15 +23839,13 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kQc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kQw" = ( @@ -24506,8 +23983,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "kRZ" = ( @@ -24525,8 +24001,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "kSm" = ( @@ -24574,8 +24049,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "kSZ" = ( @@ -24604,8 +24078,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security/glass) "kTn" = ( @@ -24618,8 +24091,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "kTF" = ( @@ -24640,15 +24112,13 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "kUf" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "kUo" = ( @@ -24711,8 +24181,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "kVG" = ( @@ -24757,8 +24226,7 @@ /obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kWp" = ( @@ -24789,20 +24257,17 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "kXa" = ( /obj/structure/window/reinforced{ dir = 1; - layer = 3; - tag = null + layer = 3 }, /obj/structure/machinery/computer3/server/rack, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor/south) "kXc" = ( @@ -24855,7 +24320,7 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "kYm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -24886,8 +24351,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "kYM" = ( @@ -24997,8 +24461,7 @@ icon_state = "medium" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lbo" = ( @@ -25013,7 +24476,7 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "lbA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -25046,8 +24509,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/atmos/outdoor) "lcK" = ( @@ -25082,8 +24544,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ldg" = ( @@ -25091,8 +24552,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ldu" = ( @@ -25135,8 +24595,7 @@ "leg" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "leh" = ( @@ -25150,15 +24609,13 @@ "lek" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "lel" = ( /obj/structure/machinery/floodlight, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "lep" = ( @@ -25185,8 +24642,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "leO" = ( @@ -25257,8 +24713,7 @@ /obj/effect/decal/cleanable/blood/xeno, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "lhC" = ( @@ -25279,8 +24734,7 @@ /obj/structure/cargo_container/hd/left/alt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "lhI" = ( @@ -25289,8 +24743,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "lhK" = ( @@ -25309,16 +24762,14 @@ /area/lv522/indoors/a_block/medical) "lhT" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "liD" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/cargo_intake) "liN" = ( @@ -25399,8 +24850,7 @@ /obj/effect/decal/cleanable/blood/drip, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen) "llJ" = ( @@ -25412,7 +24862,7 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "llM" = ( /obj/item/tool/kitchen/knife/butcher, /obj/effect/decal/cleanable/dirt, @@ -25453,8 +24903,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "lmu" = ( @@ -25478,8 +24927,7 @@ /obj/item/folder/black_random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lmF" = ( @@ -25498,8 +24946,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "lmJ" = ( @@ -25546,8 +24993,7 @@ /obj/structure/surface/table/almayer, /obj/item/ore/gold, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lnL" = ( @@ -25617,8 +25063,7 @@ /obj/structure/cargo_container/watatsumi/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "lpH" = ( @@ -25671,8 +25116,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "lrG" = ( @@ -25713,6 +25157,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"lsG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/auto_turf/shale/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) "lsR" = ( /obj/structure/fence{ layer = 2.9 @@ -25725,8 +25176,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "ltf" = ( @@ -25750,8 +25200,7 @@ /area/lv522/indoors/a_block/dorms) "ltI" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Westlock"; - welded = null + name = "\improper Westlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -25813,8 +25262,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "lvX" = ( @@ -25854,8 +25302,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lwW" = ( @@ -25890,8 +25337,7 @@ /obj/structure/surface/table/almayer, /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "lxI" = ( @@ -25949,15 +25395,14 @@ dir = 4; icon_state = "white_cyan1" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "lze" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "lzk" = ( @@ -25986,8 +25431,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2/dynamic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "lzB" = ( @@ -26022,8 +25466,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "lAj" = ( @@ -26032,8 +25475,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "lAk" = ( @@ -26053,8 +25495,7 @@ /area/lv522/indoors/a_block/fitness/glass) "lAn" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "lAD" = ( @@ -26077,8 +25518,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lBl" = ( @@ -26168,8 +25608,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "lDc" = ( @@ -26242,14 +25681,12 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lEF" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "lER" = ( @@ -26289,8 +25726,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "lGx" = ( @@ -26385,8 +25821,7 @@ "lHH" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "lHL" = ( @@ -26416,8 +25851,7 @@ "lId" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "lIB" = ( @@ -26441,7 +25875,7 @@ /turf/open/floor/corsat{ icon_state = "marked" }, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "lIR" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 @@ -26484,8 +25918,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "lKl" = ( @@ -26504,8 +25937,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "lKC" = ( @@ -26522,8 +25954,7 @@ /obj/effect/landmark/survivor_spawner/lv522_forecon_marksman, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/admin) "lKH" = ( @@ -26547,8 +25978,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "lMH" = ( @@ -26592,7 +26022,6 @@ "lNb" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 8; - locked = 0; name = "\improper Wildcatters Office"; panel_open = 1 }, @@ -26706,8 +26135,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "lPY" = ( @@ -26747,8 +26175,7 @@ pixel_y = 3 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "lRF" = ( @@ -26843,14 +26270,19 @@ /obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) +"lUh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_west_street) "lUi" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26946,8 +26378,7 @@ "lVV" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "lVY" = ( @@ -26956,8 +26387,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "lVZ" = ( @@ -27047,8 +26477,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "lYR" = ( @@ -27279,8 +26708,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "mdD" = ( @@ -27317,8 +26745,7 @@ /area/lv522/atmos/filt) "meq" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "mev" = ( @@ -27439,8 +26866,7 @@ "miW" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "miZ" = ( @@ -27452,7 +26878,6 @@ /area/lv522/outdoors/colony_streets/south_east_street) "mji" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - locked = 0; name = "\improper Corporation Dome"; req_access_txt = "100" }, @@ -27494,8 +26919,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "mjT" = ( @@ -27586,8 +27010,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mlE" = ( @@ -27615,8 +27038,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mlQ" = ( @@ -27663,8 +27085,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mmw" = ( @@ -27721,19 +27142,30 @@ /obj/structure/platform_decoration{ dir = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "mnN" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) +"mnU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/l42a/extended{ + current_rounds = 0 + }, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/security/glass) "mnX" = ( /obj/item/weapon/gun/rifle/m41a{ current_mag = null @@ -28054,8 +27486,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "mwp" = ( @@ -28065,7 +27496,7 @@ "mwv" = ( /obj/effect/landmark/lv624/fog_blocker/short, /turf/closed/wall/strata_outpost/reinforced, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "mwT" = ( /obj/structure/prop/dam/truck, /obj/structure/prop/holidays/wreath{ @@ -28090,8 +27521,7 @@ /obj/item/tool/pickaxe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "mxp" = ( @@ -28107,8 +27537,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/c_block/cargo) "mxz" = ( @@ -28150,8 +27579,7 @@ "myC" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "myE" = ( @@ -28241,8 +27669,7 @@ /area/lv522/outdoors/nw_rockies) "mBc" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -28273,8 +27700,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "mCq" = ( @@ -28335,8 +27761,7 @@ /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "mEx" = ( @@ -28361,8 +27786,7 @@ /obj/structure/cargo_container/grant/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "mFm" = ( @@ -28412,8 +27836,7 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/nw_rockies) "mGN" = ( @@ -28433,8 +27856,7 @@ "mHa" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "mHo" = ( @@ -28482,8 +27904,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "mIU" = ( @@ -28578,8 +27999,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "mKN" = ( @@ -28596,8 +28016,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "mLp" = ( @@ -28669,8 +28088,7 @@ "mMQ" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "mMU" = ( @@ -28703,8 +28121,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mNy" = ( @@ -28829,8 +28246,7 @@ }, /obj/structure/foamed_metal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "mPc" = ( @@ -28852,8 +28268,7 @@ "mPy" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "mPz" = ( @@ -28871,13 +28286,11 @@ "mPL" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "mPQ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - locked = 0; welded = 1 }, /obj/structure/pipes/standard/simple/hidden/green, @@ -28926,8 +28339,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "mQo" = ( @@ -28945,8 +28357,7 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ dir = 5; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "mQw" = ( @@ -29010,7 +28421,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /obj/effect/landmark/lv624/fog_blocker/short, /turf/closed/wall/strata_outpost/reinforced, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "mSe" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) @@ -29038,8 +28449,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "mTd" = ( @@ -29051,8 +28461,7 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/outdoor) "mTx" = ( @@ -29137,9 +28546,15 @@ /area/lv522/outdoors/colony_streets/south_east_street) "mUG" = ( /obj/structure/platform_decoration, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "mUS" = ( @@ -29157,9 +28572,12 @@ /area/lv522/indoors/a_block/kitchen) "mVi" = ( /obj/structure/platform, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "mVj" = ( @@ -29205,8 +28623,7 @@ "mVH" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "mWc" = ( @@ -29220,8 +28637,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "mWw" = ( @@ -29242,8 +28658,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "mXn" = ( @@ -29310,8 +28725,7 @@ "mZE" = ( /obj/structure/foamed_metal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "mZJ" = ( @@ -29369,8 +28783,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "naw" = ( @@ -29378,8 +28791,7 @@ current_rounds = 0 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "nax" = ( @@ -29417,8 +28829,8 @@ }, /area/lv522/indoors/a_block/hallway) "naS" = ( -/obj/structure/machinery/landinglight/ds1/delayone, /obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/floor/plating, /area/lv522/landing_zone_1) "naZ" = ( @@ -29442,8 +28854,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "nbj" = ( @@ -29458,8 +28869,7 @@ }, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/admin) "nbn" = ( @@ -29527,8 +28937,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "ncA" = ( @@ -29546,8 +28955,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "ndb" = ( @@ -29603,8 +29011,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "neO" = ( @@ -29650,8 +29057,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "nfm" = ( @@ -29708,9 +29114,11 @@ /obj/structure/platform{ dir = 4 }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "ngL" = ( @@ -29729,10 +29137,10 @@ /turf/open/floor/plating, /area/lv522/atmos/filt) "nhi" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 }, -/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1) "nhs" = ( @@ -29791,8 +29199,7 @@ "niE" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "niL" = ( @@ -29832,8 +29239,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "njW" = ( @@ -29892,8 +29298,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "nlz" = ( @@ -29940,8 +29345,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nlV" = ( @@ -30166,8 +29570,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "npT" = ( @@ -30200,8 +29603,7 @@ "nqw" = ( /obj/structure/girder, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "nqy" = ( @@ -30251,8 +29653,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nrh" = ( @@ -30269,8 +29670,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nru" = ( @@ -30287,8 +29687,7 @@ /obj/structure/surface/rack, /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "nrJ" = ( @@ -30343,8 +29742,7 @@ "nti" = ( /obj/structure/bed/chair, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "ntq" = ( @@ -30494,8 +29892,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nwR" = ( @@ -30515,8 +29912,7 @@ /obj/structure/platform_decoration, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "nxj" = ( @@ -30555,8 +29951,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "nyJ" = ( @@ -30572,8 +29967,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/radio, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nzt" = ( @@ -30599,8 +29993,7 @@ "nzU" = ( /obj/structure/barricade/deployable, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "nzZ" = ( @@ -30844,21 +30237,18 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nHi" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "nHA" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "nHT" = ( @@ -30938,8 +30328,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "nKk" = ( @@ -30956,21 +30345,14 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_street) "nKo" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/door_control/brbutton/alt{ - id = "Secure_Master_Armoury"; - name = "remote door-control" - }, -/obj/item/limb/hand/l_hand{ - dir = 1; - pixel_x = 9; - pixel_y = 3 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - icon_state = "darkredfull2" +/obj/item/weapon/gun/rifle/l42a{ + current_mag = null }, -/area/lv522/indoors/a_block/security) +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/a_block/security/glass) "nKK" = ( /obj/structure/platform{ dir = 8 @@ -31031,8 +30413,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nLW" = ( @@ -31054,13 +30435,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "nMt" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, +/obj/item/ammo_box/magazine/l42a, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -31081,8 +30462,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nMC" = ( @@ -31093,8 +30473,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nMP" = ( @@ -31124,8 +30503,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nNh" = ( @@ -31152,8 +30530,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nNA" = ( @@ -31162,8 +30539,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "nNH" = ( @@ -31214,8 +30590,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nOl" = ( @@ -31228,8 +30603,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "nOB" = ( @@ -31240,8 +30614,7 @@ /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "nOS" = ( @@ -31256,8 +30629,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "nOT" = ( @@ -31299,8 +30671,7 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /turf/open/floor/prison{ icon_state = "darkredfull2" @@ -31384,8 +30755,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nRJ" = ( @@ -31484,6 +30854,7 @@ /area/lv522/indoors/a_block/dorm_north) "nTl" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ icon_state = "plate" }, @@ -31566,8 +30937,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "nVh" = ( @@ -31604,16 +30974,14 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "nVW" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/fence, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/outdoor) "nVX" = ( @@ -31621,8 +30989,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "nWl" = ( @@ -31638,8 +31005,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nWp" = ( @@ -31658,8 +31024,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "nWq" = ( @@ -31714,8 +31079,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "nXi" = ( @@ -31728,8 +31092,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "nXl" = ( @@ -31780,8 +31143,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "nXO" = ( @@ -31809,8 +31171,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/c_block/cargo) "nYv" = ( @@ -31840,8 +31201,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "nYU" = ( @@ -31889,14 +31249,12 @@ /obj/item/ore/uranium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "nZF" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "oaa" = ( @@ -31917,8 +31275,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/central_streets) "oaq" = ( @@ -31984,8 +31341,7 @@ /obj/structure/machinery/telecomms/bus/preset_one, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "oce" = ( @@ -32020,8 +31376,7 @@ "odi" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "odt" = ( @@ -32070,8 +31425,7 @@ "odZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "oem" = ( @@ -32128,8 +31482,7 @@ }, /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oeN" = ( @@ -32168,8 +31521,7 @@ "ofy" = ( /obj/structure/bed/chair/wood/normal{ dir = 4; - pixel_x = -9; - tag = null + pixel_x = -9 }, /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/central_streets) @@ -32183,8 +31535,7 @@ /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "ofX" = ( @@ -32206,23 +31557,20 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oga" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "ogf" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "ogA" = ( @@ -32324,8 +31672,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "ohX" = ( @@ -32390,8 +31737,7 @@ /obj/structure/prop/turbine_extras/border, /obj/structure/prop/turbine, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "oiP" = ( @@ -32407,8 +31753,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "oiW" = ( @@ -32468,8 +31813,7 @@ icon_state = "medium" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ojy" = ( @@ -32483,8 +31827,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "okA" = ( @@ -32514,8 +31857,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "olz" = ( @@ -32604,15 +31946,13 @@ "oot" = ( /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "oow" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "ooG" = ( @@ -32680,8 +32020,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "oqp" = ( @@ -32740,8 +32079,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "ora" = ( @@ -32751,8 +32089,7 @@ layer = 3.1; name = "synthethic potted plant"; pixel_x = -17; - pixel_y = 9; - tag = null + pixel_y = 9 }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) @@ -32820,8 +32157,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "osN" = ( @@ -32833,16 +32169,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "osV" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "ote" = ( @@ -32944,8 +32278,7 @@ "ouI" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "ouO" = ( @@ -33038,8 +32371,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "oyf" = ( @@ -33115,8 +32447,7 @@ "ozw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "ozF" = ( @@ -33188,8 +32519,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oBf" = ( @@ -33243,8 +32573,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "oCt" = ( @@ -33280,8 +32609,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "oEw" = ( @@ -33334,8 +32662,7 @@ "oFU" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "oGl" = ( @@ -33345,15 +32672,13 @@ /obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/kitchen/damage) "oGp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "oGE" = ( @@ -33375,8 +32700,7 @@ pixel_y = -7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oGY" = ( @@ -33385,8 +32709,7 @@ pixel_y = 26 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oGZ" = ( @@ -33401,8 +32724,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "oHl" = ( @@ -33421,8 +32743,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "oHB" = ( @@ -33445,8 +32766,7 @@ "oIr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms/glass) "oIu" = ( @@ -33468,8 +32788,7 @@ "oIP" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oJj" = ( @@ -33505,8 +32824,7 @@ pixel_y = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oJQ" = ( @@ -33553,8 +32871,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oKG" = ( @@ -33587,8 +32904,7 @@ /obj/structure/machinery/autolathe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oKQ" = ( @@ -33703,8 +33019,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "oNe" = ( @@ -33725,15 +33040,13 @@ /obj/effect/decal/cleanable/dirt, /obj/item/storage/firstaid/adv/empty, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "oNM" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "oNQ" = ( @@ -33763,8 +33076,7 @@ /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "oPs" = ( @@ -33806,8 +33118,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "oQs" = ( @@ -33848,15 +33159,13 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "oRr" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "oRt" = ( @@ -33867,8 +33176,7 @@ /obj/structure/machinery/light, /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oRG" = ( @@ -33918,8 +33226,7 @@ /area/lv522/outdoors/colony_streets/south_street) "oSH" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges) "oSX" = ( @@ -33947,8 +33254,7 @@ /area/lv522/outdoors/colony_streets/north_west_street) "oTg" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "oTl" = ( @@ -33956,8 +33262,7 @@ /obj/effect/decal/cleanable/cobweb2/dynamic, /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oTp" = ( @@ -33982,14 +33287,12 @@ /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "oTI" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/hydro) "oTJ" = ( @@ -33998,16 +33301,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "oTL" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "oTX" = ( @@ -34045,8 +33346,7 @@ /obj/vehicle/train/cargo/trolley, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "oVk" = ( @@ -34093,8 +33393,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "oVS" = ( @@ -34107,8 +33406,7 @@ /obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/engineering) "oWq" = ( @@ -34122,8 +33420,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "oWK" = ( @@ -34268,15 +33565,13 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "paK" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "paT" = ( @@ -34284,15 +33579,6 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/shale/layer0, /area/lv522/landing_zone_1) -"pbb" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/girder/displaced, -/turf/open/asphalt/cement{ - icon_state = "cement12" - }, -/area/lv522/outdoors/colony_streets/south_street) "pbp" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms/glass) @@ -34305,16 +33591,14 @@ /obj/item/stack/sheet/wood, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "pck" = ( /obj/structure/largecrate/random/barrel/white, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pcr" = ( @@ -34338,8 +33622,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "pcO" = ( @@ -34381,8 +33664,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pdv" = ( @@ -34396,8 +33678,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "pdB" = ( @@ -34406,8 +33687,7 @@ }, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pdF" = ( @@ -34417,8 +33697,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "pdO" = ( @@ -34493,8 +33772,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pfj" = ( @@ -34568,8 +33846,7 @@ /obj/item/prop/alien/hugger, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pfX" = ( @@ -34578,8 +33855,7 @@ /area/lv522/indoors/a_block/admin) "pgl" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/strata{ dir = 4; @@ -34611,8 +33887,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "pgs" = ( @@ -34622,8 +33897,7 @@ }, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "pgt" = ( @@ -34644,16 +33918,14 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "pgL" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/outdoor) "pha" = ( @@ -34677,8 +33949,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "phn" = ( @@ -34761,8 +34032,7 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "pjT" = ( @@ -34791,15 +34061,13 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "pka" = ( /obj/structure/platform_decoration, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "pkB" = ( @@ -34836,8 +34104,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "pme" = ( @@ -34846,8 +34113,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "pmg" = ( @@ -34861,13 +34127,11 @@ /area/lv522/indoors/a_block/hallway) "png" = ( /obj/structure/cargo_container/wy/mid{ - health = 5000; - unacidable = 0 + health = 5000 }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "pni" = ( @@ -34878,8 +34142,7 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "pnu" = ( @@ -34933,22 +34196,6 @@ icon_state = "marked" }, /area/lv522/indoors/a_block/security) -"poN" = ( -/obj/structure/surface/table/almayer, -/obj/structure/flora/pottedplant{ - desc = "It is made of Fiberbush(tm). It contains asbestos. Studies say that greenery calms the mind due to some sort evolved mechanism in the brain. This plant is not calming."; - icon_state = "pottedplant_21"; - layer = 3.1; - name = "synthethic potted plant"; - pixel_y = 14; - tag = null - }, -/obj/effect/decal/cleanable/cobweb2, -/obj/effect/spider/spiderling/nogrow, -/turf/open/floor/prison{ - icon_state = "darkredfull2" - }, -/area/lv522/indoors/a_block/security) "poQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -34968,8 +34215,7 @@ flipped = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ppD" = ( @@ -35006,8 +34252,7 @@ /obj/item/spacecash/c1000, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "pqA" = ( @@ -35022,8 +34267,7 @@ /obj/item/newspaper, /obj/item/tool/pen/blue/clicky, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "pqI" = ( @@ -35157,8 +34401,7 @@ /area/lv522/outdoors/colony_streets/south_east_street) "psT" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "ptc" = ( @@ -35174,8 +34417,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "ptU" = ( @@ -35202,8 +34444,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "puu" = ( @@ -35246,10 +34487,10 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "pvd" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 }, -/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -35279,8 +34520,7 @@ }, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "pwk" = ( @@ -35293,8 +34533,7 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pwu" = ( @@ -35315,10 +34554,10 @@ }, /area/lv522/indoors/a_block/fitness) "pwH" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 }, -/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 4; icon_state = "greenfull" @@ -35328,8 +34567,7 @@ /obj/structure/prop/dam/crane/damaged, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pwW" = ( @@ -35377,8 +34615,7 @@ "pxS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "pxY" = ( @@ -35459,8 +34696,7 @@ pixel_y = 15 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "pzo" = ( @@ -35471,8 +34707,7 @@ /obj/structure/barricade/wooden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "pzH" = ( @@ -35508,8 +34743,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pAW" = ( @@ -35532,8 +34766,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/miner, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "pBF" = ( @@ -35542,8 +34775,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pBK" = ( @@ -35564,15 +34796,13 @@ icon_state = "p_stair_full" }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "pBT" = ( /turf/open/floor/prison{ dir = 6; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "pCb" = ( @@ -35682,8 +34912,7 @@ "pDh" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "pDA" = ( @@ -35710,8 +34939,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pDU" = ( @@ -35736,8 +34964,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pEk" = ( @@ -35746,8 +34973,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "pEm" = ( @@ -35768,8 +34994,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pEs" = ( @@ -35781,8 +35006,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pEu" = ( @@ -35799,8 +35023,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pEA" = ( @@ -35830,9 +35053,16 @@ /obj/structure/platform_decoration{ dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "pFH" = ( @@ -35885,8 +35115,7 @@ pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "pGY" = ( @@ -35912,8 +35141,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "pIu" = ( @@ -35935,8 +35163,7 @@ pixel_y = 21 }, /obj/structure/bed/chair/dropship/pilot{ - dir = 1; - tag = null + dir = 1 }, /obj/structure/machinery/light/double{ dir = 1; @@ -35949,8 +35176,7 @@ pixel_y = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "pJd" = ( @@ -36001,8 +35227,7 @@ }, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pJW" = ( @@ -36036,8 +35261,7 @@ pixel_y = 16 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ dir = 1; @@ -36090,7 +35314,6 @@ "pLN" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 2; - locked = 0; name = "Medical Airlock" }, /obj/structure/pipes/standard/simple/hidden/green, @@ -36151,7 +35374,6 @@ "pMt" = ( /obj/structure/machinery/door/airlock/almayer/medical{ dir = 2; - locked = 0; name = "Medical Airlock" }, /turf/open/floor/corsat{ @@ -36259,8 +35481,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pON" = ( @@ -36284,8 +35505,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pPt" = ( @@ -36296,8 +35516,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pPC" = ( @@ -36313,8 +35532,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pPV" = ( @@ -36331,8 +35549,7 @@ "pQx" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "pQA" = ( @@ -36366,8 +35583,7 @@ /obj/structure/surface/table/almayer, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "pQQ" = ( @@ -36395,8 +35611,7 @@ /obj/item/clothing/gloves/black, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "pRi" = ( @@ -36432,8 +35647,7 @@ /obj/effect/spawner/gibspawner/xeno, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "pRT" = ( @@ -36470,7 +35684,6 @@ /area/lv522/indoors/a_block/dorms) "pTa" = ( /obj/structure/prop/vehicles/crawler{ - density = 1; layer = 3.1 }, /turf/open/asphalt/cement{ @@ -36480,8 +35693,7 @@ "pTj" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "pTl" = ( @@ -36494,15 +35706,13 @@ /obj/item/trash/plate, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pTH" = ( /obj/structure/machinery/door/airlock/hatch/cockpit/two, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "pTO" = ( @@ -36533,8 +35743,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pTW" = ( @@ -36556,8 +35765,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "pUo" = ( @@ -36581,8 +35789,7 @@ "pVb" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "pVn" = ( @@ -36626,8 +35833,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "pVA" = ( @@ -36667,8 +35873,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "pWR" = ( @@ -36688,8 +35893,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "pWX" = ( @@ -36706,8 +35910,7 @@ /obj/structure/machinery/cell_charger, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "pXq" = ( @@ -36755,8 +35958,7 @@ /obj/vehicle/train/cargo/engine, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pYj" = ( @@ -36802,8 +36004,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "pZb" = ( @@ -36858,8 +36059,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp/green, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qaT" = ( @@ -36898,8 +36098,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "qbD" = ( @@ -36991,8 +36190,7 @@ /obj/structure/machinery/photocopier, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qda" = ( @@ -37051,8 +36249,7 @@ dir = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qfu" = ( @@ -37106,8 +36303,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "qhm" = ( @@ -37136,8 +36332,7 @@ "qig" = ( /obj/structure/bed/chair/wood/normal{ dir = 4; - pixel_x = -8; - tag = null + pixel_x = -8 }, /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/central_streets) @@ -37162,8 +36357,7 @@ /obj/structure/machinery/recharger, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "qiC" = ( @@ -37191,8 +36385,7 @@ "qiJ" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qiN" = ( @@ -37213,8 +36406,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qjr" = ( @@ -37269,8 +36461,7 @@ stat = 2 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "qkw" = ( @@ -37321,6 +36512,13 @@ }, /turf/open/floor/plating, /area/lv522/outdoors/colony_streets/central_streets) +"qma" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/north_west_street) "qml" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -37335,8 +36533,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qmr" = ( @@ -37355,8 +36552,7 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "qmD" = ( @@ -37369,8 +36565,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "qmM" = ( @@ -37396,7 +36591,6 @@ /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/overwatch/almayer/broken{ dir = 8; - layer = 2.98; pixel_x = -12; pixel_y = 1 }, @@ -37446,8 +36640,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "qnM" = ( @@ -37466,8 +36659,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "qnU" = ( @@ -37484,8 +36676,7 @@ }, /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship{ - icon_state = "rasputin6"; - tag = null + icon_state = "rasputin6" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qnY" = ( @@ -37493,8 +36684,7 @@ /obj/item/prop/alien/hugger, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qot" = ( @@ -37509,14 +36699,12 @@ "qpc" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "qpg" = ( /turf/open/shuttle/dropship{ - icon_state = "floor8"; - tag = null + icon_state = "floor8" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qpq" = ( @@ -37555,8 +36743,7 @@ /obj/structure/filingcabinet, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qqk" = ( @@ -37580,9 +36767,17 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) "qqD" = ( -/obj/item/ammo_box/magazine/shotgun/buckshot/empty, /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door_control/brbutton/alt{ + id = "Sec-Armoury-Lockdown"; + name = "remote door-control" + }, +/obj/item/limb/hand/l_hand{ + dir = 1; + pixel_x = 9; + pixel_y = 3 + }, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -37604,8 +36799,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/garage) "qqS" = ( @@ -37613,8 +36807,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin7"; - tag = null + icon_state = "rasputin7" }, /area/lv522/outdoors/w_rockies) "qqW" = ( @@ -37639,8 +36832,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "qrj" = ( @@ -37652,8 +36844,7 @@ /area/lv522/outdoors/w_rockies) "qsd" = ( /obj/structure/pipes/standard/simple/visible{ - dir = 10; - tag = null + dir = 10 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata{ @@ -37707,17 +36898,19 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "qsU" = ( /obj/structure/platform{ dir = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "qtc" = ( @@ -37736,8 +36929,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "qtl" = ( @@ -37813,15 +37005,13 @@ /obj/structure/largecrate, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qvA" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "qvJ" = ( @@ -37833,8 +37023,7 @@ /obj/structure/cargo_container/grant/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "qvM" = ( @@ -37874,8 +37063,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qxf" = ( @@ -37939,8 +37127,7 @@ /obj/structure/machinery/microwave, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "qxF" = ( @@ -37978,8 +37165,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qyG" = ( @@ -38017,12 +37203,10 @@ /area/lv522/indoors/a_block/fitness/glass) "qzp" = ( /obj/structure/machinery/door/airlock/dropship_hatch/two{ - dir = 8; - locked = 0 + dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qzw" = ( @@ -38099,8 +37283,7 @@ "qAy" = ( /obj/item/toy/beach_ball, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "qAF" = ( @@ -38109,8 +37292,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "qAX" = ( @@ -38177,8 +37359,7 @@ /area/lv522/oob) "qBR" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Northlock"; - welded = null + name = "\improper Northlock" }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -38188,8 +37369,7 @@ "qBW" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "qCd" = ( @@ -38231,8 +37411,7 @@ pixel_y = -8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "qCL" = ( @@ -38267,6 +37446,14 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) +"qDl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/auto_turf/shale/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) "qDr" = ( /obj/item/ammo_magazine/rifle/heap{ current_rounds = 0 @@ -38335,8 +37522,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qET" = ( @@ -38393,8 +37579,7 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qGC" = ( @@ -38426,8 +37611,7 @@ "qHa" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qHg" = ( @@ -38496,8 +37680,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "qIJ" = ( @@ -38506,15 +37689,13 @@ }, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "qJl" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qJp" = ( @@ -38545,8 +37726,7 @@ name = "\improper UA jacket" }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qJy" = ( @@ -38562,8 +37742,7 @@ "qJH" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "qJK" = ( @@ -38628,8 +37807,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "qLd" = ( @@ -38658,8 +37836,7 @@ "qLy" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "qLz" = ( @@ -38760,8 +37937,7 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "qNG" = ( @@ -38873,8 +38049,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "qOS" = ( @@ -38933,10 +38108,7 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "qPS" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - locked = 0 - }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -39054,8 +38226,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "qRB" = ( @@ -39096,8 +38267,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "qSj" = ( @@ -39116,8 +38286,7 @@ "qSu" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "qSw" = ( @@ -39143,8 +38312,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "qSP" = ( @@ -39173,8 +38341,7 @@ }, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "qTh" = ( @@ -39264,8 +38431,7 @@ pixel_y = -15 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qUf" = ( @@ -39289,8 +38455,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qUh" = ( @@ -39321,8 +38486,7 @@ pixel_y = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "qUL" = ( @@ -39352,8 +38516,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qVl" = ( @@ -39380,8 +38543,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "qWt" = ( @@ -39434,8 +38596,7 @@ }, /obj/structure/closet, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qXY" = ( @@ -39457,8 +38618,7 @@ }, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "qYo" = ( @@ -39514,8 +38674,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "qZh" = ( @@ -39524,8 +38683,7 @@ /obj/effect/landmark/objective_landmark/medium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qZu" = ( @@ -39567,8 +38725,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "qZY" = ( @@ -39699,13 +38856,11 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "rbV" = ( /obj/structure/prop/vehicles/crawler{ - density = 1; dir = 8; layer = 3.1 }, @@ -39780,8 +38935,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "rdq" = ( @@ -39854,8 +39008,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "rex" = ( @@ -39884,8 +39037,7 @@ /area/lv522/indoors/a_block/dorm_north) "rfe" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/corpo) "rfg" = ( @@ -39896,8 +39048,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "rfi" = ( @@ -39951,8 +39102,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "rfW" = ( @@ -39981,8 +39131,7 @@ "rgk" = ( /obj/structure/machinery/power/port_gen/pacman/mrs, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "rgA" = ( @@ -40007,8 +39156,7 @@ }, /obj/item/toy/farwadoll, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "rhh" = ( @@ -40018,19 +39166,18 @@ /obj/structure/bed/chair/wheelchair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "rhk" = ( -/obj/structure/machinery/door/airlock/dropship_hatch/two{ - dir = 8 +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" }, -/area/lv522/landing_zone_forecon/UD6_Typhoon) +/area/lv522/landing_zone_1) "rhz" = ( /obj/structure/pipes/standard/tank/oxygen{ dir = 1 @@ -40042,8 +39189,7 @@ /area/lv522/indoors/a_block/medical/glass) "rhB" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rhF" = ( @@ -40067,8 +39213,7 @@ current_rounds = 0 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rii" = ( @@ -40092,8 +39237,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "riZ" = ( @@ -40146,8 +39290,7 @@ /area/lv522/outdoors/colony_streets/east_central_street) "rjP" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rkd" = ( @@ -40163,8 +39306,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rkV" = ( @@ -40253,10 +39395,15 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) +"rmX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/auto_turf/shale/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) "rng" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -40273,8 +39420,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "rnq" = ( @@ -40365,8 +39511,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "rpe" = ( @@ -40410,8 +39555,7 @@ /area/lv522/indoors/a_block/fitness) "rqn" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2) "rqs" = ( @@ -40422,8 +39566,7 @@ "rqA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "rqP" = ( @@ -40450,8 +39593,7 @@ /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "rrI" = ( @@ -40460,8 +39602,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "rrN" = ( @@ -40536,8 +39677,7 @@ pixel_y = 24 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rtr" = ( @@ -40574,8 +39714,7 @@ "rtX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "ruc" = ( @@ -40592,19 +39731,14 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) "ruj" = ( -/obj/structure/machinery/door_control{ - id = "UD6"; - name = "Cargo Shutter Control" - }, /turf/closed/shuttle/dropship2/tornado/typhoon{ - icon_state = "53" + icon_state = "59" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rus" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "ruv" = ( @@ -40637,8 +39771,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "ruY" = ( @@ -40720,8 +39853,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "rwx" = ( @@ -40789,16 +39921,14 @@ /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/tofukabob, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rxo" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "rxu" = ( @@ -40845,8 +39975,7 @@ "ryb" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "ryj" = ( @@ -40878,12 +40007,10 @@ /obj/item/ore/silver, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "ryv" = ( -/obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -40916,8 +40043,7 @@ "ryW" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "rza" = ( @@ -40938,8 +40064,7 @@ /obj/structure/surface/table/almayer, /obj/item/storage/beer_pack, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rzR" = ( @@ -40963,8 +40088,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "rAt" = ( @@ -40993,8 +40117,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/bridges) "rAX" = ( @@ -41034,8 +40157,7 @@ /obj/structure/closet/secure_closet/atmos_personal, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "rCi" = ( @@ -41048,8 +40170,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rCE" = ( @@ -41082,24 +40203,16 @@ "rDb" = ( /obj/item/device/m56d_post, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rDu" = ( -/obj/structure/closet/crate/ammo, -/obj/item/ammo_magazine/m56d, -/obj/item/ammo_magazine/m56d, -/obj/item/device/m56d_gun, -/obj/structure/barricade/handrail{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - dir = 8 +/obj/structure/machinery/door_control{ + id = "UD6"; + name = "Cargo Shutter Control" }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null +/turf/closed/shuttle/dropship2/tornado/typhoon{ + icon_state = "53" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rDz" = ( @@ -41107,8 +40220,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "rDM" = ( @@ -41116,8 +40228,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "rEc" = ( @@ -41139,8 +40250,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "rEo" = ( @@ -41171,8 +40281,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "rFp" = ( @@ -41202,8 +40311,7 @@ "rGm" = ( /obj/item/tool/weldingtool, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "rGD" = ( @@ -41221,8 +40329,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rHl" = ( @@ -41240,8 +40347,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rHX" = ( @@ -41268,8 +40374,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/outdoors/colony_streets/south_west_street) "rIn" = ( @@ -41279,8 +40384,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "rIr" = ( @@ -41300,16 +40404,14 @@ /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "rIB" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "rIH" = ( @@ -41319,8 +40421,7 @@ pixel_y = 24 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rIM" = ( @@ -41340,8 +40441,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rJf" = ( @@ -41358,8 +40458,7 @@ /obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "rJv" = ( @@ -41406,8 +40505,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "rKg" = ( @@ -41431,8 +40529,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "rKW" = ( @@ -41548,8 +40645,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "rMr" = ( @@ -41590,8 +40686,7 @@ "rNs" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "rNv" = ( @@ -41627,8 +40722,7 @@ /area/lv522/indoors/c_block/cargo) "rOb" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "rOf" = ( @@ -41661,8 +40755,7 @@ }, /obj/structure/platform_decoration{ dir = 6; - layer = 3.51; - tag = null + layer = 3.51 }, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement, @@ -41715,8 +40808,7 @@ "rQd" = ( /obj/structure/closet/secure_closet/quartermaster, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "rQg" = ( @@ -41767,8 +40859,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rRr" = ( @@ -41795,8 +40886,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "rRJ" = ( @@ -41814,8 +40904,7 @@ pixel_y = 2 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/t_comm) "rRP" = ( @@ -41835,8 +40924,7 @@ /obj/structure/closet, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "rSd" = ( @@ -41890,8 +40978,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "rSW" = ( @@ -41940,8 +41027,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "rUr" = ( @@ -41982,8 +41068,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "rWu" = ( @@ -41996,8 +41081,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "rWP" = ( @@ -42013,8 +41097,7 @@ }, /obj/structure/ore_box, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "rXb" = ( @@ -42024,8 +41107,7 @@ "rXE" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "rXH" = ( @@ -42054,8 +41136,7 @@ pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "rYq" = ( @@ -42126,8 +41207,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "rZF" = ( @@ -42145,8 +41225,7 @@ /area/lv522/outdoors/colony_streets/south_street) "rZL" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "sag" = ( @@ -42170,8 +41249,7 @@ /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "saz" = ( @@ -42217,8 +41295,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "saY" = ( @@ -42250,8 +41327,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/n_rockies) "sbx" = ( @@ -42262,8 +41338,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "sbG" = ( @@ -42313,8 +41388,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "scw" = ( @@ -42322,8 +41396,7 @@ current_rounds = 0 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "scy" = ( @@ -42335,8 +41408,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "scM" = ( @@ -42363,8 +41435,7 @@ /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sdN" = ( @@ -42389,13 +41460,15 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/north_west_street) "seA" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "seG" = ( @@ -42404,8 +41477,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "seJ" = ( @@ -42476,8 +41548,7 @@ pixel_y = 2 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sgT" = ( @@ -42495,8 +41566,7 @@ "sha" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "shc" = ( @@ -42505,8 +41575,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "shm" = ( @@ -42565,8 +41634,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "siX" = ( @@ -42599,8 +41667,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "sjp" = ( @@ -42611,8 +41678,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "sjy" = ( @@ -42644,8 +41710,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "sjS" = ( @@ -42653,8 +41718,7 @@ /obj/item/device/sentry_computer, /obj/item/defenses/handheld/sentry, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "sjY" = ( @@ -42741,8 +41805,7 @@ pixel_y = 21 }, /obj/structure/bed/chair/dropship/pilot{ - dir = 1; - tag = null + dir = 1 }, /obj/structure/machinery/light/double{ dir = 1; @@ -42755,8 +41818,7 @@ pixel_y = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "slO" = ( @@ -42844,8 +41906,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "snR" = ( @@ -42854,8 +41915,7 @@ /obj/item/tank/oxygen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "snX" = ( @@ -42908,8 +41968,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "spz" = ( @@ -42938,8 +41997,7 @@ "spM" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "spW" = ( @@ -42950,14 +42008,12 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "sqd" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bridge) "sql" = ( @@ -42988,8 +42044,7 @@ pixel_x = 7 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "srJ" = ( @@ -43027,8 +42082,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "ssl" = ( @@ -43062,8 +42116,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "suh" = ( @@ -43179,8 +42232,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "swF" = ( @@ -43199,8 +42251,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "swY" = ( @@ -43242,8 +42293,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "syy" = ( @@ -43252,8 +42302,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "syB" = ( @@ -43322,8 +42371,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "sAp" = ( @@ -43355,20 +42403,17 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "sAT" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "sAU" = ( @@ -43382,8 +42427,7 @@ pixel_x = -16 }, /turf/open/floor{ - icon_state = "bcircuit"; - tag = null + icon_state = "bcircuit" }, /area/lv522/atmos/east_reactor) "sBt" = ( @@ -43431,15 +42475,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "sCk" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/structure/machinery/landinglight/ds1{ dir = 8 }, -/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1) "sCp" = ( @@ -43491,8 +42534,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "sDS" = ( @@ -43521,8 +42563,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "sEc" = ( @@ -43541,8 +42582,7 @@ }, /obj/item/tool/weldingtool, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/kitchen/glass) "sED" = ( @@ -43551,8 +42591,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "sFf" = ( @@ -43578,8 +42617,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/hydro) "sFG" = ( @@ -43608,8 +42646,7 @@ /obj/item/tool/pickaxe/silver, /obj/item/tool/pickaxe/silver, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "sGt" = ( @@ -43625,8 +42662,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "sGQ" = ( @@ -43640,15 +42676,13 @@ /obj/structure/barricade/deployable, /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship{ - icon_state = "rasputin4"; - tag = null + icon_state = "rasputin4" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "sGY" = ( /obj/structure/barricade/deployable, /turf/open/shuttle/dropship{ - icon_state = "floor8"; - tag = null + icon_state = "floor8" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "sHb" = ( @@ -43673,8 +42707,7 @@ "sHg" = ( /obj/structure/barricade/deployable, /turf/open/shuttle/dropship{ - icon_state = "rasputin8"; - tag = null + icon_state = "rasputin8" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "sHk" = ( @@ -43690,8 +42723,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "sHY" = ( @@ -43705,8 +42737,7 @@ }, /obj/structure/platform_decoration{ dir = 10; - layer = 3.51; - tag = null + layer = 3.51 }, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) @@ -43714,8 +42745,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sIr" = ( @@ -43771,8 +42801,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "sJI" = ( @@ -43875,8 +42904,7 @@ /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "sKS" = ( @@ -43885,8 +42913,7 @@ pixel_y = 11 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "sKU" = ( @@ -43934,8 +42961,7 @@ "sLQ" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sLR" = ( @@ -43966,8 +42992,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "sMa" = ( @@ -43983,8 +43008,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "sML" = ( @@ -44046,8 +43070,7 @@ pixel_y = 27 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "sNU" = ( @@ -44085,8 +43108,7 @@ /obj/structure/closet/crate, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "sOA" = ( @@ -44119,8 +43141,7 @@ /area/lv522/landing_zone_1) "sON" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "sOR" = ( @@ -44146,16 +43167,14 @@ /obj/structure/machinery/vending/cola, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "sPb" = ( /obj/structure/barricade/wooden, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "sPh" = ( @@ -44237,8 +43256,7 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "sQI" = ( @@ -44267,8 +43285,7 @@ /obj/structure/surface/table/almayer, /obj/item/folder/black_random, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sQT" = ( @@ -44284,8 +43301,7 @@ /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "sRd" = ( @@ -44329,8 +43345,7 @@ /obj/structure/cargo_container/wy/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "sSk" = ( @@ -44361,8 +43376,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "sSQ" = ( @@ -44393,8 +43407,7 @@ /obj/item/ore/silver, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "sTr" = ( @@ -44463,8 +43476,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/c_block/cargo) "sUN" = ( @@ -44508,8 +43520,7 @@ pixel_y = 16 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison{ dir = 1; @@ -44531,8 +43542,7 @@ /obj/item/newspaper, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "sXo" = ( @@ -44541,8 +43551,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "sXM" = ( @@ -44551,8 +43560,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "sXQ" = ( @@ -44566,8 +43574,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "sXZ" = ( @@ -44579,8 +43586,7 @@ "sYh" = ( /obj/structure/machinery/door/airlock/hatch/cockpit/two, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "sYk" = ( @@ -44600,8 +43606,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "sZq" = ( @@ -44700,8 +43705,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "tcj" = ( @@ -44728,8 +43732,7 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "tcz" = ( @@ -44815,8 +43818,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tdT" = ( @@ -44836,8 +43838,7 @@ /area/lv522/indoors/a_block/admin) "teh" = ( /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "tek" = ( @@ -44848,8 +43849,7 @@ }, /obj/item/tool/pen/blue/clicky, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tew" = ( @@ -44886,8 +43886,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tfb" = ( @@ -44912,8 +43911,7 @@ /obj/effect/landmark/railgun_camera_pos, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "tfP" = ( @@ -44939,8 +43937,7 @@ "tfZ" = ( /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "tgj" = ( @@ -44952,8 +43949,7 @@ /obj/structure/surface/rack, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "tgM" = ( @@ -44977,8 +43973,7 @@ /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "the" = ( @@ -45032,8 +44027,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "tiQ" = ( @@ -45066,8 +44060,7 @@ "tjh" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "tjx" = ( @@ -45113,8 +44106,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "tkA" = ( @@ -45150,8 +44142,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tlr" = ( @@ -45192,8 +44183,7 @@ pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "tlX" = ( @@ -45287,8 +44277,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tni" = ( @@ -45315,8 +44304,7 @@ "tnL" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "tnM" = ( @@ -45399,8 +44387,7 @@ /obj/item/clipboard, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "tpz" = ( @@ -45430,8 +44417,7 @@ /obj/structure/barricade/deployable, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "tqG" = ( @@ -45452,8 +44438,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness/glass) "tra" = ( @@ -45489,8 +44474,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "trW" = ( @@ -45514,8 +44498,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tsx" = ( @@ -45546,8 +44529,7 @@ /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tsM" = ( @@ -45586,8 +44568,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tti" = ( @@ -45632,8 +44613,7 @@ /obj/structure/cargo_container/hd/right/alt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "tuJ" = ( @@ -45653,8 +44633,7 @@ "tuK" = ( /obj/structure/ore_box, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "tvi" = ( @@ -45669,8 +44648,7 @@ /obj/structure/prop/turbine_extras/border, /obj/structure/prop/turbine, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "tvn" = ( @@ -45697,16 +44675,14 @@ /obj/structure/bed/chair, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "tvz" = ( /obj/structure/surface/table/almayer, /obj/structure/foamed_metal, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "tvO" = ( @@ -45738,8 +44714,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "twq" = ( @@ -45817,8 +44792,7 @@ /obj/structure/closet/crate, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "typ" = ( @@ -45854,8 +44828,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tzz" = ( @@ -45875,8 +44848,7 @@ current_mag = null }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tzF" = ( @@ -45884,8 +44856,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tzY" = ( @@ -45898,8 +44869,7 @@ pixel_y = 25 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tAh" = ( @@ -45929,9 +44899,11 @@ /obj/structure/platform{ dir = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/garden) "tBb" = ( @@ -45940,7 +44912,6 @@ /area/lv522/outdoors/colony_streets/south_east_street) "tBw" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder{ - icon_state = "closed"; layer = 2.1 }, /obj/structure/barricade/handrail{ @@ -45960,8 +44931,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "tBM" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin6"; - tag = null + icon_state = "rasputin6" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tBQ" = ( @@ -45980,15 +44950,13 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "tBT" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Eastlock"; - welded = null + name = "\improper Eastlock" }, /turf/open/floor/corsat{ icon_state = "marked" @@ -46023,8 +44991,7 @@ /area/lv522/outdoors/colony_streets/south_east_street) "tCR" = ( /turf/open/shuttle/dropship{ - icon_state = "floor8"; - tag = null + icon_state = "floor8" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tCX" = ( @@ -46041,8 +45008,7 @@ /area/lv522/outdoors/colony_streets/central_streets) "tDm" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin7"; - tag = null + icon_state = "rasputin7" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tDq" = ( @@ -46150,8 +45116,7 @@ "tEW" = ( /obj/structure/machinery/vending/cigarette/colony, /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /turf/open/floor/strata{ dir = 4; @@ -46200,8 +45165,7 @@ /obj/item/storage/bag/ore, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "tFx" = ( @@ -46252,7 +45216,6 @@ /area/lv522/outdoors/colony_streets/north_street) "tGm" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - locked = 0; name = "\improper Corporate Liason" }, /turf/open/floor/corsat{ @@ -46267,8 +45230,7 @@ /obj/item/stack/sheet/wood, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "tGI" = ( @@ -46305,8 +45267,7 @@ layer = 3.1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "tGY" = ( @@ -46335,8 +45296,7 @@ /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "tID" = ( @@ -46348,8 +45308,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "tIM" = ( @@ -46424,8 +45383,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "tKo" = ( @@ -46463,8 +45421,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "tLl" = ( @@ -46514,8 +45471,7 @@ /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "tLL" = ( @@ -46571,8 +45527,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "tMS" = ( @@ -46635,8 +45590,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_east_street) "tOo" = ( @@ -46745,21 +45699,9 @@ "tQp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/outdoor_bot) -"tQC" = ( -/obj/structure/window_frame/strata, -/obj/item/stack/rods, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "LV522CIC_1"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/admin) "tQE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -46821,8 +45763,7 @@ "tSn" = ( /obj/structure/girder, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "tSo" = ( @@ -46836,8 +45777,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tSL" = ( @@ -46854,8 +45794,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "tTr" = ( @@ -46888,8 +45827,7 @@ icon_state = "medium" }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tTZ" = ( @@ -46945,8 +45883,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "tVv" = ( @@ -46999,8 +45936,7 @@ /obj/item/storage/backpack, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "tXa" = ( @@ -47048,8 +45984,7 @@ "tXg" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "tXG" = ( @@ -47060,8 +45995,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "tXS" = ( @@ -47129,8 +46063,7 @@ "tZc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bridge) "tZh" = ( @@ -47183,8 +46116,7 @@ /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "tZR" = ( @@ -47284,8 +46216,7 @@ "ucx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/fitness) "ucD" = ( @@ -47347,8 +46278,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "udR" = ( @@ -47467,8 +46397,7 @@ "ufs" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ufu" = ( @@ -47535,8 +46464,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "ugo" = ( @@ -47544,8 +46472,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "ugu" = ( @@ -47558,8 +46485,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/cargo_intake) "ugG" = ( @@ -47567,8 +46493,7 @@ /obj/effect/spawner/random/tool, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "ugN" = ( @@ -47592,16 +46517,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "uhf" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 1; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "uhv" = ( @@ -47658,8 +46581,7 @@ pixel_y = 26 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "uic" = ( @@ -47672,8 +46594,7 @@ pixel_y = 26 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "uie" = ( @@ -47776,8 +46697,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "ujy" = ( @@ -47796,8 +46716,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "ukp" = ( @@ -47823,8 +46742,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "ukK" = ( @@ -47843,8 +46761,7 @@ "ulL" = ( /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "ulZ" = ( @@ -47887,8 +46804,7 @@ /area/lv522/indoors/c_block/cargo) "unE" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - locked = 0 + dir = 2 }, /turf/open/floor/corsat{ icon_state = "marked" @@ -47911,8 +46827,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "unS" = ( @@ -47925,8 +46840,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uog" = ( @@ -47996,8 +46910,7 @@ pixel_x = 16 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "upl" = ( @@ -48102,8 +47015,7 @@ dir = 4 }, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) @@ -48127,8 +47039,7 @@ /area/lv522/indoors/a_block/security) "urY" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "usn" = ( @@ -48137,8 +47048,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "usy" = ( @@ -48152,8 +47062,7 @@ /area/lv522/indoors/a_block/fitness) "usz" = ( /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/fitness) "usJ" = ( @@ -48180,8 +47089,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "utd" = ( @@ -48325,8 +47233,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "uvC" = ( @@ -48423,15 +47330,13 @@ /area/lv522/outdoors/colony_streets/south_east_street) "uya" = ( /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "uye" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "uyt" = ( @@ -48446,8 +47351,7 @@ /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uyM" = ( @@ -48465,8 +47369,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "uyN" = ( @@ -48529,6 +47432,13 @@ "uAa" = ( /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_street) +"uAb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/auto_turf/shale/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) "uAd" = ( /turf/open/floor/corsat{ dir = 1; @@ -48584,8 +47494,7 @@ /area/lv522/indoors/c_block/mining) "uCr" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/corsat{ icon_state = "marked" @@ -48595,7 +47504,7 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/security) "uDs" = ( -/obj/item/clothing/head/beret/sec/hos, +/obj/item/clothing/head/CMB, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) @@ -48612,8 +47521,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "uDP" = ( @@ -48622,8 +47530,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "uDT" = ( @@ -48681,8 +47588,7 @@ "uEC" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "uEE" = ( @@ -48694,23 +47600,23 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "uEH" = ( -/obj/structure/bed/chair/comfy{ - dir = 1; - tag = null +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) +/turf/open/floor/prison{ + dir = 4; + icon_state = "greenfull" + }, +/area/lv522/landing_zone_1) "uEP" = ( /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uEV" = ( @@ -48773,8 +47679,7 @@ "uFF" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "uFG" = ( @@ -48807,11 +47712,16 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/hallway) +"uGd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/auto_turf/shale/layer0, +/area/lv522/outdoors/colony_streets/north_west_street) "uGl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "uGO" = ( @@ -48824,8 +47734,7 @@ pixel_y = 9 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "uGT" = ( @@ -48847,8 +47756,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 4; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "uHn" = ( @@ -48869,8 +47777,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "uHE" = ( @@ -48892,8 +47799,7 @@ }, /obj/structure/machinery/light/small, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uIe" = ( @@ -48910,8 +47816,7 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "uIr" = ( @@ -48929,8 +47834,7 @@ /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "uIF" = ( @@ -48954,8 +47858,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "uIW" = ( @@ -48988,23 +47891,20 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "uJr" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ dir = 8; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "uJY" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "uKa" = ( @@ -49037,7 +47937,7 @@ /area/lv522/indoors/a_block/bridges/op_centre) "uKD" = ( /turf/closed/wall/strata_outpost/reinforced, -/area/lv522/oob) +/area/lv522/oob/w_y_vault) "uKE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -49047,8 +47947,7 @@ /area/lv522/indoors/c_block/cargo) "uKQ" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "uKR" = ( @@ -49102,7 +48001,7 @@ /area/lv522/indoors/a_block/bridges/corpo_fitness) "uLz" = ( /obj/effect/landmark/hunter_secondary, -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds1{ dir = 4 }, /turf/open/floor/plating, @@ -49223,8 +48122,7 @@ pixel_y = 6 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "uOd" = ( @@ -49303,8 +48201,7 @@ /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "uPo" = ( @@ -49312,8 +48209,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "uPy" = ( @@ -49335,8 +48231,7 @@ /obj/structure/surface/table/almayer, /obj/item/paper/janitor, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "uQf" = ( @@ -49433,8 +48328,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "uRB" = ( @@ -49448,8 +48342,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "uRL" = ( @@ -49466,8 +48359,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_street) "uRR" = ( @@ -49501,8 +48393,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "uSB" = ( @@ -49594,8 +48485,7 @@ /obj/structure/surface/table/almayer, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "uTY" = ( @@ -49616,8 +48506,7 @@ /area/lv522/indoors/a_block/security/glass) "uUk" = ( /obj/structure/bed/chair/wood/normal{ - dir = 4; - tag = null + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, @@ -49631,8 +48520,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "uUB" = ( @@ -49659,8 +48547,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/mining) "uVy" = ( @@ -49685,8 +48572,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "uVU" = ( @@ -49710,15 +48596,13 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "uWh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/strata{ dir = 4; @@ -49772,14 +48656,12 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "uXj" = ( /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "uXp" = ( @@ -49810,8 +48692,7 @@ /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "uYq" = ( @@ -49837,8 +48718,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "uZO" = ( @@ -49882,8 +48762,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "vaZ" = ( @@ -49900,8 +48779,7 @@ dir = 4 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "vbm" = ( @@ -49948,8 +48826,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vbV" = ( @@ -49958,8 +48835,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "vbX" = ( @@ -49980,16 +48856,14 @@ /obj/structure/barricade/wooden, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vcJ" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "vcR" = ( @@ -50038,8 +48912,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "vdH" = ( @@ -50048,8 +48921,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vdP" = ( @@ -50067,8 +48939,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/reagent_container/food/snacks/cheesyfries, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vdZ" = ( @@ -50088,8 +48959,7 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "veD" = ( @@ -50174,8 +49044,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vga" = ( @@ -50330,8 +49199,7 @@ "vjn" = ( /obj/structure/surface/rack, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vjr" = ( @@ -50349,10 +49217,12 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"vju" = ( +/turf/closed/wall/strata_outpost, +/area/lv522/oob/w_y_vault) "vjv" = ( /turf/closed/shuttle/dropship2/tornado{ icon_state = "69" @@ -50375,8 +49245,7 @@ pixel_y = 27 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "vjB" = ( @@ -50392,8 +49261,7 @@ "vjF" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "vjG" = ( @@ -50441,8 +49309,7 @@ /obj/structure/window/reinforced, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "vlp" = ( @@ -50453,8 +49320,7 @@ /obj/structure/bed/chair, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "vlv" = ( @@ -50465,8 +49331,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vlN" = ( @@ -50490,8 +49355,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "vmo" = ( @@ -50504,9 +49368,7 @@ }, /area/lv522/indoors/a_block/fitness) "vmp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - locked = 0 - }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /turf/open/floor/corsat{ icon_state = "marked" }, @@ -50525,8 +49387,7 @@ /obj/item/stack/sheet/cardboard/full_stack, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "vmQ" = ( @@ -50540,8 +49401,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vne" = ( @@ -50602,14 +49462,12 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vou" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "vov" = ( @@ -50706,8 +49564,7 @@ /obj/vehicle/train/cargo/trolley, /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "vqm" = ( @@ -50740,8 +49597,7 @@ "vqW" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vra" = ( @@ -50803,8 +49659,7 @@ layer = 2.9 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "vsk" = ( @@ -50823,8 +49678,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "vss" = ( @@ -50863,8 +49717,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/corpo) "vtp" = ( @@ -50907,8 +49760,7 @@ /area/lv522/indoors/b_block/hydro/glass) "vuc" = ( /obj/structure/bed/chair/comfy{ - dir = 8; - tag = null + dir = 8 }, /obj/structure/machinery/light{ dir = 1 @@ -50930,8 +49782,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "vuY" = ( @@ -50943,8 +49794,7 @@ stat = 2 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "vvi" = ( @@ -51090,8 +49940,7 @@ /obj/structure/closet/wardrobe/engineering_yellow, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/engineering) "vzg" = ( @@ -51131,8 +49980,7 @@ "vzu" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "vzw" = ( @@ -51173,8 +50021,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "vzZ" = ( @@ -51197,8 +50044,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "vBa" = ( @@ -51212,8 +50058,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "vBd" = ( @@ -51244,8 +50089,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vBB" = ( @@ -51276,8 +50120,7 @@ }, /turf/open/floor/prison{ dir = 8; - icon_state = "cell_stripe"; - tag = null + icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) "vBN" = ( @@ -51346,8 +50189,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vDr" = ( @@ -51413,12 +50255,11 @@ "vEK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/hydro) "vER" = ( -/obj/structure/machinery/landinglight/ds1/delaythree{ +/obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 }, /turf/open/floor/prison{ @@ -51458,8 +50299,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vFS" = ( @@ -51560,8 +50400,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vHN" = ( @@ -51594,8 +50433,7 @@ }, /turf/open/floor/prison{ dir = 5; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "vIg" = ( @@ -51617,8 +50455,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "vIy" = ( @@ -51647,8 +50484,7 @@ /obj/structure/surface/table/almayer, /obj/item/newspaper, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vJo" = ( @@ -51656,8 +50492,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_east_street) "vJr" = ( @@ -51689,8 +50524,7 @@ "vJT" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vKe" = ( @@ -51722,8 +50556,7 @@ /obj/structure/surface/table/almayer, /obj/item/clothing/under/redpyjamas, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "vKF" = ( @@ -51758,8 +50591,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "vLu" = ( @@ -51792,8 +50624,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/hardpoint/locomotion/van_wheels, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vLQ" = ( @@ -51803,16 +50634,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vLR" = ( /obj/item/stack/sheet/wood, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vLW" = ( @@ -51825,8 +50654,7 @@ "vMg" = ( /obj/structure/safe, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vMu" = ( @@ -51845,8 +50673,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/central_streets) "vMJ" = ( @@ -51873,8 +50700,7 @@ }, /obj/item/ammo_box/magazine/misc/flares, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "vNi" = ( @@ -51997,8 +50823,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vPb" = ( @@ -52114,16 +50939,14 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vRQ" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "vSc" = ( @@ -52147,8 +50970,7 @@ pixel_y = 5 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "vSJ" = ( @@ -52287,8 +51109,7 @@ /obj/structure/powerloader_wreckage/ft, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "vVd" = ( @@ -52326,8 +51147,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "vVs" = ( @@ -52349,8 +51169,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "vWe" = ( @@ -52394,8 +51213,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "vXc" = ( @@ -52407,8 +51225,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "vXY" = ( @@ -52431,8 +51248,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "vYK" = ( @@ -52457,8 +51273,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "vYY" = ( @@ -52541,8 +51356,7 @@ "wan" = ( /obj/structure/surface/table/almayer, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wao" = ( @@ -52626,8 +51440,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "wbL" = ( @@ -52674,8 +51487,7 @@ /area/lv522/indoors/a_block/corpo/glass) "wcq" = ( /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /turf/open/floor/strata{ dir = 4; @@ -52684,8 +51496,7 @@ /area/lv522/indoors/a_block/corpo/glass) "wcO" = ( /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /obj/structure/bed/chair{ dir = 1 @@ -52714,8 +51525,7 @@ "wcX" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wdd" = ( @@ -52728,14 +51538,12 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "wdi" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security/glass) "wdj" = ( @@ -52753,8 +51561,7 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) "wdY" = ( @@ -52781,8 +51588,7 @@ /obj/structure/closet/secure_closet/freezer/fridge/full, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "wes" = ( @@ -52834,8 +51640,7 @@ }, /obj/structure/girder/reinforced, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wfe" = ( @@ -52915,8 +51720,7 @@ pixel_y = 16 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wgn" = ( @@ -52954,16 +51758,14 @@ pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "whs" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "whz" = ( @@ -53004,8 +51806,7 @@ "whG" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2) "whR" = ( @@ -53020,8 +51821,7 @@ /obj/structure/machinery/vending/coffee, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "whZ" = ( @@ -53030,8 +51830,7 @@ id = "cargo_container" }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wiz" = ( @@ -53070,8 +51869,7 @@ /area/lv522/landing_zone_1) "wjf" = ( /obj/structure/bed/chair/wood/normal{ - dir = 8; - tag = null + dir = 8 }, /turf/open/floor/carpet, /area/lv522/indoors/c_block/casino) @@ -53133,15 +51931,13 @@ }, /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wky" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "wkC" = ( @@ -53152,8 +51948,7 @@ }, /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/kitchen/damage) "wkO" = ( @@ -53184,24 +51979,9 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1/ceiling) -"wmg" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - locked = 0 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "Sec-Kitchen-Lockdown"; - name = "\improper Storm Shutters" - }, -/turf/open/floor/corsat{ - icon_state = "marked" - }, -/area/lv522/indoors/a_block/kitchen) "wmk" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/fitness) @@ -53211,8 +51991,7 @@ /area/lv522/outdoors/w_rockies) "wmI" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor{ icon_state = "wood" @@ -53266,15 +52045,13 @@ "wog" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "woi" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "woq" = ( @@ -53313,8 +52090,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wpd" = ( @@ -53371,8 +52147,7 @@ /obj/effect/landmark/objective_landmark/medium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wqt" = ( @@ -53416,8 +52191,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/cargo) "wrC" = ( @@ -53433,8 +52207,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wsz" = ( @@ -53444,8 +52217,7 @@ /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "wsC" = ( @@ -53492,8 +52264,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wtH" = ( @@ -53548,8 +52319,7 @@ /obj/structure/closet/crate, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "wuQ" = ( @@ -53559,8 +52329,7 @@ /area/lv522/indoors/b_block/bar) "wuX" = ( /obj/structure/bed/chair/wood/normal{ - dir = 4; - tag = null + dir = 4 }, /turf/open/floor/carpet, /area/lv522/indoors/c_block/casino) @@ -53708,8 +52477,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wxg" = ( @@ -53721,8 +52489,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "wxB" = ( @@ -53743,8 +52510,7 @@ /obj/item/ammo_magazine/rifle/boltaction, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "wyv" = ( @@ -53782,8 +52548,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wyI" = ( @@ -53832,8 +52597,7 @@ "wzJ" = ( /obj/structure/machinery/light, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wzS" = ( @@ -53846,8 +52610,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/east_central_street) "wAf" = ( @@ -53863,8 +52626,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "wBp" = ( @@ -53883,8 +52645,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "wBx" = ( @@ -53961,12 +52722,10 @@ icon_state = "pottedplant_21"; layer = 3.1; name = "synthethic potted plant"; - pixel_y = 14; - tag = null + pixel_y = 14 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wCW" = ( @@ -54032,13 +52791,11 @@ /area/lv522/indoors/a_block/hallway) "wEo" = ( /obj/structure/cargo_container/wy/mid{ - health = 5000; - unacidable = 0 + health = 5000 }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_2) "wEz" = ( @@ -54074,8 +52831,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wEW" = ( @@ -54126,8 +52882,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wGG" = ( @@ -54149,8 +52904,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wGY" = ( @@ -54160,8 +52914,7 @@ "wHi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "wHj" = ( @@ -54169,8 +52922,7 @@ /obj/structure/machinery/light, /obj/item/clothing/mask/gas, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/lone_buildings/storage_blocks) "wHo" = ( @@ -54194,8 +52946,7 @@ /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "wHF" = ( @@ -54207,8 +52958,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "wHU" = ( @@ -54226,8 +52976,7 @@ /area/lv522/indoors/b_block/bridge) "wIu" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) @@ -54253,8 +53002,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wJq" = ( @@ -54276,8 +53024,7 @@ /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "wKR" = ( @@ -54293,8 +53040,7 @@ /obj/structure/surface/rack, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wLd" = ( @@ -54316,8 +53062,7 @@ /obj/item/reagent_container/food/drinks/coffee, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wLU" = ( @@ -54343,8 +53088,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "wMF" = ( @@ -54355,8 +53099,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "wNl" = ( @@ -54380,8 +53123,7 @@ "wNp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/casino) "wNF" = ( @@ -54412,16 +53154,14 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "wOU" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "wPt" = ( @@ -54429,8 +53169,7 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "wPA" = ( @@ -54457,8 +53196,7 @@ "wQy" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/mining) "wRa" = ( @@ -54474,8 +53212,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "wRk" = ( @@ -54623,8 +53360,7 @@ "wTx" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "wTy" = ( @@ -54666,8 +53402,7 @@ /obj/item/ore/diamond, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "wUx" = ( @@ -54675,8 +53410,7 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "wUL" = ( @@ -54752,8 +53486,7 @@ "wXQ" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "wYa" = ( @@ -54847,8 +53580,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "wZI" = ( @@ -54858,8 +53590,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "xaj" = ( @@ -54870,8 +53601,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "xay" = ( @@ -54882,15 +53612,13 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xaD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "xaM" = ( @@ -54919,8 +53647,7 @@ pixel_y = 4 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/c_block/mining) "xbj" = ( @@ -54956,8 +53683,7 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "xce" = ( @@ -54965,8 +53691,7 @@ /area/lv522/atmos/command_centre) "xci" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) @@ -54978,8 +53703,7 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/c_block/mining) "xcE" = ( @@ -55016,8 +53740,7 @@ /area/lv522/indoors/c_block/mining) "xcY" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1) "xdb" = ( @@ -55135,8 +53858,7 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "xfX" = ( @@ -55209,8 +53931,7 @@ "xhq" = ( /obj/structure/closet, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xhu" = ( @@ -55225,8 +53946,7 @@ "xhB" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xhD" = ( @@ -55250,8 +53970,7 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/storage_blocks) "xic" = ( @@ -55262,8 +53981,7 @@ "xig" = ( /obj/structure/closet/crate, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "xiu" = ( @@ -55283,8 +54001,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xiY" = ( @@ -55302,8 +54019,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "xju" = ( @@ -55319,16 +54035,14 @@ /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "xjC" = ( /obj/structure/pipes/vents/pump, /obj/structure/closet, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xjF" = ( @@ -55354,8 +54068,7 @@ }, /obj/item/prop/alien/hugger, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/windbreaker/observation) "xjY" = ( @@ -55367,8 +54080,7 @@ dir = 4 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/bridge) "xka" = ( @@ -55391,8 +54103,7 @@ pixel_y = -5 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "xkr" = ( @@ -55413,8 +54124,7 @@ "xkB" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/atmos/outdoor) "xkO" = ( @@ -55424,8 +54134,7 @@ /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xlq" = ( @@ -55433,8 +54142,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurple2"; - tag = null + icon_state = "darkpurple2" }, /area/lv522/indoors/a_block/dorms) "xly" = ( @@ -55475,8 +54183,7 @@ /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xlY" = ( @@ -55485,8 +54192,7 @@ }, /obj/structure/machinery/vending/coffee, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xmj" = ( @@ -55494,8 +54200,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "xmk" = ( @@ -55530,8 +54235,7 @@ }, /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "xnk" = ( @@ -55580,8 +54284,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "xnI" = ( @@ -55610,8 +54313,7 @@ }, /obj/item/storage/toolbox/electrical, /obj/structure/machinery/light{ - dir = 4; - tag = null + dir = 4 }, /turf/open/floor/strata{ dir = 4; @@ -55622,22 +54324,19 @@ /obj/structure/largecrate/random/barrel/red, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) "xpg" = ( /obj/structure/prop/server_equipment/yutani_server, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/nw_rockies) "xpu" = ( /obj/structure/platform, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "xpH" = ( @@ -55656,8 +54355,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_east_street) "xqd" = ( @@ -55684,16 +54382,14 @@ "xqV" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xqY" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/landing_zone_1) "xrr" = ( @@ -55768,8 +54464,7 @@ }, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/c_block/t_comm) "xtk" = ( @@ -55829,8 +54524,7 @@ /obj/structure/cargo_container/watatsumi/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "xvl" = ( @@ -55849,8 +54543,7 @@ /area/lv522/indoors/c_block/bridge) "xvG" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "xvQ" = ( @@ -55861,8 +54554,7 @@ /area/lv522/indoors/lone_buildings/engineering) "xvW" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges) "xwv" = ( @@ -55887,7 +54579,7 @@ }, /area/lv522/indoors/b_block/hydro) "xwO" = ( -/obj/structure/cargo_container/watatsumi/leftmid, +/obj/structure/cargo_container/seegson/left, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_west_street) "xwZ" = ( @@ -55938,14 +54630,13 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) "xxJ" = ( -/obj/structure/cargo_container/watatsumi/rightmid, +/obj/structure/cargo_container/seegson/mid, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "xxU" = ( @@ -55955,7 +54646,7 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) "xxV" = ( -/obj/structure/cargo_container/watatsumi/right, +/obj/structure/cargo_container/seegson/right, /turf/open/asphalt/cement{ icon_state = "cement1" }, @@ -55967,16 +54658,14 @@ "xyi" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) "xym" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "xyL" = ( @@ -56059,8 +54748,7 @@ icon_state = "W" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "xAO" = ( @@ -56087,8 +54775,7 @@ pixel_y = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "xAZ" = ( @@ -56164,8 +54851,7 @@ "xCY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "xDl" = ( @@ -56205,8 +54891,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/south_west_street) "xDJ" = ( @@ -56218,8 +54903,7 @@ /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "xDM" = ( @@ -56260,14 +54944,12 @@ /obj/structure/cargo_container/kelland/right, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "xEB" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -56277,7 +54959,7 @@ /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) "xEH" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds1{ dir = 1 }, /turf/open/floor/prison{ @@ -56301,8 +54983,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/admin) "xFG" = ( @@ -56336,8 +55017,7 @@ /obj/item/reagent_container/glass/bucket/janibucket, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xHj" = ( @@ -56365,8 +55045,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/dorms) "xIv" = ( @@ -56397,8 +55076,7 @@ icon_state = "S" }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_2/ceiling) "xJF" = ( @@ -56445,21 +55123,18 @@ /turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "xKc" = ( -/obj/structure/closet/coffin/woodencrate, -/obj/item/clothing/accessory/health/ceramic_plate, -/obj/item/clothing/accessory/health/ceramic_plate, -/obj/item/clothing/accessory/health/ceramic_plate, -/obj/item/clothing/accessory/health/ceramic_plate, -/obj/item/clothing/accessory/health/ceramic_plate, /obj/structure/barricade/handrail{ - dir = 4 + dir = 8 }, /obj/structure/barricade/handrail{ - dir = 8 + dir = 4 }, +/obj/structure/closet/crate/ammo, +/obj/item/ammo_magazine/m56d, +/obj/item/ammo_magazine/m56d, +/obj/item/device/m56d_gun, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) "xKk" = ( @@ -56474,14 +55149,9 @@ dir = 8 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"xKO" = ( -/obj/structure/window/framed/strata/reinforced, -/turf/open/floor/plating, -/area/lv522/indoors/a_block/fitness) "xLg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/comfy{ @@ -56542,8 +55212,7 @@ pixel_y = 16 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/cargo) "xMu" = ( @@ -56555,8 +55224,7 @@ "xMz" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "xMO" = ( @@ -56600,8 +55268,7 @@ dir = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15"; - tag = null + icon_state = "rasputin15" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "xNw" = ( @@ -56678,8 +55345,7 @@ "xPj" = ( /obj/structure/largecrate/random, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "xPo" = ( @@ -56723,8 +55389,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "xPW" = ( @@ -56747,8 +55412,7 @@ "xPY" = ( /obj/structure/fence, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/atmos/outdoor) "xQc" = ( @@ -56783,14 +55447,12 @@ /obj/effect/landmark/objective_landmark/science, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "xRg" = ( /obj/structure/bed/chair/comfy{ - dir = 1; - tag = null + dir = 1 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ @@ -56862,8 +55524,7 @@ "xRE" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "xRG" = ( @@ -56872,8 +55533,7 @@ pixel_y = 7 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "xRI" = ( @@ -56892,8 +55552,7 @@ /area/lv522/outdoors/colony_streets/north_street) "xRM" = ( /obj/structure/machinery/door/airlock/dropship_hatch/two{ - dir = 8; - locked = 0 + dir = 8 }, /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -56901,8 +55560,7 @@ indestructible = 1 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3"; - tag = null + icon_state = "rasputin3" }, /area/lv522/landing_zone_forecon/UD6_Tornado) "xRQ" = ( @@ -56966,16 +55624,14 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "xTs" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/indoors/a_block/fitness) "xTJ" = ( @@ -57011,8 +55667,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "xUx" = ( @@ -57093,8 +55748,7 @@ /area/lv522/atmos/cargo_intake) "xWf" = ( /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/bridges/dorms_fitness) "xWx" = ( @@ -57119,8 +55773,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "xWF" = ( @@ -57174,8 +55827,7 @@ /obj/structure/foamed_metal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "xXN" = ( @@ -57285,8 +55937,7 @@ /obj/item/tool/pen/blue/clicky, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/hallway) "yaf" = ( @@ -57307,20 +55958,17 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/mining) "yar" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/landing_zone_2/ceiling) "yat" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ - locked = 0; name = "\improper Marshall Office Armory" }, /obj/structure/pipes/standard/simple/hidden/green{ @@ -57383,8 +56031,7 @@ /obj/effect/spawner/random/toolbox, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/indoors/c_block/garage) "yca" = ( @@ -57404,8 +56051,7 @@ dir = 1 }, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "ycv" = ( @@ -57467,9 +56113,8 @@ }, /area/lv522/outdoors/colony_streets/north_west_street) "ydD" = ( -/obj/item/weapon/shield/riot, -/obj/item/weapon/classic_baton, -/obj/structure/surface/rack, +/obj/structure/surface/table/almayer, +/obj/item/ammo_box/magazine/shotgun/buckshot/empty, /turf/open/floor/prison{ icon_state = "darkredfull2" }, @@ -57486,8 +56131,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/b_block/bar) "ydV" = ( @@ -57511,8 +56155,7 @@ }, /turf/open/floor/prison{ dir = 10; - icon_state = "floor_marked"; - tag = null + icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) "yeM" = ( @@ -57528,8 +56171,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "yeS" = ( @@ -57591,8 +56233,7 @@ /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/indoors/a_block/security) "ygJ" = ( @@ -57648,8 +56289,7 @@ "yhU" = ( /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/landing_zone_1/ceiling) "yif" = ( @@ -57773,8 +56413,7 @@ "yjL" = ( /turf/open/floor/prison{ dir = 10; - icon_state = "whitegreenfull"; - tag = null + icon_state = "whitegreenfull" }, /area/lv522/oob) "yjP" = ( @@ -57787,8 +56426,7 @@ /obj/item/tool/screwdriver, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ - icon_state = "darkbrownfull2"; - tag = null + icon_state = "darkbrownfull2" }, /area/lv522/landing_zone_2/ceiling) "yjT" = ( @@ -57812,15 +56450,13 @@ /obj/item/tank/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison{ - icon_state = "darkpurplefull2"; - tag = null + icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms/glass) "ykc" = ( /turf/open/floor/plating{ dir = 8; - icon_state = "platingdmg3"; - tag = null + icon_state = "platingdmg3" }, /area/lv522/indoors/a_block/bridges/op_centre) "yke" = ( @@ -57844,8 +56480,7 @@ "ykL" = ( /turf/open/floor/prison{ dir = 4; - icon_state = "darkyellowfull2"; - tag = null + icon_state = "darkyellowfull2" }, /area/lv522/indoors/lone_buildings/outdoor_bot) "ykR" = ( @@ -57856,8 +56491,7 @@ pixel_x = 1 }, /turf/open/floor/prison{ - icon_state = "floor_plate"; - tag = null + icon_state = "floor_plate" }, /area/lv522/outdoors/colony_streets/north_west_street) "ykT" = ( @@ -60608,6 +59242,7 @@ pLm pkH pvd nhi +oyf tns fOc uTd @@ -60616,17 +59251,16 @@ tns fOc uTd oyf -hqY +tns fOc uTd oyf -tns uLz +fOc uTd oyf tns -fOc -ryU +rhk ryU sOM vYK @@ -61081,7 +59715,7 @@ sYH nFj nFj bhy -vTO +gnf ryU wes pxb @@ -61308,7 +59942,7 @@ sYH sYH nFj sYH -orU +vTO ryU wiY pxb @@ -61535,7 +60169,7 @@ sYH sYH sYH sYH -dMY +orU ryU wiY pxb @@ -61762,7 +60396,7 @@ sYH sYH nFj nFj -gnf +dMY ryU wiY pxb @@ -61874,8 +60508,8 @@ pUc qst qLz qVl -rhk -rhk +qzp +qzp rFp sdE sIx @@ -61989,7 +60623,7 @@ sYH sYH nFj nFj -vTO +gnf ryU wiY pxb @@ -62216,7 +60850,7 @@ sYH sYH nFj nFj -orU +vTO ryU wiY pxb @@ -62443,7 +61077,7 @@ sYH sYH sYH sYH -dMY +orU ryU wiY pxb @@ -62670,7 +61304,7 @@ sYH sYH nFj sYH -gnf +dMY ryU wiY pxb @@ -62897,7 +61531,7 @@ sYH nFj nFj sYH -vTO +gnf ryU wjE pxb @@ -63332,15 +61966,14 @@ oKG pkH pwH sCk -vJj -nFj +jIk aGS dhP vJj jIk aGS dhP -enJ +vJj jIk aGS dhP @@ -63350,7 +61983,8 @@ aGS dhP vJj jIk -ryU +aGS +uEH ryU gPv gVn @@ -66418,11 +65052,11 @@ slO hJZ hJZ hJZ -hJZ -hJZ -hJZ -hJZ -hJZ +uAb +lsG +lsG +lsG +qDl clY vjG kCJ @@ -66645,11 +65279,11 @@ slO hJZ clY hJZ -hJZ +rmX xkO xkO xkO -clY +lUh clY clY oTd @@ -66872,11 +65506,11 @@ slO hJZ clY clY -hJZ +rmX xkO sKj xkO -clY +lUh clY clY srQ @@ -67099,11 +65733,11 @@ eUt hJZ hJZ clY -hJZ +rmX xkO xWx xkO -clY +lUh clY clY oNQ @@ -67326,11 +65960,11 @@ eUt clY hJZ hJZ -hJZ +uGd sek -hJZ +fuw sek -clY +qma clY hJZ oNQ @@ -68696,7 +67330,7 @@ xqd pVx pVx pVx -xyL +xtb xWf imJ xWf @@ -68704,7 +67338,7 @@ xWf xWf qAy xWf -pMd +nLm kcS gou ulL @@ -68721,14 +67355,14 @@ pDh kcS wfb qjt -pMd +nLm klp oot pJW tUM gWh aTS -pMd +nLm lAj ulL ulL @@ -68744,7 +67378,7 @@ ulL lAj wRd wLN -pMd +nLm qQM vXc wth @@ -69377,7 +68011,7 @@ uEC uEC uEC pVx -xyL +xtb odZ imJ xWf @@ -69385,7 +68019,7 @@ xWf xWf xWf odZ -pMd +nLm kcS vId oTg @@ -69402,14 +68036,14 @@ fps npp cHC vJT -pMd +nLm oeL rAg dNm tUM gWh aAW -pMd +nLm kxW kxW lek @@ -69425,7 +68059,7 @@ oTg pJW iUo vdV -pMd +nLm qQM vXc puY @@ -69567,7 +68201,7 @@ bIJ bIJ yim abV -ebM +abV eUf fLz abV @@ -69794,9 +68428,9 @@ yim yim yim cpy -eeX -eeX -eeX +inU +cpy +cpy gGx inU inU @@ -70023,8 +68657,8 @@ cpy cpy cpy fgf -fOl -yim +cpy +cKF hzA ihy yim @@ -70250,7 +68884,7 @@ yim cpy cpy cpy -fOl +cpy cpy hIp ijv @@ -70733,7 +69367,7 @@ roT xTs sKL tkM -xtb +xyL uad xTs uIo @@ -70960,7 +69594,7 @@ vsG xTs xTs tkM -xtb +xyL ubd xTs jLF @@ -71414,7 +70048,7 @@ rLq siT uEC xqd -xyL +xtb xqd uEC pAW @@ -72095,7 +70729,7 @@ rLy siT uEC xqd -xyL +xtb ubv xXX xtb @@ -73052,7 +71686,7 @@ nwj nLm qxb wqn -uEH +cve vJT sLQ nLm @@ -73995,7 +72629,7 @@ tSL pJZ drz bFU -yfH +tSL tne kGm lML @@ -74030,7 +72664,7 @@ hyf wIr hWs pXq -bnz +pOs uNu pKl oLa @@ -74257,7 +72891,7 @@ dgY gwg cHb oqp -gxe +oLa pKl pKl tkf @@ -74676,7 +73310,7 @@ tne yfR tne yfR -yfH +tSL hES tne tne @@ -75502,10 +74136,10 @@ xtb xtb xtb xtb -xKO +xtb rMb skQ -xKO +xtb xtb tvO ugV @@ -76864,10 +75498,10 @@ emH emH yjp beB -dhQ +beB uPk vnB -dhQ +beB wrC wrC xXR @@ -77190,7 +75824,7 @@ xgH tkf pfD rQg -pbb +vdp nax nax uXp @@ -77345,8 +75979,8 @@ kRb kBk iJu uDs -uDb -nKo +jUg +uVj sjy ogK oud @@ -77526,12 +76160,12 @@ saC xED uKD uKD -abo -abo -abo -abo -abo -abo +vju +vju +vju +vju +vju +vju uKD mwv tvO @@ -77569,10 +76203,10 @@ wdi sjy sjy jmd -jmd +eWF oLW mbF -jGj +jft xbj sjy mNR @@ -77752,14 +76386,14 @@ saC saC xED uKD -abo -abo +vju +vju jbn jbn jbn kIY -abo -abo +vju +vju mwv tvO ugV @@ -77979,14 +76613,14 @@ saC saC xED uKD -abo +vju iZS jBr jEa jEa kLk lbo -abo +vju mwv tvO ugV @@ -78206,7 +76840,7 @@ saC saC xED uKD -abo +vju iZS jEa kHd @@ -78433,8 +77067,8 @@ saC saC xED uKD -abo -abo +vju +vju kzd jEa jEa @@ -78660,7 +77294,7 @@ saC saC xED uKD -abo +vju iZS jEa jEa @@ -78698,7 +77332,7 @@ sjy sjy sjy lhK -azl +nKo mqH ybt sjy @@ -78887,14 +77521,14 @@ saC saC xED uKD -abo +vju iZS jBr jEa jEa kXY lzb -abo +vju mwv tvO ugV @@ -78926,7 +77560,7 @@ sjy sjy lhK azl -mqH +mnU xhu sjy vHU @@ -79114,14 +77748,14 @@ saC saC xED uKD -abo -abo +vju +vju jbn jbn jbn kIY -abo -abo +vju +vju mwv tvO ugV @@ -79342,12 +77976,12 @@ saC xED uKD uKD -abo -abo -abo -abo -abo -abo +vju +vju +vju +vju +vju +vju uKD mSc tvO @@ -79592,7 +78226,7 @@ iPZ uSv jyx uQF -jyx +jGj wwy jPw qgr @@ -80934,7 +79568,7 @@ saC saC saC saC -cpy +saC saC ien ien @@ -80963,7 +79597,7 @@ nTx nTx nTx mvR -ryv +sjy uVj kOS uDb @@ -81159,9 +79793,9 @@ saC saC saC saC -cpy -cpy -cpy +saC +saC +saC saC saC ien @@ -81191,7 +79825,7 @@ nTx nTx mvR qPS -uVj +oGp xxs eUh eUh @@ -81385,11 +80019,11 @@ saC saC saC saC -cpy -cpy -cpy -cpy -cpy +saC +saC +saC +saC +saC saC ien rxI @@ -81418,7 +80052,7 @@ mcC nTx jNv ryv -jft +lhT xxs uDb uDb @@ -81611,11 +80245,11 @@ saC saC saC saC -cpy -cpy -cpy -cpy -cpy +saC +saC +saC +saC +saC saC ien ien @@ -81645,8 +80279,8 @@ nTx eHn uWh sjy -poN -uVj +jft +xxs uDb kBB nrP @@ -81839,10 +80473,10 @@ saC saC saC saC -cpy -cpy saC -cpy +saC +saC +saC saC saC ien @@ -81872,7 +80506,7 @@ nTx eHn pgl sjy -sjy +bnz xQi uDb uDb @@ -82069,7 +80703,7 @@ saC saC saC saC -cpy +saC saC ien ien @@ -82541,10 +81175,10 @@ umR onj wKg wKg -lVD +wKg vQT fmg -lVD +wKg wKg wKg lVD @@ -82780,8 +81414,8 @@ xlI mev mev tdD -iiz -cKF +sjy +uVj qDr xxs nrP @@ -83461,7 +82095,7 @@ xlI xlI yjy xlI -iiz +sjy uVj eqM cvi @@ -83707,7 +82341,7 @@ sjy kqb kqb mUS -wmg +egP kqb kqb pGl @@ -85613,7 +84247,7 @@ jas jas jas jas -tms +hra nQu aEF jas @@ -86837,7 +85471,7 @@ saC saC saC saC -cpy +saC saC saC saC @@ -87063,9 +85697,9 @@ saC saC saC saC -cpy -cpy -cpy +saC +saC +saC saC saC saC @@ -87290,11 +85924,11 @@ saC saC saC saC -cpy -cpy -cpy -cpy -cpy +saC +saC +saC +saC +saC saC saC bUN @@ -87518,11 +86152,11 @@ saC saC saC saC -cpy -cpy -cpy -cpy -cpy +saC +saC +saC +saC +saC ien cGd rtI @@ -87746,10 +86380,10 @@ saC saC saC saC -cpy -cpy -cpy -cpy +saC +saC +saC +saC ien rhh rtX @@ -87973,9 +86607,9 @@ saC saC saC saC -cpy -cpy -cpy +saC +saC +saC ien ien ien @@ -88201,9 +86835,9 @@ saC saC saC saC -cpy -cpy -cpy +saC +saC +saC ien qSH qSH @@ -88290,7 +86924,7 @@ lGW xgA acE kEQ -xvB +xvl otS fWG fWG @@ -88429,8 +87063,8 @@ saC saC saC saC -cpy -cpy +saC +saC ien qSH qSH @@ -88465,7 +87099,7 @@ qBb iXZ nxj rMg -hDZ +tDS uNJ orS muV @@ -88744,7 +87378,7 @@ ntS xgA bsG kEQ -xvB +xvl otS fWG cpy @@ -89146,7 +87780,7 @@ lRF ojt muV vrg -tQC +tDS iNb wWV tvi @@ -89378,14 +88012,14 @@ nxO ilR nGq way -raj +gdO puJ iuy uuH pfN pqU lSl -jab +tTK jmi cMt kiG @@ -90708,10 +89342,10 @@ dRL dRL dRL dRL -dEu +dRL qhA qiG -dEu +dRL dRL xFp nQa @@ -91623,7 +90257,7 @@ xCT rsq xCT yfP -dEu +dRL fKf qSH qSH @@ -91846,9 +90480,9 @@ oBx nTg nTg iAZ -qUq -qUq -qUq +xCT +xCT +xCT yfP rJf fKf @@ -92077,7 +90711,7 @@ reo xCT xCT yfP -dEu +dRL fKf qSH qSH @@ -92978,10 +91612,10 @@ dRL dRL dRL dRL -dEu +dRL qhA qiG -dEu +dRL dRL pGY jKB @@ -95708,7 +94342,7 @@ qSH qSH qSH qSH -qSH +oQC qnb krH krH diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index fbfa1f791f8f..cec27c56b079 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -24,30 +24,17 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/north_east_caves) "aaj" = ( -/turf/open/gm/coast{ - dir = 4 - }, -/area/lv624/ground/caves/north_central_caves) -"aak" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/west, /area/lv624/ground/caves/north_central_caves) "aam" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river, /area/lv624/ground/caves/north_central_caves) "aap" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/north_central_caves) "aaq" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/north_central_caves) "aar" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -59,56 +46,32 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/north_central_caves) "aat" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/north_central_caves) "aau" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/north_central_caves) "aav" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/north_central_caves) "aaw" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/north_central_caves) "aax" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/north_central_caves) "aay" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/caves/north_central_caves) "aaz" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/north_central_caves) "aaA" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, -/area/lv624/ground/caves/north_central_caves) -"aaB" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/caves/north_central_caves) "aaC" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/caves/north_central_caves) "aaD" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -118,29 +81,23 @@ /area/lv624/ground/caves/north_east_caves) "aaE" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/north_central_caves) "aaF" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/caves/north_central_caves) "aaG" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/caves/north_central_caves) "aaH" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/north_central_caves) "aaJ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/north_central_caves) "aaK" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/north_central_caves) "aaM" = ( /obj/effect/landmark/crap_item, @@ -153,15 +110,10 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) "aaO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/caves/north_central_caves) "aaP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/north_central_caves) "aaQ" = ( /turf/closed/wall/cult, @@ -178,38 +130,26 @@ }, /area/lv624/ground/caves/east_caves) "aaT" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/north_central_caves) "aaU" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, /area/lv624/ground/caves/north_central_caves) "aaV" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/north_central_caves) "aaW" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/north_central_caves) "aaX" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/north_central_caves) "aaY" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/north_central_caves) "aaZ" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/north_central_caves) "aba" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -226,20 +166,13 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) "abd" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/caves/north_central_caves) "abe" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/north_central_caves) "abf" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/caves/north_central_caves) "abg" = ( /obj/effect/landmark/crap_item, @@ -296,7 +229,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "abv" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, @@ -309,6 +242,7 @@ /area/lv624/ground/caves/central_caves) "aby" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) "abz" = ( @@ -327,6 +261,7 @@ /area/lv624/ground/caves/north_west_caves) "abE" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) "abF" = ( @@ -379,6 +314,7 @@ "abV" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "white" }, @@ -472,12 +408,11 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) "acr" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "acs" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ dir = 1; @@ -770,7 +705,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adD" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -781,7 +716,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adE" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal{ @@ -797,7 +732,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adF" = ( /obj/structure/surface/rack, /obj/item/tool/shovel, @@ -805,7 +740,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adH" = ( /obj/effect/decal/remains/xeno, /obj/structure/stairs/perspective{ @@ -825,7 +760,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adJ" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, @@ -834,7 +769,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adN" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/iron{ @@ -848,7 +783,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adP" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane, /obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, @@ -869,7 +804,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adS" = ( /obj/structure/xenoautopsy/tank/hugger, /turf/open/shuttle{ @@ -885,7 +820,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "adU" = ( /obj/effect/landmark/crap_item, /turf/open/floor/airless{ @@ -931,7 +866,7 @@ /area/lv624/ground/caves/south_east_caves) "aec" = ( /obj/structure/surface/table/woodentable/poor, -/obj/item/weapon/gun/shotgun/double, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) "aed" = ( @@ -956,7 +891,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "aej" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/prop/brazier/torch, @@ -992,9 +927,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "aeq" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, @@ -1009,7 +942,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) "aes" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/west_caves) "aet" = ( /obj/structure/fence, @@ -1019,9 +952,7 @@ }, /area/lv624/ground/barrens/containers) "aev" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "aex" = ( /turf/open/floor{ @@ -1177,7 +1108,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "afr" = ( /obj/structure/ore_box, @@ -1444,7 +1375,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "agv" = ( /turf/open/floor/plating{ dir = 4; @@ -1559,9 +1490,7 @@ /area/lv624/ground/caves/sand_temple) "ahe" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/barrens/west_barrens) "ahh" = ( /obj/effect/decal/cleanable/blood, @@ -1614,19 +1543,19 @@ "ahx" = ( /obj/structure/inflatable, /turf/open/gm/dirt, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahy" = ( /obj/structure/inflatable, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahz" = ( /obj/structure/inflatable/door, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/sandstone/runed, @@ -1643,18 +1572,18 @@ /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahK" = ( /obj/item/device/analyzer, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahL" = ( /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "ahM" = ( /obj/structure/machinery/floodlight, /turf/open/floor/plating{ @@ -1711,19 +1640,19 @@ /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "aie" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "aif" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "aih" = ( /obj/structure/largecrate/random, /obj/item/tool/crowbar/red, @@ -1731,7 +1660,7 @@ dir = 9; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aij" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -1739,7 +1668,7 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aik" = ( /obj/structure/surface/table, /obj/item/ashtray/plastic, @@ -1749,7 +1678,7 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aim" = ( /obj/structure/surface/table, /obj/item/device/flashlight/lamp, @@ -1757,14 +1686,14 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "ain" = ( /obj/structure/machinery/computer3, /turf/open/floor/plating{ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aio" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" @@ -1773,7 +1702,7 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aip" = ( /obj/structure/surface/table, /obj/item/stack/rods{ @@ -1784,7 +1713,7 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiq" = ( /obj/structure/surface/table, /obj/item/stack/cable_coil/random, @@ -1793,18 +1722,16 @@ dir = 5; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiu" = ( /obj/effect/landmark/corpsespawner/miner, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "aiv" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/east_barrens) "aiw" = ( /obj/structure/machinery/constructable_frame, @@ -1813,21 +1740,21 @@ dir = 9; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aix" = ( /obj/item/frame/apc, /turf/open/floor/plating{ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiy" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/plating{ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiz" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -1835,7 +1762,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiA" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -1844,14 +1771,14 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiB" = ( /obj/effect/spawner/random/tech_supply, /turf/open/floor/plating{ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiD" = ( /obj/structure/sink{ pixel_y = 30 @@ -1860,24 +1787,24 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiF" = ( /obj/item/weapon/butterfly/switchblade, /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiG" = ( /obj/structure/bed/stool, /obj/item/storage/backpack, /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiH" = ( /obj/effect/spawner/random/tech_supply, /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiI" = ( /obj/structure/bed/stool, /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiJ" = ( /obj/structure/surface/table, /obj/item/stack/medical/ointment, @@ -1886,13 +1813,13 @@ dir = 4; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiK" = ( /obj/structure/window/framed/colony, /turf/open/floor{ icon_state = "platebot" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiL" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ name = "Water Filtration Plant"; @@ -1902,13 +1829,13 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiM" = ( /turf/open/floor/plating{ dir = 10; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiO" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -1917,7 +1844,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiP" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -1926,7 +1853,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1934,7 +1861,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1943,7 +1870,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiS" = ( /obj/item/tool/kitchen/knife/butcher, /turf/open/gm/dirt, @@ -1956,24 +1883,22 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiU" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aiV" = ( /turf/open/floor/plating{ dir = 6; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aja" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/west_jungle) "ajc" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -1988,17 +1913,15 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "ajg" = ( /obj/structure/flora/bush/ausbushes, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "ajh" = ( /obj/structure/flora/jungle/planttop1, /turf/closed/wall, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "aji" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2025,23 +1948,21 @@ /area/lv624/ground/barrens/central_barrens) "ajq" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "ajr" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ajs" = ( /obj/structure/flora/jungle/plantbot1, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ajt" = ( /obj/item/weapon/broken_bottle, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "aju" = ( /obj/structure/disposalpipe/segment{ @@ -2049,16 +1970,16 @@ name = "water pipe" }, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ajv" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ajw" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/east_river) "ajx" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -2070,7 +1991,7 @@ "ajA" = ( /obj/structure/fence, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ajD" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -2081,10 +2002,7 @@ /area/lv624/ground/river/east_river) "ajE" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/central_river) "ajF" = ( /obj/structure/disposalpipe/segment{ @@ -2144,9 +2062,7 @@ /area/lv624/ground/river/central_river) "ajT" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/central_river) "ajU" = ( /obj/structure/fence, @@ -2170,9 +2086,7 @@ /area/lv624/ground/river/central_river) "ajY" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_east_jungle) "ajZ" = ( /obj/structure/disposalpipe/broken{ @@ -2226,10 +2140,8 @@ /turf/open/floor/wood, /area/lv624/lazarus/hop) "akj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "akl" = ( /obj/item/device/analyzer, @@ -2241,15 +2153,11 @@ /area/lv624/ground/river/central_river) "akn" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "ako" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/central_river) "akp" = ( /obj/structure/grille, @@ -2261,7 +2169,7 @@ /area/lv624/ground/river/east_river) "akq" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "akr" = ( /obj/structure/flora/bush/ausbushes/palebush, @@ -2297,7 +2205,7 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "aky" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "akA" = ( /obj/structure/grille, @@ -2329,12 +2237,6 @@ icon_state = "warnplate" }, /area/lv624/ground/river/east_river) -"akG" = ( -/obj/structure/machinery/floodlight/landing, -/turf/open/floor/mech_bay_recharge_floor{ - name = "Shuttle Landing Lights" - }, -/area/lv624/lazarus/landing_zones/lz1) "akJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2381,9 +2283,7 @@ "akR" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "akT" = ( /obj/structure/disposalpipe/junction, @@ -2412,44 +2312,29 @@ /area/lv624/ground/river/central_river) "akW" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/central_river) "akY" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/jungle/west_jungle) "akZ" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/jungle/west_jungle) "ala" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "alb" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "alc" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/central_river) "ald" = ( /obj/structure/disposalpipe/segment{ @@ -2464,10 +2349,7 @@ /area/lv624/ground/river/east_river) "ale" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_west_jungle) "alg" = ( /obj/structure/ore_box, @@ -2483,22 +2365,11 @@ /area/lv624/ground/river/central_river) "alo" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, -/area/lv624/ground/river/central_river) -"alp" = ( -/obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/central_river) "als" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/east_river) "alw" = ( /obj/structure/flora/jungle/alienplant1, @@ -2517,13 +2388,11 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "alC" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/west_river) "alD" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "alE" = ( /obj/structure/disposalpipe/segment, @@ -2538,9 +2407,7 @@ /area/lv624/ground/river/central_river) "alF" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "alK" = ( /obj/structure/disposalpipe/broken{ @@ -2554,16 +2421,10 @@ /area/lv624/ground/river/central_river) "alL" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_east_jungle) "alM" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/east_river) "alN" = ( /obj/structure/disposalpipe/trunk{ @@ -2578,10 +2439,8 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "alP" = ( -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_1, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "alR" = ( @@ -2610,9 +2469,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "alU" = ( /obj/structure/disposalpipe/trunk{ @@ -2622,9 +2479,7 @@ /area/lv624/ground/river/central_river) "alW" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "alX" = ( /obj/structure/fence, @@ -2640,9 +2495,7 @@ "alZ" = ( /obj/effect/landmark/crap_item, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/river/central_river) "ama" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -2660,7 +2513,7 @@ /area/lv624/ground/river/east_river) "amh" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "aml" = ( /obj/structure/disposalpipe/segment, @@ -2706,25 +2559,19 @@ /area/lv624/ground/river/west_river) "amB" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "amC" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "amD" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "amE" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "amG" = ( /obj/structure/flora/jungle/alienplant1, @@ -2732,19 +2579,14 @@ /area/lv624/ground/river/west_river) "amK" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/west_river) "amL" = ( /obj/structure/flora/bush/ausbushes/palebush, /turf/open/gm/river, /area/lv624/ground/river/east_river) "amN" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "amR" = ( @@ -2772,9 +2614,7 @@ /area/lv624/ground/river/central_river) "amW" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "amX" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -2786,22 +2626,17 @@ "amZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/west_river) "anc" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "and" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/east_river) "ane" = ( /turf/closed/wall/rock/brown, @@ -2828,20 +2663,18 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "anq" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "anv" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "anx" = ( /obj/structure/flora/jungle/vines/heavy, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "any" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -2873,7 +2706,7 @@ /area/lv624/lazarus/corporate_dome) "anP" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "anR" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, @@ -2891,10 +2724,7 @@ /area/lv624/lazarus/hydroponics) "anW" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_east_jungle) "aoa" = ( /obj/structure/machinery/medical_pod/sleeper, @@ -3084,10 +2914,7 @@ "aoX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/east_river) "aoZ" = ( /obj/structure/flora/bush/ausbushes/ppflowers, @@ -3096,18 +2923,15 @@ "apa" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) "aph" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "apl" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "apo" = ( /obj/structure/flora/bush/ausbushes/ppflowers, @@ -3115,13 +2939,11 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "app" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "apq" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "apt" = ( /turf/open/floor, @@ -3179,14 +3001,12 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "apQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz1) "apR" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "apV" = ( /obj/item/clothing/under/colonist, @@ -3195,13 +3015,9 @@ }, /area/lv624/lazarus/medbay) "apW" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "apZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{ @@ -3214,9 +3030,7 @@ /area/lv624/lazarus/medbay) "aqf" = ( /obj/structure/window/framed/colony/reinforced, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aqi" = ( @@ -3237,9 +3051,7 @@ /area/lv624/lazarus/hydroponics) "aqq" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_jungle) "aqr" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -3249,19 +3061,16 @@ "aqs" = ( /obj/effect/landmark/crap_item, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "aqt" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "aqu" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/east_river) "aqz" = ( /obj/effect/landmark/crap_item, @@ -3280,40 +3089,32 @@ /area/lv624/lazarus/medbay) "aqF" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/lazarus/quartstorage/outdoors) "aqG" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/lazarus/quartstorage/outdoors) "aqH" = ( /obj/effect/landmark/crap_item, /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/lazarus/quartstorage/outdoors) "aqI" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/lazarus/quartstorage/outdoors) "aqJ" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/river/east_river) "aqK" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "aqM" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/east_river) "aqQ" = ( /obj/structure/surface/table, @@ -3327,21 +3128,14 @@ }, /area/lv624/lazarus/medbay) "aqR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/west_jungle) "aqS" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "aqV" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/lazarus/quartstorage/outdoors) "aqW" = ( /turf/open/gm/dirt, @@ -3351,9 +3145,7 @@ /turf/open/gm/dirt, /area/lv624/lazarus/quartstorage/outdoors) "aqY" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/lazarus/quartstorage/outdoors) "arc" = ( /obj/effect/landmark/hunter_secondary, @@ -3378,13 +3170,10 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/river/east_river) "arn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/west_jungle) "aro" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "arp" = ( /obj/structure/surface/rack, @@ -3460,15 +3249,10 @@ /area/lv624/lazarus/hydroponics) "arw" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/lazarus/quartstorage/outdoors) "arE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/west_jungle) "arG" = ( /obj/effect/landmark/survivor_spawner, @@ -3503,34 +3287,24 @@ /area/lv624/lazarus/landing_zones/lz1) "arO" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/east_river) "arP" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "arQ" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "arR" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "arS" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/east_river) "arT" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -3547,30 +3321,21 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "asa" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/west_jungle) "asc" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "asd" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "ase" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_jungle) "asg" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "asi" = ( /obj/structure/girder, @@ -3589,17 +3354,12 @@ "asl" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "asm" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/river/east_river) "aso" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -3610,29 +3370,21 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "asr" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_jungle) "ast" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/south_medbay_road) "asw" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_jungle) "asx" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/west_jungle) "asy" = ( /obj/item/tool/warning_cone, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "asz" = ( /obj/structure/barricade/wooden, @@ -3657,7 +3409,7 @@ /turf/open/gm/dirt, /area/lv624/ground/colony/south_medbay_road) "asJ" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor{ dir = 5; icon_state = "warning" @@ -3665,7 +3417,7 @@ /area/lv624/lazarus/landing_zones/lz1) "asK" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "asL" = ( /obj/item/tool/warning_cone, @@ -3704,9 +3456,7 @@ "asR" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "asT" = ( /turf/closed/wall/r_wall, @@ -3740,27 +3490,23 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "asY" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "asZ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ata" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "atc" = ( /obj/structure/girder, @@ -3814,9 +3560,7 @@ }, /area/lv624/lazarus/research) "atu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_jungle) "atv" = ( /obj/structure/closet/crate, @@ -3843,11 +3587,11 @@ /area/lv624/lazarus/fitness) "atA" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "atC" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "atD" = ( /obj/structure/girder/displaced, @@ -3883,10 +3627,7 @@ /area/lv624/lazarus/quartstorage) "atJ" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/west_river) "atM" = ( /obj/structure/closet/crate, @@ -3986,9 +3727,7 @@ /area/lv624/lazarus/fitness) "atZ" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aua" = ( /obj/effect/landmark/crap_item, @@ -4000,10 +3739,7 @@ /area/lv624/lazarus/quartstorage) "auc" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/west_river) "aud" = ( /turf/open/gm/river, @@ -4012,17 +3748,17 @@ /turf/open/floor/wood{ icon_state = "wood-broken3" }, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "auf" = ( /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aug" = ( /obj/structure/barricade/wooden{ dir = 1; pixel_y = 7 }, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "auj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/surgical_tray, @@ -4037,10 +3773,7 @@ /area/lv624/lazarus/medbay) "aul" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) "aum" = ( /turf/open/floor{ @@ -4105,21 +3838,13 @@ }, /area/lv624/lazarus/research) "aux" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/stack/medical/advanced/bruise_pack/predator, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "auy" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_west_jungle) "auz" = ( /obj/structure/surface/rack, @@ -4203,9 +3928,7 @@ /area/lv624/lazarus/quartstorage/outdoors) "auM" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) "auO" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ @@ -4216,12 +3939,10 @@ /turf/open/floor{ icon_state = "cult" }, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "auP" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "auR" = ( /obj/structure/barricade/wooden{ @@ -4230,7 +3951,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken" }, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "auV" = ( /obj/effect/decal/remains/human, /turf/open/floor{ @@ -4340,7 +4061,7 @@ "avo" = ( /obj/structure/barricade/wooden, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "avp" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/stairs/perspective{ @@ -4406,9 +4127,7 @@ "avy" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "avB" = ( /obj/structure/surface/table, @@ -4478,9 +4197,7 @@ /area/lv624/lazarus/research) "avK" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/west_river) "avL" = ( /obj/structure/closet/lasertag/blue, @@ -4506,16 +4223,11 @@ /area/lv624/lazarus/fitness) "avP" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/quartstorage/outdoors) "avQ" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/lazarus/quartstorage/outdoors) "avR" = ( /obj/structure/fence, @@ -4569,21 +4281,18 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "awc" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/river/west_river) "awe" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "awg" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/jungle/west_jungle) "awh" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -4739,14 +4448,11 @@ /area/lv624/lazarus/fitness) "awz" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "awC" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/jungle/west_jungle) "awD" = ( /turf/open/floor/plating{ @@ -4766,7 +4472,7 @@ /area/lv624/lazarus/robotics) "awF" = ( /obj/item/storage/toolbox/mechanical, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "awG" = ( /obj/effect/landmark/survivor_spawner, @@ -4799,7 +4505,7 @@ /area/lv624/lazarus/research) "awL" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_central_jungle) "awM" = ( /obj/item/prop/alien/hugger, @@ -4841,7 +4547,7 @@ /area/lv624/lazarus/fitness) "awQ" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_central_jungle) "awR" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -4879,7 +4585,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "awW" = ( /obj/structure/machinery/light/small{ @@ -4968,7 +4674,7 @@ "axp" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "axt" = ( /turf/open/floor{ dir = 9; @@ -4989,10 +4695,7 @@ }, /area/lv624/lazarus/fitness) "axw" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/jungle/west_jungle) "axx" = ( /obj/effect/landmark/corpsespawner/chef, @@ -5036,7 +4739,7 @@ /area/lv624/lazarus/robotics) "axD" = ( /obj/effect/decal/remains/human, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "axF" = ( /turf/open/floor{ @@ -5076,9 +4779,9 @@ dir = 8 }, /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; - phone_id = "Research Dome" + phone_id = "Research Dome"; + pixel_y = 24 }, /turf/open/floor{ dir = 5; @@ -5113,11 +4816,9 @@ }, /area/lv624/lazarus/fitness) "axR" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "axS" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_x = 29 @@ -5129,24 +4830,22 @@ }, /area/lv624/lazarus/fitness) "axV" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/west_jungle) "axW" = ( /obj/effect/decal/remains/xeno, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/north_nexus_road) "axX" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "axY" = ( /obj/structure/tunnel{ id = "hole4" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "axZ" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -5159,13 +4858,13 @@ /area/lv624/lazarus/quartstorage) "aya" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "ayd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ayg" = ( /obj/structure/computerframe, @@ -5175,9 +4874,7 @@ /area/lv624/lazarus/robotics) "ayh" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/jungle/west_jungle) "ayj" = ( /obj/structure/machinery/optable, @@ -5200,7 +4897,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aym" = ( /obj/structure/machinery/autolathe, @@ -5294,7 +4991,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ayC" = ( /obj/item/tool/warning_cone, @@ -5373,7 +5070,7 @@ /area/lv624/lazarus/research) "ayN" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ayO" = ( /obj/item/weapon/baseballbat/metal, @@ -5405,26 +5102,19 @@ "ayS" = ( /obj/effect/landmark/crap_item, /obj/structure/barricade/wooden, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "ayT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "ayU" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_central_jungle) "ayV" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/jungle/west_jungle) "ayW" = ( /obj/structure/largecrate/random, @@ -5508,7 +5198,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "azh" = ( /obj/item/prop/alien/hugger, @@ -5629,10 +5319,7 @@ /area/lv624/ground/colony/telecomm/tcommdome/south) "azD" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/lazarus/landing_zones/lz2) "azE" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -5750,7 +5437,7 @@ /area/lv624/lazarus/sleep_female) "azU" = ( /obj/structure/barricade/wooden, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "azV" = ( /obj/item/stack/sheet/wood{ @@ -5794,7 +5481,7 @@ /area/lv624/lazarus/landing_zones/lz2) "aAd" = ( /obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "aAh" = ( /obj/effect/decal/cleanable/blood/oil, @@ -5839,9 +5526,7 @@ pixel_y = 32 }, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_tcomms_road) "aAp" = ( /turf/closed/wall/strata_ice/jungle, @@ -5856,17 +5541,15 @@ pixel_y = 32 }, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_tcomms_road) "aAs" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz2) "aAt" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aAv" = ( /obj/effect/decal/cleanable/blood, @@ -6154,7 +5837,7 @@ /area/lv624/ground/caves/sand_temple) "aBk" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aBl" = ( /obj/structure/flora/bush/ausbushes/genericbush, @@ -6162,10 +5845,7 @@ /area/lv624/ground/jungle/west_jungle) "aBn" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/west_river) "aBo" = ( /obj/docking_port/stationary/marine_dropship/lz2{ @@ -6334,10 +6014,8 @@ /area/lv624/ground/caves/north_central_caves) "aBQ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aBR" = ( /obj/structure/largecrate, @@ -6510,9 +6188,7 @@ /area/lv624/lazarus/sleep_male) "aCs" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/lazarus/landing_zones/lz2) "aCt" = ( /obj/structure/closet, @@ -6632,9 +6308,7 @@ }, /area/lv624/lazarus/robotics) "aCO" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/west_jungle) "aCP" = ( /obj/structure/bed/chair/wood/wings{ @@ -6669,9 +6343,7 @@ /area/lv624/lazarus/sleep_male) "aCS" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "aCT" = ( /obj/structure/closet{ @@ -6697,7 +6369,7 @@ }, /area/lv624/lazarus/sleep_male) "aCV" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/sleep_male) "aCX" = ( /turf/open/floor/grass, @@ -6771,14 +6443,12 @@ /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "aDl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aDn" = ( /obj/item/bananapeel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aDp" = ( /obj/structure/bed/chair/comfy/orange{ @@ -6892,10 +6562,6 @@ icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz1) -"aDH" = ( -/obj/effect/decal/warning_stripes, -/turf/open/floor/plating, -/area/lv624/lazarus/landing_zones/lz1) "aDI" = ( /obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/floor/plating, @@ -6929,9 +6595,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "aDP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_central_jungle) "aDS" = ( @@ -6990,9 +6654,7 @@ }, /area/lv624/lazarus/quartstorage) "aEe" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/west_jungle) "aEf" = ( /obj/effect/landmark/crap_item, @@ -7036,20 +6698,12 @@ /area/lv624/lazarus/fitness) "aEs" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/lazarus/landing_zones/lz2) "aEt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aEu" = ( /obj/effect/landmark/crap_item, @@ -7058,7 +6712,7 @@ "aEv" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aEw" = ( /obj/structure/machinery/landinglight/ds2{ @@ -7195,10 +6849,7 @@ }, /area/lv624/lazarus/chapel) "aEM" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/jungle/west_jungle) "aEO" = ( /obj/structure/bed/chair{ @@ -7389,7 +7040,7 @@ /area/lv624/lazarus/toilet) "aFm" = ( /turf/closed/wall/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aFn" = ( /turf/open/floor{ icon_state = "chapel" @@ -7576,7 +7227,7 @@ "aFQ" = ( /obj/structure/window_frame/wood, /turf/open/floor/plating, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aFR" = ( /turf/open/floor{ dir = 4; @@ -7667,22 +7318,15 @@ /area/lv624/ground/jungle/west_jungle) "aGh" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/lazarus/landing_zones/lz2) "aGk" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aGl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_central_jungle) "aGm" = ( @@ -7856,7 +7500,7 @@ /area/lv624/lazarus/landing_zones/lz1) "aGS" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "aGU" = ( /obj/effect/landmark/crap_item, @@ -7877,7 +7521,7 @@ /area/lv624/lazarus/landing_zones/lz2) "aGY" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/north_nexus_road) "aGZ" = ( /obj/structure/surface/table, @@ -8035,21 +7679,15 @@ /area/lv624/lazarus/landing_zones/lz1) "aHB" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/north_tcomms_road) "aHD" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/west_nexus_road) "aHE" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aHF" = ( /obj/structure/machinery/vending/coffee, @@ -8102,9 +7740,7 @@ /area/lv624/lazarus/landing_zones/lz1) "aHO" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "aHQ" = ( /obj/structure/flora/bush/ausbushes/palebush, @@ -8112,9 +7748,7 @@ /area/lv624/ground/jungle/east_jungle) "aHR" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "aHT" = ( /obj/structure/window_frame/wood, @@ -8127,7 +7761,7 @@ }, /area/lv624/lazarus/main_hall) "aIb" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor{ dir = 8; icon_state = "warning" @@ -8142,12 +7776,8 @@ }, /area/lv624/lazarus/main_hall) "aId" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_west_jungle) "aIe" = ( /obj/effect/landmark/crap_item, @@ -8210,15 +7840,15 @@ /area/lv624/lazarus/main_hall) "aIm" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIn" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIo" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIp" = ( /obj/structure/surface/table, @@ -8230,7 +7860,7 @@ /area/lv624/lazarus/main_hall) "aIq" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIr" = ( /obj/structure/machinery/atm{ @@ -8296,11 +7926,9 @@ }, /area/lv624/ground/caves/north_central_caves) "aIz" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "aIB" = ( /obj/structure/closet, @@ -8312,10 +7940,10 @@ "aIH" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/clothing/mask/cigarette/cigar, -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aII" = ( /obj/structure/surface/rack, /obj/item/clothing/glasses/regular, @@ -8327,7 +7955,7 @@ /area/lv624/lazarus/research) "aIJ" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIL" = ( /obj/structure/flora/jungle/vines/heavy, @@ -8335,9 +7963,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/yggdrasil) "aIM" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 2; name = "\improper Atmospherics Condenser" @@ -8362,9 +7988,7 @@ }, /area/lv624/lazarus/main_hall) "aIV" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) @@ -8372,16 +7996,14 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aIY" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "aIZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "aJa" = ( @@ -8432,9 +8054,7 @@ }, /area/lv624/lazarus/main_hall) "aJi" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) @@ -8462,26 +8082,20 @@ }, /area/lv624/lazarus/landing_zones/lz1) "aJr" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aJu" = ( /obj/structure/flora/jungle/planttop1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aJv" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aJz" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall, /area/lv624/lazarus/yggdrasil) "aJA" = ( @@ -8533,9 +8147,7 @@ /area/lv624/lazarus/main_hall) "aJF" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/lazarus/landing_zones/lz2) "aJG" = ( /obj/item/tool/pickaxe/jackhammer{ @@ -8621,9 +8233,7 @@ /area/lv624/lazarus/main_hall) "aJO" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/lazarus/landing_zones/lz2) "aJP" = ( /obj/item/stock_parts/scanning_module/phasic, @@ -8663,20 +8273,6 @@ /obj/effect/landmark/hunter_primary, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz1) -"aJT" = ( -/obj/effect/decal/warning_stripes, -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv624/lazarus/landing_zones/lz1) -"aJU" = ( -/obj/effect/decal/warning_stripes, -/obj/structure/machinery/landinglight/ds1{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv624/lazarus/landing_zones/lz1) "aJZ" = ( /obj/structure/closet, /obj/item/clothing/glasses/sunglasses, @@ -8688,35 +8284,31 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aKc" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aKd" = ( /obj/effect/landmark/hunter_primary, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "aKf" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aKg" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aKh" = ( /obj/effect/landmark/good_item, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKi" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKj" = ( /obj/structure/stairs/perspective{ @@ -8732,32 +8324,22 @@ "aKk" = ( /obj/structure/flora/jungle/plantbot1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKl" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKm" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKn" = ( /obj/effect/landmark/lv624/xeno_tunnel, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKo" = ( /turf/closed/wall/strata_ice/jungle, @@ -8765,23 +8347,19 @@ "aKp" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/machinery/power/apc{ dir = 1; name = "Atmospherics Processing APC" }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKr" = ( /obj/structure/window_frame/colony, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor/plating, /area/lv624/lazarus/yggdrasil) "aKv" = ( @@ -8806,65 +8384,38 @@ /turf/open/floor, /area/lv624/lazarus/main_hall) "aKB" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKC" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKD" = ( /obj/structure/flora/grass/ice/both, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aKE" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/gbcorner/north_west, /area/lv624/lazarus/yggdrasil) "aKF" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aKG" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aKH" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - dir = 8; - icon_state = "gbcorner" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/gbcorner/north_east, /area/lv624/lazarus/yggdrasil) "aKI" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/yggdrasil) "aKJ" = ( /obj/structure/machinery/light/small, @@ -8910,53 +8461,38 @@ /area/lv624/ground/jungle/south_west_jungle) "aKZ" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "aLb" = ( -/obj/structure/flora/tree/dead, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/tree/dead/tree_1, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aLc" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/gbcorner/north_west, /area/lv624/lazarus/yggdrasil) "aLd" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aLe" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLg" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 8; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_east, /area/lv624/lazarus/yggdrasil) "aLh" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/yggdrasil) "aLi" = ( /obj/structure/flora/jungle/vines/heavy{ @@ -8965,10 +8501,8 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aLj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aLk" = ( /turf/closed/wall/r_wall, @@ -8991,21 +8525,15 @@ }, /area/lv624/lazarus/main_hall) "aLo" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aLp" = ( /turf/closed/wall, /area/lv624/lazarus/canteen) "aLq" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aLr" = ( /obj/effect/landmark/xeno_spawn, @@ -9024,17 +8552,13 @@ }, /area/lv624/lazarus/robotics) "aLv" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "aLw" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aLz" = ( @@ -9045,7 +8569,7 @@ /area/lv624/lazarus/landing_zones/lz1) "aLF" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aLI" = ( /obj/structure/flora/jungle/planttop1, @@ -9055,38 +8579,29 @@ "aLJ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aLK" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLL" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aLM" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aLN" = ( /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLO" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aLQ" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_central_jungle) "aLS" = ( @@ -9165,8 +8680,8 @@ "aMd" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp{ - pixel_y = 14; - pixel_x = 6 + pixel_x = 6; + pixel_y = 14 }, /obj/structure/transmitter/colony_net/rotary{ phone_category = "Lazarus Landing"; @@ -9273,23 +8788,19 @@ /area/lv624/lazarus/landing_zones/lz1) "aMr" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "aMt" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aMz" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_central_jungle) "aMD" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aMN" = ( /obj/structure/grille{ @@ -9302,46 +8813,28 @@ /area/lv624/lazarus/yggdrasil) "aMO" = ( /obj/structure/flora/jungle/plantbot1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aMP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aMQ" = ( /obj/structure/flora/tree/jungle/bigtreeTL, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aMS" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aMT" = ( /obj/structure/flora/tree/jungle/bigtreeTR, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aMU" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aMV" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -9349,11 +8842,8 @@ /area/lv624/lazarus/yggdrasil) "aMW" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/east, /area/lv624/lazarus/yggdrasil) "aMX" = ( /obj/structure/machinery/deployable/barrier, @@ -9412,7 +8902,7 @@ /area/lv624/lazarus/security) "aNf" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aNh" = ( /obj/structure/bed/chair/office/light{ @@ -9448,9 +8938,7 @@ /area/lv624/lazarus/canteen) "aNn" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/jungle/west_jungle) "aNo" = ( /turf/closed/wall/r_wall, @@ -9463,7 +8951,7 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz1) "aNA" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor/plating{ icon_state = "platebotc" }, @@ -9471,16 +8959,11 @@ "aNB" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNC" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aND" = ( /obj/structure/flora/jungle/cart_wreck, @@ -9489,44 +8972,31 @@ "aNE" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/effect/landmark/objective_landmark/close, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNF" = ( /obj/structure/flora/jungle/treeblocker, /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNG" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNH" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aNI" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/lv624/lazarus/yggdrasil) "aNJ" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aNK" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/window_frame/colony, /turf/open/floor/plating, /area/lv624/lazarus/yggdrasil) @@ -9660,10 +9130,7 @@ /area/lv624/lazarus/kitchen) "aOb" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_jungle) "aOc" = ( /obj/structure/machinery/light/small{ @@ -9696,11 +9163,8 @@ }, /area/lv624/lazarus/sleep_female) "aOs" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/west, /area/lv624/lazarus/yggdrasil) "aOt" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, @@ -9712,9 +9176,7 @@ /area/lv624/lazarus/yggdrasil) "aOv" = ( /obj/structure/flora/jungle/treeblocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aOw" = ( /obj/structure/flora/jungle/plantbot1, @@ -9796,7 +9258,7 @@ /area/lv624/lazarus/chapel) "aOG" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aOI" = ( /obj/structure/surface/table/reinforced/prison, @@ -9822,10 +9284,7 @@ /area/lv624/lazarus/security) "aOL" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_nexus_road) "aOM" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, @@ -9876,19 +9335,15 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "aOW" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aOX" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "aPe" = ( /obj/structure/surface/table, @@ -9904,50 +9359,32 @@ }, /area/lv624/lazarus/quart) "aPf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aPg" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/gbcorner/south_west, /area/lv624/lazarus/yggdrasil) "aPh" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aPi" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/lv624/lazarus/yggdrasil) "aPj" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grassbeach/east, /area/lv624/lazarus/yggdrasil) "aPk" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall, /area/lv624/lazarus/yggdrasil) "aPm" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aPo" = ( /obj/effect/landmark/crap_item, @@ -10123,12 +9560,12 @@ /obj/structure/lz_sign/lazarus_sign{ density = 0 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "aPS" = ( /obj/structure/flora/tree/jungle/bigtreeBOT, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aPT" = ( @@ -10141,14 +9578,12 @@ /area/lv624/lazarus/yggdrasil) "aPV" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/gm/river, /area/lv624/lazarus/yggdrasil) "aPY" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_central_jungle) "aPZ" = ( /obj/structure/machinery/light/small{ @@ -10221,58 +9656,35 @@ /area/lv624/lazarus/comms) "aQo" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aQp" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_west, /area/lv624/lazarus/yggdrasil) "aQr" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aQs" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aQt" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aQu" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/lv624/lazarus/yggdrasil) "aQw" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aQx" = ( /turf/closed/wall/r_wall, @@ -10412,21 +9824,17 @@ /area/lv624/lazarus/canteen) "aQX" = ( /obj/effect/landmark/hunter_primary, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aQY" = ( /obj/structure/flora/jungle/planttop1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "aRa" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aRd" = ( /obj/structure/surface/table, @@ -10496,9 +9904,7 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/structure/flora/jungle/vines/heavy, /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aRq" = ( /obj/structure/surface/table/reinforced{ @@ -10506,7 +9912,7 @@ flipped = 1 }, /obj/structure/machinery/computer/shuttle/dropship/flight/lz1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "aRu" = ( /obj/structure/machinery/landinglight/ds2{ @@ -10518,13 +9924,11 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aRx" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/landing_zones/lz2) "aRz" = ( /obj/structure/bed, @@ -10622,10 +10026,8 @@ /area/lv624/lazarus/main_hall) "aRO" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aRP" = ( /obj/structure/machinery/light/small{ @@ -10666,9 +10068,7 @@ /area/lv624/lazarus/kitchen) "aRV" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "aRW" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -10740,23 +10140,17 @@ "aSi" = ( /obj/structure/foamed_metal, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aSj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/foamed_metal, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "aSm" = ( /obj/structure/foamed_metal, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aSo" = ( /obj/structure/stairs/perspective{ @@ -11180,7 +10574,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aTW" = ( /obj/item/clothing/glasses/regular, @@ -11253,10 +10647,7 @@ /area/lv624/lazarus/kitchen) "aUe" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/jungle/west_jungle) "aUh" = ( /obj/structure/window_frame/colony/reinforced, @@ -11264,7 +10655,7 @@ /area/lv624/lazarus/canteen) "aUi" = ( /obj/effect/landmark/hunter_secondary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "aUj" = ( /obj/structure/largecrate/random, @@ -11343,10 +10734,7 @@ /area/lv624/lazarus/engineering) "aUz" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_east_jungle) "aUA" = ( /obj/item/bedsheet/rd, @@ -11460,10 +10848,8 @@ /area/lv624/lazarus/kitchen) "aUO" = ( /obj/item/shard, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "aUQ" = ( /turf/open/floor/greengrid, @@ -11486,7 +10872,7 @@ /area/lv624/lazarus/secure_storage) "aVa" = ( /obj/item/xenos_claw, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVb" = ( /obj/structure/machinery/light, @@ -11552,18 +10938,15 @@ "aVk" = ( /obj/structure/sign/safety/maint, /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_nexus_road) "aVl" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aVm" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/colony/north_nexus_road) "aVn" = ( /obj/structure/surface/table/reinforced{ @@ -11616,11 +10999,10 @@ /turf/closed/wall/r_wall, /area/lv624/lazarus/kitchen) "aVw" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVx" = ( /obj/structure/surface/table/woodentable/poor, @@ -11631,9 +11013,7 @@ /area/lv624/ground/caves/north_central_caves) "aVA" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aVB" = ( /obj/structure/window/framed/colony/reinforced, @@ -11650,7 +11030,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVF" = ( /obj/structure/machinery/power/apc{ @@ -11692,13 +11072,11 @@ /area/lv624/lazarus/engineering) "aVJ" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVK" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aVL" = ( /obj/structure/surface/table, @@ -11737,18 +11115,17 @@ /area/lv624/lazarus/kitchen) "aVS" = ( /turf/closed/wall/mineral/sandstone/runed, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aVT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_west_jungle) "aVU" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "aVV" = ( /obj/item/device/radio/intercom{ @@ -11847,9 +11224,7 @@ /area/lv624/lazarus/engineering) "aWh" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_nexus_road) "aWi" = ( /obj/structure/bed/stool, @@ -11869,16 +11244,14 @@ }, /obj/effect/decal/cleanable/cobweb, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWm" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 @@ -11887,48 +11260,44 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWo" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWp" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWs" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aWu" = ( /obj/structure/machinery/door/poddoor/almayer{ @@ -11980,7 +11349,7 @@ /area/lv624/lazarus/engineering) "aWC" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aWD" = ( /turf/open/floor/plating{ @@ -12037,9 +11406,7 @@ /area/lv624/lazarus/engineering) "aWJ" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "aWK" = ( /obj/structure/window_frame/colony/reinforced, @@ -12068,17 +11435,17 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWP" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aWQ" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aWR" = ( /obj/structure/safe{ @@ -12164,15 +11531,11 @@ }, /area/lv624/lazarus/sleep_male) "aXd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/comms) "aXe" = ( /obj/structure/foamed_metal, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/comms) "aXf" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -12198,38 +11561,33 @@ }, /area/lv624/lazarus/engineering) "aXh" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aXi" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/north_nexus_road) "aXj" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aXk" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "aXl" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aXn" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "aXo" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aXs" = ( /obj/structure/extinguisher_cabinet{ @@ -12243,10 +11601,10 @@ /obj/structure/surface/rack, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; phone_color = "yellow"; - phone_id = "Engineering" + phone_id = "Engineering"; + pixel_y = 24 }, /turf/open/floor{ icon_state = "dark" @@ -12263,7 +11621,7 @@ /area/lv624/lazarus/engineering) "aXv" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aXw" = ( /obj/structure/closet/secure_closet/engineering_electrical, @@ -12274,27 +11632,25 @@ "aXx" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aXy" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXA" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXB" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aXC" = ( /obj/structure/surface/table/woodentable/poor, @@ -12308,7 +11664,7 @@ }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aXD" = ( /obj/structure/surface/rack, /obj/item/tank/phoron, @@ -12335,9 +11691,7 @@ }, /obj/effect/decal/remains/xeno, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/west_tcomms_road) "aXJ" = ( /obj/structure/foamed_metal{ @@ -12373,32 +11727,32 @@ /area/lv624/lazarus/engineering) "aXP" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aXQ" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXR" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/floor{ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXS" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, /turf/closed/wall/mineral/sandstone/runed, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "aXU" = ( /obj/effect/landmark/good_item, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aXV" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "aXW" = ( /obj/structure/foamed_metal{ @@ -12409,7 +11763,7 @@ }, /area/lv624/lazarus/engineering) "aXX" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "aXZ" = ( /obj/structure/surface/rack, @@ -12457,19 +11811,14 @@ /area/lv624/lazarus/engineering) "aYj" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aYm" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 24 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) "aYn" = ( /obj/effect/landmark/objective_landmark/science, @@ -12481,22 +11830,19 @@ /obj/structure/flora/jungle/vines/heavy{ pixel_y = 26 }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_west_jungle) "aYp" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_y = 24 }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aYr" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "aYs" = ( /obj/structure/largecrate/lisa, @@ -12507,25 +11853,23 @@ /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) "aYv" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "aYw" = ( /obj/structure/sign/safety/high_voltage{ pixel_x = 7; pixel_y = 32 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "aYx" = ( /obj/structure/tunnel{ id = "hole4" }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "aYC" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -12608,61 +11952,49 @@ /area/lv624/ground/caves/north_central_caves) "aYQ" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "aYR" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/west_river) "aYS" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/west_river) "aYT" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "aYU" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "aYV" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/west_river) "aYX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "aYY" = ( /obj/effect/landmark/hunter_secondary, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "aYZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "aZa" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "aZb" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -12757,7 +12089,7 @@ }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aZo" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/megaphone, @@ -12773,7 +12105,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken6" }, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "aZs" = ( /obj/structure/closet/secure_closet/bar, /turf/open/floor{ @@ -12926,7 +12258,7 @@ /area/lv624/ground/caves/east_caves) "aZP" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/lazarus/landing_zones/lz2) "aZT" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ @@ -12937,103 +12269,85 @@ "baa" = ( /obj/effect/landmark/monkey_spawn, /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "bad" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "baN" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "bbj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "bbp" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bbu" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "bbx" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbC" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "bbH" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bbI" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbJ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbL" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbN" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbO" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "bbT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/effect/decal/remains/human, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bbU" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/effect/decal/remains/human, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bbZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_central_jungle) "bdL" = ( /obj/structure/surface/table/reinforced/prison, @@ -13050,7 +12364,7 @@ "bei" = ( /obj/structure/flora/jungle/vines/heavy, /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "beB" = ( /obj/structure/bed/chair/comfy/black{ @@ -13064,10 +12378,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/containers) "bfe" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_east_jungle) "bfY" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -13077,18 +12388,14 @@ /area/lv624/ground/caves/east_caves) "bgL" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/west_tcomms_road) "bgQ" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "bhr" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_east_jungle) "bhL" = ( /obj/structure/surface/table/reinforced/prison{ @@ -13109,24 +12416,18 @@ /area/lv624/ground/caves/sand_temple) "bit" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "bkG" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "bkP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "bkY" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_west_jungle) "blC" = ( /obj/item/stack/sheet/wood, @@ -13145,14 +12446,11 @@ /area/lv624/lazarus/corporate_dome) "bnE" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "bnX" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/central_river) "boe" = ( /turf/open/floor/sandstone/runed, @@ -13179,14 +12477,11 @@ /area/lv624/lazarus/quartstorage) "brh" = ( /obj/structure/flora/jungle/plantbot1, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "bsR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) "btb" = ( /obj/item/stack/sheet/wood{ @@ -13196,10 +12491,8 @@ /area/lv624/lazarus/landing_zones/lz1) "bte" = ( /obj/effect/landmark/hunter_primary, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "btr" = ( /obj/item/weapon/harpoon/yautja{ @@ -13225,11 +12518,11 @@ /area/lv624/ground/barrens/south_eastern_barrens) "btF" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "btS" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "btX" = ( /turf/open/gm/river, @@ -13248,39 +12541,31 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "buL" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "buW" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "bwc" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/west_barrens) "bwk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "bwR" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "byl" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/east_river) "byK" = ( /obj/structure/machinery/landinglight/ds2/delayone{ @@ -13295,6 +12580,11 @@ "byY" = ( /turf/open/gm/dirt, /area/lv624/ground/colony/north_tcomms_road) +"bzs" = ( +/turf/open/gm/dirtgrassborder{ + dir = 4 + }, +/area/lv624/ground/jungle/south_west_jungle/ceiling) "bzD" = ( /obj/structure/largecrate/random, /obj/item/storage/fancy/crayons{ @@ -13307,41 +12597,30 @@ }, /area/lv624/lazarus/corporate_dome) "bAB" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_east_jungle) "bBk" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bBu" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/jungle/west_jungle) "bCe" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_east_jungle) "bCH" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "bCT" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "bEq" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) "bEU" = ( /obj/structure/showcase{ @@ -13369,7 +12648,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "bGb" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -13386,10 +12665,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/sand_temple) "bJz" = ( /obj/effect/decal/cleanable/blood, @@ -13402,19 +12678,13 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) "bLE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "bMu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_jungle) "bNn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_barrens) "bNW" = ( @@ -13449,9 +12719,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "bQA" = ( /obj/structure/stairs/perspective{ @@ -13462,10 +12730,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "bQP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_east_jungle) "bRV" = ( /obj/structure/stairs/perspective{ @@ -13481,7 +12746,7 @@ /area/lv624/ground/caves/sand_temple) "bSm" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "bTw" = ( /obj/effect/landmark/nightmare{ @@ -13513,20 +12778,18 @@ }, /area/lv624/lazarus/crashed_ship_containers) "bXP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/stack/sheet/wood{ amount = 2 }, /obj/effect/landmark/objective_landmark/far, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "bZb" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bZX" = ( /obj/structure/window/framed/colony, @@ -13534,17 +12797,15 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "cac" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "cag" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) "caH" = ( /obj/effect/landmark/objective_landmark/far, @@ -13556,13 +12817,13 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "ccn" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cdj" = ( /obj/structure/window_frame/colony, @@ -13587,10 +12848,7 @@ /turf/closed/wall/r_wall/unmeltable, /area/lv624/lazarus/quartstorage/outdoors) "cfN" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_jungle) "cfP" = ( /obj/effect/decal/remains/human, @@ -13610,7 +12868,7 @@ }, /area/lv624/lazarus/corporate_dome) "cgC" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/open/floor{ dir = 10; icon_state = "warning" @@ -13618,10 +12876,7 @@ /area/lv624/lazarus/landing_zones/lz2) "cgD" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_central_jungle) "cgK" = ( /obj/item/stool, @@ -13636,10 +12891,7 @@ /area/lv624/ground/caves/west_caves) "cij" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "ciA" = ( /obj/structure/surface/table/reinforced/prison{ @@ -13661,7 +12913,7 @@ /area/lv624/ground/caves/sand_temple) "cmf" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "cmP" = ( /obj/structure/barricade/metal/wired, @@ -13682,10 +12934,10 @@ }, /area/lv624/ground/caves/sand_temple) "cpQ" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "cpY" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "cqm" = ( /obj/structure/powerloader_wreckage/ft, @@ -13693,19 +12945,15 @@ /area/lv624/ground/barrens/containers) "cqw" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_nexus_road) "cqz" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_west_jungle) "cqE" = ( /obj/structure/barricade/wooden, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor{ dir = 1; icon_state = "warning" @@ -13713,13 +12961,11 @@ /area/lv624/lazarus/landing_zones/lz1) "crF" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "csu" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "csM" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -13728,17 +12974,15 @@ "cvk" = ( /obj/structure/fence, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/west_central_jungle) "cwv" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "cwV" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "cxc" = ( /obj/item/tool/shovel, @@ -13748,9 +12992,7 @@ /area/lv624/ground/barrens/west_barrens) "cys" = ( /obj/structure/foamed_metal, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_central_jungle) "czq" = ( /obj/effect/landmark/objective_landmark/medium, @@ -13760,7 +13002,7 @@ /area/lv624/lazarus/corporate_dome) "czu" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cAl" = ( /obj/structure/girder/displaced, @@ -13802,35 +13044,31 @@ }, /area/lv624/ground/caves/south_west_caves) "cCr" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) "cEh" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "cEn" = ( /obj/effect/decal/remains/xeno, /turf/open/gm/dirt, /area/lv624/ground/barrens/west_barrens) "cEQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "cGb" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "cIL" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "cIQ" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "cIU" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -13851,17 +13089,12 @@ /area/lv624/lazarus/corporate_dome) "cJA" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "cKj" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) -"cLw" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/lv624/ground/river/central_river) "cLD" = ( /turf/open/floor{ dir = 4; @@ -13870,7 +13103,7 @@ /area/lv624/lazarus/corporate_dome) "cMj" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "cMD" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -13899,11 +13132,11 @@ /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) "cPV" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "cQJ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cQX" = ( /obj/structure/stairs/perspective{ @@ -13915,56 +13148,45 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "cRm" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/caves/sand_temple) "cRT" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "cSs" = ( /obj/item/tool/surgery/surgicaldrill/predatorsurgicaldrill, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "cTi" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "cUk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_east_jungle) "cUL" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "cWm" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cWr" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "cXd" = ( /obj/effect/landmark/monkey_spawn, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_central_jungle) "cXk" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/barrens/west_barrens) "cYi" = ( /obj/structure/surface/table, @@ -13993,13 +13215,13 @@ /area/lv624/lazarus/crashed_ship_containers) "dbY" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ddS" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dff" = ( /obj/structure/bed/sofa/vert/grey, @@ -14041,7 +13263,7 @@ /area/lv624/lazarus/quartstorage) "djI" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "dkN" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -14049,37 +13271,26 @@ /area/lv624/ground/caves/sand_temple) "dkO" = ( /obj/effect/decal/remains/xeno, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dlh" = ( /obj/structure/bed/chair/comfy/black, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "dmf" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "dmS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "dmZ" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "dop" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "dql" = ( /obj/structure/largecrate, @@ -14100,7 +13311,7 @@ /area/lv624/ground/barrens/south_eastern_barrens) "dqK" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "drm" = ( /obj/structure/closet/crate, @@ -14115,7 +13326,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "dsz" = ( /obj/structure/closet/crate/hydroponics/prespawned, /obj/effect/landmark/objective_landmark/close, @@ -14126,12 +13337,12 @@ /area/lv624/lazarus/hydroponics) "dvf" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "dvF" = ( /obj/structure/flora/bush/ausbushes/pointybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dvX" = ( /obj/structure/bookcase/manuals/medical, @@ -14159,10 +13370,7 @@ /area/lv624/ground/barrens/south_eastern_barrens) "dwt" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/lazarus/landing_zones/lz2) "dwN" = ( /obj/structure/bed/sofa/vert/grey/bot, @@ -14187,10 +13395,7 @@ pixel_x = 12; pixel_y = 15 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "dCL" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle{ @@ -14204,37 +13409,27 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "dDa" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "dEc" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_central_jungle) "dEg" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/east_central_jungle) "dEp" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "dEI" = ( /obj/effect/landmark/monkey_spawn, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dFk" = ( /obj/structure/bed/chair/comfy/black{ @@ -14249,15 +13444,10 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) "dGc" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "dGG" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/central_river) "dGQ" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -14266,10 +13456,7 @@ /area/lv624/ground/caves/central_caves) "dHo" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_jungle) "dId" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -14286,12 +13473,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "dKg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "dLd" = ( /obj/structure/bookcase, @@ -14312,13 +13497,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_jungle) "dLY" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "dMF" = ( /obj/structure/surface/table/reinforced/prison{ @@ -14335,18 +13517,18 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "dNj" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "dNx" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "dNN" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "dOf" = ( /obj/effect/decal/cleanable/blood/drip, @@ -14423,7 +13605,7 @@ /area/lv624/ground/colony/west_nexus_road) "dZp" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "dZH" = ( /obj/structure/filingcabinet, @@ -14434,10 +13616,8 @@ }, /area/lv624/lazarus/medbay) "dZY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "eah" = ( /obj/effect/landmark/objective_landmark/close, @@ -14454,9 +13634,7 @@ /area/lv624/lazarus/landing_zones/lz1) "ebS" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/south_nexus_road) "ecy" = ( /turf/closed/wall/sulaco, @@ -14469,25 +13647,23 @@ }, /area/lv624/ground/caves/sand_temple) "ecO" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/west_nexus_road) "edS" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "eeW" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "efp" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "efX" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "ehy" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -14500,7 +13676,7 @@ /area/lv624/lazarus/hydroponics) "eil" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "eiH" = ( /obj/item/stack/sheet/wood{ @@ -14514,15 +13690,11 @@ /area/lv624/lazarus/landing_zones/lz2) "eiP" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "eji" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "ejx" = ( /obj/structure/disposalpipe/segment, @@ -14530,7 +13702,7 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "ekB" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -14557,11 +13729,11 @@ /area/lv624/lazarus/hydroponics) "eny" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "eoo" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "eoM" = ( /turf/open/floor{ @@ -14587,10 +13759,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "eqF" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "eqP" = ( /obj/structure/machinery/bioprinter, @@ -14599,16 +13771,10 @@ }, /area/lv624/lazarus/medbay) "erx" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/jungle/west_jungle) "esi" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/barrens/west_barrens) "esp" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -14627,29 +13793,23 @@ /area/lv624/ground/caves/north_central_caves) "evT" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "exf" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_west_jungle) "eyb" = ( /obj/structure/fence, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/west_tcomms_road) "eyn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/central_jungle) "ezz" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) "ezC" = ( /obj/structure/stairs/perspective{ @@ -14686,10 +13846,8 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "eBu" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "eBN" = ( /obj/structure/closet/crate/hydroponics/prespawned, @@ -14704,7 +13862,7 @@ /area/lv624/lazarus/hydroponics) "eCx" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "eCF" = ( /obj/structure/surface/table, @@ -14713,18 +13871,15 @@ /area/lv624/landing/console2) "eDy" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "eDS" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "eER" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "eFS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -14761,17 +13916,14 @@ /area/lv624/ground/river/central_river) "eHr" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "eHQ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_west_jungle) "eKs" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "eLx" = ( /obj/effect/decal/cleanable/blood/drip, @@ -14781,9 +13933,7 @@ }, /area/lv624/lazarus/crashed_ship_containers) "eNK" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_east_jungle) "eNQ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -14802,20 +13952,15 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "ePu" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) "ePw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/south_east_jungle) "ePV" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "eQh" = ( /obj/structure/largecrate/random, @@ -14826,21 +13971,14 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_jungle) "eTd" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/west_central_jungle) "eTI" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "eTQ" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_east_jungle) "eVH" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -14886,7 +14024,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "fbD" = ( /obj/structure/flora/jungle/planttop1, @@ -14924,7 +14062,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "fhs" = ( /obj/structure/stairs/perspective{ @@ -14941,26 +14079,22 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "fhJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) "fhR" = ( /obj/structure/flora/jungle/planttop1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fio" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "fir" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fiE" = ( /obj/structure/bed/alien, @@ -14969,7 +14103,7 @@ /area/lv624/ground/caves/north_central_caves) "fiZ" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "fja" = ( /obj/item/attachable/bayonet{ @@ -14979,24 +14113,19 @@ name = "\improper alien blade"; throwforce = 26 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "fjM" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "fjP" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/colony/south_nexus_road) "fjQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "fkJ" = ( /obj/structure/sink{ @@ -15009,16 +14138,10 @@ }, /area/lv624/lazarus/corporate_dome) "fpn" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/east_barrens) "fqh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_jungle) "fqM" = ( /obj/structure/machinery/power/apc{ @@ -15050,14 +14173,10 @@ }, /area/lv624/lazarus/corporate_dome) "fur" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "fuy" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz2) "fuY" = ( @@ -15079,7 +14198,7 @@ /area/lv624/ground/caves/sand_temple) "fyA" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fzg" = ( /obj/item/storage/firstaid/toxin/empty, @@ -15141,12 +14260,12 @@ /turf/open/gm/river, /area/lv624/ground/barrens/west_barrens) "fEn" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fED" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "fEU" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -15182,7 +14301,7 @@ /area/lv624/ground/colony/telecomm/cargo) "fGO" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "fHi" = ( /obj/item/ammo_magazine/smg/mp5, @@ -15191,17 +14310,12 @@ }, /area/lv624/lazarus/corporate_dome) "fHz" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "fIj" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/colony/west_nexus_road) "fIt" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -15216,7 +14330,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "fMl" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -15235,29 +14349,20 @@ }, /area/lv624/lazarus/crashed_ship_containers) "fPi" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "fPH" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_central_jungle) "fQL" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) "fSX" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "fTf" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_tcomms_road) "fTE" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -15265,9 +14370,7 @@ name = "\improper LZ1 Access"; req_one_access = null }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz1) "fTM" = ( @@ -15279,9 +14382,7 @@ /area/lv624/ground/colony/south_nexus_road) "fXD" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "fYl" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -15289,24 +14390,20 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) "fZO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/north_west_jungle) "gaw" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "gbl" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "gby" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /turf/open/floor{ dir = 9; @@ -15319,13 +14416,11 @@ /area/lv624/ground/river/west_river) "gcn" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "gcp" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_central_jungle) "gcI" = ( /obj/effect/landmark/crap_item, @@ -15343,22 +14438,20 @@ /area/lv624/lazarus/corporate_dome) "gdr" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "gds" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "gdx" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/barrens/west_barrens) "gef" = ( /obj/item/stack/sheet/wood{ amount = 2 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 1; icon_state = "warning" @@ -15376,7 +14469,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "gin" = ( /obj/effect/landmark/objective_landmark/medium, @@ -15385,14 +14478,14 @@ }, /area/lv624/lazarus/quartstorage/outdoors) "git" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "gkh" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "gkC" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -15405,7 +14498,7 @@ /area/lv624/ground/barrens/west_barrens) "glS" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "gnx" = ( /turf/open/floor{ @@ -15414,20 +14507,12 @@ /area/lv624/lazarus/corporate_dome) "god" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_nexus_road) "gpC" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/west_central_jungle) "gqG" = ( /obj/item/device/assembly/infra, @@ -15440,7 +14525,7 @@ /area/lv624/lazarus/engineering) "grl" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "grZ" = ( /obj/effect/landmark/objective_landmark/science, @@ -15456,7 +14541,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "gte" = ( /obj/structure/surface/rack, @@ -15479,37 +14564,29 @@ /area/lv624/ground/barrens/north_east_barrens) "guY" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "gve" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed/decor, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "gwP" = ( /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) "gxd" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) "gyP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_west_jungle) "gyY" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/river/east_river) "gzd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "gzo" = ( /turf/open/gm/dirt{ @@ -15528,7 +14605,7 @@ /area/lv624/ground/barrens/south_west_barrens) "gAI" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "gAS" = ( /obj/effect/vehicle_spawner/van/decrepit, @@ -15539,33 +14616,24 @@ /area/lv624/lazarus/corporate_dome) "gBG" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/south_nexus_road) "gBI" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "gDu" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/colony/west_tcomms_road) "gDy" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "gEn" = ( -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "gFg" = ( /obj/item/ammo_casing/bullet{ @@ -15577,13 +14645,11 @@ /area/lv624/lazarus/corporate_dome) "gFm" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "gGd" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "gKg" = ( /obj/item/clothing/head/hardhat/orange, @@ -15596,7 +14662,7 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-rightsidepass" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "gNo" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -15605,24 +14671,17 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "gPN" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/barrens/south_eastern_barrens) "gQr" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) "gRm" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) "gRx" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "gTu" = ( /obj/structure/filingcabinet{ @@ -15643,13 +14702,9 @@ }, /area/lv624/lazarus/corporate_dome) "gTv" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "gTM" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -15658,9 +14713,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "gUq" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_east_jungle) "gWf" = ( /obj/structure/surface/rack, @@ -15679,7 +14732,7 @@ /area/lv624/lazarus/quartstorage) "gWI" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "gXu" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony, @@ -15688,9 +14741,7 @@ }, /area/lv624/lazarus/medbay) "gXy" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 6; icon_state = "warning" @@ -15698,17 +14749,15 @@ /area/lv624/lazarus/landing_zones/lz1) "gYs" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/north_nexus_road) "gZh" = ( /obj/structure/prop/brazier, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "haN" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hba" = ( /turf/open/gm/dirt, @@ -15720,10 +14769,8 @@ }, /area/lv624/lazarus/medbay) "hbK" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "hbU" = ( /obj/structure/surface/table/reinforced/prison{ @@ -15753,6 +14800,7 @@ /area/lv624/ground/colony/telecomm/sw_lz2) "hdA" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating{ dir = 4; icon_state = "asteroidwarning" @@ -15762,13 +14810,13 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "heZ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "hfX" = ( /obj/effect/decal/remains/xeno, @@ -15777,12 +14825,12 @@ /area/lv624/lazarus/crashed_ship_containers) "hgt" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "hgO" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hgY" = ( /obj/effect/landmark/nightmare{ @@ -15803,9 +14851,7 @@ /area/lv624/ground/barrens/containers) "hjl" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/west_tcomms_road) "hke" = ( /obj/structure/platform/mineral/sandstone/runed, @@ -15818,16 +14864,12 @@ /area/lv624/ground/barrens/south_eastern_barrens) "hmK" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "hnX" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_central_jungle) "hpN" = ( /obj/structure/surface/table, @@ -15840,14 +14882,12 @@ /area/lv624/lazarus/research) "hqQ" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hqS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "hrD" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -15868,30 +14908,26 @@ /area/lv624/ground/river/central_river) "huH" = ( /obj/structure/flora/jungle/planttop1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "hwR" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "hxL" = ( /obj/effect/landmark/hunter_primary, /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "hxP" = ( /obj/effect/decal/remains/xeno, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "hyK" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "hyU" = ( /obj/structure/barricade/wooden{ @@ -15925,9 +14961,7 @@ /turf/open/gm/dirt, /area/lv624/ground/colony/west_tcomms_road) "hEl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_west_jungle) "hEs" = ( @@ -15939,16 +14973,11 @@ /area/lv624/lazarus/hydroponics) "hEu" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/west_nexus_road) "hFO" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/north_tcomms_road) "hHc" = ( /obj/structure/window/framed/colony/reinforced, @@ -15956,25 +14985,20 @@ /turf/open/floor/plating, /area/lv624/lazarus/engineering) "hHA" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz2) "hHR" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/barrens/east_barrens) "hIh" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "hIq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "hJa" = ( /obj/structure/cargo_container/lockmart/left, @@ -15988,31 +15012,20 @@ /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) "hJn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "hJW" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "hKk" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "hLu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_central_jungle) "hMd" = ( /obj/effect/landmark/objective_landmark/far, @@ -16020,7 +15033,7 @@ dir = 4; icon_state = "whiteyellowfull" }, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "hMr" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -16037,9 +15050,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "hNq" = ( /obj/structure/platform/mineral/sandstone/runed, @@ -16068,11 +15079,11 @@ /area/lv624/lazarus/quartstorage) "hRI" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "hRS" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "hSa" = ( /turf/open/floor{ @@ -16081,33 +15092,25 @@ }, /area/lv624/lazarus/landing_zones/lz1) "hSn" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "hSz" = ( /obj/effect/landmark/hunter_secondary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hSE" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, /area/lv624/ground/jungle/east_central_jungle) "hUs" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "hUD" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "hWj" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/east_river) "hWZ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, @@ -16115,9 +15118,9 @@ /area/lv624/ground/river/central_river) "hXt" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 32; phone_category = "Lazarus Landing"; - phone_id = "Lakeside Bar" + phone_id = "Lakeside Bar"; + pixel_y = 32 }, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) @@ -16133,27 +15136,22 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "hZW" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "iab" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_jungle) "iap" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_jungle) "iat" = ( /obj/structure/surface/table/reinforced/prison{ @@ -16176,11 +15174,9 @@ }, /area/lv624/ground/caves/sand_temple) "ibS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "idz" = ( /obj/item/weapon/claymore/mercsword{ @@ -16207,26 +15203,22 @@ /obj/item/stack/sheet/wood{ amount = 2 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ifk" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "ifF" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/south_east_jungle) "ifX" = ( /obj/structure/machinery/colony_floodlight, /obj/effect/landmark/nightmare{ insert_tag = "lv-gym" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "iiK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -16234,9 +15226,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) "ilf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /obj/structure/window/framed/colony/reinforced, /obj/structure/flora/jungle/planttop1, @@ -16281,26 +15271,16 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "ivl" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/west_central_jungle) "ivu" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "iwh" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_nexus_road) "iwl" = ( /obj/structure/stairs/perspective{ @@ -16322,11 +15302,6 @@ /obj/effect/landmark/corpsespawner/doctor, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) -"iyF" = ( -/turf/open/gm/coast{ - dir = 9 - }, -/area/lv624/ground/river/central_river) "izh" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -16355,12 +15330,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "iAH" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_central_jungle) "iBy" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, @@ -16376,12 +15349,10 @@ /area/lv624/lazarus/medbay) "iCN" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/west_nexus_road) "iFp" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/barricade/wooden{ dir = 4 }, @@ -16392,33 +15363,28 @@ /area/lv624/lazarus/landing_zones/lz1) "iGn" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "iHQ" = ( /obj/structure/xenoautopsy/tank/broken, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "iIF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "iIU" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_central_jungle) "iJs" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "iJA" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "iJJ" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "iKp" = ( /obj/structure/surface/rack, @@ -16434,18 +15400,14 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) "iLM" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "iLS" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "iNB" = ( /obj/structure/ore_box, @@ -16455,19 +15417,17 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "iOX" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "iPB" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "iPR" = ( /obj/item/stack/medical/ointment, @@ -16481,9 +15441,7 @@ /area/lv624/lazarus/medbay) "iRb" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "iSa" = ( /obj/structure/flora/jungle/vines/heavy, @@ -16494,17 +15452,14 @@ /area/lv624/ground/caves/sand_temple) "iSg" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "iUm" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "iUF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_central_jungle) "iVg" = ( /turf/open/gm/dirt{ @@ -16515,29 +15470,19 @@ /obj/structure/machinery/colony_floodlight, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"iXc" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/lv624/ground/barrens/east_barrens) "iXj" = ( /turf/closed/wall, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "iXz" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/west_barrens) "iXG" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/west_nexus_road) "iYJ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "iZG" = ( /obj/effect/landmark/crap_item, @@ -16545,8 +15490,8 @@ /area/lv624/ground/barrens/north_east_barrens) "iZZ" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "jaa" = ( /turf/open/gm/dirt{ @@ -16555,46 +15500,36 @@ /area/lv624/ground/barrens/central_barrens) "jas" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "jbd" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "jbB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "jdi" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "jga" = ( /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "jgJ" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/south_nexus_road) "jhG" = ( /obj/structure/barricade/handrail/strata{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) "jic" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -16619,14 +15554,12 @@ name = "\improper LZ1 Access"; req_one_access = null }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz1) "jow" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "joz" = ( /obj/structure/surface/table/reinforced/prison, @@ -16645,14 +15578,12 @@ }, /area/lv624/ground/caves/sand_temple) "jsd" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "jtg" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "jum" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -16681,11 +15612,11 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "jxR" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "jzh" = ( /obj/structure/surface/table/reinforced/prison, @@ -16717,10 +15648,8 @@ }, /area/lv624/lazarus/corporate_dome) "jzZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "jAo" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -16743,17 +15672,14 @@ /area/lv624/ground/caves/sand_temple) "jEc" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/colony/north_tcomms_road) "jFc" = ( /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/caves/sand_temple) "jFF" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "jGo" = ( /obj/structure/girder, @@ -16763,7 +15689,7 @@ "jGs" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/dirt, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "jGW" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/central_jungle) @@ -16771,44 +15697,33 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-science" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "jHN" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "jHT" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "jHW" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "jKu" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_central_jungle) "jLc" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "jLv" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/barrens/east_barrens) "jLD" = ( /obj/effect/landmark/nightmare{ @@ -16818,9 +15733,7 @@ /area/lv624/ground/river/central_river) "jLR" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_central_jungle) "jMk" = ( /obj/structure/lattice{ @@ -16866,21 +15779,16 @@ "jQj" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "jQJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/east_central_jungle) "jQV" = ( /obj/structure/barricade/wooden{ dir = 8 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 6; icon_state = "warning" @@ -16939,10 +15847,8 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "jTm" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "jTP" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -16955,9 +15861,7 @@ }, /area/lv624/lazarus/crashed_ship_containers) "jXT" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/north_east_jungle) "jYM" = ( /obj/structure/surface/table/woodentable/fancy, @@ -16975,7 +15879,7 @@ /area/lv624/lazarus/corporate_dome) "jZL" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "kbr" = ( /obj/structure/showcase{ @@ -16994,7 +15898,7 @@ /area/lv624/ground/river/west_river) "keS" = ( /turf/open/floor/plating, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "kff" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, @@ -17005,65 +15909,46 @@ /area/lv624/ground/river/central_river) "kip" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "kjp" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "kjC" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/barrens/east_barrens) "kmP" = ( /obj/item/stool, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "knd" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/jungle/west_jungle) "knp" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "koh" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/gm/dirt, /area/lv624/ground/colony/north_tcomms_road) "koM" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "kqx" = ( /obj/structure/flora/jungle/plantbot1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "kqL" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "ksB" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "ksQ" = ( /obj/structure/surface/rack, @@ -17085,10 +15970,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "kuP" = ( /obj/item/tool/hatchet{ @@ -17102,48 +15984,38 @@ /area/lv624/lazarus/hydroponics) "kuZ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "kvo" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/east_central_jungle) "kvE" = ( /obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "kwG" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "kxo" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "kxI" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "kyc" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/central_river) "kyN" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "kza" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "kzd" = ( /obj/structure/surface/table, @@ -17159,11 +16031,11 @@ /area/lv624/lazarus/hydroponics) "kzu" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "kzv" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "kzE" = ( /obj/structure/cargo_container/lockmart/right, @@ -17171,7 +16043,7 @@ /area/lv624/ground/barrens/containers) "kAg" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "kAj" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -17185,9 +16057,7 @@ /area/lv624/lazarus/corporate_dome) "kAl" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_west_jungle) "kBe" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ @@ -17200,13 +16070,10 @@ /area/lv624/lazarus/quartstorage) "kFx" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "kFV" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/west_barrens) "kGk" = ( /turf/closed/wall/r_wall, @@ -17217,34 +16084,27 @@ }, /area/lv624/ground/barrens/central_barrens) "kHU" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "kJm" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "kJq" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "kJu" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "kLP" = ( /obj/structure/flora/jungle/plantbot1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "kNm" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "kPL" = ( /obj/structure/fence, @@ -17268,18 +16128,16 @@ }, /area/lv624/lazarus/canteen) "kQY" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/jungle/west_jungle) "kRg" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "kRr" = ( /obj/structure/surface/rack, /obj/item/storage/belt/shotgun/full, -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{ pixel_y = -6 }, @@ -17288,10 +16146,7 @@ }, /area/lv624/lazarus/crashed_ship_containers) "kRR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "kSs" = ( /obj/structure/inflatable, @@ -17307,20 +16162,15 @@ /area/lv624/ground/caves/sand_temple) "kSR" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/south_medbay_road) "kUr" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_tcomms_road) "kVP" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "kWH" = ( /turf/open/floor{ @@ -17343,7 +16193,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "kZk" = ( /obj/structure/largecrate/random/barrel/blue, @@ -17361,10 +16211,8 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "kZw" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "kZS" = ( /obj/structure/surface/table/reinforced/prison, @@ -17375,46 +16223,37 @@ }, /area/lv624/lazarus/corporate_dome) "laY" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_central_jungle) "lbd" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/barrens/west_barrens) "lbX" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "ldB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "ldZ" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_jungle) "lfy" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/south_nexus_road) "lgu" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "lju" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/central_river) "lke" = ( /obj/effect/landmark/crap_item, @@ -17429,9 +16268,7 @@ amount = 2 }, /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor{ dir = 1; icon_state = "warning" @@ -17442,20 +16279,15 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-bridge-nofog" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "lnR" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_east_jungle) "lnV" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/south_east_jungle) "lpV" = ( /turf/open/floor/plating{ @@ -17464,11 +16296,11 @@ /area/lv624/lazarus/quartstorage) "lqI" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "lqS" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "lse" = ( /obj/structure/stairs/perspective{ @@ -17484,51 +16316,38 @@ "lsq" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "lsK" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/barrens/west_barrens) "ltT" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "lud" = ( /obj/structure/fence, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_tcomms_road) "lxr" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "lxX" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "lyj" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/jungle/west_jungle) "lyz" = ( /turf/closed/wall/mineral/sandstone/runed/decor, -/area/lv624/ground/jungle/south_west_jungle) +/area/lv624/ground/jungle/south_west_jungle/ceiling) "lyL" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "lyS" = ( /turf/closed/wall/r_wall/unmeltable, @@ -17540,7 +16359,7 @@ /area/lv624/ground/barrens/west_barrens) "lAX" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "lBq" = ( /obj/structure/barricade/handrail/strata, @@ -17553,11 +16372,11 @@ /area/lv624/ground/barrens/south_eastern_barrens) "lBr" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "lBu" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "lBw" = ( /turf/closed/wall/strata_ice/jungle, @@ -17571,7 +16390,7 @@ /area/lv624/ground/caves/sand_temple) "lEY" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "lFv" = ( /obj/structure/bed/chair/wheelchair{ @@ -17604,7 +16423,7 @@ /area/lv624/lazarus/engineering) "lHL" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "lIm" = ( /obj/structure/fence, @@ -17620,9 +16439,7 @@ }, /area/lv624/lazarus/quartstorage) "lIU" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_central_jungle) "lJm" = ( /obj/structure/showcase{ @@ -17646,19 +16463,15 @@ /area/lv624/ground/caves/sand_temple) "lJo" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "lJC" = ( /mob/living/simple_animal/bat, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/north_central_caves) "lKe" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 10; icon_state = "warning" @@ -17675,7 +16488,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "lNe" = ( /obj/effect/decal/cleanable/blood, @@ -17736,7 +16549,7 @@ /area/lv624/lazarus/landing_zones/lz2) "lUc" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "lUy" = ( /obj/structure/prop/brazier/torch, @@ -17752,16 +16565,11 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "lWO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_west_jungle) "lYB" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/north_tcomms_road) "lYI" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -17769,9 +16577,7 @@ name = "\improper LZ2 Access"; req_one_access = null }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz2) "lZl" = ( @@ -17796,34 +16602,34 @@ layer = 4.13; pixel_y = 18 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "mbu" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "mdQ" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/west_caves) "meP" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "mfu" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "mfI" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/west_central_jungle) "mfK" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "mgs" = ( /obj/structure/machinery/door/poddoor/almayer{ @@ -17868,7 +16674,7 @@ /area/lv624/ground/barrens/south_eastern_barrens) "mko" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_nexus_road) "mkr" = ( /obj/effect/landmark/hunter_primary, @@ -17878,42 +16684,34 @@ /area/lv624/ground/caves/south_west_caves) "mku" = ( /obj/effect/landmark/monkey_spawn, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "mkU" = ( /obj/structure/foamed_metal, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor/plating, /area/lv624/lazarus/engineering) "mkW" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "mmu" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "mnK" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "mnQ" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/barrens/west_barrens) "moM" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "moV" = ( /obj/structure/bed/chair/wood/normal{ @@ -17948,9 +16746,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "msd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "msV" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -17965,23 +16761,18 @@ /area/lv624/lazarus/medbay) "mun" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/north_tcomms_road) "muv" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "muz" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/barrens/east_barrens) "muO" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "mvc" = ( /obj/effect/landmark/static_comms/net_two, @@ -17991,7 +16782,7 @@ /area/lv624/ground/colony/telecomm/cargo) "mvr" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "mwB" = ( /obj/structure/machinery/atm{ @@ -18005,21 +16796,17 @@ /area/lv624/lazarus/corporate_dome) "mxd" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "mxW" = ( /obj/structure/window/framed/colony/reinforced, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "myI" = ( /obj/effect/landmark/monkey_spawn, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "mBL" = ( /turf/open/floor{ @@ -18045,9 +16832,7 @@ /area/lv624/lazarus/corporate_dome) "mEw" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "mFu" = ( /obj/effect/landmark/crap_item, @@ -18058,17 +16843,12 @@ /turf/open/floor/plating, /area/lv624/lazarus/corporate_dome) "mHM" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/south_medbay_road) "mIs" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "mJB" = ( /turf/open/floor{ @@ -18087,7 +16867,7 @@ /area/lv624/ground/caves/sand_temple) "mMq" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "mMv" = ( /obj/structure/surface/rack, @@ -18106,31 +16886,22 @@ /area/lv624/lazarus/quartstorage) "mNz" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "mNO" = ( /obj/structure/foamed_metal, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_central_jungle) "mNU" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/east_central_jungle) "mOA" = ( /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "mPt" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "mPK" = ( /obj/effect/landmark/crap_item, @@ -18159,9 +16930,7 @@ /area/lv624/ground/barrens/central_barrens) "mSN" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "mUH" = ( /turf/open/gm/dirtgrassborder{ @@ -18170,13 +16939,13 @@ /area/lv624/ground/barrens/south_eastern_barrens) "mUQ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "mUZ" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "mVg" = ( /obj/item/weapon/harpoon/yautja{ @@ -18209,41 +16978,32 @@ /area/lv624/lazarus/corporate_dome) "mVK" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "mVV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_jungle) "mWe" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/south_west_jungle) "mXR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_nexus_road) "mZf" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "naR" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_tcomms_road) "nbw" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/barrens/north_east_barrens) "ncq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz1) "ncV" = ( @@ -18257,7 +17017,7 @@ }, /area/lv624/lazarus/landing_zones/lz2) "ndK" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/r_wall, /area/lv624/lazarus/corporate_dome) "nfD" = ( @@ -18276,11 +17036,11 @@ /area/lv624/ground/barrens/south_eastern_barrens) "nhi" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "niF" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "niV" = ( /turf/open/floor/plating{ @@ -18300,39 +17060,32 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "nkU" = ( /obj/effect/landmark/nightmare{ insert_tag = "lv-bridge-east" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "nmO" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "nnq" = ( /obj/structure/prop/brazier, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "nnL" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/barrens/east_barrens) "npf" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/jungle/west_jungle) "npQ" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "nqt" = ( /obj/item/device/analyzer/plant_analyzer, @@ -18346,7 +17099,7 @@ /area/lv624/ground/barrens/east_barrens) "nqy" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "nrb" = ( /turf/open/floor{ @@ -18361,9 +17114,9 @@ /area/lv624/ground/barrens/west_barrens) "nrP" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; - phone_id = "Cargo" + phone_id = "Cargo"; + pixel_y = 24 }, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) @@ -18392,19 +17145,15 @@ /area/lv624/ground/barrens/south_eastern_barrens) "ntL" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/west_tcomms_road) "ntQ" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "nuU" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_central_jungle) "nuW" = ( /turf/closed/wall/strata_ice/jungle, @@ -18490,10 +17239,8 @@ /area/lv624/ground/caves/sand_temple) "nBM" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "nDr" = ( /obj/structure/surface/rack, @@ -18532,7 +17279,7 @@ name = "\improper alien blade"; throwforce = 26 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "nEE" = ( /obj/structure/surface/table, @@ -18560,7 +17307,7 @@ "nHE" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "nHP" = ( /turf/open/floor{ @@ -18570,13 +17317,11 @@ /area/lv624/lazarus/medbay) "nHY" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "nHZ" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "nIs" = ( /obj/structure/machinery/vending/snack, @@ -18616,22 +17361,15 @@ /area/lv624/lazarus/canteen) "nJF" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/west_nexus_road) "nLf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "nLk" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "nLH" = ( /obj/structure/prop/tower, @@ -18642,7 +17380,7 @@ /area/lv624/lazarus/landing_zones/lz1) "nLI" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "nMu" = ( /obj/effect/landmark/objective_landmark/science, @@ -18656,9 +17394,7 @@ /area/lv624/lazarus/corporate_dome) "nNw" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/west_nexus_road) "nOD" = ( /obj/structure/disposalpipe/segment{ @@ -18668,16 +17404,13 @@ /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "nOX" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "nPd" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/central_river) "nPk" = ( /obj/structure/stairs/perspective{ @@ -18711,7 +17444,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "nTE" = ( /obj/structure/curtain/red, @@ -18754,11 +17487,11 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "nVG" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "nVZ" = ( /obj/structure/stairs/perspective{ @@ -18796,14 +17529,12 @@ /area/lv624/ground/jungle/west_jungle) "nYx" = ( /obj/structure/flora/jungle/planttop1, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "nYR" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "nYZ" = ( /turf/open/floor{ @@ -18813,24 +17544,19 @@ /area/lv624/lazarus/medbay) "nZz" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "oaL" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "obp" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/east_barrens) "obC" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "obJ" = ( /obj/structure/curtain/red, @@ -18838,9 +17564,7 @@ /area/lv624/ground/caves/north_central_caves) "ock" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "ocG" = ( /obj/effect/landmark/corpsespawner/security/liaison, @@ -18854,10 +17578,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "odw" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ @@ -18870,14 +17591,14 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-hydro" }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "oek" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/jungle/west_jungle) "oeN" = ( /turf/closed/wall, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "oeS" = ( /obj/effect/decal/remains/human, /turf/open/gm/dirt, @@ -18894,7 +17615,7 @@ /area/lv624/ground/caves/sand_temple) "ofv" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "ogM" = ( /turf/open/gm/dirt, @@ -18926,10 +17647,7 @@ /turf/open/floor/plating, /area/lv624/ground/barrens/central_barrens) "omK" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/barrens/west_barrens) "oov" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, @@ -18937,31 +17655,26 @@ /area/lv624/ground/jungle/south_east_jungle) "ooM" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "opf" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "opP" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "opS" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_east_jungle) "oqO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/north_nexus_road) "orj" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "oua" = ( /obj/effect/landmark/crap_item, @@ -18983,20 +17696,16 @@ /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "owQ" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/east_barrens) "oxY" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "oym" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "oys" = ( /obj/structure/stairs/perspective{ @@ -19032,13 +17741,13 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "oAJ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "oAV" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -19049,20 +17758,17 @@ /obj/effect/landmark/nightmare{ insert_tag = "lv-medbay" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "oDY" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "oED" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_tcomms_road) "oEE" = ( /obj/structure/surface/table, @@ -19073,16 +17779,14 @@ }, /area/lv624/lazarus/canteen) "oEI" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/barrens/east_barrens) "oER" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "oFf" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/river/east_river) "oFO" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -19108,20 +17812,18 @@ /area/lv624/ground/barrens/south_eastern_barrens) "oGs" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_tcomms_road) "oHu" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/east_river) "oHx" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "oJL" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "oKP" = ( /obj/effect/landmark/static_comms/net_two, @@ -19132,10 +17834,7 @@ /area/lv624/ground/colony/telecomm/sw_lz2) "oLk" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/west_nexus_road) "oMZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, @@ -19161,7 +17860,7 @@ /area/lv624/lazarus/corporate_dome) "oOd" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "oOf" = ( /obj/structure/flora/jungle/vines/heavy, @@ -19174,10 +17873,8 @@ /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) "oOV" = ( -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_1, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ icon_state = "warning" }, @@ -19189,15 +17886,13 @@ }, /area/lv624/lazarus/landing_zones/lz1) "oRH" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "oSh" = ( /obj/item/stack/sheet/wood{ amount = 2 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "oSp" = ( /obj/structure/largecrate/random/barrel/red, @@ -19205,16 +17900,13 @@ /area/lv624/ground/barrens/north_east_barrens) "oSv" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/west_tcomms_road) "oSx" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "oSJ" = ( /obj/structure/surface/table, @@ -19230,10 +17922,7 @@ }, /area/lv624/lazarus/medbay) "oTt" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/central_river) "oTx" = ( /obj/structure/barricade/handrail/strata{ @@ -19242,9 +17931,7 @@ /obj/structure/barricade/handrail/strata{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/barrens/south_eastern_barrens) "oTJ" = ( /turf/open/gm/dirt, @@ -19253,7 +17940,7 @@ /turf/open/gm/dirt, /area/lv624/ground/jungle/east_jungle) "oUy" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "oUK" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ @@ -19268,27 +17955,19 @@ dir = 1; icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "oWN" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "oXl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_west_jungle) "oXI" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_west_jungle) "oXS" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/central_river) "oYx" = ( /obj/structure/window/framed/colony/reinforced, @@ -19296,19 +17975,15 @@ /turf/open/floor/plating, /area/lv624/lazarus/corporate_dome) "oYM" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/barrens/west_barrens) "pab" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "pas" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "pat" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -19320,18 +17995,15 @@ /area/lv624/lazarus/corporate_dome) "pba" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "pbd" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/rock/brown, /area/lv624/ground/jungle/west_jungle) "pbn" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/south_nexus_road) "pca" = ( /obj/effect/landmark/nightmare{ @@ -19343,19 +18015,14 @@ }, /area/lv624/lazarus/security) "pcd" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/barrens/east_barrens) "pci" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/east_barrens) "pcu" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "pcz" = ( /obj/effect/landmark/objective_landmark/medium, @@ -19365,10 +18032,7 @@ }, /area/lv624/ground/barrens/containers) "pcA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/south_central_jungle) "pfl" = ( /obj/effect/decal/cleanable/blood, @@ -19381,10 +18045,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "pgf" = ( /obj/structure/machinery/power/apc{ @@ -19407,33 +18068,27 @@ /area/lv624/lazarus/corporate_dome) "phU" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "pim" = ( /turf/open/floor, /area/lv624/ground/barrens/east_barrens) "pjk" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/east_river) "pjY" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "plf" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "ply" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "pmz" = ( /turf/open/gm/dirt{ @@ -19448,7 +18103,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "pox" = ( /obj/structure/barricade/metal{ @@ -19460,42 +18115,33 @@ }, /area/lv624/lazarus/corporate_dome) "ppR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_nexus_road) "ppZ" = ( /obj/effect/landmark/nightmare{ insert_tag = "armory" }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) "prd" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/open/floor{ icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz1) "prQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "psc" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "psh" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "psH" = ( /obj/structure/surface/rack, @@ -19513,7 +18159,7 @@ /area/lv624/lazarus/crashed_ship_containers) "ptr" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "puo" = ( /turf/open/floor/greengrid, @@ -19524,9 +18170,7 @@ }, /area/lv624/lazarus/medbay) "pws" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" @@ -19534,16 +18178,11 @@ /area/lv624/ground/caves/sand_temple) "pxc" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/central_river) "pxs" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "pyG" = ( /turf/open/floor{ @@ -19552,7 +18191,7 @@ /area/lv624/lazarus/corporate_dome) "pyS" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "pzt" = ( /obj/structure/surface/table, @@ -19569,7 +18208,7 @@ /area/lv624/lazarus/medbay) "pBk" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "pDh" = ( /obj/structure/surface/table/reinforced/prison{ @@ -19598,7 +18237,7 @@ /area/lv624/ground/barrens/north_east_barrens) "pDI" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "pDK" = ( /turf/open/gm/dirt{ @@ -19607,7 +18246,7 @@ /area/lv624/ground/caves/sand_temple) "pEl" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "pEV" = ( /turf/open/floor/strata{ @@ -19616,13 +18255,11 @@ }, /area/lv624/ground/caves/sand_temple) "pFe" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_east_jungle) "pGD" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "pHn" = ( /obj/effect/decal/cleanable/blood/oil, @@ -19641,7 +18278,7 @@ /area/lv624/lazarus/corporate_dome) "pIy" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/west_nexus_road) "pIz" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, @@ -19649,7 +18286,7 @@ /area/lv624/ground/barrens/south_eastern_barrens) "pIC" = ( /obj/effect/landmark/hunter_secondary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "pJr" = ( /obj/effect/landmark/hunter_primary, @@ -19657,7 +18294,7 @@ /area/lv624/ground/barrens/south_west_barrens) "pJN" = ( /obj/effect/landmark/hunter_secondary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "pKp" = ( /obj/effect/landmark/crap_item, @@ -19667,17 +18304,12 @@ /area/lv624/lazarus/quartstorage) "pKS" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "pLm" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/west_nexus_road) "pMV" = ( /obj/effect/landmark/hunter_primary, @@ -19687,19 +18319,14 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "pNr" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "pOC" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_west_jungle) "pOK" = ( /obj/item/ammo_casing, @@ -19715,7 +18342,7 @@ /area/lv624/lazarus/medbay) "pPd" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "pQn" = ( /obj/structure/machinery/door/airlock/almayer/generic{ @@ -19735,10 +18362,10 @@ pixel_y = -5 }, /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; phone_color = "blue"; - phone_id = "Corporate Office" + phone_id = "Corporate Office"; + pixel_y = 24 }, /turf/open/floor{ dir = 5; @@ -19777,9 +18404,7 @@ /area/lv624/ground/caves/sand_temple) "pSt" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/west_nexus_road) "pTk" = ( /obj/item/bedsheet/medical, @@ -19793,22 +18418,20 @@ /area/lv624/ground/caves/east_caves) "pXI" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "pYp" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "pYq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "pYJ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_west_jungle) "pZb" = ( @@ -19831,11 +18454,11 @@ /area/lv624/ground/river/east_river) "qcX" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "qdQ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "qeb" = ( /obj/item/ammo_casing/bullet{ @@ -19847,50 +18470,37 @@ }, /area/lv624/lazarus/corporate_dome) "qeW" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "qeY" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/west_tcomms_road) "qfh" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "qfr" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper LZ2 Access"; req_one_access = null }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor, /area/lv624/lazarus/landing_zones/lz2) "qgA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_east_jungle) "qjf" = ( /turf/open/floor, /area/lv624/ground/barrens/containers) "qjt" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "qnQ" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "qpX" = ( /obj/structure/stairs/perspective{ @@ -19904,26 +18514,20 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "qqJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "qsM" = ( /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "qtj" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_central_jungle) "qtS" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "quK" = ( /obj/structure/showcase{ @@ -19950,17 +18554,12 @@ }, /area/lv624/ground/caves/sand_temple) "qvf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "qvC" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/west_nexus_road) "qxo" = ( /obj/structure/surface/table/woodentable/fancy, @@ -19997,13 +18596,11 @@ pixel_x = -7; pixel_y = 10 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/caves/sand_temple) "qAu" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "qAP" = ( /obj/effect/landmark/crap_item, @@ -20011,7 +18608,7 @@ /area/lv624/ground/colony/west_nexus_road) "qAR" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "qBQ" = ( /obj/structure/stairs/perspective{ @@ -20024,9 +18621,12 @@ }, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) +"qBW" = ( +/turf/open/gm/dirt, +/area/lv624/ground/jungle/south_west_jungle/ceiling) "qBX" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "qCU" = ( /obj/structure/stairs/perspective{ @@ -20048,34 +18648,29 @@ }, /area/lv624/lazarus/landing_zones/lz2) "qDx" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "qDz" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "qDQ" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "qDW" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "qGH" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "qGK" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "qGR" = ( /obj/structure/foamed_metal, @@ -20108,12 +18703,10 @@ /area/lv624/lazarus/medbay) "qJx" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "qKl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/north_nexus_road) "qKC" = ( /obj/structure/flora/jungle/vines/heavy, @@ -20124,9 +18717,7 @@ /area/lv624/ground/colony/telecomm/sw_lz2) "qLc" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "qMX" = ( /obj/structure/flora/jungle/alienplant1, @@ -20140,7 +18731,7 @@ /area/lv624/lazarus/landing_zones/lz2) "qPx" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "qPO" = ( /obj/structure/stairs/perspective{ @@ -20171,7 +18762,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "qTu" = ( /obj/structure/window_frame/colony/reinforced, @@ -20187,13 +18778,10 @@ }, /area/lv624/lazarus/corporate_dome) "qUM" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/west_central_jungle) "qWf" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/west_nexus_road) "qXo" = ( /obj/structure/surface/rack, @@ -20209,13 +18797,11 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "qYM" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "qZv" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "rac" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -20239,7 +18825,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "rcR" = ( /obj/effect/landmark/hunter_primary, @@ -20250,7 +18836,7 @@ /turf/open/floor{ icon_state = "redyellowfull" }, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/barrens/west_barrens/ceiling) "rdS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox/mechanical{ @@ -20283,20 +18869,16 @@ }, /area/lv624/lazarus/quartstorage) "rfH" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/r_wall, /area/lv624/lazarus/corporate_dome) "rgQ" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "rit" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "rkq" = ( /obj/effect/landmark/crap_item, @@ -20316,8 +18898,8 @@ }, /area/lv624/lazarus/engineering) "rox" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "rpR" = ( /obj/structure/flora/jungle/vines/heavy, @@ -20328,7 +18910,7 @@ /area/lv624/lazarus/landing_zones/lz1) "rqf" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "rrz" = ( /obj/structure/curtain/red, @@ -20338,19 +18920,14 @@ "rtD" = ( /obj/structure/flora/jungle/planttop1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "rua" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_jungle) "rue" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_central_jungle) "ruv" = ( /obj/effect/landmark/nightmare{ @@ -20365,16 +18942,14 @@ /area/lv624/lazarus/quartstorage) "rvL" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "rvW" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/river/east_river) "rwg" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "rwx" = ( @@ -20406,12 +18981,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "rzT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/stack/sheet/wood{ amount = 2 }, @@ -20433,10 +19006,8 @@ }, /area/lv624/lazarus/corporate_dome) "rBF" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "rCK" = ( /obj/structure/stairs/perspective{ @@ -20450,9 +19021,7 @@ }, /area/lv624/ground/caves/sand_temple) "rCV" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_central_jungle) "rGd" = ( /obj/structure/girder/displaced, @@ -20463,7 +19032,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "rGB" = ( /obj/structure/surface/rack, @@ -20474,25 +19043,21 @@ /area/lv624/lazarus/quartstorage) "rGW" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_west_jungle) "rGZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "rHp" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "rIq" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "rJd" = ( /obj/structure/bed/alien{ @@ -20501,23 +19066,19 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "rJS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz2) "rKQ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "rKR" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "rMR" = ( /obj/structure/surface/table/woodentable/fancy, @@ -20537,11 +19098,9 @@ }, /area/lv624/lazarus/corporate_dome) "rON" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "rPK" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -20582,23 +19141,19 @@ /area/lv624/lazarus/hydroponics) "rTG" = ( /obj/structure/machinery/colony_floodlight, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "rTK" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_tcomms_road) "rVH" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; phone_color = "yellow"; - phone_id = "Communications" + phone_id = "Communications"; + pixel_y = 24 }, /turf/open/floor{ dir = 9; @@ -20611,10 +19166,8 @@ /area/lv624/ground/jungle/west_jungle) "rXW" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "rYA" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -20633,8 +19186,8 @@ /area/lv624/lazarus/quartstorage) "sau" = ( /obj/effect/landmark/crap_item, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "sbt" = ( /obj/effect/decal/cleanable/blood, @@ -20669,21 +19222,19 @@ /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "sgc" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "sgj" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/north_nexus_road) "shq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "shy" = ( /obj/structure/barricade/handrail/strata, @@ -20694,18 +19245,14 @@ "sic" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /obj/effect/landmark/objective_landmark/medium, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) "slW" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/caves/sand_temple) "smx" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/west_central_jungle) "smE" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -20722,13 +19269,11 @@ }, /area/lv624/lazarus/corporate_dome) "snm" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/colony/west_nexus_road) "snr" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "snI" = ( /obj/effect/landmark/objective_landmark/medium, @@ -20746,7 +19291,7 @@ "sqw" = ( /obj/structure/machinery/colony_floodlight, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "sqR" = ( /obj/structure/stairs/perspective{ @@ -20763,42 +19308,31 @@ }, /area/lv624/ground/caves/sand_temple) "ssc" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/east_central_jungle) "ssK" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) "suv" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "svh" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "swR" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "sxa" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "sxn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "sxY" = ( /obj/structure/surface/rack, @@ -20808,10 +19342,7 @@ /area/lv624/lazarus/corporate_dome) "syc" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "syx" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -20819,7 +19350,7 @@ /area/lv624/ground/barrens/east_barrens) "szy" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "sBg" = ( /obj/structure/machinery/vending/cigarette, @@ -20833,14 +19364,11 @@ /area/lv624/lazarus/corporate_dome) "sBC" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/west_tcomms_road) "sBJ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "sCg" = ( /obj/structure/stairs/perspective{ @@ -20863,25 +19391,18 @@ }, /area/lv624/lazarus/landing_zones/lz1) "sCX" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "sDE" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "sFc" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river, /area/lv624/ground/river/west_river) -"sFt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3"; - icon_tag = "light_3" - }, -/turf/open/gm/grass, -/area/lv624/ground/jungle/south_east_jungle) "sFY" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Workshop Storage"; @@ -20897,11 +19418,11 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "sHT" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "sIg" = ( /turf/closed/wall/rock/brown, @@ -20950,38 +19471,34 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "sOp" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "sOZ" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "sPm" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "sPy" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "sRH" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "sSE" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "sTB" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/jungle/west_jungle) "sTX" = ( /obj/structure/flora/jungle/alienplant1, @@ -20989,15 +19506,15 @@ /area/lv624/ground/river/central_river) "sUc" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "sUm" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "sUT" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "sVh" = ( /obj/structure/window/framed/colony/reinforced, @@ -21005,7 +19522,7 @@ /area/lv624/lazarus/hydroponics) "sWy" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "sWE" = ( /obj/structure/largecrate, @@ -21038,20 +19555,16 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "sYY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "taa" = ( /obj/structure/barricade/wooden, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 9; icon_state = "warning" @@ -21060,15 +19573,12 @@ "taK" = ( /obj/structure/fence, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_tcomms_road) "tbV" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "tdX" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -21094,15 +19604,11 @@ /area/lv624/ground/jungle/south_central_jungle) "teR" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "teS" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_west_jungle) "tfA" = ( /obj/structure/surface/rack, @@ -21124,7 +19630,7 @@ "tgV" = ( /obj/structure/flora/bush/ausbushes/grassybush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "thn" = ( /obj/item/weapon/claymore/mercsword{ @@ -21159,10 +19665,7 @@ dir = 8 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "tiw" = ( /mob/living/simple_animal/bat, @@ -21172,17 +19675,14 @@ /area/lv624/ground/caves/north_west_caves) "tka" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "tlD" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river, /area/lv624/ground/river/central_river) "tlE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_west_jungle) "tlQ" = ( /obj/structure/surface/table/reinforced/prison, @@ -21198,25 +19698,20 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "toz" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "toF" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "toL" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "toT" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, @@ -21224,15 +19719,15 @@ pixel_x = 6; pixel_y = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "tqe" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tqH" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "trs" = ( /obj/item/tool/shovel, @@ -21254,27 +19749,22 @@ /area/lv624/ground/jungle/south_central_jungle) "tsK" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_nexus_road) "ttu" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "ttI" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ttZ" = ( /obj/structure/barricade/handrail/strata{ dir = 4 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "tuX" = ( /obj/effect/landmark/crap_item, @@ -21284,32 +19774,21 @@ /area/lv624/ground/caves/north_central_caves) "tvC" = ( /obj/structure/flora/bush/ausbushes/palebush, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_east_jungle) "twg" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "twC" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/barrens/east_barrens) "twN" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "txp" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "txx" = ( @@ -21326,7 +19805,7 @@ }, /area/lv624/lazarus/medbay) "tyG" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "tzo" = ( /turf/open/gm/dirt{ @@ -21337,22 +19816,19 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "tzK" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "tBB" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "tBJ" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "tDa" = ( /obj/structure/stairs/perspective{ @@ -21366,9 +19842,7 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "tEn" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ icon_state = "warning" }, @@ -21381,7 +19855,7 @@ /area/lv624/lazarus/corporate_dome) "tHc" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "tIg" = ( /obj/structure/surface/table, @@ -21393,7 +19867,7 @@ /area/lv624/lazarus/medbay) "tIZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "tJb" = ( /obj/structure/surface/rack, @@ -21421,17 +19895,17 @@ /area/lv624/ground/caves/sand_temple) "tJN" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tKI" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "tLQ" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "tLS" = ( /obj/structure/bed/chair/office/light, @@ -21442,15 +19916,13 @@ /area/lv624/lazarus/corporate_dome) "tLU" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "tMh" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "tMB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -21475,31 +19947,24 @@ "tRu" = ( /obj/effect/landmark/hunter_primary, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "tSd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/lazarus/quartstorage/outdoors) "tSN" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "tTh" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "tTX" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "tWw" = ( /obj/effect/decal/cleanable/blood/drip, @@ -21511,12 +19976,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "tXO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_central_jungle) "tXZ" = ( /obj/structure/largecrate, @@ -21533,10 +19996,7 @@ /area/lv624/lazarus/comms) "tZa" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/east_river) "tZe" = ( /obj/item/tank/oxygen/yellow, @@ -21547,7 +20007,7 @@ /area/lv624/lazarus/landing_zones/lz2) "uaP" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "ubb" = ( /obj/structure/flora/bush/ausbushes/ppflowers, @@ -21565,7 +20025,7 @@ /area/lv624/ground/caves/sand_temple) "ubN" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "udj" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -21587,7 +20047,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "ufG" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -21599,11 +20059,9 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/caves/sand_temple) "ugk" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "ugG" = ( /obj/effect/landmark/nightmare{ @@ -21633,23 +20091,21 @@ /area/lv624/ground/caves/north_central_caves) "uiz" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/south_nexus_road) "uiN" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/north_tcomms_road) "ujd" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "ukk" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "ukE" = ( /turf/open/gm/dirt{ @@ -21673,10 +20129,10 @@ /area/lv624/ground/caves/sand_temple) "ulp" = ( /obj/structure/transmitter/colony_net{ - pixel_y = 24; phone_category = "Lazarus Landing"; phone_color = "red"; - phone_id = "Secure Storage" + phone_id = "Secure Storage"; + pixel_y = 24 }, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) @@ -21697,7 +20153,7 @@ /area/lv624/ground/colony/telecomm/tcommdome/south) "upM" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "upQ" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -21725,14 +20181,11 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "uvh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "uxh" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "uxq" = ( /obj/effect/decal/cleanable/blood, @@ -21741,9 +20194,7 @@ /area/lv624/ground/caves/north_central_caves) "uxT" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "uya" = ( /turf/open/gm/dirt, @@ -21770,9 +20221,7 @@ }, /area/lv624/ground/caves/sand_temple) "uDs" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_central_jungle) "uDw" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -21782,12 +20231,12 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "uEl" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "uEL" = ( /obj/structure/machinery/light/small{ @@ -21822,9 +20271,7 @@ /area/lv624/lazarus/corporate_dome) "uHI" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "uIF" = ( /obj/structure/barricade/sandbags/wired, @@ -21842,9 +20289,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "uMz" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -21853,47 +20298,30 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) "uMD" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "uOi" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "uRb" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "uRE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/lazarus/landing_zones/lz2) "uSq" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/west_tcomms_road) "uSw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/west_jungle) "uSy" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/east_barrens) "uSF" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -21912,7 +20340,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "uUi" = ( /obj/structure/surface/table/reinforced/prison, @@ -21922,9 +20350,7 @@ }, /area/lv624/lazarus/corporate_dome) "uUl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_west_jungle) "uUJ" = ( /turf/open/gm/dirtgrassborder{ @@ -21933,20 +20359,19 @@ /area/lv624/ground/barrens/south_eastern_barrens) "uVk" = ( /obj/effect/landmark/objective_landmark/far, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "uVx" = ( -/turf/open/floor{ - dir = 6; - icon_state = "warning" +/obj/structure/machinery/floodlight/landing, +/obj/effect/decal/warning_stripes, +/turf/open/floor/mech_bay_recharge_floor{ + name = "Shuttle Landing Lights" }, /area/lv624/lazarus/landing_zones/lz1) "uVU" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "uWr" = ( /obj/effect/decal/cleanable/blood/oil/streak, @@ -21964,7 +20389,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "uZp" = ( /obj/structure/surface/table/reinforced/prison{ @@ -21996,11 +20421,11 @@ /area/lv624/lazarus/research) "vam" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "vcY" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "vdy" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -22025,9 +20450,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "vft" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -22039,7 +20462,7 @@ /area/lv624/ground/caves/sand_temple) "vfR" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "vgJ" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -22052,17 +20475,15 @@ /area/lv624/ground/caves/sand_temple) "vgM" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "vhx" = ( /obj/structure/girder, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "vjH" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "vjL" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, @@ -22070,10 +20491,7 @@ /area/lv624/ground/caves/east_caves) "vjO" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/south_nexus_road) "vkI" = ( /obj/structure/stairs/perspective{ @@ -22098,7 +20516,7 @@ "vmv" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "vno" = ( /obj/item/ammo_casing/bullet{ @@ -22122,22 +20540,18 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "vqT" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "vsT" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "vtt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "vty" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "vuy" = ( /obj/effect/landmark/crap_item, @@ -22147,10 +20561,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "vvE" = ( /obj/structure/machinery/vending/cola, @@ -22163,17 +20574,15 @@ }, /area/lv624/lazarus/corporate_dome) "vxa" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/stack/sheet/wood{ amount = 2 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "vxU" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "vyz" = ( /obj/structure/largecrate, @@ -22183,9 +20592,7 @@ }, /area/lv624/lazarus/quartstorage) "vBe" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) "vBu" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -22207,14 +20614,11 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) "vDy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "vDW" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "vEj" = ( /obj/effect/landmark/objective_landmark/medium, @@ -22224,14 +20628,14 @@ }, /area/lv624/lazarus/comms) "vEp" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "vGg" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "vHe" = ( /obj/structure/surface/rack, @@ -22263,22 +20667,18 @@ "vJs" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/item/bananapeel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "vKc" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "vKt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "vLO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/quartstorage/outdoors) "vMV" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -22288,11 +20688,11 @@ /area/lv624/ground/caves/south_west_caves) "vNP" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "vNW" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "vOD" = ( /turf/open/floor{ @@ -22301,23 +20701,18 @@ }, /area/lv624/ground/colony/telecomm/tcommdome/south) "vOF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_central_jungle) "vPu" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor, /area/lv624/ground/barrens/containers) "vPV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/east_jungle) "vSG" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "vUw" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -22339,9 +20734,7 @@ }, /area/lv624/ground/colony/telecomm/sw_lz2) "vVD" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/rock/brown, /area/lv624/ground/jungle/west_jungle) "vVN" = ( @@ -22352,26 +20745,20 @@ }, /area/lv624/lazarus/quartstorage) "vWs" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/east_jungle) "vXW" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wbK" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "wbP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "wca" = ( @@ -22398,33 +20785,25 @@ /area/lv624/lazarus/crashed_ship_containers) "wcS" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "wcW" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) "weH" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "wgk" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/caves/sand_temple) "whr" = ( /obj/item/ammo_magazine/smg/mp5, @@ -22447,7 +20826,7 @@ desc = "The oranges aren't done yet... this sucks."; name = "orange tree" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "whR" = ( /turf/open/floor/plating, @@ -22463,27 +20842,22 @@ /obj/structure/sign/safety/analysis_lab{ pixel_x = 40 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wkt" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/east_river) "wkE" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "wkP" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "wkZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "wlh" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, @@ -22492,11 +20866,9 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) "wlo" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "wmj" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -22535,7 +20907,7 @@ }, /area/lv624/ground/caves/sand_temple) "wpw" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "wqy" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -22544,20 +20916,18 @@ "wqz" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "wqO" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wrN" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirt, /area/lv624/ground/caves/north_central_caves) "wsZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_east_jungle) "wtK" = ( @@ -22574,22 +20944,19 @@ /area/lv624/lazarus/corporate_dome) "wvO" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "wvP" = ( /obj/effect/decal/remains/xeno, /turf/open/gm/dirt, /area/lv624/ground/barrens/central_barrens) "wxP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_jungle) "wzG" = ( /obj/effect/landmark/hunter_primary, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wAe" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -22604,16 +20971,12 @@ }, /area/lv624/lazarus/research) "wAI" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_central_jungle) "wAP" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "wBS" = ( /obj/item/clothing/suit/armor/yautja_flavor, @@ -22626,20 +20989,17 @@ /area/lv624/ground/caves/south_east_caves) "wEQ" = ( /obj/effect/decal/remains/xeno, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "wFp" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/river/east_river) "wFx" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, -/area/lv624/ground/jungle/west_jungle) +/area/lv624/ground/jungle/west_jungle/ceiling) "wFR" = ( /obj/effect/landmark/crap_item, /obj/effect/decal/cleanable/blood/drip, @@ -22654,18 +21014,13 @@ }, /area/lv624/lazarus/landing_zones/lz2) "wJA" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/lv624/lazarus/corporate_dome) "wJG" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "wJT" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -22694,12 +21049,10 @@ /area/lv624/lazarus/landing_zones/lz2) "wMk" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "wNB" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 10; icon_state = "warning" @@ -22721,10 +21074,7 @@ }, /area/lv624/lazarus/corporate_dome) "wPN" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) "wQj" = ( /obj/structure/surface/rack, @@ -22737,9 +21087,7 @@ /area/lv624/lazarus/quartstorage) "wQl" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "wSg" = ( /obj/structure/inflatable/popped, @@ -22751,9 +21099,7 @@ /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "wSo" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/west_barrens) "wSA" = ( /obj/structure/stairs/perspective{ @@ -22795,17 +21141,15 @@ }, /area/lv624/lazarus/corporate_dome) "wTa" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "wTC" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) "wTL" = ( /obj/item/storage/firstaid, @@ -22821,21 +21165,17 @@ /area/lv624/ground/barrens/central_barrens) "wVK" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "wWg" = ( /turf/open/floor/plating{ icon_state = "warnplate" }, -/area/lv624/ground/barrens/east_barrens) +/area/lv624/ground/barrens/east_barrens/ceiling) "wWm" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/north_east_jungle) "wWs" = ( /obj/structure/surface/rack, @@ -22869,23 +21209,19 @@ }, /area/lv624/ground/colony/telecomm/tcommdome/south) "wXp" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/west_central_jungle) "wXy" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "wYp" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "wZc" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "wZd" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -22912,18 +21248,16 @@ /area/lv624/ground/barrens/south_eastern_barrens) "xcC" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "xdO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_west_jungle) "xei" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "xeq" = ( /obj/structure/machinery/light{ @@ -22938,12 +21272,8 @@ }, /area/lv624/lazarus/corporate_dome) "xeT" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "xfP" = ( /obj/item/stack/rods, @@ -22957,10 +21287,7 @@ /turf/closed/wall/r_wall, /area/lv624/lazarus/corporate_dome) "xhC" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "xkU" = ( /obj/structure/bed/sofa/vert/grey/top, @@ -22977,20 +21304,14 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "xpf" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_nexus_road) "xpz" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "xqV" = ( /obj/structure/surface/rack, @@ -23001,24 +21322,19 @@ }, /area/lv624/lazarus/fitness) "xrI" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor{ dir = 6; icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz2) "xsN" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "xuk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_central_jungle) "xuK" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -23075,12 +21391,10 @@ /area/lv624/lazarus/crashed_ship_containers) "xze" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "xzD" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/north_jungle) "xBi" = ( /turf/open/gm/dirt{ @@ -23099,16 +21413,14 @@ /area/lv624/lazarus/corporate_dome) "xDl" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/east_central_jungle) "xDw" = ( /turf/closed/wall/r_wall/unmeltable, /area/lv624/ground/colony/telecomm/cargo) "xDR" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "xEt" = ( /turf/closed/wall/strata_ice/jungle, @@ -23121,11 +21433,11 @@ /area/lv624/lazarus/canteen) "xGd" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "xHa" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "xJA" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -23139,15 +21451,11 @@ /area/lv624/ground/caves/north_central_caves) "xKu" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/quartstorage/outdoors) "xKE" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/west_jungle) "xLi" = ( /obj/structure/surface/rack, @@ -23158,21 +21466,19 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/containers) "xPk" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/south_medbay_road) "xPD" = ( /obj/item/tool/pickaxe, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) "xPL" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_east_jungle) "xPS" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "xQy" = ( /obj/structure/largecrate/random, @@ -23185,13 +21491,13 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "xRo" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) "xSA" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -23210,32 +21516,28 @@ /turf/open/gm/dirt, /area/lv624/ground/jungle/south_west_jungle) "xVb" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/barrens/east_barrens) "xVk" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "xVo" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "xXB" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) "xXZ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_central_jungle) "xYj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "xZE" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -23250,9 +21552,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "ybQ" = ( /obj/structure/surface/table/woodentable/fancy, @@ -23263,7 +21563,7 @@ /area/lv624/lazarus/corporate_dome) "ydp" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "ydz" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -23275,23 +21575,14 @@ }, /area/lv624/lazarus/crashed_ship_containers) "yga" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_east_jungle) "ygn" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/east_river) "yhd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "yhH" = ( /obj/structure/barricade/wooden{ @@ -23326,7 +21617,7 @@ /area/lv624/lazarus/corporate_dome) "yiE" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "yiT" = ( /obj/structure/surface/table/reinforced/prison, @@ -23340,10 +21631,7 @@ /area/lv624/lazarus/corporate_dome) "yjh" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/west_tcomms_road) "yjN" = ( /obj/structure/flora/jungle/vines/heavy, @@ -23355,7 +21643,7 @@ "ykM" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) "yle" = ( /turf/open/gm/dirt, @@ -24497,7 +22785,7 @@ tMh aKb aVS aVS -uUl +bzs aVS aXy aKf @@ -24725,7 +23013,7 @@ kwG aKb aVS aWk -xTT +qBW axR aXy gve @@ -24953,7 +23241,7 @@ aKb aKb lyz aWl -xTT +qBW aWO hMd aWl @@ -25183,7 +23471,7 @@ aVS aWm aWO aWO -xTT +qBW aXQ aVS aLm @@ -25411,7 +23699,7 @@ acr aWn aWO jGs -xTT +qBW aWO aVS aYm @@ -25640,7 +23928,7 @@ aWo aWP aWO aWO -xTT +qBW axR xdO hUs @@ -25868,7 +24156,7 @@ aWl aWO aWO aWO -xTT +qBW aVS aYo aVK @@ -26094,7 +24382,7 @@ aKb aVS aWp aWO -xTT +qBW aXA aWl lyz @@ -26321,7 +24609,7 @@ aXh aVw aVS axR -xTT +qBW aWO aWO aXR @@ -38673,7 +36961,7 @@ abb abb abb abb -aaB +aaC aaj aaA aaU @@ -39351,7 +37639,7 @@ aah aah aaX aaj -aak +abe abb abb abb @@ -41288,7 +39576,7 @@ wVk wVk wVk ajr -iyF +lju nHY oTt mVV @@ -43238,7 +41526,7 @@ abh abb abb abb -aaB +aaC aaA aah aah @@ -43467,7 +41755,7 @@ abb abb abb abb -aaB +aaC aaA aah aaH @@ -44249,7 +42537,7 @@ wVk wVk ajq ako -alp +ajT sqj sqj rit @@ -45616,7 +43904,7 @@ wVk wVk wVk ajq -alp +ajT sqj sqj sqj @@ -46973,7 +45261,7 @@ muz twC nqv nqv -iXc +jLv obp wVk wVk @@ -47659,7 +45947,7 @@ nnL owQ uSy nqv -iXc +jLv pci wVk wVk @@ -47888,7 +46176,7 @@ uFB xVb spm nqv -iXc +jLv oEI pci wVk @@ -48111,14 +46399,14 @@ lQC lQC lQC xVb -iXc +jLv pci fpn uSy nqv nqv nqv -iXc +jLv oEI oEI oEI @@ -48340,7 +46628,7 @@ lQC lQC fpn uSy -iXc +jLv oEI twC syx @@ -49039,7 +47327,7 @@ lQC lQC ajr sqj -iyF +lju hwR oTt hrG @@ -49723,7 +48011,7 @@ sqj sqj sqj sTX -cLw +dGG nPd dVH dVH @@ -49952,7 +48240,7 @@ ajG sqj sqj kft -cLw +dGG nPd bfe bQP @@ -50634,7 +48922,7 @@ ajr sqj sqj sTX -iyF +lju hwR oTt dVH @@ -51547,7 +49835,7 @@ sqj sqj akr sqj -cLw +dGG bnX amr oRH @@ -56612,7 +54900,7 @@ acb avS acb asN -akG +uVx aDG aDG aDG @@ -56624,7 +54912,7 @@ aHu aGz aGz aGz -akG +uVx aGz aGz aGz @@ -56636,7 +54924,7 @@ aDG aDG aDG aDG -aMq +uVx aky aky aky @@ -56841,8 +55129,8 @@ btb uZq aDG aHu -aDH -aEj +ank +aGB aEj aFK aGe @@ -56852,7 +55140,7 @@ aFK aGe aGB aEj -aJT +aFK aGe aGB aEj @@ -56862,8 +55150,8 @@ aGB aEj aFK aGe -akG -aDH +aGB +ank aMq aky aky @@ -57069,7 +55357,7 @@ lke aGz aGz aGz -aDI +aDJ ank ank ano @@ -57297,7 +55585,7 @@ aDM aDM aDM hSa -aDJ +aDK ank ank ank @@ -57525,7 +55813,7 @@ btF btF btF aDi -aDK +aDL ank ank ank @@ -57753,7 +56041,7 @@ aky dbY btF aDi -aDL +aDI ank ank ank @@ -57981,7 +56269,7 @@ aky aky btF aDi -aDI +aDJ ank ank ank @@ -58209,7 +56497,7 @@ nSR aky btF aDi -aDJ +aDK ank ank ank @@ -58437,7 +56725,7 @@ qBX nSR btF aDi -aDK +aDL ank ank ank @@ -58665,7 +56953,7 @@ qBX tKI btF aDi -aDL +aDI ank ank ank @@ -58893,7 +57181,7 @@ qBX tKI btF aDi -aDI +aDJ ank ank ank @@ -59121,7 +57409,7 @@ shq rKQ btF aDi -aDJ +aDK ank ank ank @@ -59349,7 +57637,7 @@ aky jtg btF aDi -aDK +aDL ank ank ano @@ -59577,18 +57865,18 @@ aky aky btF aDi -aDH -aEl +ank +aGE aEl aFM -ank +aGf aGE aEl aFM aGf aGE aEl -aJU +aFM aGf aGE aEl @@ -59598,8 +57886,8 @@ aGE aEl aFM aGf -akG -aDH +aGE +ank aMq btF aky @@ -59804,7 +58092,7 @@ phU eHr aky btF -akG +uVx aDM aDM aDM @@ -59816,7 +58104,7 @@ aDM aDM aDM aDM -akG +uVx aDM aDM aDM @@ -60755,7 +59043,7 @@ wpw wpw wpw wpw -sFt +wYp lBw lBw lBw diff --git a/maps/map_files/LV624/cargospecial/cargospecial1_mines.dmm b/maps/map_files/LV624/cargospecial/cargospecial1_mines.dmm index 83e1ef880373..4f374a352b54 100644 --- a/maps/map_files/LV624/cargospecial/cargospecial1_mines.dmm +++ b/maps/map_files/LV624/cargospecial/cargospecial1_mines.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "b" = ( /obj/structure/largecrate/random/barrel/blue, @@ -11,7 +11,7 @@ /area/lv624/lazarus/quartstorage) "o" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "p" = ( /obj/structure/window/framed/colony/reinforced, diff --git a/maps/map_files/LV624/cargospecial/cargospecial2_weapons.dmm b/maps/map_files/LV624/cargospecial/cargospecial2_weapons.dmm index d2e5c33cc12a..d9da1c3daa4c 100644 --- a/maps/map_files/LV624/cargospecial/cargospecial2_weapons.dmm +++ b/maps/map_files/LV624/cargospecial/cargospecial2_weapons.dmm @@ -47,7 +47,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/smg/mp27, /obj/item/ammo_magazine/smg/mp27, -/obj/item/weapon/gun/shotgun/double/with_stock{ +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{ pixel_y = -4 }, /obj/item/weapon/gun/smg/mp27{ diff --git a/maps/map_files/LV624/gym/20.pool.dmm b/maps/map_files/LV624/gym/20.pool.dmm index 510e7f990b50..92bba9a7dcff 100644 --- a/maps/map_files/LV624/gym/20.pool.dmm +++ b/maps/map_files/LV624/gym/20.pool.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bA" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bQ" = ( /turf/open/floor{ @@ -56,19 +56,14 @@ /turf/open/floor, /area/lv624/lazarus/fitness) "ic" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "iv" = ( /obj/item/toy/inflatable_duck, /turf/open/gm/river, /area/lv624/lazarus/fitness) "iJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/north_nexus_road) "jS" = ( /obj/structure/surface/rack, @@ -130,7 +125,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "oK" = ( /obj/item/shard, @@ -179,22 +174,22 @@ /area/lv624/ground/colony/south_medbay_road) "wH" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "wO" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "xt" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "xS" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "yO" = ( /obj/item/toy/beach_ball, @@ -284,10 +279,7 @@ }, /area/lv624/lazarus/fitness) "Gf" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/south_medbay_road) "Iu" = ( /obj/structure/machinery/atm{ @@ -313,18 +305,18 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "JM" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "KS" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/north_nexus_road) "NC" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "Ot" = ( /obj/structure/window_frame/colony, @@ -377,11 +369,11 @@ /area/lv624/lazarus/fitness) "Td" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "Ua" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "Us" = ( /obj/structure/closet/athletic_mixed, @@ -404,9 +396,7 @@ }, /area/lv624/lazarus/fitness) "Vb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "Vo" = ( /obj/structure/window/framed/colony, @@ -422,13 +412,10 @@ }, /area/lv624/lazarus/fitness) "Wj" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "WV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_nexus_road) "Zo" = ( /obj/effect/landmark/good_item, @@ -436,9 +423,7 @@ /area/lv624/lazarus/fitness) "ZM" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) (1,1,1) = {" diff --git a/maps/map_files/LV624/gym/30.alternate.dmm b/maps/map_files/LV624/gym/30.alternate.dmm index e786b6116743..8762e50bc905 100644 --- a/maps/map_files/LV624/gym/30.alternate.dmm +++ b/maps/map_files/LV624/gym/30.alternate.dmm @@ -181,14 +181,11 @@ }, /area/lv624/lazarus/fitness) "lq" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/colony/north_nexus_road) "nl" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "ok" = ( /obj/structure/machinery/light{ @@ -239,7 +236,7 @@ /area/lv624/ground/colony/south_medbay_road) "ux" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "uF" = ( /obj/structure/barricade/handrail{ @@ -279,7 +276,7 @@ /area/lv624/lazarus/fitness) "vZ" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "wA" = ( /obj/structure/bed/chair, @@ -289,9 +286,7 @@ }, /area/lv624/lazarus/fitness) "wL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "xe" = ( /obj/structure/closet/boxinggloves, @@ -327,7 +322,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "AE" = ( /turf/open/floor{ @@ -336,9 +331,7 @@ }, /area/lv624/lazarus/fitness) "Bl" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/central_jungle) "Bm" = ( /obj/structure/machinery/vending/cola, @@ -368,7 +361,7 @@ /area/lv624/lazarus/fitness) "CO" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "CZ" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -387,7 +380,7 @@ }, /area/lv624/lazarus/fitness) "DM" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "EQ" = ( /obj/structure/holohoop{ @@ -420,7 +413,7 @@ /area/lv624/lazarus/fitness) "Hz" = ( /obj/structure/fence, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/north_nexus_road) "HF" = ( /obj/structure/surface/rack, @@ -501,13 +494,11 @@ /area/lv624/lazarus/fitness) "LB" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "LG" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "Mn" = ( /obj/structure/machinery/light, @@ -516,16 +507,16 @@ }, /area/lv624/lazarus/fitness) "Nt" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "NW" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "Od" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) "Op" = ( /obj/effect/landmark/survivor_spawner, @@ -541,10 +532,7 @@ /turf/open/floor, /area/lv624/lazarus/fitness) "Ph" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/colony/north_nexus_road) "PC" = ( /obj/item/tool/soap, @@ -568,7 +556,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "Qj" = ( /obj/item/device/radio/intercom{ @@ -605,7 +593,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "To" = ( /turf/open/floor{ @@ -665,10 +653,7 @@ }, /area/lv624/lazarus/fitness) "Wh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/colony/south_medbay_road) "Wx" = ( /obj/structure/window_frame/colony, diff --git a/maps/map_files/LV624/hydro/30.destroyed.dmm b/maps/map_files/LV624/hydro/30.destroyed.dmm index c3cadb6c3c1f..a1c9ebcf3dbb 100644 --- a/maps/map_files/LV624/hydro/30.destroyed.dmm +++ b/maps/map_files/LV624/hydro/30.destroyed.dmm @@ -35,7 +35,7 @@ /area/lv624/lazarus/hydroponics) "bM" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/north_nexus_road) "ck" = ( /obj/effect/decal/cleanable/blood/xeno, @@ -57,15 +57,10 @@ }, /area/lv624/lazarus/hydroponics) "eU" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_nexus_road) "fk" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/colony/south_medbay_road) "ft" = ( /obj/item/clothing/gloves/marine/veteran/pmc{ @@ -110,7 +105,7 @@ /area/lv624/lazarus/hydroponics) "jg" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "jy" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, @@ -222,7 +217,7 @@ /area/lv624/lazarus/hydroponics) "se" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "tK" = ( /obj/structure/barricade/deployable{ @@ -343,7 +338,7 @@ /area/lv624/lazarus/hydroponics) "BL" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "Cp" = ( /obj/structure/surface/rack, @@ -452,7 +447,7 @@ }, /area/lv624/lazarus/hydroponics) "Km" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "Lk" = ( /obj/effect/decal/cleanable/blood/xeno, @@ -476,7 +471,7 @@ /area/lv624/lazarus/hydroponics) "Mm" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "MM" = ( /obj/structure/barricade/deployable{ @@ -659,11 +654,11 @@ }, /area/lv624/lazarus/hydroponics) "XA" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "XJ" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "YJ" = ( /obj/item/storage/firstaid, diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm index ecc11583e466..27e4f42b6152 100644 --- a/maps/map_files/LV624/maintemple/1.intact.dmm +++ b/maps/map_files/LV624/maintemple/1.intact.dmm @@ -49,10 +49,7 @@ dir = 8 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "aO" = ( /obj/structure/bed/chair/comfy/black{ @@ -145,7 +142,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "dF" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) "dJ" = ( /obj/structure/barricade/handrail/strata{ @@ -281,10 +278,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "fl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "fD" = ( /obj/structure/barricade/handrail/strata{ @@ -293,9 +287,7 @@ /obj/structure/barricade/handrail/strata{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/barrens/south_eastern_barrens) "fE" = ( /obj/structure/bed/alien{ @@ -341,9 +333,7 @@ }, /area/lv624/ground/caves/sand_temple) "gw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "gA" = ( /obj/structure/curtain/red, @@ -356,7 +346,7 @@ desc = "The oranges aren't done yet... this sucks."; name = "orange tree" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "gL" = ( /turf/open/floor/strata{ @@ -394,9 +384,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "hi" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "hu" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1188,9 +1176,7 @@ /obj/structure/barricade/handrail/strata{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) "DH" = ( /obj/structure/showcase{ @@ -1379,10 +1365,7 @@ dir = 4 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "Jc" = ( /turf/open/shuttle{ @@ -1680,9 +1663,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "QL" = ( /obj/structure/stairs/perspective{ @@ -1809,7 +1790,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "Vu" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "Wl" = ( /obj/structure/bed/chair/comfy/black{ @@ -1850,10 +1831,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "Xz" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -1905,10 +1883,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "Zt" = ( /obj/structure/prop/brazier, diff --git a/maps/map_files/LV624/maintemple/2.flooded.dmm b/maps/map_files/LV624/maintemple/2.flooded.dmm index 7a857bf43ee3..f375b61213ce 100644 --- a/maps/map_files/LV624/maintemple/2.flooded.dmm +++ b/maps/map_files/LV624/maintemple/2.flooded.dmm @@ -4,10 +4,7 @@ /turf/closed/wall/rock/brown, /area/lv624/ground/caves/sand_temple) "ap" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "as" = ( /obj/structure/surface/table/reinforced/prison{ @@ -24,14 +21,11 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "ax" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "aA" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "aI" = ( /obj/structure/surface/table/reinforced/prison{ @@ -52,16 +46,11 @@ dir = 8 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "aO" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "aT" = ( /obj/structure/stairs/perspective{ @@ -75,9 +64,7 @@ }, /area/lv624/ground/caves/sand_temple) "bP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "bZ" = ( @@ -85,16 +72,10 @@ /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) "ci" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) "de" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "dr" = ( /obj/structure/stairs/perspective{ @@ -143,7 +124,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "dF" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) "dJ" = ( /obj/structure/barricade/handrail/strata{ @@ -170,10 +151,7 @@ /area/lv624/ground/caves/sand_temple) "dQ" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "dV" = ( /obj/structure/surface/table/reinforced/prison{ @@ -194,9 +172,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "ez" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/barrens/south_eastern_barrens) "eM" = ( /obj/structure/stairs/perspective{ @@ -207,16 +183,11 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "eY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "fl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "fD" = ( /obj/structure/barricade/handrail/strata{ @@ -225,30 +196,20 @@ /obj/structure/barricade/handrail/strata{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/barrens/south_eastern_barrens) "fE" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "fP" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/coast{ - dir = 8 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/coast/east, /area/lv624/ground/caves/sand_temple) "gw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) "gA" = ( /obj/structure/curtain/red, @@ -261,7 +222,7 @@ desc = "The oranges aren't done yet... this sucks."; name = "orange tree" }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "gL" = ( /turf/open/floor/strata{ @@ -273,10 +234,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "gY" = ( /obj/structure/stairs/perspective{ @@ -298,21 +256,14 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "hi" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "hu" = ( /obj/item/weapon/claymore/mercsword, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "hA" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/caves/sand_temple) "hD" = ( /turf/open/gm/dirtgrassborder{ @@ -323,10 +274,8 @@ /obj/structure/bed/chair/comfy/black{ dir = 8 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "ic" = ( /obj/structure/flora/jungle/vines/heavy, @@ -362,16 +311,11 @@ /area/lv624/ground/barrens/south_eastern_barrens) "iM" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "iN" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "iW" = ( /obj/structure/barricade/handrail/strata{ @@ -385,33 +329,19 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "ja" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "jZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "ky" = ( /obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) "lm" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/caves/sand_temple) "lt" = ( /obj/structure/surface/table/reinforced/prison{ @@ -542,9 +472,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "od" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -574,9 +502,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "po" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "pu" = ( /obj/structure/stairs/perspective{ @@ -592,10 +518,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "pN" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -630,10 +553,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "rd" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/sand_temple) "rA" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ @@ -819,13 +739,8 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "vC" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "vN" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -834,10 +749,7 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "vY" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) "we" = ( /obj/structure/stairs/perspective{ @@ -898,24 +810,17 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "wP" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/caves/sand_temple) "wQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "wR" = ( /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "wS" = ( /obj/structure/showcase{ @@ -929,9 +834,7 @@ }, /area/lv624/ground/caves/sand_temple) "wU" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) "wZ" = ( /turf/open/gm/dirtgrassborder{ @@ -939,15 +842,10 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "xp" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "xu" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) "xx" = ( @@ -977,17 +875,11 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/caves/sand_temple) "yf" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "yh" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -1027,13 +919,10 @@ dir = 8; layer = 3.01 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "zA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "zO" = ( /obj/structure/platform/mineral/sandstone/runed{ @@ -1050,9 +939,7 @@ /area/lv624/ground/caves/sand_temple) "Ak" = ( /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/south_eastern_barrens) "Ao" = ( /obj/structure/showcase{ @@ -1078,15 +965,10 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "Aw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "AB" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "AQ" = ( /obj/structure/stairs/perspective{ @@ -1174,21 +1056,18 @@ }, /area/lv624/ground/caves/sand_temple) "Dj" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/barrens/south_eastern_barrens) "Dl" = ( /obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "Ds" = ( /obj/structure/flora/jungle/alienplant1{ layer = 4.13; pixel_y = 18 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) "Dw" = ( /turf/closed/wall/strata_ice/jungle, @@ -1197,9 +1076,7 @@ /obj/structure/barricade/handrail/strata{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) "DH" = ( /obj/structure/showcase{ @@ -1230,10 +1107,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "Eq" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1253,26 +1127,15 @@ }, /area/lv624/ground/caves/sand_temple) "Es" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/sand_temple) "EB" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) "EJ" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/caves/sand_temple) "EM" = ( /obj/structure/showcase{ @@ -1328,17 +1191,12 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "FS" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/item/hunting_trap{ desc = "A bizarre alien device used for trapping and killing prey."; name = "Alien Mine" }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/caves/sand_temple) "Ge" = ( /turf/open/floor/corsat{ @@ -1353,9 +1211,7 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "Gu" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/south_eastern_barrens) "GO" = ( /obj/structure/stairs/perspective{ @@ -1389,9 +1245,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "Hl" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1446,10 +1300,7 @@ pixel_x = 10; pixel_y = 3 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) "Ix" = ( /obj/structure/barricade/handrail/strata, @@ -1465,10 +1316,7 @@ dir = 4 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) "Jc" = ( /turf/open/shuttle{ @@ -1558,21 +1406,16 @@ /area/lv624/ground/barrens/south_eastern_barrens) "Ki" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) "Kk" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) "Kr" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "KB" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1596,18 +1439,14 @@ }, /area/lv624/ground/caves/sand_temple) "KL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "Lg" = ( /turf/open/gm/river, /area/lv624/ground/barrens/south_eastern_barrens) "Lt" = ( /obj/item/reagent_container/food/snacks/stew, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) "LF" = ( /obj/structure/stairs/perspective{ @@ -1673,15 +1512,10 @@ /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) "MB" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) "MD" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "MK" = ( /turf/open/gm/dirtgrassborder{ @@ -1689,9 +1523,7 @@ }, /area/lv624/ground/barrens/south_eastern_barrens) "MX" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "Nt" = ( @@ -1746,9 +1578,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) "PA" = ( /obj/structure/machinery/door/airlock/sandstone/runed/destroyable{ @@ -1801,17 +1631,13 @@ /area/lv624/ground/caves/sand_temple) "PR" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) "QG" = ( /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) "QL" = ( /obj/structure/stairs/perspective{ @@ -1828,12 +1654,8 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/caves/sand_temple) "Rg" = ( /obj/structure/flora/jungle/vines/heavy, @@ -1897,21 +1719,17 @@ /turf/open/gm/river, /area/lv624/ground/barrens/south_eastern_barrens) "TY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "Ug" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) "Uk" = ( /obj/structure/stairs/perspective{ @@ -1925,9 +1743,7 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) "UK" = ( /turf/open/gm/dirtgrassborder{ @@ -1948,13 +1764,11 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "Vu" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) "Wl" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) "Ws" = ( /obj/structure/barricade/handrail/strata{ @@ -1982,10 +1796,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "XV" = ( /obj/structure/bed/chair/comfy/black{ @@ -1997,9 +1808,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 1 }, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/caves/sand_temple) "Yu" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ diff --git a/maps/map_files/LV624/medbay/10.destroyed.dmm b/maps/map_files/LV624/medbay/10.destroyed.dmm index c40cc7a7e2bc..34dbd1981cf0 100644 --- a/maps/map_files/LV624/medbay/10.destroyed.dmm +++ b/maps/map_files/LV624/medbay/10.destroyed.dmm @@ -99,11 +99,11 @@ /area/lv624/lazarus/medbay) "jY" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "kg" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "kh" = ( /obj/structure/surface/table, @@ -116,7 +116,7 @@ /area/lv624/lazarus/medbay) "kD" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "lk" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -162,7 +162,7 @@ /area/lv624/lazarus/medbay) "nG" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "og" = ( /turf/open/gm/dirt, @@ -210,11 +210,11 @@ /area/lv624/lazarus/medbay) "rZ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "se" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "tK" = ( /obj/structure/machinery/light{ @@ -239,9 +239,7 @@ /area/lv624/lazarus/medbay) "xe" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/south_medbay_road) "xF" = ( /obj/structure/surface/table/reinforced, @@ -255,11 +253,11 @@ }, /area/lv624/lazarus/medbay) "xM" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "ym" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "yU" = ( /obj/structure/girder, @@ -300,7 +298,7 @@ /area/lv624/lazarus/medbay) "zS" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "AB" = ( /obj/effect/landmark/objective_landmark/science, @@ -310,12 +308,10 @@ /area/lv624/lazarus/medbay) "Be" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/south_medbay_road) "Bn" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "BL" = ( /obj/structure/window_frame/colony, @@ -381,7 +377,7 @@ /area/lv624/lazarus/medbay) "Ha" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "Il" = ( /obj/structure/machinery/bioprinter, @@ -410,7 +406,7 @@ }, /area/lv624/lazarus/medbay) "JE" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "JK" = ( /obj/item/stack/medical/ointment, @@ -436,7 +432,7 @@ /area/lv624/lazarus/medbay) "Km" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "Lk" = ( /obj/structure/machinery/light{ @@ -613,7 +609,7 @@ }, /area/lv624/lazarus/medbay) "XA" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "XJ" = ( /turf/closed/wall/r_wall, diff --git a/maps/map_files/LV624/medbay/30.larvasurgery.dmm b/maps/map_files/LV624/medbay/30.larvasurgery.dmm index 5cf4e37bb31a..a47a2cd2ed62 100644 --- a/maps/map_files/LV624/medbay/30.larvasurgery.dmm +++ b/maps/map_files/LV624/medbay/30.larvasurgery.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ac" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "ae" = ( /turf/closed/wall/r_wall, @@ -10,7 +10,7 @@ /area/lv624/lazarus/medbay) "ag" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "ai" = ( /obj/structure/machinery/medical_pod/sleeper, @@ -29,7 +29,7 @@ /area/lv624/lazarus/medbay) "al" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "an" = ( /obj/structure/surface/table, @@ -100,7 +100,7 @@ /area/lv624/lazarus/medbay) "au" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "av" = ( /turf/open/floor{ @@ -265,9 +265,7 @@ /area/lv624/lazarus/medbay) "bw" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/colony/south_medbay_road) "bx" = ( /obj/item/trash/plate, @@ -301,9 +299,7 @@ /area/lv624/lazarus/medbay) "bE" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/south_medbay_road) "bF" = ( /turf/open/gm/dirt, @@ -364,7 +360,7 @@ /area/lv624/lazarus/medbay) "qK" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "qP" = ( /obj/structure/machinery/power/apc{ @@ -410,11 +406,11 @@ /area/lv624/lazarus/medbay) "we" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "wz" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "yd" = ( /turf/open/floor{ @@ -423,7 +419,7 @@ }, /area/lv624/lazarus/medbay) "zE" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "zF" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -433,7 +429,7 @@ /area/lv624/lazarus/medbay) "zL" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "AO" = ( /obj/effect/decal/cleanable/blood/xeno, @@ -474,10 +470,10 @@ /area/lv624/lazarus/medbay) "Es" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "ES" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/south_medbay_road) "Gu" = ( /obj/structure/closet/wardrobe, @@ -510,14 +506,14 @@ /area/lv624/lazarus/medbay) "LQ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "Np" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "Pe" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "Pi" = ( /obj/structure/surface/table, diff --git a/maps/map_files/LV624/science/10.yautja.dmm b/maps/map_files/LV624/science/10.yautja.dmm index 8983af50d4bf..d0dfdca90fc7 100644 --- a/maps/map_files/LV624/science/10.yautja.dmm +++ b/maps/map_files/LV624/science/10.yautja.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "ab" = ( /turf/closed/wall/r_wall, @@ -70,9 +70,7 @@ /area/lv624/lazarus/research) "an" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "ao" = ( /obj/structure/window/framed/colony/reinforced, @@ -135,7 +133,7 @@ }, /area/lv624/lazarus/research) "av" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "aw" = ( /obj/structure/machinery/optable, @@ -431,7 +429,7 @@ }, /area/lv624/lazarus/research) "bg" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bh" = ( /turf/closed/wall/strata_ice/jungle, diff --git a/maps/map_files/LV624/science/40.fullylocked.dmm b/maps/map_files/LV624/science/40.fullylocked.dmm index 42b74e6510dd..63a5d17558f3 100644 --- a/maps/map_files/LV624/science/40.fullylocked.dmm +++ b/maps/map_files/LV624/science/40.fullylocked.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) "ab" = ( /turf/closed/wall/r_wall, @@ -69,9 +69,7 @@ /area/lv624/lazarus/research) "an" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/south_medbay_road) "ao" = ( /obj/structure/window/framed/colony/reinforced, @@ -141,7 +139,7 @@ }, /area/lv624/lazarus/research) "ax" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/colony/south_medbay_road) "ay" = ( /turf/open/floor{ @@ -416,7 +414,7 @@ }, /area/lv624/lazarus/research) "bE" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) "bF" = ( /turf/closed/wall/strata_ice/jungle, diff --git a/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm b/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm index d88e8cd60bb7..8b09597980a6 100644 --- a/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm +++ b/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm @@ -168,6 +168,7 @@ /obj/effect/decal/cleanable/blood/splatter, /obj/item/ammo_casing, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor{ icon_state = "white" }, diff --git a/maps/map_files/LV624/standalone/laststand.dmm b/maps/map_files/LV624/standalone/laststand.dmm index dd516a9cd479..43201f92cb17 100644 --- a/maps/map_files/LV624/standalone/laststand.dmm +++ b/maps/map_files/LV624/standalone/laststand.dmm @@ -99,8 +99,8 @@ /area/lv624/ground/caves/north_central_caves) "au" = ( /obj/structure/surface/table/woodentable/poor, -/obj/item/weapon/gun/shotgun/double/with_stock, -/obj/item/weapon/gun/shotgun/double/with_stock{ +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{ pixel_y = 7 }, /turf/open/floor/wood, diff --git a/maps/map_files/LV624/standalone/leftsidepass.dmm b/maps/map_files/LV624/standalone/leftsidepass.dmm index e2a7ac052c25..678059d4ad83 100644 --- a/maps/map_files/LV624/standalone/leftsidepass.dmm +++ b/maps/map_files/LV624/standalone/leftsidepass.dmm @@ -1,16 +1,14 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "ac" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "ad" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/west_river) "ae" = ( /obj/structure/flora/bush/ausbushes/grassybush, @@ -32,9 +30,7 @@ /area/lv624/ground/river/west_river) "ai" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "aj" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, @@ -49,145 +45,97 @@ /turf/open/gm/river, /area/lv624/ground/river/west_river) "ao" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/west_river) "aq" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/west_river) "ar" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/west_river) "as" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, /area/lv624/ground/jungle/west_jungle) "at" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/river/west_river) "au" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "av" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_jungle) "aw" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/jungle/west_jungle) "ax" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/west_jungle) "ay" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "az" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aA" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aB" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/west_jungle) "aC" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aD" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aE" = ( /obj/structure/flora/bush/ausbushes/pointybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aF" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aG" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/west_jungle) "aH" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aI" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aJ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aK" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/west_jungle) "aU" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/river/west_river) "aV" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_jungle) "aX" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) "bc" = ( /turf/open/gm/river, @@ -204,26 +152,20 @@ /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "bm" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/west_river) "bt" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/west_river) "bx" = ( /obj/effect/alien/weeds/node, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) "bz" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/west_river) "bL" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/west_river) "bN" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -231,18 +173,13 @@ /area/lv624/ground/river/west_river) "bV" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_jungle) "gX" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/river/west_river) "kE" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/jungle/west_jungle) "qG" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -253,9 +190,7 @@ /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "zW" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/jungle/west_jungle) "Dw" = ( /turf/closed/wall/strata_ice/jungle, @@ -274,9 +209,7 @@ /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) "Ms" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/jungle/west_jungle) "Ok" = ( /obj/structure/flora/jungle/alienplant1, diff --git a/maps/map_files/LV624/standalone/lv-bridge-east.dmm b/maps/map_files/LV624/standalone/lv-bridge-east.dmm index 75cf3a498d95..62df758ef0df 100644 --- a/maps/map_files/LV624/standalone/lv-bridge-east.dmm +++ b/maps/map_files/LV624/standalone/lv-bridge-east.dmm @@ -27,18 +27,16 @@ /area/lv624/ground/barrens/central_barrens) "af" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "ag" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ah" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "aj" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -47,9 +45,7 @@ "ak" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "al" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -67,23 +63,11 @@ /area/lv624/ground/river/central_river) "ao" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/central_river) "aq" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, -/area/lv624/ground/river/central_river) -"ar" = ( -/obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 6; - icon_state = "beach" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/central_river) "as" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -91,10 +75,7 @@ /area/lv624/ground/river/central_river) "at" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 2; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/central_river) "au" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -107,13 +88,11 @@ "av" = ( /obj/effect/landmark/crap_item, /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "ax" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "ay" = ( /obj/effect/landmark/crap_item, @@ -125,40 +104,24 @@ /area/lv624/ground/river/central_river) "aB" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/central_river) "aD" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/central_river) "aE" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "aG" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast{ - dir = 9; - icon_state = "beach" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/central_river) "aH" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/river/central_river) "aJ" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/lv624/ground/river/central_river) "aK" = ( /turf/open/gm/river, @@ -175,15 +138,10 @@ /turf/open/gm/river, /area/lv624/ground/river/central_river) "aR" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/central_river) "aT" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_jungle) "aV" = ( /obj/structure/flora/jungle/plantbot1, @@ -203,65 +161,41 @@ }, /area/lv624/ground/river/central_river) "aZ" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/central_river) "ba" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/river/central_river) "be" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "bf" = ( /turf/open/gm/dirt, /area/lv624/ground/river/central_river) "bq" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "br" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_jungle) "bt" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_jungle) "bu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/north_jungle) "bw" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "by" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "bz" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_jungle) "bD" = ( /obj/effect/landmark/lv624/fog_blocker, @@ -269,65 +203,50 @@ /area/lv624/ground/jungle/north_jungle) "bE" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "bH" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "bK" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "bN" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "cp" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "gh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/north_jungle) "mf" = ( -/turf/open/gm/coast{ - dir = 2; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/central_river) "oa" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/north_jungle) "px" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "pW" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/river, /area/lv624/ground/river/central_river) "uc" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/river/central_river) "uC" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/central_river) "wp" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "wu" = ( /obj/structure/flora/jungle/alienplant1, @@ -342,7 +261,7 @@ /area/lv624/ground/river/central_river) "BA" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "DQ" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -360,9 +279,7 @@ /area/lv624/ground/river/central_river) "Hi" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "HT" = ( /obj/structure/flora/jungle/planttop1, @@ -382,22 +299,17 @@ /area/lv624/ground/river/central_river) "Ow" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "Rp" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/dirt, /area/lv624/ground/jungle/north_jungle) "RE" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "XL" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/central_river) "XY" = ( /obj/structure/fence, @@ -645,7 +557,7 @@ bK (15,1,1) = {" af ao -ar +at aK aK aK @@ -740,7 +652,7 @@ bN "} (21,1,1) = {" af -ar +at aK aK aK diff --git a/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm b/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm index b9608d702436..1b9b8a9408b8 100644 --- a/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm +++ b/maps/map_files/LV624/standalone/lv-bridge-nofog.dmm @@ -55,12 +55,10 @@ /turf/open/gm/dirt, /area/lv624/ground/river/central_river) "aj" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) "ak" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) "al" = ( /obj/effect/decal/cleanable/blood/drip, @@ -70,10 +68,7 @@ }, /area/lv624/ground/river/central_river) "dC" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/central_river) "iW" = ( /obj/effect/landmark/crap_item, @@ -84,29 +79,22 @@ /area/lv624/ground/river/central_river) "jr" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/central_river) "jT" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 2; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/lv624/ground/river/central_river) "km" = ( /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/river, /area/lv624/ground/river/central_river) "lS" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "lW" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "lY" = ( /turf/open/floor/plating{ @@ -129,20 +117,14 @@ /area/lv624/ground/river/central_river) "mD" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "mE" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "pF" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/central_river) "qL" = ( /obj/effect/spawner/gibspawner/human, @@ -154,15 +136,10 @@ /area/lv624/ground/river/central_river) "xB" = ( /obj/effect/landmark/crap_item, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_jungle) "yj" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/central_river) "yu" = ( /turf/closed/wall/strata_ice/jungle, @@ -182,9 +159,7 @@ /area/lv624/ground/river/central_river) "EG" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) "Pz" = ( /turf/closed/wall/strata_ice/jungle, @@ -198,12 +173,10 @@ }, /area/lv624/ground/river/central_river) "VN" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) "Wb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) "Yw" = ( /turf/open/floor/plating{ diff --git a/maps/map_files/LV624/standalone/rightsidepass.dmm b/maps/map_files/LV624/standalone/rightsidepass.dmm index 4f11ce69db62..944be98dfbe7 100644 --- a/maps/map_files/LV624/standalone/rightsidepass.dmm +++ b/maps/map_files/LV624/standalone/rightsidepass.dmm @@ -1,16 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bw" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/east_river) "ci" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "cG" = ( /turf/open/gm/dirt, @@ -28,34 +22,30 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "gs" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "hc" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) "jd" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "je" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "kf" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "lm" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "lD" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -63,10 +53,7 @@ /turf/open/gm/river, /area/lv624/ground/river/east_river) "lJ" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "mK" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -79,24 +66,20 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "oA" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "pf" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "pS" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "qk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "rP" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -106,9 +89,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "sn" = ( /turf/closed/wall/strata_ice/jungle, @@ -120,10 +101,7 @@ }, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tJ" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tN" = ( /turf/open/gm/dirt{ @@ -131,7 +109,7 @@ }, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "tT" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "ww" = ( /turf/open/gm/dirt{ @@ -140,29 +118,20 @@ /area/lv624/ground/river/east_river) "zT" = ( /obj/structure/flora/bush/ausbushes/ppflowers, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "Cf" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/lv624/ground/river/east_river) "CA" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "CL" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "DA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_jungle) "Ek" = ( /turf/open/gm/river, @@ -173,43 +142,29 @@ /area/lv624/ground/river/east_river) "Fj" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/lv624/ground/river/east_river) "Fm" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/river/east_river) "FQ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/river/east_river) "GI" = ( /obj/effect/landmark/lv624/fog_blocker, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "Hb" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "JA" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/east_river) "Kd" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/lv624/ground/river/east_river) "Kp" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -219,41 +174,29 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "NJ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/east_jungle) "Ov" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "Pb" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) "Pk" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/east_river) "Pr" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) "PE" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) "PV" = ( /turf/open/gm/dirt, @@ -265,16 +208,10 @@ /area/lv624/ground/jungle/east_jungle) "Qb" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/river/east_river) "Qp" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_jungle) "Qz" = ( /turf/open/gm/dirt, @@ -285,10 +222,7 @@ /area/lv624/ground/river/east_river) "VF" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/east_jungle) "Wq" = ( /turf/open/gm/dirt{ @@ -297,27 +231,19 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "WK" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/east_jungle) "Xe" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "Xq" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) "YK" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) (1,1,1) = {" diff --git a/maps/map_files/LV624/standalone/sandtemple-jungle.dmm b/maps/map_files/LV624/standalone/sandtemple-jungle.dmm index 543da9987398..3b5a0176fb01 100644 --- a/maps/map_files/LV624/standalone/sandtemple-jungle.dmm +++ b/maps/map_files/LV624/standalone/sandtemple-jungle.dmm @@ -1,77 +1,57 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aq" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "ar" = ( /obj/structure/flora/jungle/vines/heavy, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "cP" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "dy" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_west_jungle) "eV" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "fv" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, /obj/effect/landmark/objective_landmark/far, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "gb" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "hq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "ja" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) "jy" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_west_jungle) "jV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/jungle/south_west_jungle) "lf" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "lR" = ( @@ -82,189 +62,139 @@ name = "\improper alien blade"; throwforce = 26 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "ny" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "op" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/south_west_jungle) "oA" = ( /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "oD" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "oO" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "pB" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "qZ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "rK" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "ub" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "ui" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "uj" = ( /obj/structure/flora/grass/tallgrass/jungle, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "up" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "ux" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_west_jungle) "uV" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "vt" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "vT" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "zh" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, -/turf/open/gm/grass, -/area/lv624/ground/jungle/south_west_jungle) -"Am" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "AQ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "Bl" = ( /obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "Bs" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "DF" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "El" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "FE" = ( /obj/effect/landmark/hunter_primary, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "Ge" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_west_jungle) "Gi" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_west_jungle) "IP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_west_jungle) "Kn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/south_west_jungle) "Lv" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "Lz" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/jungle/south_west_jungle) "LF" = ( /obj/structure/flora/bush/ausbushes/ausbush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "LM" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "LV" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "LW" = ( /turf/closed/wall/strata_ice/jungle, @@ -274,83 +204,58 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "MG" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, -/area/lv624/ground/jungle/south_west_jungle) -"MY" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/closed/wall/strata_ice/jungle, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "Nq" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "NE" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "NU" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_west_jungle) "Ok" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/south_west_jungle) "QL" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "Rj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_3, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "RS" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_west_jungle) "Sj" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) "TE" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "Wp" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 3 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "WQ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) "XG" = ( /obj/effect/landmark/yautja_teleport, @@ -360,7 +265,7 @@ /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) (1,1,1) = {" @@ -406,7 +311,7 @@ Bl LW LW LW -MY +TE Bs oA aq @@ -460,7 +365,7 @@ RS LW "} (7,1,1) = {" -Am +LV Nq zh uj diff --git a/maps/map_files/LV624/standalone/sandtemple-se.dmm b/maps/map_files/LV624/standalone/sandtemple-se.dmm index a5d507b2b4d0..76d29d2d01ba 100644 --- a/maps/map_files/LV624/standalone/sandtemple-se.dmm +++ b/maps/map_files/LV624/standalone/sandtemple-se.dmm @@ -1,15 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "al" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light" - }, -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - icon_tag = "heavy"; - pixel_x = 0 - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "aK" = ( /turf/closed/wall/strata_ice/jungle, @@ -19,84 +12,56 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "cC" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) -"eR" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; - pixel_y = 0 - }, -/turf/closed/wall/mineral/sandstone/runed, -/area/lv624/ground/jungle/south_east_jungle) "gO" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3"; - icon_tag = "light" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "gU" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "jc" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0 - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "kd" = ( /obj/structure/flora/jungle/planttop1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "lV" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "nI" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0 - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "qo" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "rA" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "ug" = ( -/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "uk" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /turf/closed/wall/mineral/sandstone/runed, @@ -106,37 +71,27 @@ /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "ur" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light_2" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_2, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "wQ" = ( /obj/structure/flora/jungle/vines/heavy{ pixel_x = -28 }, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "xk" = ( /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/jungle/south_east_jungle) "yg" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "zg" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3"; - icon_tag = "light" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "Be" = ( @@ -145,84 +100,66 @@ /area/lv624/ground/jungle/south_east_jungle) "CW" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /obj/effect/decal/cleanable/cobweb, /turf/open/gm/dirt, /area/lv624/ground/jungle/south_east_jungle) "EZ" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3" - }, +/obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "LV" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) "LW" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/lazarus/landing_zones/lz1) "NU" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /turf/open/gm/dirt, /area/lv624/ground/jungle/south_east_jungle) "Tl" = ( /obj/structure/flora/jungle/plantbot1, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "Uc" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 26 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "UA" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_3"; - icon_tag = "light" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_3, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "VR" = ( /obj/effect/landmark/yautja_teleport, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "Wl" = ( /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "Wp" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/jungle/south_east_jungle) "Wr" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light" - }, +/obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "Wt" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; +/obj/structure/flora/jungle/vines/light_2{ pixel_y = -22 }, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/jungle/south_east_jungle) "WQ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_east_jungle) "Xl" = ( /turf/open/gm/dirt, @@ -235,21 +172,11 @@ /turf/open/gm/dirt, /area/lv624/ground/jungle/south_east_jungle) "XB" = ( -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, -/area/lv624/ground/jungle/south_east_jungle) -"XN" = ( -/obj/structure/flora/jungle/vines{ - icon_state = "light_2"; - icon_tag = "light" - }, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "XR" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0 - }, +/obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) "XS" = ( @@ -258,46 +185,30 @@ /area/lv624/ground/jungle/south_east_jungle) "Ya" = ( /obj/effect/landmark/lv624/xeno_tunnel, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "Yr" = ( -/turf/open/gm/grass{ - icon_state = "grass2" - }, +/turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_east_jungle) "Yz" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 24 }, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) -"YD" = ( -/obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - icon_tag = "heavy"; - pixel_x = 0 - }, -/turf/open/gm/grass, -/area/lv624/ground/jungle/south_east_jungle) "Ze" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_east_jungle) "Zi" = ( /obj/structure/flora/jungle/vines/heavy{ - icon_state = "heavy_6"; - pixel_x = 0; pixel_y = 24 }, -/obj/structure/flora/jungle/vines, -/turf/open/gm/grass, +/obj/structure/flora/jungle/vines/light_1, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "Zp" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) (1,1,1) = {" @@ -352,13 +263,13 @@ aK cC LW Wr -XN -YD +ur +jc Wl CW Xl Xl -eR +XS XS XS aK @@ -366,8 +277,8 @@ aK "} (5,1,1) = {" LW -YD -YD +jc +jc qo UA xk @@ -383,7 +294,7 @@ aK (6,1,1) = {" LW LW -XN +ur qo qo Wl @@ -399,7 +310,7 @@ aK (7,1,1) = {" qo UA -YD +jc qo qo Wt diff --git a/maps/map_files/LV624/storage-crashed-ship/10.armorystorage.dmm b/maps/map_files/LV624/storage-crashed-ship/10.armorystorage.dmm index bd54efc8c5b4..90b9f293b9f8 100644 --- a/maps/map_files/LV624/storage-crashed-ship/10.armorystorage.dmm +++ b/maps/map_files/LV624/storage-crashed-ship/10.armorystorage.dmm @@ -16,13 +16,13 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "d" = ( /obj/item/tool/shovel, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "e" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ dir = 1; @@ -34,7 +34,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "i" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/smg/mp27, @@ -58,10 +58,10 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "j" = ( /turf/closed/wall, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "n" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/gold{ @@ -78,7 +78,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "p" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) @@ -98,19 +98,19 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "t" = ( /obj/item/tool/pickaxe, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "v" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "x" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/fp9000, @@ -118,7 +118,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "y" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/explosive/grenade/high_explosive/stick, @@ -132,7 +132,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "z" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/mar40{ @@ -146,7 +146,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "B" = ( /obj/structure/closet/crate, /obj/item/ammo_magazine/rifle/mar40, @@ -159,7 +159,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "F" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/smg/nailgun, @@ -169,7 +169,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "G" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/mp27{ @@ -182,7 +182,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "I" = ( /obj/structure/machinery/light{ dir = 4 @@ -204,7 +204,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "K" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, @@ -213,7 +213,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "O" = ( /obj/structure/machinery/light{ dir = 8 @@ -221,7 +221,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "P" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/mac15, @@ -232,7 +232,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "Q" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -242,7 +242,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "T" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ icon_state = "door_locked"; @@ -253,7 +253,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "U" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/lmg, @@ -262,7 +262,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "V" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -275,7 +275,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "X" = ( /obj/effect/alien/weeds/node, /turf/open/gm/dirt, @@ -294,7 +294,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) (1,1,1) = {" X diff --git a/maps/map_files/LV624/storage-crashed-ship/10.valuables.dmm b/maps/map_files/LV624/storage-crashed-ship/10.valuables.dmm index aa22dd39d781..c76947ab37e8 100644 --- a/maps/map_files/LV624/storage-crashed-ship/10.valuables.dmm +++ b/maps/map_files/LV624/storage-crashed-ship/10.valuables.dmm @@ -11,7 +11,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "e" = ( /obj/structure/machinery/light{ dir = 4 @@ -20,10 +20,10 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "f" = ( /turf/closed/wall, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "i" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond{ @@ -32,7 +32,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "l" = ( /obj/effect/landmark/crap_item, /obj/effect/alien/weeds/node, @@ -55,7 +55,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "p" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/silver{ @@ -66,13 +66,13 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "q" = ( /obj/effect/landmark/crap_item, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "r" = ( /obj/effect/landmark/crap_item, /turf/open/gm/dirt, @@ -84,14 +84,14 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "t" = ( /obj/structure/surface/rack, /obj/item/tool/shovel, /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "y" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal{ @@ -107,7 +107,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "C" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/platinum{ @@ -116,14 +116,14 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "D" = ( /obj/structure/largecrate/supply, /turf/open/floor{ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "G" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/lmg, @@ -131,7 +131,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "H" = ( /obj/structure/machinery/light{ dir = 8 @@ -140,7 +140,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "I" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/mar40{ @@ -153,7 +153,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "M" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/iron{ @@ -163,7 +163,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "N" = ( /obj/effect/alien/weeds/node, /turf/open/gm/dirt, @@ -184,7 +184,7 @@ dir = 8; icon_state = "vault" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "U" = ( /obj/structure/closet/crate, /obj/item/ammo_magazine/rifle/mar40, @@ -197,7 +197,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "V" = ( /obj/structure/machinery/light{ dir = 4 @@ -211,7 +211,7 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "X" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ icon_state = "door_locked"; @@ -222,12 +222,12 @@ /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) "Z" = ( /turf/open/floor{ icon_state = "dark" }, -/area/lv624/ground/barrens/north_east_barrens) +/area/lv624/ground/barrens/north_east_barrens/ceiling) (1,1,1) = {" O diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index bf8684bd97da..7969b1a120a0 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -417,7 +417,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/varadero/exterior/pontoon_beach) "atb" = ( /obj/structure/machinery/vending/snack, @@ -492,9 +492,7 @@ /area/varadero/exterior/lz1_near) "awf" = ( /obj/item/toy/beach_ball, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/pontoon_beach) "axX" = ( /obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/secure{ @@ -576,7 +574,7 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers{ icon_state = "brflowers_3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "aCl" = ( /obj/structure/machinery/door/airlock/strata/autoname{ @@ -940,7 +938,7 @@ /turf/open/floor/plating, /area/varadero/interior/cargo) "aOg" = ( -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "aOi" = ( /turf/open/floor/shiva{ @@ -1291,10 +1289,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 8 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastbeach) "bfg" = ( /obj/structure/surface/table, @@ -3420,7 +3415,7 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers{ icon_state = "ywflowers_3" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "cSb" = ( /obj/structure/surface/rack, @@ -3745,10 +3740,7 @@ /area/varadero/interior_protected/caves/digsite) "dki" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastbeach) "dkl" = ( /turf/open/floor/shiva{ @@ -3854,10 +3846,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/varadero/interior/oob) "dpz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ @@ -4091,10 +4080,7 @@ /obj/structure/platform_decoration/kutjevo{ dir = 1 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastbeach) "dFd" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -4704,9 +4690,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "elO" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -5191,10 +5175,7 @@ }, /area/varadero/interior_protected/maintenance/south) "eGX" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/pontoon_beach) "eHB" = ( /obj/structure/flora/pottedplant{ @@ -5310,6 +5291,7 @@ /area/varadero/interior/medical) "eMf" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) "eMi" = ( @@ -5410,10 +5392,7 @@ /area/varadero/interior/toilets) "eRc" = ( /obj/structure/prop/rock/brown, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/varadero/interior/oob) "eRD" = ( /obj/structure/pipes/vents/pump, @@ -5449,9 +5428,7 @@ }, /area/varadero/interior_protected/vessel) "eSd" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/eastbeach) "eSg" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -6143,10 +6120,7 @@ }, /area/varadero/interior/maintenance/security) "fvL" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/varadero/interior/oob) "fvR" = ( /obj/structure/platform_decoration/kutjevo{ @@ -6330,10 +6304,7 @@ }, /area/varadero/interior/electrical) "fFD" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/varadero/interior/oob) "fFI" = ( /obj/structure/bed/chair/office/dark{ @@ -6500,9 +6471,7 @@ /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) "fLY" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/varadero/exterior/pontoon_beach) "fMq" = ( /obj/item/device/cassette_tape/heavymetal{ @@ -6533,16 +6502,11 @@ }, /area/varadero/interior/maintenance/research) "fOA" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/eastbeach) "fOW" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/pontoon_beach) "fPn" = ( /obj/structure/disposalpipe/segment{ @@ -6567,7 +6531,7 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers{ icon_state = "ywflowers_2" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "fPv" = ( /obj/structure/machinery/power/apc{ @@ -7276,7 +7240,7 @@ /area/varadero/interior/maintenance/north) "gsm" = ( /obj/structure/prop/rock/brown, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "gsq" = ( /obj/structure/machinery/vending/coffee, @@ -7858,10 +7822,7 @@ /turf/open/floor/plating, /area/varadero/interior_protected/caves) "gVO" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/varadero/exterior/pontoon_beach) "gWd" = ( /obj/structure/desertdam/decals/road_edge{ @@ -8084,7 +8045,7 @@ /area/varadero/interior/mess) "hiE" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "hjj" = ( /obj/item/ammo_magazine/handful/shotgun/buckshot{ @@ -8173,10 +8134,7 @@ }, /area/varadero/interior/laundry) "hmu" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastbeach) "hni" = ( /obj/structure/sign/safety/fire_haz{ @@ -8444,7 +8402,7 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers{ icon_state = "ywflowers_4" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "hza" = ( /obj/effect/decal/cleanable/blood/oil, @@ -8649,9 +8607,7 @@ }, /area/varadero/interior/hall_N) "hKK" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) "hLA" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -9027,9 +8983,7 @@ icon_state = "hr_kutjevo"; name = "support struts" }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "iaO" = ( /turf/closed/wall/r_wall/elevator{ @@ -9133,10 +9087,7 @@ pixel_x = -11; pixel_y = -4 }, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/pontoon_beach) "idI" = ( /obj/structure/prop/invuln/minecart_tracks{ @@ -9260,9 +9211,7 @@ /area/varadero/exterior/pontoon_beach) "ijR" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "iks" = ( /obj/item/tool/shovel/spade, @@ -9839,10 +9788,7 @@ pixel_x = 3; pixel_y = 5 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/pontoon_beach) "iHh" = ( /obj/item/weapon/gun/shotgun/pump, @@ -9991,9 +9937,7 @@ /turf/open/floor/plating, /area/varadero/interior/mess) "iLL" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/varadero/exterior/eastbeach) "iLN" = ( /obj/structure/platform/kutjevo/smooth, @@ -10376,9 +10320,7 @@ }, /area/varadero/interior/security) "jaF" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/exterior/pontoon_beach) "jbh" = ( /obj/structure/machinery/disposal, @@ -11259,9 +11201,7 @@ }, /area/varadero/interior/comms1) "jSX" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/pontoon_beach) "jTe" = ( /obj/structure/disposalpipe/segment{ @@ -11320,7 +11260,7 @@ }, /area/varadero/interior/hall_N) "jVw" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/varadero/exterior/eastbeach) "jVK" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -12086,9 +12026,7 @@ }, /area/varadero/interior/electrical) "kDy" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/eastbeach) "kDF" = ( /obj/structure/disposalpipe/segment{ @@ -12826,7 +12764,7 @@ }, /area/varadero/interior/hall_N) "lnO" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/varadero/exterior/pontoon_beach) "lod" = ( /obj/structure/surface/table/reinforced/prison, @@ -13552,7 +13490,7 @@ /area/varadero/interior/hall_NW) "lVQ" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "lVW" = ( /obj/structure/desertdam/decals/road_edge{ @@ -14934,6 +14872,7 @@ /area/varadero/interior/hall_SE) "ncd" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) "ncg" = ( @@ -15043,9 +14982,7 @@ /area/varadero/interior/laundry) "nfD" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/eastbeach) "nfX" = ( /obj/item/reagent_container/glass/bucket{ @@ -15716,6 +15653,7 @@ /area/varadero/interior/hall_NW) "nOI" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand_white/layer0, /area/varadero/interior_protected/caves) "nOO" = ( @@ -16150,11 +16088,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"oei" = ( -/turf/open/shuttle{ - icon_state = "floor6" - }, -/area/varadero/interior_protected/vessel) "oeF" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -16944,6 +16877,7 @@ /area/varadero/interior/research) "oPb" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" @@ -17403,7 +17337,7 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers{ icon_state = "brflowers_2" }, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "pie" = ( /obj/structure/prop/invuln/lattice_prop{ @@ -18508,10 +18442,7 @@ /turf/open/floor/wood, /area/varadero/interior/bunks) "qgm" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/varadero/exterior/pontoon_beach) "qgy" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -19013,7 +18944,7 @@ }, /area/varadero/interior/maintenance/research) "qDk" = ( -/obj/item/weapon/gun/shotgun/double/sawn, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -20785,7 +20716,7 @@ /area/varadero/interior/research) "rWN" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "rWX" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -20917,9 +20848,7 @@ /turf/open/floor/wood, /area/varadero/interior/hall_SE) "scL" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/pontoon_beach) "scO" = ( /obj/item/paper{ @@ -21807,9 +21736,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "sLU" = ( /obj/structure/reagent_dispensers/water_cooler, @@ -21889,10 +21816,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) "sRs" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/pontoon_beach) "sRM" = ( /obj/structure/machinery/disposal, @@ -22417,9 +22341,7 @@ /obj/structure/platform/kutjevo/smooth{ dir = 8 }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/eastbeach) "tyc" = ( /obj/structure/platform_decoration/kutjevo, @@ -23675,9 +23597,7 @@ icon_state = "hr_kutjevo"; name = "support struts" }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) "uEz" = ( /obj/structure/disposalpipe/segment{ @@ -24230,9 +24150,7 @@ /obj/structure/platform_decoration/kutjevo{ dir = 1 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/exterior/eastbeach) "vaV" = ( /obj/structure/surface/table/reinforced/prison, @@ -24756,9 +24674,7 @@ }, /area/varadero/interior/hall_N) "vxA" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/varadero/interior/oob) "vxM" = ( /obj/structure/machinery/light{ @@ -25073,9 +24989,7 @@ pixel_x = -12; pixel_y = -3 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) "vMU" = ( /obj/structure/surface/rack, @@ -25611,9 +25525,6 @@ icon_state = "floor3" }, /area/varadero/interior/laundry) -"wjA" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior_protected/caves) "wjB" = ( /turf/open/floor{ icon_state = "asteroidwarning" @@ -25639,11 +25550,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/records) -"wku" = ( -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior_protected/maintenance/south) "wkC" = ( /obj/item/stack/cable_coil/cut{ pixel_x = 6; @@ -26031,10 +25937,7 @@ /area/varadero/interior/laundry) "wAj" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/pontoon_beach) "wAx" = ( /obj/effect/landmark/corpsespawner/security, @@ -26648,10 +26551,7 @@ /turf/closed/wall/r_wall, /area/varadero/interior/administration) "xgH" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/eastbeach) "xgU" = ( /obj/structure/prop/structure_lattice{ @@ -27253,7 +27153,7 @@ /area/varadero/interior/records) "xGV" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/gm/grass/weedable, +/turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) "xHt" = ( /obj/structure/desertdam/decals/road_edge{ @@ -27277,9 +27177,7 @@ /area/varadero/interior/research) "xJn" = ( /obj/structure/blocker/fog, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/varadero/interior/oob) "xJx" = ( /obj/structure/machinery/photocopier, @@ -28013,9 +27911,7 @@ /area/varadero/interior/toilets) "ykD" = ( /obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) "ykE" = ( /obj/structure/surface/table/reinforced/prison, @@ -30005,7 +29901,7 @@ mEA sBk ksn fay -wjA +crY vYW vYW vYW @@ -30187,8 +30083,8 @@ aJc lqV xrA fay -wjA -wjA +crY +crY vYW vYW vYW @@ -30370,8 +30266,8 @@ hDA tMx fay qMH -wjA -wjA +crY +crY vYW vYW vYW @@ -32022,9 +31918,9 @@ vYW hto pGs pGs -wjA -wjA -wjA +crY +crY +crY pGs pGs pGs @@ -32193,8 +32089,8 @@ fay ebr ebr vYW -wjA -wjA +crY +crY ebr alL alL @@ -32202,12 +32098,12 @@ uQa uQa vYW vYW -wjA -wjA +crY +crY vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -32376,7 +32272,7 @@ ebr ebr vYW vYW -wjA +crY vYW uQa uQa @@ -32389,8 +32285,8 @@ vYW vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -32565,15 +32461,15 @@ uQa uQa uQa vYW -wjA +crY vYW vYW -wjA +crY vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -32755,7 +32651,7 @@ vYW vYW vYW vYW -wjA +crY pGs pGs pGs @@ -32933,12 +32829,12 @@ ebr ebr ebr ebr -wjA +crY vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33115,12 +33011,12 @@ ebr ebr ebr ebr -wjA +crY vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33302,8 +33198,8 @@ vYW vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33480,12 +33376,12 @@ ebr ebr ebr ebr -wjA +crY vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33666,8 +33562,8 @@ ebr vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -33845,11 +33741,11 @@ ebr ebr ebr ebr -wjA +crY vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -34028,10 +33924,10 @@ ebr ebr vYW ckM -wjA +crY vYW vYW -wjA +crY pGs pGs pGs @@ -34397,8 +34293,8 @@ vYW vYW vYW vYW -wjA -wjA +crY +crY hto pGs pGs @@ -35301,7 +35197,7 @@ vYW vYW hto vYW -wjA +crY vYW vYW vYW @@ -35316,7 +35212,7 @@ vYW vYW vYW vYW -wjA +crY pGs pGs pGs @@ -35483,12 +35379,12 @@ hto ebr hto vYW -wjA -wjA -wjA +crY +crY +crY vYW vYW -wjA +crY vYW vYW vYW @@ -35665,7 +35561,7 @@ ebr ebr ebr vYW -wjA +crY pJF hWG gHJ @@ -35856,8 +35752,8 @@ vYW vYW vYW vYW -wjA -wjA +crY +crY vYW vYW vYW @@ -36027,7 +35923,7 @@ vYW ebr ebr ebr -wjA +crY vYW vYW pJF @@ -36038,7 +35934,7 @@ vYW vYW vYW vYW -wjA +crY qMH hto vYW @@ -36209,17 +36105,17 @@ vYW ebr ebr ebr -wjA +crY vYW -wjA -wjA +crY +crY nOI vYW vYW vYW vYW vYW -wjA +crY ebr ebr hto @@ -36393,7 +36289,7 @@ qMH qMH vYW vYW -wjA +crY vYW fGP vYW @@ -36564,18 +36460,18 @@ sdz ebr ebr qMH -wjA +crY vYW vYW vYW vYW vYW vYW -wjA +crY qMH vYW vYW -wjA +crY pJF hWG pJF @@ -36746,8 +36642,8 @@ nTG ebr ebr qMH -wjA -wjA +crY +crY vYW vYW vYW @@ -36756,7 +36652,7 @@ vYW vYW vYW vYW -wjA +crY vYW hWG cYC @@ -36929,7 +36825,7 @@ jpD ebr ebr qMH -wjA +crY vYW vYW vYW @@ -36938,7 +36834,7 @@ vYW vYW vYW vYW -wjA +crY vYW pJF hWG @@ -37111,14 +37007,14 @@ jpD ebr ebr ebr -wjA -wjA -wjA +crY +crY +crY vYW vYW vYW vYW -wjA +crY vYW vYW vYW @@ -37293,14 +37189,14 @@ gUP cQK ktE ebr -wjA -wjA -wjA +crY +crY +crY vYW vYW vYW vYW -wjA +crY vYW vYW vYW @@ -37476,12 +37372,12 @@ xes oSb ebr qMH -wjA +crY vYW vYW vYW vYW -wjA +crY vYW vYW ebr @@ -37658,11 +37554,11 @@ xes sYS ebr ebr -wjA +crY ckM -wjA -wjA -wjA +crY +crY +crY vYW vYW hto @@ -37670,11 +37566,11 @@ ebr ebr vYW vYW -wjA +crY vYW vYW -wjA -wjA +crY +crY ebr ebr hto @@ -37840,8 +37736,8 @@ wug axZ ebr ebr -wjA -wjA +crY +crY vYW vYW vYW @@ -37854,13 +37750,13 @@ vYW vYW vYW vYW -wjA -wjA -wjA +crY +crY +crY ebr ebr ebr -wjA +crY vYW vYW uQa @@ -38024,25 +37920,25 @@ kyG kyG kyG kyG -wjA -wjA +crY +crY vYW -wjA -wjA -wjA +crY +crY +crY vYW vYW vYW vYW vYW qMH -wjA -wjA +crY +crY ebr ebr ebr ebr -wjA +crY vYW vYW vYW @@ -38206,17 +38102,17 @@ sTA ukw rTT kyG -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA +crY +crY +crY +crY +crY +crY +crY +crY +crY +crY +crY qMH ebr ebr @@ -38225,13 +38121,13 @@ ebr ebr ebr ebr -wjA +crY vYW vYW vYW vYW -wjA -wjA +crY +crY pGs pGs pGs @@ -38389,15 +38285,15 @@ wOL hvj kyG ebr -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA -wjA +crY +crY +crY +crY +crY +crY +crY +crY +crY ebr ebr ebr @@ -38410,10 +38306,10 @@ ebr qMH hto vYW -wjA -wjA -wjA -wjA +crY +crY +crY +crY pGs pGs pGs @@ -38572,12 +38468,12 @@ dqy kyG ebr ebr -wjA -wjA -wjA -wjA -wjA -wjA +crY +crY +crY +crY +crY +crY qMH ebr ebr @@ -38592,10 +38488,10 @@ ebr ebr ebr hto -wjA -wjA -wjA -wjA +crY +crY +crY +crY qMH pGs pGs @@ -38758,7 +38654,7 @@ qMH qMH ebr ebr -wjA +crY ebr ebr ebr @@ -38774,10 +38670,10 @@ ebr ebr ebr ebr -wjA -wjA -wjA -wjA +crY +crY +crY +crY qMH pGs pGs @@ -38956,11 +38852,11 @@ ebr ebr ebr ebr -wjA -wjA -wjA -wjA -wjA +crY +crY +crY +crY +crY hto pGs pGs @@ -43699,7 +43595,7 @@ cto kDJ ncd ckG -wku +cto cto cto iDn @@ -63354,7 +63250,7 @@ avD kEK kjI kjI -oei +kjI lDz oPb ijo diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 0bd504c71721..2da1f3f4295d 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -2669,9 +2669,7 @@ }, /area/strata/ug/interior/jungle/deep/structures/res) "ahK" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/tearlake) "ahL" = ( /obj/structure/disposalpipe/segment{ @@ -5065,8 +5063,8 @@ }, /area/strata/ag/interior/landingzone_1) "api" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -5078,7 +5076,7 @@ }, /area/strata/ag/interior/landingzone_1) "apk" = ( -/obj/structure/machinery/landinglight/ds2/delaythree, +/obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -5141,7 +5139,7 @@ }, /area/strata/ag/interior/research_decks/security) "apv" = ( -/obj/structure/machinery/landinglight/ds1{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 }, /turf/open/asphalt/cement{ @@ -6543,10 +6541,10 @@ }, /area/strata/ag/interior/landingzone_1) "atq" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 }, -/obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement{ icon_state = "cement3" }, @@ -7622,9 +7620,7 @@ dir = 1; pixel_y = 20 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/structures/res) "awC" = ( /turf/open/gm/river, @@ -8128,10 +8124,7 @@ /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/south_res) "aya" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/structures/res) "ayb" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ @@ -8140,9 +8133,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/north_outpost) "ayc" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/structures/res) "ayd" = ( /obj/structure/surface/table/reinforced/prison, @@ -8174,12 +8165,12 @@ /area/strata/ag/interior/landingzone_1) "ayh" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 8 + dir = 1 }, /turf/open/asphalt/cement{ - icon_state = "cement3" + icon_state = "cement4" }, -/area/strata/ag/interior/landingzone_1) +/area/strata/ag/exterior/landingzone_2) "ayj" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -10633,7 +10624,7 @@ /area/strata/ag/interior/dorms) "aFR" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/gun/shotgun/double/with_stock, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, @@ -11358,6 +11349,7 @@ dir = 8 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/strata{ dir = 8; icon_state = "white_cyan2" @@ -11420,7 +11412,7 @@ }, /area/strata/ag/interior/dorms) "aIs" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/southresearch) "aIw" = ( @@ -13603,7 +13595,6 @@ "aPz" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 2; - req_access = null; req_one_access = null }, /turf/open/floor/strata{ @@ -14270,10 +14261,10 @@ /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/adminext) "aRz" = ( +/obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds1/delayone{ dir = 1 }, -/obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement{ icon_state = "cement4" }, @@ -14600,15 +14591,10 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/east_dorms) "aSC" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/north_carp) "aSD" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/north_carp) "aSF" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -14708,10 +14694,10 @@ /turf/open/floor/strata, /area/strata/ag/interior/dorms/south) "aSX" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2{ dir = 1 }, -/obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement{ icon_state = "cement4" }, @@ -14752,7 +14738,7 @@ "aTh" = ( /obj/item/lightstick/red/planted, /obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "aTi" = ( @@ -15058,9 +15044,7 @@ /turf/open/gm/river, /area/strata/ug/interior/jungle/deep/north_carp) "aUh" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/north_carp) "aUn" = ( /obj/structure/platform/strata/metal, @@ -15487,20 +15471,13 @@ }, /area/strata/ag/interior/outpost/maint/canteen_e_1) "aVK" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/deep/north_carp) "aVL" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/deep/north_carp) "aVM" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/deep/north_carp) "aVN" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -15520,15 +15497,10 @@ /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/hotsprings) "aVS" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/hotsprings) "aVT" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/hotsprings) "aVW" = ( /obj/structure/platform/strata/metal{ @@ -15907,10 +15879,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/jung/dorms/admin4) "aXr" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/north_carp) "aXs" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony, @@ -15920,16 +15889,10 @@ }, /area/strata/ag/exterior/shed_five_caves) "aXt" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/hotsprings) "aXu" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/hotsprings) "aXv" = ( /obj/structure/platform/strata/metal{ @@ -16535,9 +16498,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/adminext) "aZL" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/north_carp) "aZO" = ( /turf/open/gm/dirt, @@ -17894,10 +17855,7 @@ }, /area/strata/ug/interior/jungle/deep/west_engi) "beG" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/east_carp) "beH" = ( /obj/effect/landmark/xeno_spawn, @@ -18587,10 +18545,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh) "bhd" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/east_carp) "bhe" = ( /obj/structure/pipes/standard/simple/hidden/cyan, @@ -18601,10 +18556,7 @@ /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/vanyard) "bhg" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/east_carp) "bhh" = ( /obj/structure/fence, @@ -23145,6 +23097,7 @@ /area/strata/ag/interior/restricted) "byl" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/floor/strata{ icon_state = "floor2" @@ -24028,10 +23981,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) "bDH" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/exterior/jungle/deep/carplake_center) "bDO" = ( /obj/structure/cargo_container/grant/left{ @@ -25406,9 +25356,7 @@ }, /area/strata/ag/interior/dorms/canteen) "bPy" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/shed_five_caves) "bPA" = ( @@ -26616,9 +26564,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/dorms) "bZX" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/exterior/jungle/deep/carplake_center) "bZY" = ( /obj/structure/surface/table/almayer, @@ -27833,9 +27779,7 @@ /turf/closed/wall/wood, /area/strata/ug/interior/jungle/deep/north_carp) "ciy" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz1, /turf/open/floor/plating, /area/strata/ag/interior/landingzone_1) "ciA" = ( @@ -28453,7 +28397,7 @@ }, /area/strata/ag/interior/outpost/canteen/bar) "cmu" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/north_carp) "cmA" = ( /turf/open/asphalt/cement{ @@ -28770,9 +28714,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) "cor" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/north_carp) "cot" = ( /obj/structure/platform_decoration/strata/metal{ @@ -29156,11 +29098,11 @@ }, /area/strata/ag/interior/administration) "crW" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ - dir = 4 +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 1 }, /turf/open/asphalt/cement{ - icon_state = "cement1" + icon_state = "cement4" }, /area/strata/ag/interior/landingzone_1) "crY" = ( @@ -29644,9 +29586,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "cvG" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/exterior/jungle/deep/carplake_center) "cvY" = ( /obj/structure/platform_decoration/strata/metal{ @@ -29733,29 +29673,19 @@ }, /area/strata/ag/exterior/marsh) "cxA" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/exterior/jungle/deep/carplake_center) "cxB" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/exterior/jungle/deep/carplake_center) "cxC" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/exterior/jungle/deep/carplake_center) "cxJ" = ( /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/east_dorms) "cxK" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/east_dorms) "cxS" = ( /obj/structure/barricade/handrail/strata{ @@ -29873,9 +29803,7 @@ }, /area/strata/ag/interior/outpost/med) "cFp" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/deep/east_dorms) "cFK" = ( /obj/structure/flora/grass/tallgrass/ice/corner, @@ -30081,6 +30009,14 @@ icon_state = "multi_tiles" }, /area/strata/ag/interior/dorms/hive) +"cZH" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/strata/ag/interior/landingzone_1) "daq" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/east_carp) @@ -30222,6 +30158,14 @@ icon_state = "floor3" }, /area/strata/ug/interior/outpost/jung/dorms/sec1) +"dnS" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 1 + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/strata/ag/interior/landingzone_1) "doO" = ( /obj/structure/machinery/weather_siren{ dir = 1; @@ -30244,9 +30188,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/admin2) "drQ" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/tearlake) "drS" = ( /obj/effect/decal/strata_decals/catwalk/prison, @@ -30448,9 +30390,7 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "dIh" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/tearlake) "dIE" = ( /obj/structure/prop/turbine_extras, @@ -30472,7 +30412,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh) "dNq" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/east_dorms) "dND" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -30609,7 +30549,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/med1) "dZl" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/north_outpost) "dZm" = ( @@ -30874,7 +30814,7 @@ }, /area/strata/ag/exterior/tcomms/tcomms_deck) "eBo" = ( -/obj/structure/machinery/landinglight/ds1, +/obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -31409,6 +31349,14 @@ icon_state = "red1" }, /area/strata/ag/interior/dorms/flight_control) +"fuA" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 1 + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/strata/ag/interior/landingzone_1) "fuX" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/auto_turf/strata_grass/layer0, @@ -31436,7 +31384,7 @@ /turf/open/floor/strata, /area/strata/ug/interior/outpost/jung/dorms/sec1) "fwV" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/north_outpost) "fxM" = ( @@ -31501,9 +31449,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "fAS" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/crash) "fBh" = ( @@ -31551,7 +31497,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) "fCz" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/tearlake) "fCE" = ( /obj/effect/decal/strata_decals/catwalk/prison, @@ -31604,6 +31550,7 @@ dir = 4 }, /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/plating, /area/strata/ag/interior/tcomms) "fKt" = ( @@ -31809,9 +31756,7 @@ }, /area/strata/ag/interior/outpost/med) "gcj" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/deep/tearlake) "gdZ" = ( /obj/structure/machinery/smartfridge, @@ -32020,9 +31965,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "goG" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/north_outpost) "gpp" = ( @@ -32159,9 +32102,7 @@ }, /area/strata/ag/interior/tcomms) "gzd" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/south_engi) "gAm" = ( /turf/open/floor/strata{ @@ -32186,9 +32127,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "gBr" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/south_engi) "gCa" = ( /obj/item/stack/snow, @@ -32341,10 +32280,7 @@ /turf/open/floor/plating, /area/strata/ag/exterior/marsh/center) "gSR" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/deep/south_engi) "gTa" = ( /obj/structure/platform_decoration/strata/metal{ @@ -32569,9 +32505,7 @@ /turf/open/auto_turf/strata_grass/layer0_mud, /area/strata/ug/interior/jungle/deep/tearlake) "hir" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh) "hiL" = ( @@ -32688,7 +32622,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east/scrub) "hue" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ +/obj/structure/machinery/landinglight/ds2{ dir = 8 }, /turf/open/asphalt/cement{ @@ -32765,9 +32699,7 @@ }, /area/strata/ag/exterior/research_decks) "hFm" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/east_dorms) "hGd" = ( /obj/structure/platform/strata/metal{ @@ -32926,9 +32858,7 @@ /turf/closed/wall/strata_outpost/reinforced, /area/strata/ug/interior/outpost/jung/dorms/med1) "hWk" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/exterior/jungle/deep/carplake_center) "hYc" = ( /turf/closed/wall/strata_outpost/reinforced, @@ -33215,9 +33145,7 @@ }, /area/strata/ag/exterior/landingzone_2) "iws" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "iwH" = ( @@ -33303,10 +33231,7 @@ /turf/open/floor/plating, /area/strata/ag/interior/tcomms) "iBT" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/tearlake) "iBV" = ( /obj/item/stack/catwalk, @@ -33501,9 +33426,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) "iSe" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/south_engi) "iUw" = ( /obj/structure/prop/dam/crane/cargo, @@ -33516,9 +33439,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) "iUK" = ( -/obj/docking_port/stationary/marine_dropship/lz2{ - dwidth = 1 - }, +/obj/docking_port/stationary/marine_dropship/lz2, /turf/open/floor/plating, /area/strata/ag/exterior/landingzone_2) "iUN" = ( @@ -34001,9 +33922,7 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/tearlake) "jLc" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/nearlz2) "jLY" = ( @@ -34061,9 +33980,11 @@ }, /area/strata/ug/interior/jungle/deep/structures/engi) "jPQ" = ( -/obj/structure/machinery/landinglight/ds1/delayone, +/obj/structure/machinery/landinglight/ds2{ + dir = 4 + }, /turf/open/asphalt/cement{ - icon_state = "cement12" + icon_state = "cement1" }, /area/strata/ag/exterior/landingzone_2) "jPV" = ( @@ -34303,7 +34224,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/deep/structures/engi) "kim" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh) "kjc" = ( @@ -34483,7 +34404,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "kBL" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/nearlz2) "kCf" = ( @@ -34494,9 +34415,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "kCk" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh/center) "kDb" = ( @@ -34563,17 +34482,13 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/east_engi) "kJd" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/deep/east_dorms) "kKI" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/jung/dorms/admin1) "kLM" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/east_dorms) "kLZ" = ( /obj/effect/blocker/sorokyne_cold_water, @@ -34582,10 +34497,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) "kNJ" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/south_engi) "kNZ" = ( /obj/structure/inflatable, @@ -34608,10 +34520,7 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "kPC" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/exterior/jungle/deep/carplake_center) "kPL" = ( /obj/structure/surface/table/reinforced/prison, @@ -34633,10 +34542,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/admin1) "kQu" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/exterior/jungle/deep/carplake_center) "kRb" = ( /obj/structure/bed/nest, @@ -34677,9 +34583,7 @@ }, /area/strata/ag/interior/outpost/med) "kSs" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/exterior/jungle/deep/carplake_center) "kSS" = ( /obj/structure/window/reinforced/tinted{ @@ -34695,7 +34599,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/dorms) "kTB" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/exterior/jungle/deep/carplake_center) "kUb" = ( /obj/effect/landmark/monkey_spawn, @@ -34708,9 +34612,7 @@ }, /area/strata/ag/interior/tcomms) "kUs" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/exterior/jungle/deep/carplake_center) "kUN" = ( /obj/effect/decal/strata_decals/grime/grime2{ @@ -34720,9 +34622,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/dorms) "kWS" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/southresearch) "kXi" = ( @@ -34820,7 +34720,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/research_decks) "ldO" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/east_carp) "lec" = ( /obj/structure/flora/grass/tallgrass/ice/corner, @@ -35025,9 +34925,7 @@ }, /area/strata/ag/interior/dorms/flight_control) "lvF" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/tearlake) "lwI" = ( /obj/structure/barricade/handrail/strata{ @@ -35100,7 +34998,7 @@ /turf/open/gm/river, /area/strata/ag/interior/tcomms) "lEo" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -35277,7 +35175,7 @@ /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/tcomms) "lTW" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/strata/ug/interior/jungle/deep/south_engi) "lTX" = ( /obj/structure/pipes/standard/simple/hidden/cyan, @@ -35792,9 +35690,7 @@ }, /area/strata/ag/interior/tcomms) "mDF" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/vanyard) "mEk" = ( @@ -35916,10 +35812,7 @@ }, /area/strata/ag/interior/outpost/engi/drome) "mMp" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/deep/tearlake) "mMR" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, @@ -36167,10 +36060,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh) "noq" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/east_dorms) "npy" = ( /obj/structure/closet/secure_closet/medical3{ @@ -36216,9 +36106,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "nrp" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/river) "nrP" = ( @@ -36232,9 +36120,7 @@ }, /area/strata/ug/interior/outpost/jung/dorms/admin3) "nsq" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/east_carp) "nsB" = ( /obj/structure/closet/coffin, @@ -36277,9 +36163,7 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "nAf" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/deep/east_carp) "nAM" = ( /obj/structure/platform/strata{ @@ -36390,10 +36274,7 @@ }, /area/strata/ag/interior/outpost/gen/bball) "nPb" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/deep/east_carp) "nPh" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -36448,7 +36329,7 @@ }, /area/strata/ag/interior/outpost/med) "nTf" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 }, /turf/open/asphalt/cement{ @@ -36526,9 +36407,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ag/interior/landingzone_checkpoint) "ocz" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh) "ocE" = ( @@ -36556,6 +36435,12 @@ icon_state = "multi_tiles" }, /area/strata/ag/interior/tcomms) +"odB" = ( +/obj/structure/machinery/landinglight/ds2/delayone, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/strata/ag/exterior/landingzone_2) "odJ" = ( /turf/closed/wall/strata_ice/dirty, /area/strata/ag/interior/outpost/engi/drome) @@ -36576,9 +36461,7 @@ /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/tcomms/tcomms_deck) "oeO" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/east_carp) "oeQ" = ( /turf/open/floor/strata{ @@ -36683,9 +36566,7 @@ /turf/open/asphalt/cement, /area/strata/ag/exterior/vanyard) "oqc" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/deep/east_dorms) "oqA" = ( /obj/item/stack/rods, @@ -36845,9 +36726,7 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "oKl" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) "oKo" = ( @@ -37566,9 +37445,7 @@ /turf/open/gm/river, /area/strata/ag/interior/tcomms) "pJA" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/east_dorms) "pKq" = ( /obj/effect/blocker/sorokyne_cold_water, @@ -37650,9 +37527,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ag/interior/research_decks/security) "pRp" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/north_outpost) "pSc" = ( @@ -37672,9 +37547,7 @@ /turf/open/floor/strata, /area/strata/ag/interior/tcomms) "pSw" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/east_carp) "pUB" = ( /obj/structure/bed{ @@ -37754,11 +37627,11 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/south_dorms) "qbk" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 8 +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 }, /turf/open/asphalt/cement{ - icon_state = "cement3" + icon_state = "cement4" }, /area/strata/ag/exterior/landingzone_2) "qbA" = ( @@ -37770,6 +37643,14 @@ "qbR" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/jung/dorms/sec2) +"qbU" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/strata/ag/exterior/landingzone_2) "qcB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/strata_grass/layer1, @@ -37973,9 +37854,7 @@ }, /area/strata/ag/interior/outpost/med) "qvy" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/crash) "qvJ" = ( @@ -38014,9 +37893,7 @@ /turf/open/floor/interior/tatami, /area/strata/ag/interior/restricted) "qxr" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/tearlake) "qxt" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, @@ -38470,6 +38347,14 @@ icon_state = "white_cyan1" }, /area/strata/ag/interior/dorms/maintenance) +"rhk" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement1" + }, +/area/strata/ag/interior/landingzone_1) "rhJ" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -38610,15 +38495,10 @@ /turf/open/floor/greengrid, /area/strata/ag/interior/disposals) "ruM" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/deep/south_engi) "rvD" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/deep/south_engi) "rwD" = ( /obj/effect/decal/cleanable/blood, @@ -38731,9 +38611,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/nearlz2) "rIM" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/north_carp) "rJf" = ( /turf/open/floor/strata{ @@ -39022,10 +38900,10 @@ }, /area/strata/ag/interior/outpost/engi/drome) "skJ" = ( -/obj/structure/machinery/landinglight/ds2/delaythree{ +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2{ dir = 4 }, -/obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement{ icon_state = "cement1" }, @@ -39091,9 +38969,7 @@ }, /area/strata/ag/interior/tcomms) "ssd" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/strata/ug/interior/jungle/deep/east_dorms) "sse" = ( /obj/structure/bed{ @@ -39115,9 +38991,7 @@ }, /area/strata/ag/exterior/vanyard) "stf" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/strata/ug/interior/jungle/deep/east_carp) "stF" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ @@ -39243,11 +39117,11 @@ /turf/open/gm/dirt, /area/strata/ug/exterior/jungle/deep/carplake_center) "sFB" = ( -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 4 +/obj/structure/machinery/landinglight/ds2{ + dir = 1 }, /turf/open/asphalt/cement{ - icon_state = "cement1" + icon_state = "cement4" }, /area/strata/ag/exterior/landingzone_2) "sGJ" = ( @@ -39506,7 +39380,7 @@ }, /area/strata/ag/exterior/north_lz_caves) "tfM" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/shed_five_caves) "tgr" = ( @@ -39631,18 +39505,13 @@ }, /area/strata/ug/interior/jungle/platform/east/scrub) "toV" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/tearlake) "tqG" = ( /turf/open/floor/strata, /area/strata/ag/exterior/paths/north_outpost) "tqK" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "trr" = ( @@ -39785,7 +39654,7 @@ /turf/open/floor/plating, /area/strata/ag/exterior/landingzone_2) "tDo" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) "tEf" = ( @@ -39992,9 +39861,7 @@ }, /area/strata/ag/interior/tcomms) "tSb" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "tSi" = ( @@ -40045,9 +39912,7 @@ }, /area/strata/ag/interior/tcomms) "tUu" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/north_lz_caves) "tUN" = ( @@ -40096,9 +39961,7 @@ }, /area/strata/ag/interior/tcomms) "tWf" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/adminext) "tWJ" = ( @@ -40406,10 +40269,6 @@ "uux" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/deep/structures/res) -"uvm" = ( -/obj/effect/landmark/static_comms/net_two, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/crash) "uvw" = ( /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/deep/west_engi) @@ -40639,6 +40498,7 @@ /area/strata/ag/exterior/research_decks) "uSR" = ( /obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, /obj/effect/landmark/queen_spawn, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/tearlake) @@ -40741,7 +40601,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/southresearch) "vaZ" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/cabin_area) "vbw" = ( @@ -40995,7 +40855,7 @@ }, /area/strata/ag/interior/outpost/med) "vsp" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 8 }, /turf/open/asphalt/cement{ @@ -41119,7 +40979,7 @@ /obj/structure/platform/strata/metal{ dir = 8 }, -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "vwV" = ( @@ -41370,13 +41230,11 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/minehead) "vXt" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/southresearch) "vYf" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "vYD" = ( @@ -41392,9 +41250,7 @@ }, /area/strata/ag/interior/outpost/med) "vZT" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/deep/south_engi) "wab" = ( /obj/structure/machinery/space_heater, @@ -41495,9 +41351,7 @@ /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/tcomms) "wjv" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) "wkv" = ( @@ -41508,10 +41362,7 @@ /turf/closed/wall/strata_ice/dirty, /area/strata/ag/interior/outpost/engi) "wne" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/deep/east_dorms) "wni" = ( /turf/open/asphalt/cement{ @@ -41612,9 +41463,7 @@ }, /area/strata/ag/interior/outpost/admin) "wuI" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/east_carp) "wvt" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -41832,9 +41681,7 @@ }, /area/strata/ag/interior/tcomms) "wWS" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/adminext) "wXb" = ( @@ -42059,9 +41906,7 @@ }, /area/strata/ag/exterior/research_decks) "xre" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_3" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/tcomms/tcomms_deck) "xrx" = ( @@ -42115,10 +41960,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/research_decks) "xuY" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/deep/south_engi) "xvy" = ( /obj/structure/window/framed/strata/reinforced, @@ -42226,7 +42068,7 @@ }, /area/strata/ag/interior/dorms/hive) "xEV" = ( -/obj/structure/flora/grass/ice/brown, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh) "xFc" = ( @@ -42279,8 +42121,8 @@ /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/deep/west_engi) "xGE" = ( -/obj/structure/machinery/landinglight/ds1/delayone, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/asphalt/cement{ icon_state = "cement12" }, @@ -42426,9 +42268,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/marsh/river) "xOL" = ( -/obj/structure/flora/grass/ice/brown{ - icon_state = "snowgrassbb_2" - }, +/obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/dorms_quad) "xPv" = ( @@ -42505,9 +42345,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "xUg" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/strata/ug/interior/jungle/deep/south_engi) "xVQ" = ( /obj/structure/bed/chair/dropship/passenger{ @@ -42598,7 +42436,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "yee" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ +/obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 }, /turf/open/asphalt/cement{ @@ -42644,9 +42482,7 @@ }, /area/strata/ag/interior/outpost/med) "ylE" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/deep/south_engi) "ylF" = ( /obj/structure/stairs/perspective{ @@ -43493,27 +43329,27 @@ cqE cnv crb apc -crW -crW arR atp auj -crW +rhk arR atp auj -crW -crW +rhk +arR atp auj -crW +rhk arR +atp auj -auj -crW +rhk arR atp -atp +auj +rhk +arR atp apc cmA @@ -43710,7 +43546,7 @@ crE arS crE crE -aRx +crW cmA cnv cqE @@ -43905,7 +43741,7 @@ crE crE ciy crE -aRx +fuA cmA cnv cqE @@ -44100,7 +43936,7 @@ crE crE crE crE -aRx +dnS cmA cnv cqE @@ -44490,7 +44326,7 @@ crE crE crE crE -aRx +crW cmA cnv cqE @@ -44685,7 +44521,7 @@ crE crE crE crE -aRx +fuA aSH coX aVX @@ -44880,7 +44716,7 @@ crE crE crE crE -aRx +dnS cmA cnv acY @@ -45270,7 +45106,7 @@ crE crE crE crE -aRx +crW cmA cnv cot @@ -45465,7 +45301,7 @@ crE crE crE crE -aRx +fuA cmA cnv aoj @@ -45510,7 +45346,7 @@ cXU bhO bgS bhO -uvm +bhO bhO bhO bhO @@ -45660,7 +45496,7 @@ crE arS crE crE -aRx +dnS cmA cnv aoj @@ -45833,28 +45669,28 @@ cqE cnv crb apc -cwQ -cwQ +cZH +auk arT atq auk cwQ arT -ayh +cZH auk cwQ -cwQ -ayh +arT +cZH auk cwQ arT -ayh +cZH auk cwQ arT -ayh -auk +cZH auk +cwQ apc cmA cnv @@ -50604,27 +50440,27 @@ bvD eFa bJI iwp -iwp +jPQ apv nTf -sFB +iwp skJ apv nTf -sFB -iwp iwp +jPQ +apv nTf -sFB iwp +jPQ apv -sFB -sFB +nTf iwp +jPQ apv nTf -nTf -nTf +iwp +jPQ bJI wvF bvE @@ -50992,7 +50828,7 @@ rNI xTU bvD eFa -jPQ +sBg jWs jWs jWs @@ -51015,7 +50851,7 @@ jWs jWs iUK jWs -yee +qbk wvF bvE bwt @@ -51210,7 +51046,7 @@ jWs jWs jWs jWs -yee +ayh wvF bvE bwt @@ -51382,7 +51218,7 @@ rNI xTU bvD eFa -sBg +odB vqx jWs jWs @@ -51795,7 +51631,7 @@ jWs jWs jWs jWs -yee +qbk wvF bvD bvD @@ -51990,7 +51826,7 @@ jWs jWs jWs jWs -yee +ayh wvF bvE bvE @@ -52162,7 +51998,7 @@ bvD bvD bvE eFa -sBg +odB jWs jWs jWs @@ -52185,7 +52021,7 @@ jWs jWs jWs jWs -yee +sFB oFG bvE byr @@ -52552,7 +52388,7 @@ bvD bvE bvD eFa -jPQ +sBg jWs jWs jWs @@ -52575,7 +52411,7 @@ jWs jWs jWs jWs -yee +qbk wvF bvD bvE @@ -52770,7 +52606,7 @@ jWs ewk jWs jWs -yee +ayh wvF bvD bvE @@ -52944,26 +52780,26 @@ xTU eFa bJI vsp -vsp -qbk -hzb hue -vsp -qbk hzb -hue -vsp +qbU vsp -hzb hue -vsp -qbk hzb +qbU +vsp hue +hzb +qbU vsp -qbk +hue hzb +qbU +vsp hue +hzb +qbU +vsp hue bJI wvF diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index b30503215b59..63562239f4dc 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -835,6 +835,20 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +"acJ" = ( +/mob/living/silicon/decoy/ship_ai{ + pixel_y = -16; + layer = 2.98 + }, +/obj/structure/blocker/invisible_wall, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "acK" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2 @@ -993,6 +1007,9 @@ /obj/structure/closet, /obj/item/clothing/suit/armor/riot/marine/vintage_riot, /obj/item/clothing/head/helmet/riot/vintage_riot, +/obj/structure/machinery/light/small{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -2445,18 +2462,24 @@ /obj/item/paper_bin/uscm, /obj/item/tool/pen, /obj/structure/machinery/door_control{ - id = "bot_uniforms"; - name = "Uniform Vendor Lockdown"; - pixel_x = -8; - pixel_y = 10; - req_access_txt = "1" + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown Override"; + req_one_access_txt = "90;91;92"; + pixel_y = -24; + pixel_x = 8 + }, +/obj/structure/machinery/door_control{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown Override"; + req_one_access_txt = "91;92"; + pixel_y = -24 }, /obj/structure/machinery/door_control{ id = "Brig Lockdown Shutters"; - name = "Brig Lockdown"; - pixel_x = 10; - pixel_y = 10; - req_access_txt = "1;3" + name = "Brig Lockdown Override"; + req_access_txt = "1;3"; + pixel_x = -8; + pixel_y = -24 }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) @@ -3305,6 +3328,13 @@ /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/machinery/door_control{ + id = "bot_uniforms"; + name = "Uniform Vendor Lockdown"; + pixel_x = 8; + pixel_y = 24; + req_access_txt = "31" + }, /turf/open/floor/almayer{ dir = 1; icon_state = "silver" @@ -4859,20 +4889,6 @@ icon_state = "orange" }, /area/almayer/engineering/engineering_workshop/hangar) -"apQ" = ( -/obj/structure/disposalpipe/up/almayer{ - dir = 8; - id = "almayerlink_ot_med" - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door/window/southleft{ - desc = "A window, that is also a door. A windoor if you will. This one is stronger."; - health = 500; - name = "Reinforced Glass door"; - req_one_access_txt = "2;35" - }, -/turf/open/floor/almayer, -/area/almayer/engineering/engineering_workshop/hangar) "apR" = ( /obj/structure/surface/rack, /obj/item/storage/box/beakers{ @@ -5260,7 +5276,7 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "aqU" = ( -/turf/closed/wall/almayer, +/turf/closed/wall/almayer/reinforced, /area/almayer/command/airoom) "aqV" = ( /obj/structure/machinery/light{ @@ -5796,17 +5812,15 @@ }, /area/almayer/engineering/engineering_workshop/hangar) "asD" = ( -/obj/structure/machinery/light{ - dir = 1 - }, +/obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door_control{ - id = "areslockdownexterior"; - name = "ARES Lockdown"; - pixel_x = -25; - req_one_access_txt = "19" + id = "ARES StairsUpper"; + name = "ARES Core Access"; + req_one_access_txt = "1;200;90;91;92"; + pixel_y = 24; + pixel_x = -24 }, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/almayer{ +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -5814,20 +5828,23 @@ /turf/closed/wall/almayer/reinforced, /area/almayer/engineering/engineering_workshop/hangar) "asF" = ( -/obj/structure/machinery/door_control{ - id = "areslockdowninterior"; - name = "ARES Lockdown"; - pixel_x = -25; - req_one_access_txt = "19" +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + name = "\improper AI Reception"; + req_access = null; + req_one_access_txt = "91;92" }, -/mob/living/silicon/decoy/ship_ai, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer{ +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) "asG" = ( -/turf/open/floor/almayer{ +/obj/structure/surface/table/reinforced/almayer_B{ + climbable = 0; + unacidable = 1; + unslashable = 1; + indestructible = 1 + }, +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -5971,6 +5988,15 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"asZ" = ( +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 4; + pixel_x = -17 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "ata" = ( /obj/structure/machinery/light{ dir = 8 @@ -6377,12 +6403,14 @@ }, /area/almayer/lifeboat_pumps/south1) "auc" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; - id = "areslockdownexterior"; - name = "\improper ARES Core Shutters" + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown" }, -/turf/open/floor/almayer{ +/obj/effect/step_trigger/ares_alert/access_control, +/turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, /area/almayer/command/airoom) @@ -6405,20 +6433,14 @@ }, /area/almayer/hallways/port_hallway) "auf" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "areslockdowninterior"; - name = "\improper ARES Core Shutters" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/closed/wall/almayer/white/hull, /area/almayer/command/airoom) "aug" = ( /obj/structure/bed/chair/office/dark{ - dir = 1 + dir = 8 }, -/turf/open/floor/almayer{ +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -6511,6 +6533,9 @@ pixel_x = 8; pixel_y = -32 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -7051,29 +7076,64 @@ }, /area/almayer/living/starboard_garden) "avK" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/almayer{ +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) "avL" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/computer/station_alert{ - dir = 1 +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + req_one_access_txt = "91;92"; + pixel_y = -24; + pixel_x = -10 }, -/turf/open/floor/almayer{ +/obj/structure/machinery/door_control{ + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown"; + req_one_access_txt = "91;92"; + pixel_y = -24 + }, +/obj/structure/surface/table/reinforced/almayer_B{ + climbable = 0; + unacidable = 1; + unslashable = 1; + indestructible = 1 + }, +/obj/structure/transmitter/rotary{ + phone_color = "blue"; + phone_id = "AI Reception"; + phone_category = "ARES"; + name = "AI Reception Telephone" + }, +/obj/structure/machinery/door_control{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown"; + req_one_access_txt = "91;92"; + pixel_y = -24; + pixel_x = 10 + }, +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) "avM" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/paper_bin/uscm, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 8; + pixel_x = 17; + pixel_y = 6 + }, +/obj/structure/surface/table/reinforced/almayer_B{ + climbable = 0; + unacidable = 1; + unslashable = 1; + indestructible = 1 + }, +/obj/item/paper_bin/uscm{ + pixel_y = 6 + }, /obj/item/tool/pen, -/turf/open/floor/almayer{ +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -7281,21 +7341,18 @@ }, /area/almayer/command/cic) "awu" = ( -/obj/structure/machinery/door_control{ - id = "areslockdownexterior"; - name = "ARES Lockdown"; - pixel_x = 25; - req_one_access_txt = "19" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "W"; + pixel_x = -1 }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "cargo_arrow" +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, -/area/almayer/hallways/aft_hallway) +/area/almayer/command/airoom) "awv" = ( /obj/structure/machinery/computer/telecomms/monitor, /turf/open/floor/almayer{ @@ -7804,6 +7861,10 @@ /obj/item/storage/belt/medical/full, /obj/item/storage/belt/medical/full, /obj/item/storage/belt/medical/full, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -9096,6 +9157,14 @@ icon_state = "plate" }, /area/almayer/command/cic) +"aCd" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "aCf" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -10912,6 +10981,47 @@ }, /turf/open/floor/almayer, /area/almayer/command/cichallway) +"aKs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + name = "ARES Chamber Lockdown"; + req_one_access_txt = "1;200;90;91;92"; + pixel_x = 24; + pixel_y = -8; + indestructible = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES Railing"; + name = "ARES Chamber Railings"; + req_one_access_txt = "91;92"; + pixel_x = 24; + needs_power = 0; + indestructible = 1 + }, +/obj/structure/machinery/door/poddoor/railing{ + dir = 2; + id = "ARES Railing"; + unslashable = 0; + unacidable = 0; + pixel_y = -1; + pixel_x = -1; + open_layer = 2.1; + closed_layer = 4.1; + density = 0; + layer = 2.1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "aKu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -13347,6 +13457,10 @@ }, /area/almayer/hallways/stern_hallway) "aWb" = ( +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "orangecorner" @@ -14172,6 +14286,18 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"bat" = ( +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Right"; + name = "ARES Mainframe Lockdown"; + req_one_access_txt = "200;91;92"; + pixel_x = -24; + pixel_y = -24 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "baw" = ( /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) @@ -19285,6 +19411,39 @@ icon_state = "test_floor4" }, /area/almayer/hallways/starboard_hallway) +"bBi" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/liaison_suit/formal, +/obj/item/clothing/under/liaison_suit, +/obj/item/clothing/under/liaison_suit/outing, +/obj/item/clothing/under/liaison_suit/suspenders, +/obj/item/clothing/under/blackskirt{ + desc = "A stylish skirt, in a business-black and red colour scheme."; + name = "liaison's skirt" + }, +/obj/item/clothing/under/suit_jacket/charcoal{ + desc = "A professional black suit and blue tie. A combination popular among government agents and corporate Yes-Men alike."; + name = "liaison's black suit" + }, +/obj/item/clothing/under/suit_jacket/navy{ + desc = "A navy suit and red tie, intended for the Almayer's finest. And accountants."; + name = "liaison's navy suit" + }, +/obj/item/clothing/under/suit_jacket/trainee, +/obj/item/clothing/under/liaison_suit/charcoal, +/obj/item/clothing/under/liaison_suit/outing/red, +/obj/item/clothing/under/liaison_suit/blazer, +/obj/item/clothing/suit/storage/snow_suit/liaison, +/obj/item/clothing/gloves/black, +/obj/item/clothing/gloves/marine/dress, +/obj/item/clothing/glasses/sunglasses/big, +/obj/item/clothing/accessory/blue, +/obj/item/clothing/accessory/red, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "bBl" = ( /obj/structure/machinery/light{ dir = 4 @@ -19910,18 +20069,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"bEk" = ( -/obj/structure/machinery/door/airlock/almayer/marine/requisitions{ - dir = 1; - name = "\improper Requisitions Storage" - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/squads/req) "bEl" = ( /obj/structure/machinery/computer/supply_drop_console/limited, /turf/closed/wall/almayer, @@ -20916,6 +21063,26 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bIp" = ( +/obj/effect/step_trigger/ares_alert/mainframe, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES Mainframe Left"; + name = "\improper ARES Mainframe Shutters"; + plane = -7 + }, +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + open_layer = 1.9; + id = "ARES Emergency"; + needs_power = 0; + name = "ARES Emergency Lockdown"; + layer = 3.2; + closed_layer = 3.2; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "bIs" = ( /obj/structure/largecrate/supply/supplies/mre, /obj/structure/machinery/light/small{ @@ -21697,6 +21864,23 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/vehiclehangar) +"bLv" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + req_one_access_txt = "19;200;90;91;92"; + pixel_x = 24; + pixel_y = -8 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8; + pixel_y = 2 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) "bLw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -23074,6 +23258,35 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) +"bRo" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES StairsLower"; + name = "\improper ARES Core Shutters"; + plane = -7 + }, +/obj/effect/step_trigger/ares_alert/public{ + alert_message = "Caution: Movement detected in ARES Core."; + cooldown_duration = 1200; + alert_id = "AresStairs" + }, +/obj/effect/step_trigger/ares_alert/public{ + alert_message = "Caution: Movement detected in ARES Core."; + cooldown_duration = 1200; + alert_id = "AresStairs" + }, +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + open_layer = 1.9; + id = "ARES Emergency"; + needs_power = 0; + name = "ARES Emergency Lockdown"; + layer = 3.2; + closed_layer = 3.2; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "bRr" = ( /obj/structure/machinery/fuelcell_recycler, /turf/open/floor/almayer{ @@ -23769,6 +23982,13 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"bUx" = ( +/obj/effect/landmark/start/working_joe, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/almayer/command/airoom) "bUy" = ( /obj/structure/closet/crate/ammo, /obj/structure/machinery/light/small, @@ -25529,11 +25749,18 @@ }, /area/almayer/command/cichallway) "cck" = ( -/obj/structure/window/framed/almayer/hull/hijack_bustable, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 +/obj/structure/surface/table/reinforced/almayer_B, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, -/turf/open/floor/plating, /area/almayer/command/airoom) "ccq" = ( /obj/effect/decal/warning_stripes{ @@ -27174,6 +27401,17 @@ "cls" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/port_point_defense) +"clw" = ( +/obj/structure/machinery/light{ + dir = 8; + unacidable = 1; + unslashable = 1; + invisibility = 101 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "cly" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/safety/maint{ @@ -27565,12 +27803,10 @@ }, /area/almayer/hallways/starboard_hallway) "cnp" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/folder/yellow, /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/almayer{ +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -27910,6 +28146,19 @@ icon_state = "green" }, /area/almayer/hallways/starboard_hallway) +"cqm" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/folder/white{ + pixel_y = 6 + }, +/obj/item/folder/white{ + pixel_y = 6; + pixel_x = 5 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "cqn" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -28199,6 +28448,12 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"cwS" = ( +/obj/structure/blocker/invisible_wall, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "cwX" = ( /obj/structure/ladder{ height = 1; @@ -28206,6 +28461,18 @@ }, /turf/open/floor/plating/almayer, /area/almayer/living/briefing) +"cxc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "cxe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28322,6 +28589,9 @@ "cBd" = ( /obj/structure/surface/rack, /obj/item/reagent_container/food/snacks/wrapped/chunk, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -28360,6 +28630,24 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) +"cBm" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -97; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) "cBs" = ( /obj/structure/bed/chair, /obj/effect/decal/warning_stripes{ @@ -28810,6 +29098,16 @@ /obj/item/tool/lighter/zippo, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) +"cLo" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build{ + dir = 2; + icon_state = "cargo_arrow" + }, +/area/almayer/command/airoom) "cLp" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -29446,6 +29744,9 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"daz" = ( +/turf/closed/wall/almayer/white/hull, +/area/almayer/command/airoom) "dbe" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/camera/autoname/almayer{ @@ -30585,6 +30886,12 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"dyp" = ( +/obj/structure/machinery/ares/cpu, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "dyx" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -30800,6 +31107,15 @@ icon_state = "orange" }, /area/almayer/engineering/engine_core) +"dDp" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 3.3 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "dDt" = ( /obj/structure/toilet{ dir = 1 @@ -30938,6 +31254,23 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"dGl" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -97; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "dGr" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -31076,6 +31409,12 @@ }, /turf/open/floor/plating, /area/almayer/living/bridgebunks) +"dIi" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/plating/plating_catwalk{ + allow_construction = 0 + }, +/area/almayer/command/airoom) "dIl" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -31083,6 +31422,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_f_s) +"dIn" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 5 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "dII" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo, /obj/effect/decal/warning_stripes{ @@ -31259,6 +31606,23 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"dQl" = ( +/obj/structure/platform{ + dir = 4 + }, +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -97; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) "dQv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31721,6 +32085,9 @@ icon_state = "orange" }, /area/almayer/engineering/engine_core) +"ebN" = ( +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/command/airoom) "ebO" = ( /obj/structure/machinery/light/small, /turf/open/floor/almayer{ @@ -32653,6 +33020,17 @@ /obj/effect/landmark/late_join/delta, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"erN" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/pipes/vents/pump/no_boom{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "erS" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -32782,6 +33160,21 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/testlab) +"euN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Left"; + name = "ARES Mainframe Lockdown"; + req_one_access_txt = "200;91;92"; + pixel_x = 24; + pixel_y = 24 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "euO" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -33467,6 +33860,20 @@ icon_state = "test_floor5" }, /area/almayer/squads/req) +"eKJ" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/machinery/light{ + dir = 4; + unacidable = 1; + unslashable = 1; + invisibility = 101 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "eKK" = ( /obj/structure/sink{ dir = 4; @@ -33609,6 +34016,9 @@ dir = 8 }, /obj/effect/decal/cleanable/blood, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -34023,6 +34433,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"eYz" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "eYC" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/wood/ship, @@ -34270,6 +34688,19 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"fcX" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "fdj" = ( /obj/structure/surface/table/almayer, /obj/item/storage/pouch/tools/full, @@ -34364,6 +34795,11 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/operating_room_two) +"ffE" = ( +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "fgh" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -34566,6 +35002,19 @@ icon_state = "plate" }, /area/almayer/squads/req) +"fmv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "fmB" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -34781,6 +35230,19 @@ }, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) +"frM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "fsd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -35324,6 +35786,14 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) +"fEN" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "fER" = ( /obj/structure/machinery/autolathe, /turf/open/floor/almayer{ @@ -35615,6 +36085,23 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_s) +"fJY" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/command/airoom) +"fKe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "fKg" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -35704,6 +36191,47 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower_engineering) +"fMl" = ( +/obj/structure/machinery/door_control{ + id = "ARES Operations Right"; + name = "ARES Operations Shutter"; + req_one_access_txt = "1;200;91;92"; + pixel_x = 24; + pixel_y = -8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) +"fMt" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES Interior"; + name = "\improper ARES Inner Chamber Shutters"; + plane = -7 + }, +/obj/effect/step_trigger/ares_alert/core, +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + open_layer = 1.9; + id = "ARES Emergency"; + needs_power = 0; + name = "ARES Emergency Lockdown"; + layer = 3.2; + closed_layer = 3.2; + plane = -7 + }, +/obj/structure/sign/safety/laser{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 6; + pixel_x = 32 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "fMA" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" @@ -35840,6 +36368,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"fPB" = ( +/obj/structure/machinery/ares/processor/apollo, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "fQk" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/plating_catwalk, @@ -36208,6 +36742,50 @@ icon_state = "silver" }, /area/almayer/command/cichallway) +"gba" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/faxmachine/uscm/command{ + department = "AI Core"; + pixel_y = 8 + }, +/obj/structure/transmitter/rotary{ + pixel_x = 8; + pixel_y = -8; + phone_color = "blue"; + phone_id = "AI Core"; + phone_category = "ARES"; + name = "AI Core Telephone" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"gbg" = ( +/obj/structure/sign/safety/terminal{ + pixel_y = 24; + pixel_x = 14 + }, +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/obj/structure/machinery/door_control{ + id = "ARES Operations Right"; + name = "ARES Operations Shutter"; + req_one_access_txt = "1;200;91;92"; + pixel_x = -24; + pixel_y = -8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "gbQ" = ( /obj/structure/toilet{ dir = 8 @@ -36413,14 +36991,23 @@ }, /turf/open/floor/almayer, /area/almayer/squads/delta) -"gfE" = ( -/obj/structure/machinery/light{ - dir = 4 +"gfu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer{ +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/no_build{ icon_state = "tcomms" }, /area/almayer/command/airoom) +"gfE" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/plating, +/area/almayer/command/airoom) "gfS" = ( /obj/structure/sign/safety/cryo{ pixel_y = -26 @@ -36579,8 +37166,25 @@ }, /area/almayer/hull/lower_hull/l_f_s) "gjw" = ( -/obj/structure/blocker/invisible_wall, -/turf/open/floor/almayer{ +/obj/structure/machinery/faxmachine/uscm/command{ + department = "AI Core"; + pixel_y = 32; + density = 0 + }, +/obj/structure/surface/rack{ + pixel_y = 16; + density = 0 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17; + pixel_y = -6; + ticket_console = 1 + }, +/obj/item/storage/box/ids{ + pixel_x = -4 + }, +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -36628,13 +37232,6 @@ icon_state = "redfull" }, /area/almayer/hull/lower_hull/l_f_s) -"gkg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/closed/wall/almayer, -/area/almayer/squads/req) "gks" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating, @@ -37039,6 +37636,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"gwn" = ( +/obj/structure/machinery/ares/processor/bioscan, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "gwo" = ( /turf/open/floor/almayer{ dir = 4; @@ -37225,6 +37828,16 @@ icon_state = "orange" }, /area/almayer/hallways/starboard_hallway) +"gyN" = ( +/obj/structure/machinery/prop{ + icon_state = "comm_server"; + name = "server box"; + desc = "It's a server box..." + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "gyO" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -37310,6 +37923,24 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"gAe" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/folder/white, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "gAj" = ( /obj/structure/bed/chair/comfy/charlie{ dir = 1 @@ -37401,6 +38032,18 @@ icon_state = "plate" }, /area/almayer/hallways/vehiclehangar) +"gCu" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/folded_tent/cmd, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "gCw" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = 10 @@ -37821,6 +38464,39 @@ icon_state = "test_floor4" }, /area/almayer/hull/upper_hull/u_m_p) +"gMN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + name = "ARES Chamber Lockdown"; + req_one_access_txt = "1;200;90;91;92"; + pixel_x = -24; + pixel_y = -8; + indestructible = 1 + }, +/obj/structure/machinery/door/poddoor/railing{ + dir = 2; + id = "ARES Railing"; + unslashable = 0; + unacidable = 0; + pixel_y = -1; + pixel_x = -1; + open_layer = 2.1; + density = 0; + closed_layer = 4.1; + layer = 2.1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "gMU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -37855,6 +38531,33 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) +"gOs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + name = "ARES Chamber Lockdown"; + req_one_access_txt = "1;200;90;91;92"; + pixel_x = 24; + pixel_y = 8; + indestructible = 1 + }, +/obj/structure/machinery/door/poddoor/railing{ + id = "ARES Railing"; + unslashable = 0; + unacidable = 0; + open_layer = 2.1; + density = 0; + layer = 2.1; + closed_layer = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) "gPc" = ( /obj/structure/machinery/power/terminal{ dir = 1 @@ -37864,6 +38567,23 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"gPr" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -97; + vector_y = 65 + }, +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + dir = 4 + }, +/area/almayer/command/airoom) "gPF" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -37990,6 +38710,23 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"gTH" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/skills{ + dir = 4; + pixel_y = 18 + }, +/obj/structure/machinery/computer/secure_data{ + dir = 4 + }, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 4; + pixel_y = -18 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "gUf" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/almayer{ @@ -38037,6 +38774,15 @@ }, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) +"gUN" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/almayer/command/airoom) "gUV" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -38046,6 +38792,13 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/north2) +"gVA" = ( +/obj/structure/disposalpipe/down/almayer{ + dir = 8; + id = "almayerlink_OT1_req" + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "gVF" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -38075,6 +38828,12 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_p) +"gXh" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "gXl" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access_txt = "5" @@ -38096,6 +38855,20 @@ icon_state = "plate" }, /area/almayer/engineering/engineering_workshop) +"gXs" = ( +/obj/effect/step_trigger/ares_alert/terminals, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES Operations Right"; + name = "\improper ARES Operations Shutters"; + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "gXv" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -38339,6 +39112,12 @@ icon_state = "plate" }, /area/almayer/living/cryo_cells) +"hcC" = ( +/obj/structure/disposalpipe/up/almayer{ + id = "almayerlink_OT_req" + }, +/turf/closed/wall/almayer, +/area/almayer/engineering/engineering_workshop/hangar) "hcI" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -39064,18 +39843,9 @@ /turf/open/floor/almayer, /area/almayer/command/cic) "hvw" = ( -/obj/structure/machinery/r_n_d/server/core{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer{ - icon_state = "tcomms" - }, -/area/almayer/command/airoom) +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/plating, +/area/almayer/powered/agent) "hvH" = ( /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) @@ -39211,6 +39981,17 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/processing) +"hyE" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + dir = 4; + id = "ARES StairsLock"; + name = "ARES Exterior Lockdown" + }, +/obj/effect/step_trigger/ares_alert/access_control, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "hyQ" = ( /turf/closed/wall/almayer, /area/almayer/living/synthcloset) @@ -39380,6 +40161,18 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"hBP" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/folded_tent/med, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "hBU" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/warning_stripes{ @@ -39985,6 +40778,33 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/execution) +"hRW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_x = -17; + dir = 4 + }, +/obj/structure/sign/safety/terminal{ + pixel_y = 24; + pixel_x = 14 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "hSk" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) @@ -40046,6 +40866,18 @@ }, /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_a_p) +"hTl" = ( +/obj/structure/prop/server_equipment/yutani_server{ + pixel_y = 16; + name = "server tower"; + desc = "A powerful server tower housing various AI functions."; + density = 0 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "hTt" = ( /obj/structure/machinery/brig_cell/cell_1{ pixel_x = 32; @@ -40289,6 +41121,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"hZj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "hZN" = ( /obj/structure/machinery/medical_pod/bodyscanner, /obj/structure/disposalpipe/segment{ @@ -40509,6 +41350,20 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/lower_medical_lobby) +"ieF" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -97; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/no_build{ + dir = 4 + }, +/area/almayer/command/airoom) "ieH" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -40564,6 +41419,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) +"igr" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "igt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41032,8 +41895,17 @@ /turf/open/floor/plating, /area/almayer/living/port_emb) "isC" = ( -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) "isH" = ( @@ -41079,6 +41951,33 @@ icon_state = "bluecorner" }, /area/almayer/hallways/aft_hallway) +"itf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/door_control{ + id = "ARES Interior"; + name = "ARES Chamber Lockdown"; + req_one_access_txt = "1;200;90;91;92"; + pixel_x = -24; + pixel_y = 8; + indestructible = 1 + }, +/obj/structure/machinery/door/poddoor/railing{ + id = "ARES Railing"; + unslashable = 0; + unacidable = 0; + open_layer = 2.1; + density = 0; + layer = 2.1; + closed_layer = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "itR" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -41308,6 +42207,18 @@ icon_state = "test_floor4" }, /area/almayer/shipboard/brig/main_office) +"iyH" = ( +/obj/structure/surface/table/reinforced/almayer_B{ + climbable = 0; + unacidable = 1; + unslashable = 1; + indestructible = 1; + desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metal rail running above it, preventing something large passing over. Like you." + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "iyQ" = ( /turf/open/floor/almayer{ dir = 5; @@ -42364,6 +43275,23 @@ icon_state = "red" }, /area/almayer/command/lifeboat) +"iZw" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -97; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) "iZG" = ( /obj/structure/window/framed/almayer/hull, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -42429,6 +43357,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_p) +"jaH" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/paper_bin/uscm{ + pixel_y = 6 + }, +/obj/item/tool/pen, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "jaP" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/almayer_network{ @@ -43206,6 +44144,26 @@ allow_construction = 0 }, /area/almayer/shipboard/brig/lobby) +"jqP" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES Interior"; + name = "\improper ARES Inner Chamber Shutters"; + plane = -7 + }, +/obj/effect/step_trigger/ares_alert/core, +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + open_layer = 1.9; + id = "ARES Emergency"; + needs_power = 0; + name = "ARES Emergency Lockdown"; + layer = 3.2; + closed_layer = 3.2; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "jre" = ( /obj/structure/closet/secure_closet/cargotech, /obj/item/clothing/accessory/storage/webbing, @@ -43241,6 +44199,14 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) +"jtj" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "jtJ" = ( /obj/structure/machinery/door_control{ id = "laddernorthwest"; @@ -43330,6 +44296,12 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) +"jvB" = ( +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/no_build{ + dir = 4 + }, +/area/almayer/command/airoom) "jvI" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer{ @@ -43533,6 +44505,29 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_lobby) +"jDV" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + req_one_access_txt = "19;200;90;91;92"; + pixel_x = 24 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "jEs" = ( /obj/structure/surface/table/almayer, /obj/item/tool/screwdriver{ @@ -44022,6 +45017,19 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_m_p) +"jRz" = ( +/obj/effect/step_trigger/teleporter/random{ + affect_ghosts = 1; + name = "tele_ground1"; + teleport_x = 180; + teleport_x_offset = 200; + teleport_y = 50; + teleport_y_offset = 80; + teleport_z = 1; + teleport_z_offset = 1 + }, +/turf/closed/wall/almayer/outer, +/area/space) "jRK" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -44151,6 +45159,16 @@ icon_state = "plate" }, /area/almayer/living/bridgebunks) +"jUn" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door/window/southleft{ + desc = "A window, that is also a door. A windoor if you will. This one is stronger."; + health = 500; + name = "Reinforced Glass door"; + req_one_access_txt = "2;35" + }, +/turf/open/floor/almayer, +/area/almayer/engineering/engineering_workshop/hangar) "jUs" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -44300,6 +45318,22 @@ icon_state = "mono" }, /area/almayer/hallways/vehiclehangar) +"jYR" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "jZd" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -44498,9 +45532,19 @@ }, /area/almayer/engineering/upper_engineering) "kbH" = ( -/obj/structure/window/reinforced, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) "kbV" = ( @@ -44631,6 +45675,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"kfU" = ( +/turf/open/floor/plating, +/area/almayer/powered/agent) "kfX" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -44704,6 +45751,22 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"khJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "khS" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -44974,6 +46037,10 @@ icon_state = "plating" }, /area/almayer/hull/lower_hull/l_a_p) +"kpc" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/almayer/command/airoom) "kpl" = ( /obj/structure/machinery/door_control{ id = "cl_shutters"; @@ -45503,6 +46570,19 @@ icon_state = "red" }, /area/almayer/hallways/port_hallway) +"kzT" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + req_one_access_txt = "19;200;90;91;92"; + pixel_x = -24; + pixel_y = -8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "kAh" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -45535,6 +46615,12 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"kBy" = ( +/obj/structure/machinery/ares/processor, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "kBP" = ( /turf/open/floor/almayer{ dir = 9; @@ -45883,6 +46969,24 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) +"kKv" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -97; + vector_y = 65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "kKG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -46228,6 +47332,21 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"kSy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Right"; + name = "ARES Mainframe Lockdown"; + req_one_access_txt = "200;91;92"; + pixel_x = -24; + pixel_y = 24 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "kSJ" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -46436,6 +47555,12 @@ icon_state = "silver" }, /area/almayer/command/computerlab) +"kXj" = ( +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) "kXu" = ( /turf/open/floor/almayer{ dir = 8; @@ -46636,6 +47761,12 @@ icon_state = "plate" }, /area/almayer/squads/charlie) +"lcg" = ( +/obj/structure/machinery/ares/substrate, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "lcy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46746,6 +47877,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/navigation) +"ley" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "leY" = ( /obj/structure/bed/sofa/south/white/left, /turf/open/floor/almayer{ @@ -46875,9 +48012,20 @@ /turf/open/floor/wood/ship, /area/almayer/living/basketball) "lin" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) "liJ" = ( @@ -47019,17 +48167,8 @@ }, /area/almayer/medical/medical_science) "lmz" = ( -/obj/structure/machinery/door_control{ - id = "areslockdowninterior"; - name = "ARES Lockdown"; - pixel_x = 25; - req_one_access_txt = "19" - }, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/almayer{ - icon_state = "ai_floors" - }, -/area/almayer/command/airoom) +/turf/closed/wall/almayer/white/hull, +/area/space) "lmE" = ( /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer{ @@ -47078,6 +48217,32 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering) +"lnS" = ( +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/sign/safety/terminal{ + pixel_y = 24; + pixel_x = 14 + }, +/obj/structure/machinery/door_control{ + id = "ARES Operations Left"; + name = "ARES Operations Shutter"; + req_one_access_txt = "1;200;91;92"; + pixel_x = 24; + pixel_y = -8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "lok" = ( /obj/structure/machinery/cm_vending/clothing/marine/charlie, /obj/structure/sign/safety/cryo{ @@ -47927,6 +49092,10 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"lEW" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/almayer, +/area/almayer/engineering/engineering_workshop/hangar) "lFb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48852,6 +50021,22 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"mdW" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/item/folder/white, +/obj/item/folder/white, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "meu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -49137,10 +50322,15 @@ }, /area/almayer/engineering/port_atmos) "mlb" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 }, -/turf/open/floor/almayer{ +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/no_build{ icon_state = "tcomms" }, /area/almayer/command/airoom) @@ -49844,6 +51034,26 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"mFN" = ( +/obj/effect/step_trigger/ares_alert/mainframe, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES Mainframe Right"; + name = "\improper ARES Mainframe Shutters"; + plane = -7 + }, +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + open_layer = 1.9; + id = "ARES Emergency"; + needs_power = 0; + name = "ARES Emergency Lockdown"; + layer = 3.2; + closed_layer = 3.2; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "mFO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -49919,6 +51129,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/medical/medical_science) +"mHE" = ( +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "mHO" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -50155,6 +51371,10 @@ icon_state = "plate" }, /area/almayer/living/pilotbunks) +"mLE" = ( +/obj/effect/landmark/start/working_joe, +/turf/open/floor/plating, +/area/almayer/command/airoom) "mLF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50288,8 +51508,7 @@ }, /area/almayer/engineering/laundry) "mOi" = ( -/obj/structure/blocker/invisible_wall, -/turf/closed/wall/almayer, +/turf/closed/wall/almayer/outer, /area/almayer/command/airoom) "mOr" = ( /obj/structure/surface/table/almayer, @@ -50404,6 +51623,34 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"mRn" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES Interior"; + name = "\improper ARES Inner Chamber Shutters"; + plane = -7 + }, +/obj/effect/step_trigger/ares_alert/core, +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + open_layer = 1.9; + id = "ARES Emergency"; + needs_power = 0; + name = "ARES Emergency Lockdown"; + layer = 3.2; + closed_layer = 3.2; + plane = -7 + }, +/obj/structure/sign/safety/terminal{ + pixel_y = -8; + pixel_x = -18 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = -18; + pixel_y = 6 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "mRW" = ( /turf/open/floor/almayer/research/containment/corner1, /area/almayer/medical/containment/cell/cl) @@ -50531,6 +51778,27 @@ icon_state = "test_floor4" }, /area/almayer/squads/bravo) +"mUz" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 8; + pixel_x = 17 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"mUC" = ( +/obj/structure/machinery/light{ + dir = 4; + unacidable = 1; + unslashable = 1; + invisibility = 101 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "mUQ" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer{ @@ -50667,6 +51935,14 @@ }, /turf/open/floor/almayer, /area/almayer/hull/upper_hull/u_f_p) +"mYv" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + negdir = 4; + posdir = 1 + }, +/turf/closed/wall/almayer, +/area/almayer/squads/req) "mYw" = ( /obj/structure/sign/safety/escapepod{ pixel_x = -17; @@ -51951,8 +53227,6 @@ /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, -/obj/effect/landmark/wo_supplies/guns/common/m39, -/obj/effect/landmark/wo_supplies/guns/common/m39, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, /obj/structure/sign/safety/ammunition{ @@ -51962,6 +53236,8 @@ /obj/structure/sign/safety/hazard{ pixel_y = 32 }, +/obj/item/weapon/gun/smg/m39, +/obj/item/weapon/gun/smg/m39, /turf/open/floor/almayer{ icon_state = "redfull" }, @@ -52294,6 +53570,15 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_a_p) +"nJH" = ( +/obj/structure/machinery/computer/cameras/almayer/ares{ + dir = 8; + pixel_x = 17 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "nKq" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -52378,6 +53663,20 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"nMq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/hallways/aft_hallway) "nMu" = ( /turf/open/floor/almayer{ dir = 9; @@ -52793,6 +54092,22 @@ "nXP" = ( /turf/closed/wall/almayer/outer, /area/almayer/hull/lower_hull/l_f_s) +"nXU" = ( +/obj/structure/machinery/door/airlock/almayer/marine/requisitions{ + dir = 1; + name = "\improper Requisitions Storage" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, +/obj/structure/disposalpipe/up/almayer{ + dir = 4; + id = "almayerlink_OT1_req" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/squads/req) "nYc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -52965,6 +54280,34 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) +"ocB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/sign/safety/terminal{ + pixel_y = 24; + pixel_x = 14 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17; + ticket_console = 1 + }, +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "oda" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio{ @@ -53663,6 +55006,17 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"osy" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/platform_decoration, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) "osz" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -53757,6 +55111,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_a_s) +"our" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/paper_bin/uscm{ + pixel_y = 6 + }, +/obj/item/tool/pen, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "ouB" = ( /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, @@ -54327,13 +55694,26 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "oJR" = ( -/obj/structure/closet/toolcloset, -/obj/structure/machinery/firealarm{ - dir = 8; +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + req_one_access_txt = "19;200;90;91;92"; pixel_x = -24 }, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) "oKb" = ( @@ -54383,6 +55763,24 @@ /obj/effect/landmark/late_join/bravo, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha) +"oLm" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + req_one_access_txt = "19;200;90;91;92"; + pixel_x = -24; + pixel_y = 8 + }, +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 4; + pixel_y = -8 + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "oLv" = ( /obj/structure/sign/safety/medical{ pixel_x = 8; @@ -54676,6 +56074,16 @@ icon_state = "plate" }, /area/almayer/living/gym) +"oRV" = ( +/obj/structure/blocker/invisible_wall, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "oRZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55170,6 +56578,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"pfT" = ( +/obj/structure/machinery/ares/processor/interface, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "pgo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55183,12 +56597,20 @@ /turf/closed/wall/almayer, /area/almayer/lifeboat_pumps/south1) "pgH" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 80 +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 }, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) "pha" = ( @@ -55384,6 +56806,18 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"pmV" = ( +/obj/structure/prop/server_equipment/yutani_server/broken{ + pixel_y = 16; + name = "server tower"; + desc = "A powerful server tower housing various AI functions."; + density = 0 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "pno" = ( /obj/structure/sign/safety/escapepod{ pixel_y = 32 @@ -55683,6 +57117,18 @@ icon_state = "green" }, /area/almayer/hallways/aft_hallway) +"pvF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/folded_tent/reqs, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "pvJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56343,6 +57789,19 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"pJR" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -97; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + dir = 4 + }, +/area/almayer/command/airoom) "pJW" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -56969,13 +58428,15 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) "pYi" = ( -/obj/structure/machinery/telecomms/processor/preset_four, -/obj/structure/sign/safety/laser{ - pixel_x = 8; - pixel_y = 32 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/structure/pipes/vents/pump/no_boom{ + dir = 8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 }, /area/almayer/command/airoom) "pYo" = ( @@ -57418,6 +58879,17 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"qit" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/item/paper_bin/uscm, +/obj/item/tool/pen, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "qiy" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -57957,6 +59429,19 @@ icon_state = "plate" }, /area/almayer/living/offices) +"qwJ" = ( +/obj/structure/machinery/door_control{ + id = "ARES Operations Left"; + name = "ARES Operations Shutter"; + req_one_access_txt = "1;200;91;92"; + pixel_x = -24; + pixel_y = -8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "qxA" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer{ @@ -58582,6 +60067,12 @@ icon_state = "blue" }, /area/almayer/hallways/aft_hallway) +"qLS" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, +/turf/open/floor/almayer/no_build{ + dir = 4 + }, +/area/almayer/command/airoom) "qLV" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/disk_reader, @@ -58781,6 +60272,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"qQS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "qRj" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -59055,6 +60558,13 @@ icon_state = "green" }, /area/almayer/hallways/port_hallway) +"qYC" = ( +/obj/structure/disposalpipe/down/almayer{ + dir = 4; + id = "almayerlink_OT_req" + }, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "qYG" = ( /turf/open/floor/almayer{ icon_state = "mono" @@ -59187,6 +60697,18 @@ icon_state = "plate" }, /area/almayer/hull/lower_hull/l_f_s) +"rby" = ( +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Left"; + name = "ARES Mainframe Lockdown"; + req_one_access_txt = "200;91;92"; + pixel_x = 24; + pixel_y = -24 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "rbB" = ( /turf/open/floor/almayer{ icon_state = "silvercorner" @@ -59694,9 +61216,25 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"rna" = ( +/turf/closed/wall/almayer/white, +/area/almayer/command/airoom) "rne" = ( /turf/open/floor/carpet, /area/almayer/command/corporateliason) +"rnH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_x = 17; + dir = 8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "rnM" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer{ @@ -59736,6 +61274,20 @@ icon_state = "plate" }, /area/almayer/shipboard/port_point_defense) +"roH" = ( +/obj/effect/step_trigger/ares_alert/terminals, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES Operations Left"; + name = "\improper ARES Operations Shutters"; + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "roU" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -60269,6 +61821,14 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +"rCi" = ( +/obj/structure/machinery/camera/autoname/almayer/containment/ares{ + dir = 8 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "rCp" = ( /obj/structure/largecrate/random/case/small, /obj/structure/machinery/light/small{ @@ -60279,12 +61839,19 @@ }, /area/almayer/hull/upper_hull/u_a_p) "rCw" = ( -/obj/structure/window/reinforced, -/obj/structure/machinery/light{ +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 + }, +/obj/structure/platform{ dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) "rCK" = ( @@ -60783,16 +62350,11 @@ }, /area/almayer/medical/containment/cell/cl) "rNF" = ( -/obj/structure/sign/safety/fibre_optics{ - pixel_x = 32; - pixel_y = 7 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 32; - pixel_y = -8 +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 }, -/obj/effect/landmark/start/working_joe, -/turf/open/floor/almayer{ +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -61345,6 +62907,9 @@ icon_state = "test_floor4" }, /area/almayer/engineering/upper_engineering/notunnel) +"sbJ" = ( +/turf/closed/wall/almayer/white/hull, +/area/almayer/powered/agent) "sbM" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -61419,16 +62984,30 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_p) -"sdl" = ( -/obj/structure/machinery/telecomms/processor/preset_four, -/obj/structure/sign/safety/fibre_optics{ - pixel_x = 8; - pixel_y = 32 +"scS" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 }, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/structure/machinery/light{ + dir = 8; + unacidable = 1; + unslashable = 1; + invisibility = 101 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) +"sdl" = ( +/obj/structure/surface/rack{ + pixel_y = 16; + density = 0 + }, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, +/obj/item/tool/wet_sign, +/turf/open/floor/plating, +/area/almayer/command/airoom) "sdn" = ( /obj/structure/sink{ dir = 4; @@ -61859,6 +63438,10 @@ }, /area/almayer/shipboard/brig/cells) "soq" = ( +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17 + }, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -62460,36 +64043,6 @@ icon_state = "silvercorner" }, /area/almayer/hallways/aft_hallway) -"sDL" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/under/liaison_suit/formal, -/obj/item/clothing/under/liaison_suit, -/obj/item/clothing/under/liaison_suit/outing, -/obj/item/clothing/under/liaison_suit/suspenders, -/obj/item/clothing/under/blackskirt{ - desc = "A stylish skirt, in a business-black and red colour scheme."; - name = "liaison's skirt" - }, -/obj/item/clothing/under/suit_jacket/charcoal{ - desc = "A professional black suit and blue tie. A combination popular among government agents and corporate Yes-Men alike."; - name = "liaison's black suit" - }, -/obj/item/clothing/under/suit_jacket/navy{ - desc = "A navy suit and red tie, intended for the Almayer's finest. And accountants."; - name = "liaison's navy suit" - }, -/obj/item/clothing/under/suit_jacket/trainee, -/obj/item/clothing/gloves/black, -/obj/item/clothing/gloves/marine/dress, -/obj/item/clothing/glasses/sunglasses/big, -/obj/item/clothing/accessory/blue, -/obj/item/clothing/accessory/red, -/obj/item/clothing/shoes/dress, -/obj/structure/machinery/status_display{ - pixel_x = -32 - }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "sDM" = ( /turf/open/floor/almayer{ dir = 9; @@ -62572,6 +64125,14 @@ icon_state = "orange" }, /area/almayer/hallways/hangar) +"sEK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/almayer/no_build{ + icon_state = "tcomms" + }, +/area/almayer/command/airoom) "sEM" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/radio/intercom{ @@ -62662,6 +64223,12 @@ /obj/structure/mirror, /turf/closed/wall/almayer, /area/almayer/living/gym) +"sGZ" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/command/airoom) "sHg" = ( /obj/structure/surface/rack, /obj/item/storage/backpack/marine/satchel{ @@ -62721,11 +64288,16 @@ }, /area/almayer/squads/alpha) "sIf" = ( -/obj/structure/machinery/door/window/southleft{ - req_access_txt = "19" +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 }, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) "sIk" = ( @@ -62823,6 +64395,15 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/morgue) +"sKY" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8; + layer = 3.25 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "sLo" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -63135,6 +64716,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"sTV" = ( +/obj/structure/machinery/power/apc/almayer/hardened{ + dir = 1 + }, +/turf/open/floor/plating, +/area/almayer/command/airoom) "sUg" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -63358,8 +64945,6 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/effect/landmark/wo_supplies/guns/common/m39, -/obj/effect/landmark/wo_supplies/guns/common/m39, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, @@ -63367,6 +64952,8 @@ /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, +/obj/item/weapon/gun/smg/m39, +/obj/item/weapon/gun/smg/m39, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "sYC" = ( @@ -63966,6 +65553,16 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"tmK" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + req_one_access_txt = "91;92"; + req_one_access = null + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "tnb" = ( /obj/structure/bed/chair/comfy/black, /turf/open/floor/almayer{ @@ -64284,6 +65881,12 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/port) +"tte" = ( +/obj/structure/pipes/vents/pump/no_boom{ + welded = 1 + }, +/turf/open/floor/plating, +/area/almayer/powered/agent) "ttM" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -64744,13 +66347,19 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) "tFe" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - dir = 1; - name = "\improper ARES Mainframe"; - req_access = null; - req_one_access_txt = "2;7" +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES StairsUpper"; + name = "\improper ARES Core Shutters"; + plane = -7 }, -/turf/open/floor/almayer{ +/obj/structure/machinery/door/poddoor/almayer/blended/open{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown"; + open_layer = 1.9; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ icon_state = "test_floor4" }, /area/almayer/command/airoom) @@ -64895,6 +66504,12 @@ icon_state = "silver" }, /area/almayer/shipboard/brig/cic_hallway) +"tHu" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/command/airoom) "tHv" = ( /turf/open/floor/almayer{ dir = 8; @@ -65743,6 +67358,15 @@ /obj/item/frame/table, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_a_p) +"ubA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "ucp" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -66341,13 +67965,6 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/hydroponics) -"urx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/closed/wall/almayer, -/area/almayer/engineering/engineering_workshop/hangar) "urM" = ( /obj/structure/machinery/light{ dir = 8 @@ -67838,6 +69455,14 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/containment) +"uVv" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "uVA" = ( /turf/open/floor/almayer{ dir = 4; @@ -68266,6 +69891,11 @@ icon_state = "orange" }, /area/almayer/squads/bravo) +"vfB" = ( +/turf/open/floor/almayer/no_build{ + dir = 4 + }, +/area/almayer/command/airoom) "vfJ" = ( /obj/structure/surface/rack, /obj/item/frame/table, @@ -68372,10 +70002,13 @@ }, /area/almayer/hull/lower_hull/l_m_p) "vhe" = ( -/obj/structure/sign/kiddieplaque{ - pixel_x = -32 +/obj/structure/prop/server_equipment/yutani_server{ + pixel_y = 16; + name = "server tower"; + desc = "A powerful server tower housing various AI functions."; + density = 0 }, -/turf/open/floor/almayer{ +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -68491,6 +70124,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +"viB" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk{ + allow_construction = 0 + }, +/area/almayer/command/airoom) "viJ" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer{ @@ -68780,6 +70421,14 @@ icon_state = "dark_sterile" }, /area/almayer/engineering/laundry) +"vqO" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_a_p) "vqW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69246,6 +70895,18 @@ icon_state = "sterile_green_corner" }, /area/almayer/medical/containment) +"vAU" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/pipes/vents/scrubber/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 8 + }, +/area/almayer/command/airoom) "vBm" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/main_office) @@ -69434,6 +71095,18 @@ icon_state = "orangefull" }, /area/almayer/living/briefing) +"vHa" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/computer/ares_console{ + pixel_x = 9 + }, +/obj/structure/machinery/computer/view_objectives{ + pixel_x = -9 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "vHh" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/item/tool/warning_cone{ @@ -69934,6 +71607,18 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"vSr" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/folded_tent/big, +/turf/open/floor/almayer{ + icon_state = "plating_striped" + }, +/area/almayer/squads/req) "vSE" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer{ @@ -70214,6 +71899,20 @@ }, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering/port) +"vXh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17; + ticket_console = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "vXQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -70844,6 +72543,30 @@ icon_state = "bluefull" }, /area/almayer/command/cichallway) +"wkM" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "ARES StairsLower"; + name = "\improper ARES Core Shutters"; + plane = -7 + }, +/obj/effect/step_trigger/ares_alert/public{ + alert_message = "Caution: Movement detected in ARES Core."; + cooldown_duration = 1200; + alert_id = "AresStairs" + }, +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + open_layer = 1.9; + id = "ARES Emergency"; + needs_power = 0; + name = "ARES Emergency Lockdown"; + layer = 3.2; + closed_layer = 3.2; + plane = -7 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "test_floor4" + }, +/area/almayer/command/airoom) "wkX" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -70986,6 +72709,10 @@ icon_state = "cargo" }, /area/almayer/living/bridgebunks) +"wnh" = ( +/obj/structure/window/framed/almayer/white/hull, +/turf/open/floor/plating, +/area/almayer/command/airoom) "wnL" = ( /obj/item/stack/tile/carpet{ amount = 12 @@ -71063,6 +72790,14 @@ icon_state = "rasputin3" }, /area/almayer/powered/agent) +"wpw" = ( +/obj/structure/bed/chair/comfy/ares{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "wpz" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -71466,6 +73201,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"wyQ" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "ARES Emergency"; + name = "ARES Emergency Lockdown"; + req_one_access_txt = "91;92"; + indestructible = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "plating" + }, +/area/almayer/command/airoom) "wza" = ( /obj/structure/machinery/cm_vending/clothing/vehicle_crew, /turf/open/floor/almayer{ @@ -71555,11 +73302,19 @@ }, /area/almayer/shipboard/brig/processing) "wCT" = ( -/obj/structure/machinery/power/apc/almayer/hardened{ +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 97; + vector_y = -65 + }, +/obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" }, /area/almayer/command/airoom) "wDl" = ( @@ -71897,6 +73652,9 @@ desc = "A small coin, bearing the falling falcons insignia."; name = "falling falcons challenge coin" }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -72386,11 +74144,11 @@ /obj/effect/decal/warning_stripes{ icon_state = "N" }, -/obj/effect/landmark/wo_supplies/guns/common/m39, -/obj/effect/landmark/wo_supplies/guns/common/m39, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39, +/obj/item/weapon/gun/smg/m39, +/obj/item/weapon/gun/smg/m39, /turf/open/floor/plating/almayer, /area/almayer/shipboard/brig/armory) "wVy" = ( @@ -72772,10 +74530,13 @@ }, /area/almayer/living/gym) "xbN" = ( -/obj/structure/machinery/telecomms/processor/preset_four, -/turf/open/floor/almayer{ - icon_state = "tcomms" +/obj/structure/surface/rack{ + pixel_y = 16; + density = 0 }, +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/plating, /area/almayer/command/airoom) "xcp" = ( /obj/structure/stairs/perspective{ @@ -73576,6 +75337,20 @@ icon_state = "test_floor4" }, /area/almayer/squads/charlie) +"xvM" = ( +/obj/structure/machinery/door_control{ + id = "ARES StairsLower"; + name = "ARES Core Lockdown"; + req_one_access_txt = "19;200;90;91;92"; + pixel_x = 24; + pixel_y = 8 + }, +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/no_build{ + icon_state = "silver"; + dir = 4 + }, +/area/almayer/command/airoom) "xvX" = ( /obj/structure/machinery/cm_vending/gear/leader, /turf/open/floor/almayer{ @@ -73973,6 +75748,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"xDC" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "xEc" = ( /turf/open/floor/almayer{ dir = 9; @@ -74519,8 +76300,8 @@ }, /area/almayer/shipboard/brig/perma) "xQV" = ( -/obj/effect/landmark/start/working_joe, -/turf/open/floor/almayer{ +/obj/effect/step_trigger/clone_cleaner, +/turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) @@ -74798,6 +76579,19 @@ icon_state = "plate" }, /area/almayer/command/combat_correspondent) +"xVc" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + req_one_access_txt = "1;200;90;91;92"; + pixel_y = 24; + pixel_x = 24 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "xVj" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldingtool{ @@ -75019,6 +76813,23 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"yaQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 9 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) +"yaZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S"; + layer = 3.3 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "ybb" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/ids{ @@ -75142,6 +76953,15 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/north2) +"ydI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "ydM" = ( /obj/structure/window{ dir = 8 @@ -75309,6 +77129,17 @@ icon_state = "red" }, /area/almayer/hallways/starboard_hallway) +"yit" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/pipes/vents/pump/no_boom{ + dir = 1 + }, +/turf/open/floor/almayer/no_build{ + icon_state = "ai_floors" + }, +/area/almayer/command/airoom) "yiC" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -101419,8 +103250,8 @@ gfW bUe cbR ccr -cmp -urx +hcC +lEW aqd bWM bWM @@ -101623,7 +103454,7 @@ iRx iEb bHa apm -apQ +jUn avT bWM bWM @@ -104987,7 +106818,7 @@ yfv bit baw baw -baw +qYC kwo trb aag @@ -105190,7 +107021,7 @@ abg ajC baw vbB -baw +ley kwo trb aag @@ -105393,7 +107224,7 @@ avn aim baw dBp -baw +gVA tQV tQV aah @@ -109044,7 +110875,7 @@ awE vGk xCX vGk -csz +hoX qVM csz qVM @@ -109242,7 +111073,7 @@ fAo awE bhM wQv -sDL +bBi awE ieH qVM @@ -109856,7 +111687,7 @@ awE csz iid csz -csz +hoX qVM noV csz @@ -113077,10 +114908,10 @@ anf apK arf auG -awu azb azb -auG +azb +nMq aDp apK cbr @@ -113274,15 +115105,15 @@ xfm als ani aow -aqU -aqU -aqU -aqU -aqU -aqU -aqU +mOi +mOi +mOi +mOi +mOi +mOi auc -aqU +auc +hyE aqU aHq aHq @@ -113477,16 +115308,16 @@ ajJ aEX ajt ali -aqU -hvw +mOi +rCw rCw lin oJR -aqU +tFe asD xQV avK -cck +aqU aCZ dgg xRk @@ -113680,16 +115511,16 @@ ael isW ajt abg -aqU +mOi wCT sIf isC isC tFe -lmz +xQV xQV rNF -cck +aqU qjF oqv iqd @@ -113883,15 +115714,15 @@ ael abg akU abg -aqU -mlb +mOi +kbH kbH pgH -aqU -aqU -aqU -auf -aqU +jDV +tFe +xVc +xQV +eYz aqU gjB wDy @@ -114086,16 +115917,16 @@ adO lwm akU nQx -aqU -pYi -isC -xbN -aqU +mOi +mOi +mOi +mOi +mOi mOi asF asG -vhe -cck +iyH +aqU jVE nTs pje @@ -114291,14 +116122,14 @@ aii abg aqU sdl -isC -xbN -aqU -mOi -gjw +mLE +bUx +mLE +tmK +avK aug avL -cck +aqU lyE rsO aGN @@ -114495,13 +116326,13 @@ abg aqU xbN gfE -xbN +gfE +kpc aqU -mOi gjw cnp avM -cck +aqU wmK liJ pTj @@ -115282,7 +117113,7 @@ aag lYA aao aap -aap +gXh aao aap aap @@ -116228,7 +118059,7 @@ bNQ bNQ bNQ bNQ -bEk +nXU bKA jac bCA @@ -116431,7 +118262,7 @@ bNP bmD bNP bmD -gkg +mYv doP jac isS @@ -117438,7 +119269,7 @@ bEi bZr bmD ngw -pjG +gCu boz bpR bpR @@ -117641,7 +119472,7 @@ brp bZr bmD xId -pjG +hBP boz bpR bpR @@ -118047,7 +119878,7 @@ buz bZr bmD dmE -pjG +pvF boz bpR bpR @@ -118250,7 +120081,7 @@ bEm bZr bmD hAc -pjG +vSr boz bpR bpR @@ -122848,7 +124679,7 @@ vuv vuv cxo cxo -cxo +vqO sXK tbD qMu @@ -127752,23 +129583,23 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -127955,23 +129786,23 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -128158,23 +129989,23 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -128361,23 +130192,23 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -128564,23 +130395,23 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -128767,23 +130598,23 @@ aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -128968,25 +130799,25 @@ aaa aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -129171,21 +131002,21 @@ aaa aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -129374,21 +131205,21 @@ aaa aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -129577,21 +131408,21 @@ aaa aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -129780,21 +131611,21 @@ aaa aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -129983,21 +131814,21 @@ aaa aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -130186,21 +132017,21 @@ aaa aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -130389,21 +132220,21 @@ aaa aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -130580,10 +132411,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aab +aab +aab +aab aab aaa aaa @@ -130591,22 +132422,22 @@ aKQ aaa aaa aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +bdH aaa aaa aaa @@ -130781,35 +132612,35 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa aab -aaa -aaa -aKQ -aaa -aaa aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab +bdH +bdH +bdH +bdH +bdH +bdH +aKQ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aak +bdH aaa aaa aaa @@ -130977,42 +132808,42 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aab -aaa -aaa -aKQ -aaa -aaa +aab +aab +aab +aab +aab +aab aab aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +aKQ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aak +bdH aaa aaa aaa @@ -131180,53 +133011,53 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aKQ +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -131383,53 +133214,53 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aab aaa aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -131586,53 +133417,53 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aab aaa aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -131789,53 +133620,53 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa aab aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -131992,53 +133823,53 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aab aaa aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -132195,53 +134026,53 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa aab aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +daz +vhe +fEN +cqm +gTH +qit +rna +qQS +gwn +pfT +jYR +dyp +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -132398,53 +134229,53 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aab aaa aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +sbJ +sbJ +sbJ +daz +jtj +avK +avK +sKY +avK +bIp +fKe +dDp +dDp +frM +lcg +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -132601,53 +134432,53 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +lmz +lmz +lmz +lmz +lmz +daz +daz +daz +daz +daz +tte +hvw +auf +pmV +xDC +xDC +dIn +rby +bIp +euN +sEK +sEK +mlb +lcg +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -132804,7 +134635,53 @@ aaa aaa aaa aaa +aab aaa +bdH +lmz +lmz +lmz +lmz +daz +daz +hRW +asZ +vXh +daz +daz +kfU +daz +rna +rna +lnS +uVv +yit +rna +cxc +kBy +kBy +gfu +fPB +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -132816,69 +134693,23 @@ aaa aaa aaa aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -wVb -bhD -bdo -bdo -bdo -bdo -bdo -bdo -bdo -ovn -ovn -ovn -ovn -ovn -ovn -bCR -vTK +wVb +bhD +bdo +bdo +bdo +bdo +bdo +bdo +bdo +ovn +ovn +ovn +ovn +ovn +ovn +bCR +vTK aaa aaa aaa @@ -133007,60 +134838,60 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +lmz +lmz +lmz +daz +daz +scS +yaZ +ffE +hZj +clw +daz +daz +daz +sGZ +rna +rna +roH +ebN +ebN +ebN +daz +wnh +wnh +daz +daz +daz +lmz +lmz +lmz +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -133210,60 +135041,60 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aab aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +lmz +lmz +lmz +daz +acJ +ubA +cck +wyQ +fmv +ubA +gMN +mRn +itf +mHE +vAU +qwJ +fJY +kzT +wkM +oLm +fcX +kKv +kKv +dGl +dGl +daz +lmz +lmz +lmz +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -133413,60 +135244,60 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +lmz +lmz +lmz +daz +cwS +ffE +vHa +wpw +ffE +ffE +ffE +jqP +cLo +vfB +viB +dIi +qLS +vfB +wkM +jvB +jvB +ieF +ieF +pJR +gPr +daz +lmz +lmz +lmz +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -133527,335 +135358,14 @@ aaa aaa aaa aaa -aab -aaa -aaa -"} -(287,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -wVb -bdo -jbB -bdo -bne -bdo -jbB -bdo -bne -ovn -gXv -ovn -grX -ovn -gXv -ovn -vTK -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(288,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab aaa aaa +"} +(287,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -133877,24 +135387,6 @@ aaa aaa aaa aaa -wVb -wVb -wVb -wVb -wVb -wVb -wVb -wVb -wVb -vTK -vTK -vTK -vTK -vTK -vTK -vTK -vTK -aaa aaa aaa aaa @@ -133933,14 +135425,9 @@ aaa aaa aaa aaa -aab -aaa aaa -"} -(289,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -133960,11 +135447,81 @@ aaa aaa aaa aaa +aab aaa +bdH +lmz +lmz +lmz +daz +oRV +ydI +mdW +jaH +awu +ydI +aKs +fMt +gOs +kXj +pYi +fMl +gUN +bLv +bRo +xvM +osy +cBm +cBm +iZw +dQl +daz +lmz +lmz +lmz +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa aaa +wVb +bdo +jbB +bdo +bne +bdo +jbB +bdo +bne +ovn +gXv +ovn +grX +ovn +gXv +ovn +vTK aaa aaa aaa @@ -134004,10 +135561,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(288,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -134035,13 +135596,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -134092,11 +135650,81 @@ aaa aaa aaa aaa +aab aaa +bdH +lmz +lmz +lmz +daz +daz +eKJ +yaZ +ffE +hZj +mUC +daz +daz +daz +tHu +rna +rna +gXs +ebN +ebN +ebN +daz +wnh +wnh +daz +daz +daz +lmz +lmz +lmz +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa aaa +wVb +wVb +wVb +wVb +wVb +wVb +wVb +wVb +wVb +vTK +vTK +vTK +vTK +vTK +vTK +vTK +vTK aaa aaa aaa @@ -134140,7 +135768,7 @@ aab aaa aaa "} -(290,1,1) = {" +(289,1,1) = {" aaa aaa aab @@ -134225,7 +135853,60 @@ aaa aaa aaa aaa +aab aaa +bdH +lmz +lmz +lmz +lmz +daz +daz +ocB +nJH +rnH +daz +daz +sTV +daz +rna +rna +gbg +uVv +erN +rna +qQS +kBy +kBy +gfu +kBy +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134238,13 +135919,8 @@ aaa aaa aaa aaa -aab -aaa -aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -134291,10 +135967,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(290,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -134339,14 +136019,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(291,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -134380,7 +136056,60 @@ aaa aaa aaa aaa +aab aaa +bdH +lmz +lmz +lmz +lmz +lmz +daz +daz +daz +daz +daz +tte +hvw +auf +hTl +xDC +xDC +yaQ +bat +mFN +kSy +dDp +dDp +frM +lcg +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134444,7 +136173,8 @@ aaa aab aaa aaa -aKQ +"} +(291,1,1) = {" aaa aaa aab @@ -134529,61 +136259,60 @@ aaa aaa aaa aaa +aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -"} -(292,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +sbJ +sbJ +sbJ +daz +jtj +avK +avK +aCd +avK +mFN +igr +sEK +sEK +mlb +lcg +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134647,7 +136376,8 @@ aaa aab aaa aaa -aKQ +"} +(292,1,1) = {" aaa aaa aab @@ -134732,37 +136462,60 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aab aaa aaa -"} -(293,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +daz +gAe +rCi +gba +mUz +our +rna +cxc +kBy +kBy +khJ +gyN +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134823,10 +136576,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(293,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -134847,13 +136604,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -134911,8 +136665,48 @@ aaa aaa aaa aaa +aab aaa aaa +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +daz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -134948,14 +136742,10 @@ aaa aaa aaa aaa -aab aaa aaa -"} -(294,1,1) = {" aaa aaa -aab aaa aaa aaa @@ -134989,10 +136779,14 @@ aaa aaa aaa aaa +aab aaa aaa +"} +(294,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -135050,13 +136844,10 @@ aaa aaa aaa aaa -aab aaa aaa -aKQ aaa aaa -aab aaa aaa aaa @@ -135077,8 +136868,48 @@ aaa aaa aaa aaa +aab aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -135240,48 +137071,48 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aab -aaa -aaa -aKQ -aaa -aaa aab aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +bdH +bdH +bdH +aak +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aaa aaa @@ -135446,37 +137277,37 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aaa aaa -aKQ -aaa -aaa -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +bdH +bdH +bdH +bdH +bdH +bdH +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +lmz +bdH +bdH +bdH aab aab aab @@ -135648,39 +137479,39 @@ aaa aaa aaa aaa +aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aKQ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa aaa @@ -135851,39 +137682,39 @@ aaa aaa aaa aaa +aab aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aKQ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +aab aaa aaa aaa @@ -136054,39 +137885,39 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aKQ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab +aab +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +jRz +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aak +aab aaa aaa aaa @@ -136286,7 +138117,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aaa aaa diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index fb8dd0bf8213..a39d7d7fffba 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -219,9 +219,7 @@ }, /area/whiskey_outpost/inside/living) "aK" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_south) "aM" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -308,9 +306,7 @@ /area/whiskey_outpost/inside/hospital) "bc" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/three_north) "bd" = ( /obj/effect/decal/medical_decals{ @@ -454,7 +450,7 @@ /area/whiskey_outpost/inside/bunker) "bD" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/three_south) "bF" = ( /obj/structure/disposalpipe/segment, @@ -595,9 +591,7 @@ /obj/effect/decal/cleanable/blood/writing{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/inside/caves/caverns/west) "cl" = ( /obj/structure/barricade/metal/wired{ @@ -699,9 +693,7 @@ dir = 4 }, /obj/item/stool, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_south) "cC" = ( /obj/structure/sign/poster, @@ -795,9 +787,7 @@ }, /area/whiskey_outpost/inside/hospital) "cR" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/inside/caves/caverns/east) "cS" = ( /obj/structure/curtain/black{ @@ -842,14 +832,11 @@ }, /area/whiskey_outpost/inside/living) "dd" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/south/very_far) "de" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_north) "df" = ( /obj/structure/mirror{ @@ -871,10 +858,7 @@ /area/whiskey_outpost/inside/living) "dj" = ( /obj/structure/closet/crate/trashcart, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/two_south) "dk" = ( /obj/structure/curtain, @@ -1064,7 +1048,7 @@ /obj/item/device/healthanalyzer, /obj/item/device/healthanalyzer, /obj/item/device/healthanalyzer, -/obj/item/weapon/gun/shotgun/double/sawn, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor{ dir = 1; icon_state = "whitegreen" @@ -1162,10 +1146,7 @@ }, /area/whiskey_outpost/inside/hospital) "ej" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/four_south) "ek" = ( /obj/structure/largecrate/supply/supplies/sandbags, @@ -1175,15 +1156,10 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "eo" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/lane/four_south) "ep" = ( -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/lane/one_south) "eq" = ( /obj/structure/machinery/power/apc/almayer{ @@ -1256,10 +1232,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) "eG" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/two_north) "eH" = ( /obj/structure/surface/rack, @@ -1380,10 +1353,7 @@ }, /area/whiskey_outpost/inside/hospital) "fb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/three_north) "fc" = ( /obj/structure/disposalpipe/segment, @@ -1651,9 +1621,7 @@ /area/whiskey_outpost/outside/south/far) "fS" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/two_north) "fT" = ( /obj/structure/window/reinforced{ @@ -1762,10 +1730,7 @@ }, /area/whiskey_outpost/inside/hospital) "gj" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/two_north) "gl" = ( /obj/structure/disposalpipe/segment, @@ -1788,7 +1753,7 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/cic) "gr" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/south) "gs" = ( /obj/structure/machinery/door/poddoor{ @@ -1811,25 +1776,17 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "gu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/two_north) "gv" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/inside/caves/caverns/west) "gx" = ( /obj/structure/machinery/colony_floodlight, /turf/open/jungle, /area/whiskey_outpost/outside/lane/three_north) "gy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/lane/one_north) "gz" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -2017,10 +1974,7 @@ /turf/open/floor/plating, /area/whiskey_outpost/inside/hospital) "hh" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/west) "hi" = ( /obj/structure/extinguisher_cabinet, @@ -2092,9 +2046,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/lane/two_south) "hs" = ( -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/lane/four_north) "ht" = ( /turf/open/floor{ @@ -2143,9 +2095,7 @@ /area/whiskey_outpost/inside/hospital) "hy" = ( /obj/item/lightstick/red/planted, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south/far) "hz" = ( /obj/effect/decal/medical_decals{ @@ -2233,10 +2183,7 @@ }, /area/whiskey_outpost/inside/hospital) "hI" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_west, /area/whiskey_outpost/outside/lane/one_north) "hJ" = ( /obj/structure/machinery/colony_floodlight, @@ -2244,12 +2191,10 @@ /area/whiskey_outpost/outside/north/platform) "hK" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/one_north) "hL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/inside/caves/caverns/west) "hM" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -2357,14 +2302,10 @@ /obj/structure/barricade/handrail/wire{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_south) "if" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/lane/four_south) "ig" = ( /obj/effect/decal/medical_decals{ @@ -2436,9 +2377,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/lane/four_north) "iq" = ( /obj/structure/largecrate/supply/supplies/mre, @@ -3054,7 +2993,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/south) "ko" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/one_north) "kp" = ( /obj/structure/surface/table/reinforced/prison, @@ -3223,10 +3162,7 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/south) "kS" = ( /turf/open/floor/prison, @@ -3267,9 +3203,7 @@ }, /area/whiskey_outpost/inside/hospital) "lc" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/north/northeast) "ld" = ( /turf/open/shuttle/dropship{ @@ -3287,9 +3221,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south) "lg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_south) "li" = ( /obj/structure/surface/table/reinforced/prison, @@ -3307,10 +3239,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/living) "lk" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/south) "lm" = ( /turf/open/floor/prison{ @@ -3609,9 +3538,7 @@ }, /area/whiskey_outpost/inside/hospital) "mw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/very_far) "mx" = ( /obj/structure/flora/pottedplant/random, @@ -3623,10 +3550,7 @@ }, /area/whiskey_outpost/inside/cic) "my" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/four_south) "mz" = ( /obj/structure/extinguisher_cabinet, @@ -3855,10 +3779,7 @@ }, /area/whiskey_outpost/inside/hospital) "ng" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/lane/four_south) "nh" = ( /turf/closed/wall/strata_ice/jungle, @@ -3877,10 +3798,7 @@ }, /area/whiskey_outpost) "nj" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_west, /area/whiskey_outpost/outside/south) "nk" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -4372,7 +4290,7 @@ /area/whiskey_outpost/outside/mortar_pit) "pj" = ( /obj/effect/landmark/start/whiskey/engineer, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "pm" = ( /obj/effect/decal/cleanable/blood/writing, @@ -4389,15 +4307,13 @@ /turf/open/floor/plating, /area/whiskey_outpost/inside/engineering) "pu" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/lane/four_north) "pv" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) "pw" = ( /obj/structure/disposalpipe/segment, @@ -4444,10 +4360,7 @@ }, /area/whiskey_outpost/inside/living) "pD" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/three_south) "pE" = ( /obj/structure/disposalpipe/segment{ @@ -4610,10 +4523,7 @@ }, /area/whiskey_outpost/inside/living) "qg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north) "qi" = ( /obj/structure/disposalpipe/segment, @@ -4692,9 +4602,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "qt" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/lane/four_south) "qu" = ( /obj/structure/machinery/power/smes/buildable, @@ -4704,10 +4612,7 @@ }, /area/whiskey_outpost/inside/engineering) "qv" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/whiskey_outpost/outside/lane/four_south) "qw" = ( /obj/structure/surface/table/reinforced/prison, @@ -4916,10 +4821,7 @@ }, /area/whiskey_outpost) "qY" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/lane/one_south) "ra" = ( /obj/structure/machinery/power/apc/almayer{ @@ -5023,10 +4925,7 @@ }, /area/whiskey_outpost/inside/engineering) "rw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/lane/two_north) "ry" = ( /turf/open/gm/dirt, @@ -5173,9 +5072,7 @@ }, /area/whiskey_outpost/inside/supply) "rT" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/three_south) "rV" = ( /turf/open/floor/prison{ @@ -5204,10 +5101,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north) "rZ" = ( /obj/structure/surface/rack, @@ -5312,10 +5206,7 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker/pillbox/four) "so" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/south/far) "sp" = ( /obj/structure/disposalpipe/segment{ @@ -5358,10 +5249,7 @@ }, /area/whiskey_outpost/inside/cic) "sA" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/two_south) "sC" = ( /obj/effect/landmark/start/whiskey/doctor, @@ -5494,10 +5382,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) "ti" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_east, /area/whiskey_outpost/outside/south) "tj" = ( /obj/structure/machinery/light/small, @@ -5680,10 +5565,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north) "tL" = ( /obj/structure/largecrate/supply/supplies/metal, @@ -5697,10 +5579,7 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/supply) "tO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north) "tP" = ( /obj/structure/machinery/vending/snack{ @@ -5850,10 +5729,7 @@ }, /area/whiskey_outpost/inside/living) "um" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north) "uo" = ( /obj/structure/largecrate/supply/supplies/flares, @@ -5924,9 +5800,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/mortar_pit) "uy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "uz" = ( /obj/structure/extinguisher_cabinet, @@ -5980,10 +5854,7 @@ dir = 1; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north) "uI" = ( /obj/structure/machinery/door/airlock/almayer/maint{ @@ -6109,10 +5980,7 @@ /turf/closed/wall, /area/whiskey_outpost/outside/lane/one_north) "vg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north/beach) "vi" = ( /obj/structure/curtain/black, @@ -6279,10 +6147,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) "vQ" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_east, /area/whiskey_outpost/outside/lane/one_south) "vR" = ( /obj/structure/machinery/light/small{ @@ -6347,9 +6212,7 @@ /area/whiskey_outpost/inside/bunker) "wb" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/river/east) "wc" = ( /obj/structure/curtain/black, @@ -6531,9 +6394,7 @@ }, /area/whiskey_outpost/inside/bunker) "wF" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/four_south) "wG" = ( /obj/structure/machinery/light{ @@ -6568,10 +6429,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "wK" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/two_south) "wM" = ( /obj/structure/machinery/line_nexter{ @@ -6722,18 +6580,13 @@ }, /area/whiskey_outpost/inside/bunker) "xp" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/two_north) "xq" = ( /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/lane/four_north) "xr" = ( /obj/structure/surface/rack, @@ -6827,9 +6680,7 @@ /area/whiskey_outpost/inside/bunker) "xK" = ( /obj/item/lightstick/red/planted, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/very_far) "xL" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -6921,10 +6772,7 @@ }, /area/whiskey_outpost/inside/living) "xZ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/two_south) "ya" = ( /obj/effect/landmark/whiskey_outpost/supplydrops, @@ -6983,10 +6831,7 @@ }, /area/whiskey_outpost/outside/north/platform) "yl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/inside/caves/caverns/west) "yn" = ( /obj/structure/platform_decoration, @@ -7004,9 +6849,7 @@ dir = 1; icon_state = "sandbag_0" }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/lane/four_south) "yp" = ( /obj/structure/platform{ @@ -7023,9 +6866,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) "yt" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/lane/four_north) "yv" = ( /obj/structure/sign/prop3, @@ -7278,9 +7119,7 @@ }, /area/whiskey_outpost/outside/north/platform) "zh" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_north) "zi" = ( /obj/structure/disposalpipe/sortjunction/flipped{ @@ -7295,10 +7134,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/north) "zl" = ( /obj/structure/machinery/power/apc/almayer, @@ -7349,9 +7185,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/three) "zw" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) "zy" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -7479,9 +7313,7 @@ }, /area/whiskey_outpost/outside/north/platform) "zU" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south) "zV" = ( /obj/structure/disposalpipe/segment{ @@ -7500,9 +7332,7 @@ }, /area/whiskey_outpost/inside/bunker) "zX" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river) "zY" = ( /obj/structure/barricade/plasteel/wired{ @@ -7511,10 +7341,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) "Aa" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/three_north) "Ab" = ( /obj/structure/machinery/autodoc_console, @@ -7527,10 +7354,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/lane/four_north) "Ad" = ( /obj/structure/machinery/colony_floodlight, @@ -7543,9 +7367,7 @@ /turf/closed/wall/rock/brown, /area/whiskey_outpost/inside/bunker/bunker/front) "Af" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/lane/four_south) "Ag" = ( /obj/structure/machinery/floodlight{ @@ -7646,9 +7468,7 @@ dir = 1 }, /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/inside/caves/caverns/west) "AE" = ( /obj/structure/flora/jungle/planttop1, @@ -7683,7 +7503,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "AK" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north/beach) "AO" = ( /obj/structure/barricade/metal/wired, @@ -7729,7 +7549,7 @@ }, /area/whiskey_outpost/outside/north) "AV" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/west) "AW" = ( /obj/structure/disposalpipe/segment{ @@ -7740,9 +7560,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker/bunker/front) "AY" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river/east) "AZ" = ( /obj/structure/barricade/sandbags/wired, @@ -7784,9 +7602,7 @@ /area/whiskey_outpost/outside/north/platform) "Bf" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/three_north) "Bg" = ( /obj/structure/platform_decoration{ @@ -7807,7 +7623,7 @@ /area/whiskey_outpost/outside/river/west) "Bj" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/inside/caves/caverns/west) "Bl" = ( /obj/structure/disposalpipe/segment{ @@ -7904,15 +7720,10 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) "By" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_east, /area/whiskey_outpost/outside/river/east) "Bz" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/river/east) "BA" = ( /obj/structure/platform_decoration{ @@ -7944,10 +7755,7 @@ }, /area/whiskey_outpost/outside/north/platform) "BF" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river/west) "BG" = ( /obj/structure/barricade/sandbags/wired, @@ -8099,10 +7907,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Ce" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/lane/one_north) "Cf" = ( /obj/structure/disposalpipe/segment{ @@ -8248,7 +8053,7 @@ "CJ" = ( /obj/structure/bed/chair, /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "CK" = ( /obj/structure/disposalpipe/segment, @@ -8296,9 +8101,7 @@ /area/whiskey_outpost/outside/river/west) "CZ" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/west) "Db" = ( /turf/open/gm/dirt, @@ -8429,7 +8232,7 @@ /area/whiskey_outpost/outside/north/platform) "Dw" = ( /obj/structure/surface/table/woodentable/poor, -/obj/item/weapon/gun/shotgun/double/sawn, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/wood, /area/whiskey_outpost/inside/caves/caverns) "Dy" = ( @@ -8481,9 +8284,7 @@ }, /area/whiskey_outpost/outside/north/beach) "DE" = ( -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/river/east) "DF" = ( /obj/structure/blocker/invisible_wall, @@ -8494,7 +8295,7 @@ pixel_x = 5; pixel_y = -12 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) "DH" = ( /obj/structure/platform{ @@ -8578,11 +8379,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) -"DW" = ( -/turf/open/gm/coast{ - dir = 6 - }, -/area/whiskey_outpost/outside/lane/four_south) "DX" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river, @@ -8610,10 +8406,7 @@ }, /area/whiskey_outpost/outside/north/platform) "Ea" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/south) "Eb" = ( /obj/structure/machinery/medical_pod/autodoc/unskilled, @@ -8635,14 +8428,10 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) "Ee" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/east) "Eg" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/west) "Eh" = ( /obj/effect/decal/cleanable/blood/oil, @@ -8665,11 +8454,11 @@ icon_state = "distribution" }, /obj/structure/blocker/invisible_wall, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/west) "Eo" = ( /obj/structure/blocker/invisible_wall, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/west) "Eq" = ( /obj/structure/bed/chair{ @@ -8685,10 +8474,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/lane/four_north) "Et" = ( /obj/structure/machinery/floodlight{ @@ -8700,10 +8486,7 @@ }, /area/whiskey_outpost/outside/north/platform) "Eu" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river/west) "Ev" = ( /obj/structure/barricade/sandbags/wired, @@ -8779,9 +8562,7 @@ /turf/open/jungle, /area/whiskey_outpost/inside/caves/caverns/east) "EG" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/west) "EH" = ( /obj/structure/barricade/sandbags/wired{ @@ -8821,7 +8602,7 @@ }, /area/whiskey_outpost/outside/lane/three_south) "EO" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "EP" = ( /turf/open/jungle/impenetrable, @@ -8836,7 +8617,7 @@ }, /area/whiskey_outpost/outside/north/platform) "ER" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_south) "ES" = ( /turf/closed/wall/r_wall, @@ -8851,9 +8632,7 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/west) "EY" = ( /obj/effect/landmark/whiskey_outpost/xenospawn, @@ -8917,9 +8696,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river) "Fj" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -8943,19 +8720,13 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Fn" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/south/very_far) "Fp" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river/west) "Fr" = ( /obj/structure/machinery/light/small, @@ -8969,15 +8740,10 @@ dir = 1 }, /obj/structure/platform_decoration, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river/west) "Fu" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/inside/caves/caverns/east) "Fv" = ( /obj/structure/machinery/light/small{ @@ -8993,15 +8759,11 @@ /area/whiskey_outpost/inside/bunker/bunker/front) "Fw" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) "Fx" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 9 - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/river/east) "Fy" = ( /obj/structure/barricade/sandbags/wired, @@ -9015,24 +8777,14 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northeast) -"FB" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/whiskey_outpost/outside/river/west) "FC" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river/west) "FD" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/west) "FE" = ( /obj/structure/disposalpipe/segment{ @@ -9050,13 +8802,13 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "FG" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "FH" = ( /obj/structure/flora/jungle/alienplant1, @@ -9098,11 +8850,6 @@ icon_state = "asteroidfloor" }, /area/whiskey_outpost/outside/north/platform) -"FR" = ( -/turf/open/gm/coast{ - dir = 6 - }, -/area/whiskey_outpost/outside/river/east) "FS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9143,9 +8890,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) "FW" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/inside/caves/caverns/east) "FX" = ( /obj/structure/platform{ @@ -9167,18 +8912,13 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) "FZ" = ( -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/beach) "Ga" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north/beach) "Gb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north/beach) "Gd" = ( /obj/structure/barricade/sandbags/wired{ @@ -9195,7 +8935,7 @@ /turf/open/floor/plating, /area/whiskey_outpost/inside/living) "Gf" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) "Gg" = ( /obj/effect/decal/cleanable/blood, @@ -9211,16 +8951,10 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Gi" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/south) "Gl" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north/beach) "Gm" = ( /obj/structure/platform{ @@ -9342,7 +9076,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/lane/two_north) "GK" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/three_north) "GL" = ( /obj/structure/barricade/sandbags/wired, @@ -9382,9 +9116,7 @@ pixel_x = -6; pixel_y = 10 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) "GT" = ( /obj/structure/reagent_dispensers/fueltank, @@ -9398,19 +9130,14 @@ /turf/open/floor/plating, /area/whiskey_outpost/outside/north/northeast) "GV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/lane/one_north) "GW" = ( /obj/structure/cargo_container/grant/rightmid, /turf/open/floor/plating, /area/whiskey_outpost/outside/north/northeast) "GX" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/south) "GY" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, @@ -9457,23 +9184,15 @@ }, /area/whiskey_outpost/outside/north) "Hj" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/inside/caves/caverns/west) "Hk" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river/west) "Hl" = ( /obj/structure/platform, -/turf/open/gm/coast{ - dir = 5 - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river/west) "Hm" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -9504,7 +9223,7 @@ /area/whiskey_outpost/inside/bunker/bunker/front) "Hp" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/one_north) "Hq" = ( /obj/structure/pipes/standard/manifold/visible, @@ -9513,9 +9232,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "Hr" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/one_north) "Hs" = ( /obj/structure/platform_decoration{ @@ -9530,10 +9247,7 @@ /area/whiskey_outpost/outside/north/northwest) "Hu" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/west) "Hv" = ( /obj/structure/platform_decoration{ @@ -9566,18 +9280,14 @@ /turf/open/jungle, /area/whiskey_outpost/outside/lane/four_south) "HB" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/three_south) "HH" = ( /obj/effect/landmark/start/whiskey/leader, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) "HI" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/inside/caves/caverns/west) "HK" = ( /obj/structure/barricade/sandbags/wired{ @@ -9635,10 +9345,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/north) "HU" = ( /obj/structure/surface/table/reinforced/prison, @@ -9743,9 +9450,7 @@ /obj/structure/bed/chair{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/south) "Im" = ( /obj/structure/cargo_container/watatsumi/rightmid, @@ -9801,9 +9506,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_south) "Iw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/two_north) "Ix" = ( /turf/open/floor{ @@ -9845,9 +9548,7 @@ /area/whiskey_outpost/outside/north/platform) "IG" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/very_far) "IH" = ( /obj/structure/surface/table, @@ -9858,23 +9559,16 @@ /area/whiskey_outpost/outside/south/far) "IK" = ( /obj/item/lightstick/red/planted, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south) "IM" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/lane/four_south) "IN" = ( /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/east) "IO" = ( /turf/closed/shuttle/dropship{ @@ -9898,9 +9592,7 @@ /obj/structure/platform{ dir = 1 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/east) "IU" = ( /obj/effect/landmark/start/whiskey/marine, @@ -9921,9 +9613,7 @@ /obj/item/tool/weldpack{ pixel_x = 7 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "IW" = ( /obj/structure/cargo_container/arious/leftmid, @@ -9939,13 +9629,10 @@ /area/whiskey_outpost/outside/north/northeast) "Jb" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north/beach) "Jc" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/three_south) "Jd" = ( /obj/structure/machinery/light/small, @@ -9966,9 +9653,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north/northwest) "Jg" = ( /obj/effect/spawner/gibspawner/human, @@ -9992,10 +9677,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north/northwest) "Jl" = ( /obj/structure/barricade/sandbags/wired{ @@ -10095,20 +9777,14 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/south) "JL" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north/beach) "JM" = ( /obj/structure/machinery/light/small{ @@ -10161,19 +9837,13 @@ }, /area/whiskey_outpost/inside/hospital) "JU" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/lane/four_south) "JX" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/four_south) "JZ" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/north/beach) "Kb" = ( /obj/structure/sign/poster{ @@ -10191,9 +9861,7 @@ }, /area/whiskey_outpost/outside/lane/four_north) "Ke" = ( -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/lane/four_south) "Kf" = ( /obj/structure/flora/jungle/planttop1, @@ -10213,10 +9881,7 @@ }, /area/whiskey_outpost/outside/lane/four_south) "Kn" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/lane/one_north) "Ko" = ( /obj/structure/curtain, @@ -10252,13 +9917,11 @@ }, /area/whiskey_outpost/inside/hospital/triage) "Ky" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/inside/caves/caverns) "KB" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "KF" = ( /obj/structure/disposalpipe/segment, @@ -10268,9 +9931,7 @@ }, /area/whiskey_outpost/outside/north/northeast) "KG" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/three_north) "KJ" = ( /obj/item/stack/medical/bruise_pack, @@ -10290,9 +9951,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_south) "KM" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/north/northwest) "KN" = ( /obj/structure/largecrate/random/barrel/red, @@ -10315,9 +9974,7 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/river) "KT" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/lane/four_north) "KW" = ( /obj/item/clothing/gloves/boxing, @@ -10345,9 +10002,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northwest) "Ld" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/west) "Le" = ( /obj/structure/machinery/m56d_hmg/mg_turret, @@ -10370,9 +10025,7 @@ /turf/open/jungle, /area/whiskey_outpost/inside/caves/caverns) "Lh" = ( -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river/west) "Lj" = ( /obj/effect/landmark/start/whiskey/medic, @@ -10393,13 +10046,10 @@ "Lp" = ( /obj/item/lightstick/red/planted, /obj/structure/disposalpipe/segment, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "Ls" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river/west) "Lt" = ( /obj/structure/closet/cabinet, @@ -10432,9 +10082,7 @@ }, /area/whiskey_outpost/inside/hospital/triage) "Ly" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/three_north) "Lz" = ( /turf/open/floor{ @@ -10508,15 +10156,10 @@ /turf/closed/wall, /area/whiskey_outpost/outside/south) "LN" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/three_south) "LQ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/three_south) "LR" = ( /obj/item/lightstick/red/planted, @@ -10525,9 +10168,7 @@ /area/whiskey_outpost/outside/north/beach) "LT" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_north) "LU" = ( /obj/item/stack/medical/bruise_pack, @@ -10536,14 +10177,7 @@ }, /area/whiskey_outpost/outside/lane/one_north) "LX" = ( -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, -/area/whiskey_outpost/outside/river/east) -"LY" = ( -/turf/open/gm/coast{ - dir = 10 - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/east) "LZ" = ( /obj/structure/extinguisher_cabinet, @@ -10556,9 +10190,7 @@ }, /area/whiskey_outpost/outside/lane/one_north) "Mb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south/very_far) "Mc" = ( /obj/structure/barricade/sandbags/wired{ @@ -10572,10 +10204,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) "Me" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/south_west, /area/whiskey_outpost/outside/lane/one_south) "Mf" = ( /turf/closed/shuttle/dropship{ @@ -10617,7 +10246,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) "Mk" = ( /obj/structure/sign/safety/north, @@ -10697,9 +10326,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north) "MB" = ( /obj/structure/platform{ @@ -10775,9 +10402,7 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/lane/two_north) "MU" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/north/beach) "MW" = ( /obj/structure/disposalpipe/segment, @@ -10798,12 +10423,10 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/south/far) "MZ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/one_north) "Na" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "Nc" = ( /obj/item/lightstick/red/planted, @@ -10903,9 +10526,7 @@ /area/whiskey_outpost/outside/south/very_far) "Nv" = ( /obj/structure/flora/jungle/alienplant1, -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_north) "Ny" = ( /obj/structure/barricade/sandbags/wired{ @@ -10957,9 +10578,7 @@ /area/whiskey_outpost/outside/lane/four_south) "NE" = ( /obj/item/stool, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/two_south) "NF" = ( /obj/structure/flora/bush/ausbushes/grassybush, @@ -10969,15 +10588,10 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/coast{ - dir = 8 - }, +/turf/open/gm/coast/east, /area/whiskey_outpost/outside/river/west) "NI" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/east) "NJ" = ( /obj/structure/machinery/colony_floodlight, @@ -10987,16 +10601,10 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "NL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/north/beach) "NM" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river) "NQ" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -11031,14 +10639,10 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) "NX" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north/northwest) "NY" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/two_south) "NZ" = ( /obj/structure/machinery/vending/cola, @@ -11073,9 +10677,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/south) "Oi" = ( -/turf/open/gm/coast{ - dir = 4 - }, +/turf/open/gm/coast/west, /area/whiskey_outpost/outside/lane/four_north) "Oj" = ( /obj/structure/barricade/sandbags/wired, @@ -11085,10 +10687,7 @@ }, /area/whiskey_outpost/outside/north/beach) "Ok" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/lane/four_south) "Om" = ( /obj/structure/surface/table/reinforced/prison, @@ -11145,9 +10744,7 @@ /area/whiskey_outpost/outside/lane/three_south) "Ou" = ( /obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/east) "Ov" = ( /obj/structure/machinery/vending/snack, @@ -11166,11 +10763,6 @@ icon_state = "asteroidfloor" }, /area/whiskey_outpost/inside/bunker/bunker/front) -"Oy" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/whiskey_outpost/outside/river/east) "OA" = ( /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, @@ -11180,10 +10772,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_north) "OE" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/three_north) "OF" = ( /obj/item/lightstick/red/planted, @@ -11211,15 +10800,10 @@ /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker/pillbox/three) "OO" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/north/northwest) "OP" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/inside/caves/caverns/west) "OQ" = ( /obj/effect/landmark/start/whiskey/marine, @@ -11236,24 +10820,16 @@ /area/whiskey_outpost/inside/cic) "OT" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north/northwest) "OU" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river) "OV" = ( /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river) "OX" = ( /obj/structure/disposalpipe/segment{ @@ -11269,7 +10845,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) "OZ" = ( /turf/open/floor{ @@ -11279,9 +10855,7 @@ /area/whiskey_outpost/outside/lane/three_south) "Pc" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/three_north) "Pd" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -11317,10 +10891,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) "Pk" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river/east) "Pl" = ( /obj/structure/disposalpipe/trunk{ @@ -11361,7 +10932,7 @@ /area/whiskey_outpost/inside/bunker/bunker/front) "Pt" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) "Pu" = ( /obj/structure/barricade/metal/wired, @@ -11406,36 +10977,22 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) "PD" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/lane/four_north) "PE" = ( -/turf/open/gm/coast{ - dir = 6 - }, +/turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/river) "PF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/lane/four_south) "PG" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/lane/two_south) "PH" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/three_north) "PL" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_north) "PM" = ( /turf/open/floor/plating/plating_catwalk, @@ -11453,7 +11010,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) "PQ" = ( /obj/structure/platform{ @@ -11506,9 +11063,7 @@ /obj/structure/platform_decoration{ dir = 4 }, -/turf/open/gm/coast{ - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/east) "Qe" = ( /turf/open/floor, @@ -11525,9 +11080,7 @@ }, /area/whiskey_outpost/outside/lane/four_north) "Qi" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south) "Ql" = ( /obj/item/lightstick/red/planted, @@ -11564,10 +11117,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) "Qq" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north/northwest) "Qs" = ( /obj/structure/barricade/handrail{ @@ -11580,9 +11130,7 @@ /area/whiskey_outpost/inside/bunker) "Qt" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south/far) "Qv" = ( /obj/structure/largecrate/random, @@ -11615,13 +11163,10 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/one_north) "QB" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_north) "QD" = ( -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river/east) "QF" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ @@ -11648,14 +11193,10 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south) "QJ" = ( -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/lane/one_north) "QL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_north) "QM" = ( /turf/open/gm/dirt, @@ -11678,10 +11219,7 @@ }, /area/whiskey_outpost/inside/caves/caverns/west) "QS" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north/northwest) "QU" = ( /obj/structure/barricade/sandbags/wired, @@ -11696,18 +11234,13 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_north) "QW" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/inside/caves/caverns/west) "QX" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/north) "QY" = ( /obj/structure/platform_decoration, @@ -11775,9 +11308,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south/very_far) "Ri" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/north/northwest) "Rm" = ( /obj/structure/disposalpipe/segment, @@ -11785,9 +11316,7 @@ /area/whiskey_outpost/outside/lane/three_south) "Rn" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/inside/caves/caverns/west) "Ro" = ( /turf/open/jungle, @@ -11800,7 +11329,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north) "Rx" = ( /obj/structure/surface/rack, @@ -11811,9 +11340,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/three) "Rz" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_south) "RA" = ( /obj/effect/landmark/start/whiskey/leader, @@ -11843,24 +11370,18 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south) "RG" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_east, /area/whiskey_outpost/outside/north/northwest) "RH" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/north/northwest) "RK" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "RL" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "RM" = ( /obj/structure/machinery/defenses/sentry/premade, @@ -11875,9 +11396,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/river/east) "RP" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/south) "RR" = ( /obj/structure/barricade/plasteel/wired, @@ -11888,9 +11407,7 @@ /area/whiskey_outpost/inside/bunker/pillbox/three) "RS" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/one_north) "RU" = ( /obj/structure/machinery/cm_vending/clothing/medic, @@ -11906,10 +11423,7 @@ }, /area/whiskey_outpost/outside/lane/four_north) "RW" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river) "RX" = ( /obj/structure/largecrate/random/case, @@ -11922,9 +11436,7 @@ /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river) "Sb" = ( /obj/structure/platform, @@ -11963,9 +11475,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/four) "Si" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/south) "Sj" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -12025,30 +11535,14 @@ "Sq" = ( /turf/open/gm/river, /area/whiskey_outpost/outside/north/northwest) -"Sr" = ( -/turf/open/gm/coast{ - dir = 5 - }, -/area/whiskey_outpost/outside/lane/four_south) "Ss" = ( /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker/bunker/front) -"St" = ( -/turf/open/gm/coast{ - dir = 10 - }, -/area/whiskey_outpost/outside/river) "Sx" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/north/northwest) "Sy" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/lane/three_south) "Sz" = ( /obj/structure/barricade/sandbags/wired{ @@ -12058,10 +11552,7 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/north) "SA" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river/east) "SB" = ( /obj/structure/extinguisher_cabinet, @@ -12074,13 +11565,11 @@ }, /area/whiskey_outpost/inside/hospital) "SE" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/inside/caves/caverns/east) "SF" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_south) "SG" = ( /obj/structure/machinery/power/apc/almayer{ @@ -12101,9 +11590,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/four) "SI" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/inside/caves/caverns/east) "SJ" = ( /obj/structure/machinery/light/small{ @@ -12125,7 +11612,7 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "SN" = ( /obj/structure/window/framed/colony/reinforced, @@ -12181,10 +11668,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/four) "SU" = ( -/turf/open/gm/grass{ - dir = 4; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/west, /area/whiskey_outpost/outside/south) "SW" = ( /obj/structure/machinery/shower{ @@ -12212,17 +11696,13 @@ /area/whiskey_outpost/outside/lane/one_south) "Ta" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/gm/grass{ - icon_state = "gbcorner" - }, +/turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/north/northwest) "Tc" = ( /obj/structure/platform{ dir = 4 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river/east) "Td" = ( /obj/structure/sink{ @@ -12286,9 +11766,7 @@ /obj/structure/platform{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1 - }, +/turf/open/gm/coast/south, /area/whiskey_outpost/outside/river/east) "Tp" = ( /obj/structure/machinery/door/airlock/almayer/marine/alpha{ @@ -12383,9 +11861,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/one) "TL" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north) "TP" = ( /obj/structure/surface/table/almayer, @@ -12411,9 +11887,7 @@ pixel_x = 7; pixel_y = 3 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "TS" = ( /turf/closed/shuttle/dropship{ @@ -12431,10 +11905,7 @@ /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/coast{ - dir = 1; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river) "TW" = ( /obj/structure/machinery/door/airlock/almayer/marine/bravo{ @@ -12487,16 +11958,10 @@ }, /area/whiskey_outpost/outside/lane/three_north) "Uf" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/lane/one_south) "Ug" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/three_south) "Uh" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass{ @@ -12554,7 +12019,7 @@ /area/whiskey_outpost/inside/bunker/pillbox/four) "Uq" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/three_north) "Ur" = ( /obj/effect/decal/cleanable/blood/writing{ @@ -12564,10 +12029,7 @@ /area/whiskey_outpost/outside/lane/one_south) "Us" = ( /obj/structure/machinery/colony_floodlight, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/three_north) "Ut" = ( /obj/effect/landmark/start/whiskey/engineer, @@ -12596,9 +12058,7 @@ /area/whiskey_outpost/outside/lane/one_north) "Uz" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_north) "UB" = ( /obj/structure/disposalpipe/trunk{ @@ -12620,10 +12080,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/one) "UF" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/lane/four_north) "UH" = ( /obj/structure/disposalpipe/segment{ @@ -12672,7 +12129,7 @@ /area/whiskey_outpost/outside/north/beach) "UO" = ( /obj/item/lightstick/red/planted, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north/northwest) "UP" = ( /obj/item/lightstick/red/planted, @@ -12705,9 +12162,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/one) "UY" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/two_south) "UZ" = ( /obj/structure/machinery/cm_vending/clothing/marine/delta{ @@ -12727,23 +12182,16 @@ /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) "Vb" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/three_north) "Vd" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "Ve" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_north) "Vg" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/inside/caves/caverns/east) "Vh" = ( /turf/open/jungle/impenetrable{ @@ -12764,10 +12212,7 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) "Vk" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/north) "Vl" = ( /obj/structure/bed/chair, @@ -12803,7 +12248,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north) "Vu" = ( /obj/structure/disposalpipe/segment{ @@ -12816,20 +12261,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/whiskey_outpost/outside/north) "Vw" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north) "Vx" = ( /obj/structure/machinery/medical_pod/bodyscanner{ @@ -12848,14 +12287,10 @@ /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) "Vz" = ( -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/south/far) "VC" = ( -/turf/open/gm/grass{ - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_south) "VD" = ( /obj/effect/decal/cleanable/blood/writing, @@ -12900,9 +12335,7 @@ /area/whiskey_outpost/inside/bunker/pillbox/four) "VK" = ( /obj/structure/disposalpipe/segment, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/three_south) "VL" = ( /obj/structure/largecrate/supply/medicine/medkits, @@ -12966,10 +12399,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/north) "VU" = ( /turf/open/gm/dirt{ @@ -12977,10 +12407,7 @@ }, /area/whiskey_outpost/inside/caves/caverns/west) "VV" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/lane/two_south) "VX" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -12988,9 +12415,7 @@ /area/whiskey_outpost/outside/lane/one_south) "Wa" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "Wb" = ( /obj/structure/barricade/sandbags/wired{ @@ -13099,10 +12524,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/two) "Wv" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/lane/three_north) "Wx" = ( /obj/structure/barricade/plasteel/wired, @@ -13150,19 +12572,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north) "WM" = ( /turf/closed/wall/r_wall/unmeltable, /area/whiskey_outpost/outside/south/very_far) "WN" = ( /obj/structure/fence, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/inside/caves/caverns/east) "WO" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/inside/caves/caverns/west) "WP" = ( /obj/structure/disposalpipe/segment{ @@ -13220,10 +12640,7 @@ /area/whiskey_outpost/outside/north) "Xd" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/two_south) "Xe" = ( /obj/structure/barricade/plasteel/wired, @@ -13248,10 +12665,7 @@ /area/whiskey_outpost/inside/bunker/pillbox/one) "Xk" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/two_south) "Xl" = ( /obj/effect/landmark/start/whiskey/engineer, @@ -13281,9 +12695,15 @@ icon_state = "floor_plate" }, /area/whiskey_outpost/inside/bunker/pillbox/one) +"Xq" = ( +/turf/open/jungle{ + bushes_spawn = 0; + icon_state = "grass_impenetrable" + }, +/area/whiskey_outpost/outside/lane/two_north) "Xr" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/lane/two_south) "Xx" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -13291,7 +12711,7 @@ /area/whiskey_outpost/outside/lane/four_north) "Xy" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/grass, +/turf/open/gm/grass/grass1, /area/whiskey_outpost/outside/north) "Xz" = ( /turf/closed/shuttle/dropship{ @@ -13376,9 +12796,7 @@ "XN" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/two_south) "XP" = ( /obj/structure/disposalpipe/segment{ @@ -13423,14 +12841,11 @@ /turf/closed/shuttle/dropship, /area/whiskey_outpost/outside/lane/four_north) "XZ" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/lane/three_south) "Yc" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/outside/north) "Yd" = ( /obj/structure/barricade/sandbags/wired{ @@ -13492,13 +12907,13 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/three) "Yo" = ( -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) "Yp" = ( /obj/structure/platform_decoration{ dir = 8 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "Yq" = ( /turf/open/floor/prison{ @@ -13539,7 +12954,7 @@ /obj/structure/platform_decoration{ dir = 9 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "YA" = ( /obj/structure/platform{ @@ -13551,7 +12966,7 @@ /obj/structure/platform_decoration{ dir = 5 }, -/turf/open/gm/coast, +/turf/open/gm/coast/north, /area/whiskey_outpost/outside/lane/four_north) "YB" = ( /obj/effect/decal/warning_stripes/asteroid{ @@ -13584,9 +12999,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/two) "YH" = ( -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/inside/caves/caverns/west) "YI" = ( /obj/structure/surface/rack, @@ -13613,9 +13026,7 @@ /area/whiskey_outpost/outside/lane/four_north) "YM" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/lane/three_south) "YN" = ( /obj/structure/disposalpipe/segment, @@ -13637,15 +13048,10 @@ /area/whiskey_outpost/inside/bunker/pillbox/three) "YT" = ( /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/whiskey_outpost/outside/lane/three_south) "YV" = ( -/turf/open/gm/coast{ - dir = 4; - icon_state = "beachcorner2" - }, +/turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river) "YY" = ( /turf/closed/shuttle/dropship{ @@ -13720,10 +13126,7 @@ /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_north) "Zi" = ( -/turf/open/gm/grass{ - dir = 8; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/lane/two_north) "Zj" = ( /obj/structure/platform{ @@ -13742,9 +13145,7 @@ pixel_y = 2 }, /obj/effect/decal/cleanable/blood/oil, -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/south) "Zm" = ( /obj/structure/machinery/cm_vending/sorted/medical/chemistry, @@ -13785,10 +13186,7 @@ }, /area/whiskey_outpost/inside/bunker/bunker/front) "Zs" = ( -/turf/open/gm/grass{ - dir = 1; - icon_state = "grassbeach" - }, +/turf/open/gm/grass/grassbeach/south, /area/whiskey_outpost/outside/lane/one_south) "Zt" = ( /obj/effect/landmark/start/whiskey/marine, @@ -13797,9 +13195,7 @@ "Zv" = ( /obj/structure/bed/chair, /obj/effect/landmark/start/whiskey/marine, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner2" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_south) "Zw" = ( /turf/open/jungle, @@ -13849,9 +13245,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/one) "ZF" = ( -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/far) "ZG" = ( /obj/structure/sign/safety/medical{ @@ -13888,10 +13282,7 @@ }, /area/whiskey_outpost/outside/lane/four_north) "ZL" = ( -/turf/open/gm/coast{ - dir = 8; - icon_state = "beachcorner" - }, +/turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/lane/four_south) "ZN" = ( /obj/effect/landmark/start/whiskey/engineer, @@ -13901,10 +13292,7 @@ }, /area/whiskey_outpost/inside/bunker/pillbox/two) "ZP" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/lane/one_north) "ZQ" = ( /obj/structure/machinery/light/small{ @@ -13920,9 +13308,7 @@ /area/whiskey_outpost/inside/bunker/pillbox/two) "ZT" = ( /obj/item/lightstick/red/planted, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/whiskey_outpost/outside/south/far) "ZU" = ( /turf/open/floor/prison{ @@ -18678,7 +18064,7 @@ mT mT AV zq -FB +Ls Ld Ld Hk @@ -19297,7 +18683,7 @@ zq zq zq zq -FB +Ls Ld Ld FC @@ -19906,7 +19292,7 @@ zq zq zq zq -FB +Ls FC NX RK @@ -22152,7 +21538,7 @@ Zf Zf Zf mT -CE +Xq GJ GJ mT @@ -22355,8 +21741,8 @@ Zf Zf mT GJ -CE -CE +Xq +Xq mT Zf Zf @@ -22559,7 +21945,7 @@ mT GJ GJ GJ -CE +Xq Zf Zf mT @@ -22758,7 +22144,7 @@ Zf mT mT mT -CE +Xq GJ GJ GJ @@ -22959,10 +22345,10 @@ Zf Zf mT mT -CE -CE +Xq +Xq GJ -CE +Xq GJ Oq Oq @@ -23163,9 +22549,9 @@ mT mT GJ GJ -CE -CE -CE +Xq +Xq +Xq Oq Qw Qw @@ -23357,20 +22743,20 @@ mT Db OD gu -CE +Xq mT mT mT -CE -CE +Xq +Xq cY GJ -CE -CE +Xq +Xq GJ GJ -CE -CE +Xq +Xq GJ GJ GJ @@ -23563,17 +22949,17 @@ GJ GJ GJ GJ +Xq +Xq +Xq GJ GJ -CE GJ +Xq GJ GJ -CE GJ -GJ -GJ -CE +Xq GJ GJ QB @@ -23764,19 +23150,19 @@ gu GJ GJ GJ -CE +Xq GJ GJ -CE -CE +Xq +Xq GJ GJ -CE -CE +Xq +Xq GJ GJ -CE -CE +Xq +Xq GJ QB CG @@ -23963,22 +23349,22 @@ QO Db OD gu -CE -CE -CE -CE +Xq +Xq +Xq +Xq GJ -CE -CE -CE +Xq +Xq +Xq GJ -CE -CE -CE +Xq +Xq +Xq GJ -CE -CE -CE +Xq +Xq +Xq GJ QB CG @@ -24165,23 +23551,23 @@ QO Db OD gu -CE -CE -CE +Xq +Xq +Xq GJ -CE -CE +Xq +Xq GJ GJ -CE -CE +Xq +Xq AE In -CE -CE +Xq +Xq GJ GJ -CE +Xq QB VH CN @@ -24349,7 +23735,7 @@ UN UN UN TU -St +OU eY eY zX @@ -24367,23 +23753,23 @@ Pu Db OD gu -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE -CE +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq +Xq QB CG CN @@ -25582,20 +24968,20 @@ Db eG QL rw -CE -CE -CE +Xq +Xq +Xq GJ QB Db Db Db gu -CE -CE +Xq +Xq GJ -CE -CE +Xq +Xq QB CG CN @@ -25793,11 +25179,11 @@ IB IB sb gu -CE +Xq GJ GJ GJ -CE +Xq QB VH CN @@ -25995,11 +25381,11 @@ Db Db ky gu -CE -CE +Xq +Xq GJ GJ -CE +Xq QB CG CN @@ -26201,7 +25587,7 @@ GJ GJ GJ GJ -CE +Xq QB CG mT @@ -29804,7 +29190,7 @@ UN UN UN TU -St +OU eY eY eY @@ -31016,7 +30402,7 @@ BL BL BL Qc -FR +Bz eK eK yU @@ -31621,7 +31007,7 @@ fy fy Ou GS -FR +Bz eK zy eK @@ -32225,7 +31611,7 @@ fy fy LX zw -FR +Bz eK yU eK @@ -32627,7 +32013,7 @@ fy fy LX zw -FR +Bz zy eK eK @@ -33433,7 +32819,7 @@ IN zw zw zw -FR +Bz eK eK eK @@ -33824,7 +33210,7 @@ LX zw zw zw -FR +Bz eK eK Jp @@ -33841,7 +33227,7 @@ eK eK eK eK -Oy +SA zw lc lc @@ -34224,7 +33610,7 @@ LX zw zw zw -FR +Bz eK eK eK @@ -34443,10 +33829,10 @@ IR Ee Ee Ee -LY +QD eK eK -Oy +SA zw Bz eK @@ -34624,7 +34010,7 @@ mT mT mT zw -FR +Bz eK zy eK @@ -36261,7 +35647,7 @@ DM Ec MP LX -FR +Bz eK eK DE @@ -36668,7 +36054,7 @@ Gf eK eK eK -Oy +SA zw wb DE @@ -38115,11 +37501,11 @@ Tj py Yd yo -DW +if iD gU gU -Sr +IM ZL GQ GN @@ -38316,7 +37702,7 @@ Rr jQ KT qt -DW +if gU gU gU diff --git a/maps/new_varadero.json b/maps/new_varadero.json index 8d163a335d1f..d9d6a0d231cc 100644 --- a/maps/new_varadero.json +++ b/maps/new_varadero.json @@ -34,6 +34,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, + "camouflage": "jungle", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/override_ground.json b/maps/override_ground.json new file mode 100644 index 000000000000..94d3c70757e1 --- /dev/null +++ b/maps/override_ground.json @@ -0,0 +1,21 @@ +{ + "override_map": true, + "map_name": "Unknown", + "survivor_types": [ + "/datum/equipment_preset/survivor/civilian", + "/datum/equipment_preset/survivor/goon" + ], + "map_item_type": "/obj/item/map/big_red_map", + "announce_text": "We've lost contact with a Weyland-Yutani's research facility. The ###SHIPNAME### has been dispatched to assist.", + "monkey_types": [ + "neaera" + ], + "traits": [{ "Ground": true }], + "gamemodes": [ + "Distress Signal", + "Hunter Games", + "Hive Wars", + "Faction Clash", + "Infection" + ] +} diff --git a/maps/override_ship.json b/maps/override_ship.json new file mode 100644 index 000000000000..09bb02434998 --- /dev/null +++ b/maps/override_ship.json @@ -0,0 +1,5 @@ +{ + "override_map": true, + "map_name": "Ship", + "traits": [{"Marine Main Ship": true}] +} diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index b3bdc834241a..467df24a94f4 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -876,9 +876,7 @@ /obj/structure/barricade/handrail/strata{ dir = 1 }, -/turf/open/gm/dirtgrassborder{ - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/yautja) "cd" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1598,9 +1596,7 @@ /turf/closed/wall/huntership, /area/yautja) "dw" = ( -/turf/open/gm/dirtgrassborder{ - dir = 1 - }, +/turf/open/gm/dirtgrassborder/south, /area/yautja) "dI" = ( /turf/open/space/basic, @@ -1616,10 +1612,7 @@ dir = 4 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 4; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/yautja) "er" = ( /obj/structure/stairs/perspective{ @@ -2211,9 +2204,7 @@ /obj/structure/barricade/handrail/strata{ dir = 8 }, -/turf/open/gm/dirtgrassborder{ - dir = 4 - }, +/turf/open/gm/dirtgrassborder/west, /area/yautja) "uO" = ( /obj/structure/bed/chair/hunter{ @@ -2300,10 +2291,7 @@ dir = 8 }, /obj/structure/barricade/handrail/strata, -/turf/open/gm/dirtgrassborder{ - dir = 8; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/yautja) "xn" = ( /obj/structure/surface/table/reinforced/prison{ @@ -2371,9 +2359,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 8 - }, +/turf/open/gm/dirtgrassborder/east, /area/yautja) "zA" = ( /turf/open/floor{ @@ -3044,7 +3030,7 @@ }, /area/yautja) "RS" = ( -/turf/open/gm/dirtgrassborder, +/turf/open/gm/dirtgrassborder/north, /area/yautja) "Sx" = ( /turf/open/floor{ @@ -3215,10 +3201,7 @@ /obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/gm/dirtgrassborder{ - dir = 1; - icon_state = "grassdirt_corner" - }, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/yautja) "XP" = ( /obj/structure/machinery/cryopod, diff --git a/maps/prison_station_fop.json b/maps/prison_station_fop.json index 7993346cbfad..b29f7255c21b 100644 --- a/maps/prison_station_fop.json +++ b/maps/prison_station_fop.json @@ -32,6 +32,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 0 }, + "camouflage": "classic", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/runtime.json b/maps/runtime.json index a153f877e9f9..44aaea094dcb 100644 --- a/maps/runtime.json +++ b/maps/runtime.json @@ -6,5 +6,6 @@ "/datum/equipment_preset/survivor/scientist/lv" ], "traits": [{"Marine Main Ship": true}], + "camouflage": "classic", "disable_ship_map": true } diff --git a/maps/shivas_snowball.json b/maps/shivas_snowball.json index 902aa73e0894..412f0e35ff41 100644 --- a/maps/shivas_snowball.json +++ b/maps/shivas_snowball.json @@ -37,6 +37,7 @@ "xeno_hive_charlie": 0, "xeno_hive_delta": 0 }, + "camouflage": "snow", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/shuttles/trijentshuttle2.dmm b/maps/shuttles/trijentshuttle2.dmm index ccb1fc3902e8..c99ce5d16488 100644 --- a/maps/shuttles/trijentshuttle2.dmm +++ b/maps/shuttles/trijentshuttle2.dmm @@ -43,6 +43,17 @@ }, /turf/open/shuttle/escapepod, /area/shuttle/trijent_shuttle/elevator) +"n" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 26; + start_charge = 0 + }, +/obj/item/tool/wirecutters{ + pixel_y = -7 + }, +/turf/open/floor/plating, +/area/shuttle/trijent_shuttle/elevator) "o" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 1 @@ -56,6 +67,14 @@ "q" = ( /turf/closed/shuttle/elevator/freight, /area/shuttle/trijent_shuttle/elevator) +"r" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + dir = 1 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/shuttle/escapepod, +/area/shuttle/trijent_shuttle/elevator) "s" = ( /turf/closed/shuttle/elevator{ dir = 4 @@ -79,6 +98,17 @@ dir = 8 }, /area/shuttle/trijent_shuttle/elevator) +"w" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/tool/screwdriver{ + layer = 3.6; + pixel_x = 9; + pixel_y = 8 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor11" + }, +/area/shuttle/trijent_shuttle/elevator) "A" = ( /turf/closed/shuttle/elevator{ dir = 9 @@ -91,6 +121,17 @@ }, /turf/open/shuttle/escapepod, /area/shuttle/trijent_shuttle/elevator) +"I" = ( +/obj/item/tool/crowbar/red{ + pixel_x = -13; + pixel_y = -13 + }, +/obj/item/stack/cable_coil{ + pixel_x = 1; + pixel_y = 10 + }, +/turf/open/shuttle/escapepod, +/area/shuttle/trijent_shuttle/elevator) "J" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -100,6 +141,18 @@ icon_state = "rasputin15" }, /area/shuttle/trijent_shuttle/elevator) +"O" = ( +/obj/item/limb/hand/r_hand, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/shuttle/escapepod, +/area/shuttle/trijent_shuttle/elevator) +"P" = ( +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 8 + }, +/obj/item/circuitboard/apc, +/turf/open/shuttle/escapepod, +/area/shuttle/trijent_shuttle/elevator) "Q" = ( /turf/open/shuttle/escapepod{ icon_state = "floor11" @@ -124,11 +177,6 @@ icon_state = "E"; dir = 1 }, -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 26; - start_charge = 0 - }, /turf/open/shuttle/escapepod, /area/shuttle/trijent_shuttle/elevator) "V" = ( @@ -158,30 +206,30 @@ h (2,1,1) = {" d R -l +r l t s "} (3,1,1) = {" k -a +I W c -a +O s "} (4,1,1) = {" q -a -Q +n +w Y a s "} (5,1,1) = {" u -a +P Q b a diff --git a/maps/sorokyne_strata.json b/maps/sorokyne_strata.json index ab0078e17b93..61c3a7fd3f69 100644 --- a/maps/sorokyne_strata.json +++ b/maps/sorokyne_strata.json @@ -33,6 +33,7 @@ "xeno_hive_bravo": 0, "xeno_hive_charlie": 70 }, + "camouflage": "snow", "gamemodes": [ "Distress Signal", "Hunter Games", diff --git a/maps/templates/clf_ert_station.dmm b/maps/templates/clf_ert_station.dmm new file mode 100644 index 000000000000..ec2a81bf6218 --- /dev/null +++ b/maps/templates/clf_ert_station.dmm @@ -0,0 +1,3985 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ac" = ( +/obj/structure/target/syndicate, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"at" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.0 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/clf_station) +"av" = ( +/obj/structure/closet/crate, +/obj/item/explosive/grenade/phosphorus/clf, +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/adminlevel/ert_station/clf_station) +"ax" = ( +/turf/closed/wall/rock/brown, +/area/adminlevel/ert_station/clf_station) +"az" = ( +/obj/structure/prop/brazier/frame_woodened, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/adminlevel/ert_station/clf_station) +"aA" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/obj/item/roller, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"aE" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"aL" = ( +/obj/structure/machinery/shower{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/clf_station) +"aN" = ( +/obj/structure/toilet{ + pixel_y = 16 + }, +/obj/structure/machinery/light/small/built{ + dir = 8 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/adminlevel/ert_station/clf_station) +"aO" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"aR" = ( +/obj/structure/platform/kutjevo, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/adminlevel/ert_station/clf_station) +"bb" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"by" = ( +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) +"bI" = ( +/obj/structure/flora/jungle/planttop1, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"bL" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 5 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"bX" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/adminlevel/ert_station/clf_station) +"cc" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/item/reagent_container/food/condiment/enzyme, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"ce" = ( +/obj/item/trash/chips, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"cx" = ( +/obj/structure/sink{ + pixel_y = 24 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/adminlevel/ert_station/clf_station) +"cB" = ( +/obj/vehicle/powerloader/ft, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/adminlevel/ert_station/clf_station) +"cH" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/adminlevel/ert_station/clf_station) +"dd" = ( +/turf/open/gm/coast{ + dir = 1 + }, +/area/adminlevel/ert_station/clf_station) +"dg" = ( +/obj/item/prop/helmetgarb/spent_buckshot, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/adminlevel/ert_station/clf_station) +"dI" = ( +/obj/structure/flora/bush/ausbushes/genericbush, +/turf/open/gm/dirt, +/area/adminlevel/ert_station/clf_station) +"dM" = ( +/obj/structure/flora/grass/tallgrass/jungle, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"dU" = ( +/obj/structure/platform/kutjevo{ + dir = 1 + }, +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"dY" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"eh" = ( +/obj/structure/platform/kutjevo{ + dir = 1 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"eo" = ( +/obj/structure/flora/bush/ausbushes/genericbush, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"ey" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"eE" = ( +/obj/structure/largecrate/black_market/clf_supplies, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"eH" = ( +/obj/structure/window/framed/wood/reinforced, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"eO" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"eP" = ( +/obj/structure/window/framed/wood, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"fd" = ( +/obj/structure/closet/secure_closet/freezer/fridge/groceries, +/obj/structure/machinery/light/small/built, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"fk" = ( +/obj/structure/pipes/vents/pump, +/turf/closed/wall/wood, +/area/adminlevel/ert_station/clf_station) +"fo" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"fx" = ( +/obj/structure/largecrate/supply/medicine/blood, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"fA" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"fX" = ( +/obj/structure/prop/wooden_cross, +/turf/open/gm/dirt, +/area/adminlevel/ert_station/clf_station) +"gc" = ( +/obj/structure/closet/crate, +/obj/item/device/encryptionkey/clf, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"gi" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/drinks/bottle/whiskey, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"gj" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"gN" = ( +/obj/effect/decal/cleanable/egg_smudge, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"hd" = ( +/obj/structure/reagent_dispensers/beerkeg{ + density = 0 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"hr" = ( +/obj/structure/machinery/light/small/built{ + dir = 4 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"hE" = ( +/obj/structure/bed/chair, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"hL" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.0 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/item/weapon/gun/pistol/clfpistol, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/clf_station) +"hO" = ( +/obj/item/reagent_container/food/drinks/bottle/whiskey, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"ie" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"iB" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 10 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"iG" = ( +/obj/structure/flora/grass/tallgrass/jungle, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"iK" = ( +/obj/structure/barricade/sandbags, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"iO" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/harpoon/yautja{ + anchored = 1; + name = "Alien Harpoon"; + pixel_x = 6 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/mask/yautja_flavor{ + anchored = 1; + unacidable = 0 + }, +/turf/open/floor/sandstone/runed, +/area/adminlevel/ert_station/clf_station) +"jc" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) +"jj" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 10 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/gm/grass{ + icon_state = "grass2" + }, +/area/adminlevel/ert_station/clf_station) +"jp" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/drinks/bottle/whiskey, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"jG" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"jZ" = ( +/obj/structure/flora/jungle/plantbot1, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"ki" = ( +/obj/structure/largecrate/black_market/confiscated_equipment, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"kk" = ( +/obj/item/ammo_box/magazine/l42a, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"ko" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines{ + icon_state = "heavy_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"kr" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 6 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"ks" = ( +/obj/structure/platform/kutjevo, +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/adminlevel/ert_station/clf_station) +"kF" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/surface/table/woodentable/poor, +/obj/item/storage/pill_bottle{ + pixel_y = 12; + pixel_x = 5 + }, +/obj/item/storage/pill_bottle/ultrazine/antag{ + pixel_y = 14; + pixel_x = -3 + }, +/obj/item/storage/pill_bottle{ + pixel_y = 10 + }, +/obj/item/reagent_container/food/drinks/bottle/vodka, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"kS" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/drinks/shaker, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"la" = ( +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"lp" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/item/weapon/gun/pistol/heavy{ + pixel_y = 8 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"lI" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"lN" = ( +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/gm/dirtgrassborder{ + dir = 4; + icon_state = "grassdirt_corner" + }, +/area/adminlevel/ert_station/clf_station) +"lT" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"lX" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/item/weapon/gun/rifle/l42a{ + pixel_y = 7 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"ma" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/storage/fancy/cigarettes/lucky_strikes_4, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"me" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/dirtgrassborder{ + dir = 4; + icon_state = "grassdirt_corner" + }, +/area/adminlevel/ert_station/clf_station) +"mk" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"ms" = ( +/obj/structure/machinery/chem_dispenser/soda{ + density = 0; + pixel_y = 10 + }, +/obj/structure/surface/table/reinforced, +/obj/item/spacecash/c50, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"mt" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/clothing/suit/chef/classic, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/head/chefhat, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"mw" = ( +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"mR" = ( +/obj/structure/machinery/gibber{ + pixel_y = 10 + }, +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"ne" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/bedsheet/brown{ + layer = 3.0 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"nn" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 4 + }, +/obj/structure/flora/grass/tallgrass/jungle, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"nr" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"nC" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/drinks/bottle/vodka, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"nJ" = ( +/obj/item/clothing/shoes/jackboots, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"nM" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/random/secure, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"nQ" = ( +/obj/item/clothing/mask/cigarette/cigar/classic, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"oc" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/ammo_magazine/shotgun/slugs, +/obj/item/ammo_magazine/shotgun/slugs, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"om" = ( +/turf/open/gm/dirtgrassborder{ + dir = 4; + icon_state = "grassdirt_corner2" + }, +/area/adminlevel/ert_station/clf_station) +"ow" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.0 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/item/stock_parts/subspace/crystal, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/clf_station) +"oy" = ( +/obj/item/trash/candy, +/obj/structure/machinery/light/small/built, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"oI" = ( +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/adminlevel/ert_station/clf_station) +"oN" = ( +/obj/structure/flora/jungle/vines, +/turf/closed/wall/strata_ice/jungle, +/area/adminlevel/ert_station/clf_station) +"oO" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/kutjevo, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"pk" = ( +/obj/structure/flora/grass/tallgrass/jungle, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"pp" = ( +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/gm/grass{ + icon_state = "grass2" + }, +/area/adminlevel/ert_station/clf_station) +"pE" = ( +/obj/structure/platform/kutjevo, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 9 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"pF" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/adminlevel/ert_station/clf_station) +"pY" = ( +/obj/structure/flora/jungle/plantbot1, +/turf/open/gm/dirtgrassborder{ + dir = 8 + }, +/area/adminlevel/ert_station/clf_station) +"qa" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/adminlevel/ert_station/clf_station) +"qb" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/adminlevel/ert_station/clf_station) +"ql" = ( +/obj/structure/flora/bush/ausbushes/genericbush, +/turf/open/gm/grass{ + icon_state = "grass2" + }, +/area/adminlevel/ert_station/clf_station) +"qy" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/gm/river, +/area/adminlevel/ert_station/clf_station) +"rm" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/device/healthanalyzer{ + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"rz" = ( +/obj/structure/curtain/red, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"rD" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 9 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"rO" = ( +/obj/structure/platform/kutjevo, +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"rZ" = ( +/obj/structure/platform/kutjevo, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"sv" = ( +/obj/structure/target/syndicate, +/obj/item/weapon/throwing_knife, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"sx" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/handcuffs, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"sC" = ( +/obj/structure/flora/jungle/planttop1, +/turf/open/gm/dirtgrassborder{ + dir = 1; + icon_state = "grassdirt_corner" + }, +/area/adminlevel/ert_station/clf_station) +"sK" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/weapon/gun/smg/uzi, +/obj/item/ammo_magazine/smg/uzi, +/obj/item/ammo_magazine/smg/uzi, +/obj/item/ammo_magazine/smg/uzi, +/obj/item/ammo_magazine/smg/uzi, +/obj/item/ammo_magazine/smg/uzi, +/obj/item/ammo_magazine/smg/uzi, +/obj/item/ammo_magazine/smg/uzi, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"sN" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"ta" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 4 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"ts" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 5 + }, +/turf/open/gm/grass{ + icon_state = "grass2" + }, +/area/adminlevel/ert_station/clf_station) +"tt" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"tz" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/effect/landmark/wo_supplies/storage/belts/lifesaver, +/obj/effect/landmark/wo_supplies/storage/belts/lifesaver{ + pixel_y = 5 + }, +/obj/item/storage/belt/medical/full{ + pixel_y = -1 + }, +/obj/item/storage/belt/medical/full/with_suture_and_graft{ + pixel_y = 10 + }, +/obj/structure/machinery/light/small/built, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"tG" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 80 + }, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/turf/open/floor/plating/plating_catwalk, +/area/adminlevel/ert_station/clf_station) +"tJ" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/sandstone/runed, +/area/adminlevel/ert_station/clf_station) +"ug" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/gm/dirt, +/area/adminlevel/ert_station/clf_station) +"un" = ( +/obj/structure/flora/jungle/vines{ + icon_state = "heavy_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"up" = ( +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/adminlevel/ert_station/clf_station) +"uF" = ( +/obj/structure/platform/kutjevo{ + dir = 1 + }, +/obj/structure/closet/coffin/woodencrate, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"uO" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/bedsheet/yellow, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"uX" = ( +/turf/open/floor/plating, +/area/adminlevel/ert_station/clf_station) +"uZ" = ( +/obj/structure/prop/wooden_cross{ + pixel_y = 14 + }, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/adminlevel/ert_station/clf_station) +"vm" = ( +/obj/structure/bed/chair/bolted{ + dir = 1 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"vx" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/trash/candle, +/obj/item/reagent_container/syringe/drugs{ + pixel_y = 8 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"vA" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"vE" = ( +/obj/structure/largecrate/supply/weapons/shotgun, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"vI" = ( +/turf/open/floor/sandstone/runed, +/area/adminlevel/ert_station/clf_station) +"vQ" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"wI" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 6 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"wW" = ( +/turf/open/gm/coast{ + dir = 9 + }, +/area/adminlevel/ert_station/clf_station) +"xi" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/random/barrel/white, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"xE" = ( +/turf/open/gm/coast{ + dir = 8; + icon_state = "beachcorner2" + }, +/area/adminlevel/ert_station/clf_station) +"xJ" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/obj/item/prop/helmetgarb/spent_buckshot, +/turf/open/auto_turf/strata_grass/layer0_mud, +/area/adminlevel/ert_station/clf_station) +"xL" = ( +/obj/structure/flora/grass/tallgrass/jungle, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"xM" = ( +/obj/structure/sink{ + dir = 1; + pixel_y = -10 + }, +/obj/item/tool/soap, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/adminlevel/ert_station/clf_station) +"xO" = ( +/obj/item/holder/cat/kitten{ + name = "Isabelle" + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"xS" = ( +/obj/structure/platform/kutjevo{ + dir = 1 + }, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"ye" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 5 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"yy" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"yE" = ( +/obj/structure/closet/crate, +/obj/item/explosive/grenade/incendiary/molotov, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/adminlevel/ert_station/clf_station) +"yH" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"yM" = ( +/obj/structure/closet/crate, +/obj/item/ammo_magazine/pistol/clfpistol, +/obj/item/ammo_magazine/pistol/clfpistol, +/obj/item/ammo_magazine/pistol/clfpistol, +/obj/item/ammo_magazine/pistol/clfpistol, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/adminlevel/ert_station/clf_station) +"yO" = ( +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/obj/structure/flora/bush/ausbushes/genericbush, +/turf/open/gm/grass{ + icon_state = "grass2" + }, +/area/adminlevel/ert_station/clf_station) +"yU" = ( +/turf/open/gm/river, +/area/adminlevel/ert_station/clf_station) +"yW" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/largecrate/random/case/small, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"yY" = ( +/obj/structure/prop/brazier/frame_woodened, +/turf/open/floor/plating{ + icon_state = "asteroidwarning" + }, +/area/adminlevel/ert_station/clf_station) +"zy" = ( +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"zH" = ( +/obj/structure/closet/secure_closet/medical_doctor, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"zO" = ( +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"zZ" = ( +/obj/structure/sign/poster/clf, +/turf/closed/wall/wood, +/area/adminlevel/ert_station/clf_station) +"Ad" = ( +/obj/structure/flora/jungle/vines{ + icon_state = "heavy_4" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Ag" = ( +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/adminlevel/ert_station/clf_station) +"Ah" = ( +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/gm/dirtgrassborder{ + dir = 1; + icon_state = "grassdirt_corner" + }, +/area/adminlevel/ert_station/clf_station) +"Aj" = ( +/obj/structure/flora/jungle/planttop1, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"AE" = ( +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/gm/dirtgrassborder{ + dir = 8 + }, +/area/adminlevel/ert_station/clf_station) +"AK" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 6 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"AO" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/ammo_magazine/shotgun/flechette, +/obj/item/ammo_magazine/shotgun/flechette, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"AV" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/ammo_magazine/smg/mac15/extended, +/obj/item/ammo_magazine/smg/mac15/extended, +/obj/item/ammo_magazine/smg/mac15/extended, +/obj/item/weapon/gun/smg/mac15/extended, +/obj/structure/machinery/light/small/built, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Ba" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) +"Bl" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/ammo_magazine/smg/mp5, +/obj/item/weapon/gun/smg/mp5, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Bn" = ( +/obj/item/trash/burger, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Bt" = ( +/obj/structure/platform/kutjevo{ + dir = 1 + }, +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Bx" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"BB" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/obj/structure/flora/grass/tallgrass/jungle, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"BC" = ( +/obj/structure/machinery/door/airlock/sandstone/runed/destroyable{ + name = "\improper Strange Temple" + }, +/turf/open/space/basic, +/area/adminlevel/ert_station/clf_station) +"BP" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/microwave{ + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"BQ" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/platform/kutjevo, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"BS" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) +"BU" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer0_mud, +/area/adminlevel/ert_station/clf_station) +"Ch" = ( +/obj/structure/platform/kutjevo, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Ck" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/device/radio/headset/distress/CLF, +/obj/item/device/radio/headset/distress/CLF/command, +/obj/structure/machinery/recharger, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"CE" = ( +/obj/structure/flora/jungle/planttop1, +/obj/structure/largecrate/random/secure, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"CQ" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Dn" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/gm/dirt, +/area/adminlevel/ert_station/clf_station) +"Dy" = ( +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer0_mud, +/area/adminlevel/ert_station/clf_station) +"DF" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/adminlevel/ert_station/clf_station) +"DN" = ( +/obj/structure/flora/jungle/vines/heavy, +/turf/closed/wall/strata_ice/jungle, +/area/adminlevel/ert_station/clf_station) +"DW" = ( +/obj/structure/closet/secure_closet/brig, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Eb" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 9; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) +"Ee" = ( +/turf/open/gm/dirtgrassborder{ + dir = 8 + }, +/area/adminlevel/ert_station/clf_station) +"Ez" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"EJ" = ( +/obj/structure/machinery/floodlight, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"ER" = ( +/obj/structure/toilet{ + pixel_y = 16 + }, +/obj/structure/machinery/light/small/built{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/adminlevel/ert_station/clf_station) +"Fj" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/drinks/bottle/vodka, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Fn" = ( +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"FD" = ( +/turf/open/auto_turf/strata_grass/layer0_mud, +/area/adminlevel/ert_station/clf_station) +"FV" = ( +/obj/item/reagent_container/food/drinks/bottle/vodka, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Gj" = ( +/obj/structure/platform/kutjevo, +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Gl" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/spacecash/c10, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"GB" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/weapon/gun/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/turf/open/auto_turf/strata_grass/layer0_mud, +/area/adminlevel/ert_station/clf_station) +"GG" = ( +/obj/structure/flora/grass/tallgrass/jungle, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"GR" = ( +/obj/structure/platform/kutjevo, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 1 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"GV" = ( +/turf/open/floor/plating{ + dir = 8; + icon_state = "asteroidwarning" + }, +/area/adminlevel/ert_station/clf_station) +"Hs" = ( +/obj/docking_port/stationary/emergency_response/idle_port1, +/turf/open/floor/plating, +/area/adminlevel/ert_station/clf_station) +"HI" = ( +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/dirt, +/area/adminlevel/ert_station/clf_station) +"Ie" = ( +/turf/open/gm/dirtgrassborder{ + dir = 1; + icon_state = "grassdirt_corner2" + }, +/area/adminlevel/ert_station/clf_station) +"Ig" = ( +/obj/structure/largecrate/black_market/clf_supplies, +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Io" = ( +/obj/structure/platform/kutjevo, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 5 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Iz" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"IH" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/adminlevel/ert_station/clf_station) +"IT" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/adminlevel/ert_station/clf_station) +"IW" = ( +/obj/structure/closet/crate, +/obj/item/clothing/mask/gas/swat, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/adminlevel/ert_station/clf_station) +"Jg" = ( +/obj/structure/platform/kutjevo, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Jh" = ( +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Ke" = ( +/obj/structure/flora/jungle/vines{ + icon_state = "heavy_4" + }, +/turf/closed/wall/strata_ice/jungle, +/area/adminlevel/ert_station/clf_station) +"KT" = ( +/turf/closed/wall/strata_ice/jungle, +/area/adminlevel/ert_station/clf_station) +"Lu" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/weapon/gun/rifle/mar40/carbine, +/obj/item/ammo_magazine/rifle/mar40, +/obj/item/ammo_magazine/rifle/mar40, +/turf/open/auto_turf/strata_grass/layer0_mud, +/area/adminlevel/ert_station/clf_station) +"LH" = ( +/obj/structure/closet/secure_closet/brig, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"LN" = ( +/obj/structure/machinery/floodlight, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"LO" = ( +/turf/closed/wall/mineral/sandstone/runed, +/area/adminlevel/ert_station/clf_station) +"LQ" = ( +/obj/structure/machinery/light/small/built{ + dir = 8 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Me" = ( +/obj/structure/flora/jungle/planttop1, +/turf/open/gm/dirtgrassborder{ + dir = 4; + icon_state = "grassdirt_corner" + }, +/area/adminlevel/ert_station/clf_station) +"MD" = ( +/obj/structure/platform/kutjevo{ + dir = 1 + }, +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"ME" = ( +/obj/structure/machinery/door/window/brigdoor{ + dir = 8; + req_access = null + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"MI" = ( +/obj/structure/flora/jungle/vines/heavy, +/turf/closed/wall/rock/brown, +/area/adminlevel/ert_station/clf_station) +"MP" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.0 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/clf_station) +"MQ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/adminlevel/ert_station/clf_station) +"MT" = ( +/obj/item/tank/anesthetic, +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/mask/breath/medical, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"MU" = ( +/obj/structure/window/reinforced, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Ne" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Ng" = ( +/obj/structure/flora/jungle/plantbot1, +/turf/open/gm/dirtgrassborder{ + dir = 1; + icon_state = "grassdirt_corner" + }, +/area/adminlevel/ert_station/clf_station) +"Ni" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/condiment/peppermill, +/obj/item/reagent_container/food/condiment/saltshaker, +/obj/item/storage/box/drinkingglasses, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Nk" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Ns" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"NB" = ( +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/adminlevel/ert_station/clf_station) +"NV" = ( +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"NY" = ( +/obj/effect/decal/cleanable/tomato_smudge, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"Of" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray, +/obj/item/tool/kitchen/knife{ + pixel_x = 3 + }, +/obj/item/tool/kitchen/knife/butcher{ + pixel_x = -8 + }, +/obj/item/tool/kitchen/rollingpin, +/obj/item/book/manual/chef_recipes, +/obj/structure/machinery/light/small/built{ + dir = 1 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"Oi" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/adminlevel/ert_station/clf_station) +"Op" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/random/barrel/red, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Ou" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.0 + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/structure/machinery/light/small/built, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/clf_station) +"Oy" = ( +/obj/item/spacecash/c1, +/obj/item/storage/box/matches, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/transmitter/rotary{ + name = "CLF Outpost"; + phone_category = "CLF"; + phone_id = "CLF Outpost"; + callable = 0; + pixel_y = 10 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"OG" = ( +/obj/item/storage/belt/shotgun/full/quackers, +/turf/open/gm/river, +/area/adminlevel/ert_station/clf_station) +"OK" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) +"ON" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/flora/grass/tallgrass/jungle, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"OX" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/random/case/double, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"OY" = ( +/turf/open/gm/dirtgrassborder{ + dir = 4; + icon_state = "grassdirt_corner" + }, +/area/adminlevel/ert_station/clf_station) +"OZ" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/supply/weapons/flamers, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Ph" = ( +/turf/open/gm/coast{ + dir = 4; + icon_state = "beachcorner" + }, +/area/adminlevel/ert_station/clf_station) +"Pj" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Pr" = ( +/mob/living/simple_animal/cat{ + name = "Edwin" + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/adminlevel/ert_station/clf_station) +"PC" = ( +/obj/item/trash/candle, +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"PI" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/surgical_tray{ + pixel_y = 8 + }, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical{ + desc = "A sterile mask designed to help prevent the spread of diseases. This one has already been used."; + name = "used sterile mask" + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"PW" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 5 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Qw" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/device/radio/headset/distress/CLF, +/obj/item/device/radio/headset/distress/CLF/medic, +/obj/structure/machinery/light/small/built, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Qx" = ( +/turf/open/gm/coast{ + dir = 8 + }, +/area/adminlevel/ert_station/clf_station) +"QA" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/supply/explosives/mines, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"QB" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/supply/explosives/grenades, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"QE" = ( +/obj/structure/closet/crate, +/obj/item/storage/toolbox/syndicate, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"QG" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/ammo_box/magazine/shotgun/buckshot, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"QV" = ( +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Re" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/item/bedsheet/green, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Rg" = ( +/turf/open/gm/dirt, +/area/adminlevel/ert_station/clf_station) +"Ro" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/clothing/glasses/sunglasses/blindfold, +/obj/item/handcuffs, +/obj/item/handcuffs, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Rr" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/adminlevel/ert_station/clf_station) +"Rv" = ( +/obj/structure/curtain/red, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/adminlevel/ert_station/clf_station) +"RB" = ( +/obj/structure/flora/jungle/plantbot1{ + icon_state = "alienplant1"; + luminosity = 2 + }, +/turf/open/gm/river, +/area/adminlevel/ert_station/clf_station) +"RR" = ( +/obj/structure/machinery/chem_dispenser/beer{ + density = 0; + pixel_y = 10 + }, +/obj/structure/surface/table/reinforced, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"Sc" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/obj/structure/machinery/floodlight, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Sd" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/machinery/light/small/built{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/adminlevel/ert_station/clf_station) +"Sj" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/adminlevel/ert_station/clf_station) +"Sy" = ( +/obj/structure/platform/kutjevo, +/obj/structure/platform/kutjevo{ + dir = 4 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"SD" = ( +/obj/structure/largecrate/random/case/small, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Tk" = ( +/obj/structure/bed/chair, +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/adminlevel/ert_station/clf_station) +"Tr" = ( +/turf/open/gm/dirtgrassborder{ + dir = 1; + icon_state = "grassdirt_corner" + }, +/area/adminlevel/ert_station/clf_station) +"Tt" = ( +/obj/structure/platform/kutjevo, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Tu" = ( +/turf/open/floor/plating{ + dir = 4; + icon_state = "asteroidwarning" + }, +/area/adminlevel/ert_station/clf_station) +"TM" = ( +/obj/structure/machinery/recharger, +/obj/structure/surface/table/woodentable/poor, +/obj/item/device/defibrillator, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"TN" = ( +/obj/structure/largecrate/random/case, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"TZ" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Ub" = ( +/turf/closed/wall/mineral/sandstone/runed/decor, +/area/adminlevel/ert_station/clf_station) +"Uj" = ( +/obj/structure/closet/crate, +/obj/item/clothing/head/welding, +/obj/item/tool/weldingtool/experimental, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/adminlevel/ert_station/clf_station) +"Um" = ( +/obj/structure/largecrate/random/secure, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Uo" = ( +/obj/structure/flora/bush/ausbushes/var3, +/turf/open/gm/river, +/area/adminlevel/ert_station/clf_station) +"Uu" = ( +/turf/open/floor/plating{ + icon_state = "asteroidwarning" + }, +/area/adminlevel/ert_station/clf_station) +"UB" = ( +/turf/open/floor/plating{ + dir = 1; + icon_state = "asteroidwarning" + }, +/area/adminlevel/ert_station/clf_station) +"Vf" = ( +/obj/structure/largecrate/black_market/confiscated_weaponry, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Vi" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/gm/coast{ + dir = 8 + }, +/area/adminlevel/ert_station/clf_station) +"Vk" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/prop/helmetgarb/gunoil, +/obj/item/weapon/baton/cattleprod, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Vm" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/processor{ + pixel_y = 10 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"VE" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/largecrate/random/barrel/green, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"VO" = ( +/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines{ + icon_state = "heavy_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"VR" = ( +/obj/structure/platform/kutjevo{ + dir = 1 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Wb" = ( +/obj/structure/curtain/red, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Wc" = ( +/obj/structure/prop/wooden_cross{ + pixel_y = 14 + }, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/adminlevel/ert_station/clf_station) +"Wo" = ( +/obj/item/weapon/throwing_knife, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"Wq" = ( +/obj/structure/machinery/light/small/built{ + dir = 4 + }, +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"Wz" = ( +/obj/structure/closet/crate, +/obj/item/weapon/baton/cattleprod, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"WA" = ( +/obj/structure/closet/crate, +/obj/item/explosive/grenade/incendiary/molotov, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"WM" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"WO" = ( +/obj/structure/prop/wooden_cross, +/obj/item/clothing/head/helmet/marine/fluff/limo, +/turf/open/gm/dirt, +/area/adminlevel/ert_station/clf_station) +"WU" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/drinks/bottle/sake, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Xc" = ( +/obj/item/clothing/under/colonist/clf, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"Xp" = ( +/turf/open/floor/prison{ + icon_state = "kitchen" + }, +/area/adminlevel/ert_station/clf_station) +"Xv" = ( +/obj/structure/flora/jungle/plantbot1, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Xz" = ( +/obj/structure/machinery/iv_drip, +/obj/structure/machinery/light/small/built, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"XE" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/auto_turf/strata_grass/layer0_mud, +/area/adminlevel/ert_station/clf_station) +"Yq" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 10 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"Yv" = ( +/obj/structure/platform/kutjevo{ + dir = 8 + }, +/obj/structure/flora/jungle/vines, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"YA" = ( +/obj/structure/machinery/light/small/built, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"YB" = ( +/turf/open/gm/grass{ + icon_state = "grass2" + }, +/area/adminlevel/ert_station/clf_station) +"Ze" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/item/reagent_container/food/drinks/flask/barflask, +/obj/structure/machinery/light/small/built, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/adminlevel/ert_station/clf_station) +"Zj" = ( +/obj/structure/closet/crate, +/obj/item/reagent_container/food/snacks/appletart, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/adminlevel/ert_station/clf_station) +"ZE" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/storage/box/beakers{ + pixel_y = 12; + pixel_x = -4 + }, +/obj/item/reagent_container/glass/beaker{ + pixel_y = 4; + pixel_x = 12 + }, +/obj/item/reagent_container/glass/beaker/silver, +/obj/item/reagent_container/glass/beaker/vial/random/good{ + pixel_x = 18; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/adminlevel/ert_station/clf_station) +"ZI" = ( +/turf/closed/wall/wood, +/area/adminlevel/ert_station/clf_station) +"ZO" = ( +/obj/structure/prop/brazier/torch, +/turf/closed/wall/mineral/sandstone/runed, +/area/adminlevel/ert_station/clf_station) +"ZS" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) + +(1,1,1) = {" +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +KT +KT +KT +KT +KT +KT +KT +KT +"} +(2,1,1) = {" +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +yU +yU +yU +yU +yU +RB +yU +yU +dd +WO +Rg +Rg +Rg +Rg +vI +ZO +LO +ax +KT +KT +KT +KT +KT +KT +KT +KT +"} +(3,1,1) = {" +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +qy +yU +yU +yU +yU +yU +yU +yU +yU +xE +Ph +Rg +Rg +ax +Rg +Rg +Rg +tJ +Ub +ax +KT +KT +KT +KT +KT +KT +KT +KT +"} +(4,1,1) = {" +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +yU +yU +yU +OG +yU +yU +Uo +yU +yU +yU +dd +Rg +Rg +ax +ax +ax +Rg +vI +vI +BC +ax +KT +KT +KT +KT +KT +KT +KT +KT +"} +(5,1,1) = {" +ax +ax +ax +ax +ax +ax +ax +ax +ax +yU +RB +yU +yU +yU +yU +wW +Qx +Qx +Qx +Qx +Qx +Ph +ax +ax +ax +ax +ax +Rg +Rg +iO +Ub +ax +KT +KT +KT +KT +KT +KT +KT +KT +"} +(6,1,1) = {" +ax +ax +ax +ax +ax +ax +ax +yU +yU +yU +yU +yU +wW +Qx +Qx +Ph +ug +Dn +Rg +Rg +ax +ax +ax +ax +ax +ax +ax +Rg +Rg +ZO +LO +ax +KT +KT +KT +KT +KT +KT +KT +KT +"} +(7,1,1) = {" +ax +ax +ax +ax +ax +ax +Vi +Qx +Qx +Qx +Qx +Qx +Ph +Rg +Rg +Dn +dI +Rg +Rg +Rg +dI +Rg +Rg +ax +MI +MI +Rg +Rg +Rg +ax +ax +ax +KT +KT +KT +KT +KT +KT +KT +KT +"} +(8,1,1) = {" +KT +KT +KT +KT +Rg +fX +ug +Rg +Rg +Rg +Rg +Rg +Ie +om +Rg +Ie +Me +Ng +om +Rg +Rg +Dn +Rg +Ie +Ee +om +HI +HI +ax +ax +ax +KT +KT +KT +KT +KT +KT +KT +KT +KT +"} +(9,1,1) = {" +KT +KT +KT +Rg +Dn +Rg +Rg +Ie +om +fX +ug +Ie +OY +Tr +Ee +OY +QV +YB +Tr +Ee +Ee +Ee +Ee +OY +QV +Tr +Ee +MI +ax +ax +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +"} +(10,1,1) = {" +KT +KT +Rg +Rg +Ie +Ee +Ee +me +Ah +AE +AE +lN +la +pp +la +la +pp +pp +la +la +la +la +la +yO +la +Pj +QV +QV +Nk +ax +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +"} +(11,1,1) = {" +KT +DN +Rg +Ie +OY +YB +ql +Jg +yY +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +Tu +az +VR +YB +QV +Nk +iG +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +"} +(12,1,1) = {" +KT +sC +pY +OY +QV +QV +YB +Jg +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +UB +VR +Aj +Xv +Nk +BB +iG +iG +iG +KT +KT +KT +KT +KT +KT +KT +"} +(13,1,1) = {" +KT +YB +QV +QV +QV +QV +QV +Jg +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +Hs +uX +UB +Bt +la +la +jj +pk +pk +BB +pk +pk +KT +KT +KT +KT +KT +KT +"} +(14,1,1) = {" +DN +YB +YB +CQ +QV +QV +QV +Jg +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +UB +oI +oI +oI +eh +gj +ON +pk +ON +pk +pk +KT +KT +KT +KT +KT +"} +(15,1,1) = {" +DN +ts +sN +QV +CQ +wI +ye +Jg +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +UB +oI +cB +oI +eh +iB +Ez +TZ +eo +pk +pk +ax +ax +ax +KT +KT +"} +(16,1,1) = {" +KT +dM +ye +sN +LN +Nk +GG +Io +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +UB +oI +oI +Oi +eh +zO +zO +zO +zO +iB +xL +pk +ax +ax +KT +KT +"} +(17,1,1) = {" +ax +dM +ZI +ZI +ZI +Yq +GG +GR +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +UB +IT +Rr +qb +eh +zO +yH +zO +bI +jZ +iB +Ez +ax +ax +KT +KT +"} +(18,1,1) = {" +ax +GG +ZI +aN +Wb +FD +iB +pE +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +UB +MD +lT +lT +Ne +zO +zO +zO +zO +zO +zO +zO +zO +DN +KT +KT +"} +(19,1,1) = {" +ax +pk +ZI +ZI +ZI +FD +zO +Ch +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +UB +eh +bI +jZ +yy +Fn +Fn +Fn +Fn +Fn +Fn +Fn +Jh +WM +KT +KT +"} +(20,1,1) = {" +ax +rD +ZI +ER +Wb +FD +zO +Ch +Uu +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +uX +UB +eh +zO +yy +Sy +ZI +eP +eP +eP +ZI +eP +eP +ZI +dU +WM +KT +"} +(21,1,1) = {" +ax +zO +ZI +ZI +ZI +FD +zO +Ch +yY +GV +GV +GV +GV +GV +GV +GV +GV +GV +GV +GV +GV +GV +GV +GV +az +eh +zO +Ch +ZI +ZI +MQ +mw +mw +LQ +Xp +Xp +ZI +ZI +eh +KT +"} +(22,1,1) = {" +ax +bI +jZ +zO +zO +FD +zO +fo +nM +VE +vE +ey +OZ +Op +Op +QA +bb +OK +OK +OK +aO +QB +xi +Ig +OX +yW +jG +Ch +eP +vx +WU +mw +hE +mt +Xp +Xp +gi +eP +eh +KT +"} +(23,1,1) = {" +ax +zO +zO +zO +EJ +FD +zO +zO +zO +Um +CE +jZ +TN +vA +SD +lI +zO +FD +FD +Dy +EJ +eE +Vf +tt +ki +zO +zO +Ch +eP +jp +Gl +mw +Tk +Ni +Xp +Xp +nC +eP +xS +KT +"} +(24,1,1) = {" +ax +zO +zO +iK +GB +Lu +zO +zO +FD +FD +FD +FD +FD +XE +FD +FD +FD +FD +FD +FD +FD +zO +zO +FD +FD +FD +zO +Ch +eP +Ns +qa +mw +hE +kS +Xp +Xp +gN +eP +xS +KT +"} +(25,1,1) = {" +ax +sv +zO +iK +FD +FD +FD +FD +FD +FD +zO +FD +FD +FD +zO +zO +FD +FD +FD +FD +FD +FD +FD +FD +FD +FD +FD +Eb +ZI +ce +mw +mw +hE +Fj +Wq +Xp +Xp +eP +eh +KT +"} +(26,1,1) = {" +ax +ac +Wo +iK +xJ +zO +FD +FD +zO +zO +yH +zO +EJ +FD +FD +zO +zO +Dy +FD +zO +zO +FD +FD +zO +zO +FD +FD +ZS +Wb +mw +mw +mw +oy +ZI +ZI +rz +rz +ZI +xS +KT +"} +(27,1,1) = {" +ax +zO +yy +Fn +nr +Ba +Ba +oO +Fn +WM +yy +Fn +nr +Ba +Ba +oO +Fn +WM +Iz +Fn +nr +Ba +Ba +oO +Fn +Sc +FD +ZS +Wb +mw +mw +cH +aE +ZI +Of +Xp +Xp +eP +xS +KT +"} +(28,1,1) = {" +DN +zO +Ch +ZI +ZI +Wb +Wb +ZI +ZI +eh +Ch +ZI +ZI +Wb +Wb +ZI +ZI +eh +Ch +ZI +ZI +Wb +Wb +ZI +ZI +eh +yH +jc +zZ +ma +mw +mw +FV +ZI +Vm +NY +hd +eP +xS +KT +"} +(29,1,1) = {" +KT +NV +Ch +ZI +up +mw +mw +YA +ZI +eh +Ch +ZI +at +mw +DF +Ou +ZI +eh +Ch +ZI +zy +pF +mw +tz +ZI +uF +FD +Ch +eP +Ns +Bn +mw +Ns +zZ +mR +Xp +cc +ZI +eh +KT +"} +(30,1,1) = {" +KT +DN +rZ +eP +mw +Vk +lp +pF +eP +eh +Ch +eP +yE +mw +mw +IW +eP +eh +Ch +ZI +ZE +kF +DF +TM +eP +uF +FD +Ch +eP +MQ +mw +aE +Ze +ZI +BP +Xp +Bx +ZI +eh +KT +"} +(31,1,1) = {" +KT +KT +rZ +eP +mw +Sj +mw +mw +eP +eh +Ch +zZ +MP +mw +mw +ow +ZI +eh +Ch +ZI +rm +mw +mw +aA +eP +eh +FD +Ch +eP +WU +hE +Oy +nQ +ZI +ms +Xp +fd +ZI +eh +KT +"} +(32,1,1) = {" +KT +NV +rZ +zZ +mw +mw +mw +mw +ZI +eh +Ch +eP +QE +Xc +DF +WA +eP +eh +Ch +ZI +zH +cH +mw +fx +eP +eh +FD +Ch +ZI +ZI +hE +hO +PC +ZI +RR +Xp +ZI +ZI +eh +KT +"} +(33,1,1) = {" +KT +jG +Ch +ZI +eP +Wb +Rv +eP +ZI +eh +Ch +ZI +at +mw +mw +Ou +ZI +eh +Tt +ZI +PI +MU +mw +ie +ZI +eh +FD +eO +rO +ZI +eP +eP +eP +ZI +ZI +ZI +ZI +MD +Ne +KT +"} +(34,1,1) = {" +KT +zO +Ch +ZI +oc +mw +mw +AV +ZI +eh +Gj +eP +Uj +Pr +mw +Wz +eP +eh +Ch +ZI +MT +MU +IH +Xz +ZI +eh +FD +FD +vQ +lT +lT +lT +lT +lT +Yv +fA +ko +mk +zO +KT +"} +(35,1,1) = {" +KT +zO +Ch +ZI +sK +DF +mw +Bl +ZI +eh +Ch +zZ +MP +xO +nJ +MP +ZI +eh +Ch +ZI +ZI +ZI +Wb +ZI +ZI +eh +EJ +FD +FD +Ag +FD +FD +zO +zO +zO +oN +Ke +VO +NV +KT +"} +(36,1,1) = {" +KT +KT +Ch +ZI +sK +mw +IH +Ck +ZI +eh +Ch +eP +yM +mw +mw +av +eP +eh +Ch +ZI +tG +Sd +NB +aL +ZI +eh +yH +zO +zO +FD +Ag +Ag +FD +zO +yH +NV +oN +NV +oN +KT +"} +(37,1,1) = {" +KT +KT +Ch +ZI +AO +dg +kk +Qw +ZI +eh +Ch +ZI +hL +mw +mw +Ou +ZI +eh +Gj +ZI +tG +NB +NB +aL +ZI +eh +zO +Iz +Fn +nr +Ba +Ba +oO +Fn +WM +Ad +un +VO +KT +KT +"} +(38,1,1) = {" +KT +NV +Ch +ZI +ZI +QG +lX +ZI +ZI +eh +Ch +ZI +ZI +Zj +gc +ZI +ZI +eh +Ch +ZI +fk +cx +xM +ZI +ZI +eh +zO +Ch +ZI +ZI +Wb +Wb +ZI +ZI +eh +zO +NV +KT +KT +KT +"} +(39,1,1) = {" +KT +NV +dY +BQ +ZI +ZI +ZI +ZI +MD +Ne +vQ +BQ +ZI +eP +eP +ZI +MD +Ne +vQ +BQ +ZI +ZI +ZI +ZI +MD +Ne +zO +Ch +ZI +DW +pF +mw +sx +ZI +eh +zO +KT +KT +KT +KT +"} +(40,1,1) = {" +KT +jG +zO +dY +lT +lT +lT +lT +AK +ta +ta +PW +lT +lT +lT +lT +Ne +zO +zO +vQ +BS +bX +BU +lT +Ne +yH +zO +Ch +ZI +LH +mw +DF +Ro +ZI +eh +KT +KT +KT +KT +KT +"} +(41,1,1) = {" +KT +zO +KT +KT +KT +ta +ta +ta +ax +ax +ax +pk +ta +bL +yH +zO +kr +ta +pk +bL +by +by +kr +ta +bL +zO +zO +Ch +ZI +eH +ME +eH +eH +ZI +eh +KT +KT +KT +KT +KT +"} +(42,1,1) = {" +KT +KT +KT +KT +KT +KT +pk +ax +ax +ax +ax +KT +KT +nn +ta +ta +pk +pk +pk +pk +ta +ta +pk +pk +pk +bL +uZ +ks +eH +uO +cH +mw +vm +eH +eh +KT +KT +KT +KT +KT +"} +(43,1,1) = {" +KT +KT +KT +KT +KT +KT +ax +ax +ax +ax +KT +KT +KT +KT +pk +pk +pk +pk +pk +pk +pk +pk +pk +pk +pk +pk +Wc +aR +eH +Re +mw +hr +ne +ZI +ax +KT +KT +KT +KT +KT +"} +(44,1,1) = {" +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +KT +ax +ax +ax +ax +ax +ax +ax +ax +ax +ax +KT +KT +KT +"} diff --git a/maps/templates/freelancer_ert_station.dmm b/maps/templates/freelancer_ert_station.dmm new file mode 100644 index 000000000000..44d47c7952ef --- /dev/null +++ b/maps/templates/freelancer_ert_station.dmm @@ -0,0 +1,1722 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/space/basic, +/area/space) +"r" = ( +/obj/docking_port/stationary/emergency_response/idle_port1, +/turf/open/floor/plating, +/area/space) +"t" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/space) +"u" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/plating/almayer, +/area/space) +"x" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/plating/almayer, +/area/space) +"E" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/plating/almayer, +/area/space) +"U" = ( +/turf/open/floor/plating/almayer, +/area/space) +"V" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/plating/almayer, +/area/space) +"X" = ( +/turf/open/floor/plating, +/area/space) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +a +a +a +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +t +U +x +x +x +x +x +x +x +x +x +x +x +x +x +x +x +U +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +r +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +t +V +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +E +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(26,1,1) = {" +a +a +a +a +a +a +a +a +a +t +U +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +U +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +t +a +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(31,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(32,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(33,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(34,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(35,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(36,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(37,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(38,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/templates/upp_ert_station.dmm b/maps/templates/upp_ert_station.dmm new file mode 100644 index 000000000000..4aff44053f78 --- /dev/null +++ b/maps/templates/upp_ert_station.dmm @@ -0,0 +1,5240 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ac" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 16; + pixel_y = 13 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"ag" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"am" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"au" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space, +/area/space) +"ax" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack{ + pixel_x = 5 + }, +/obj/item/tool/weldpack{ + pixel_x = -2 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"ay" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"aA" = ( +/obj/structure/bed/chair/comfy/lime{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"aF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/drinkingglass{ + pixel_y = 5; + pixel_x = 8 + }, +/obj/item/storage/box/drinkingglasses, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"aH" = ( +/turf/open/floor/strata{ + icon_state = "red1" + }, +/area/adminlevel/ert_station/upp_station) +"aO" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/antag_guns{ + hacked = 1; + name = "\improper Response Team Automated Guns Rack"; + use_power = 0; + use_snowflake_points = 1; + density = 0; + pixel_x = 32 + }, +/turf/open/floor/strata{ + icon_state = "blue3"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"aP" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"aS" = ( +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"aV" = ( +/obj/item/stack/catwalk, +/obj/item/stack/catwalk, +/obj/item/tool/wrench, +/obj/structure/disposalpipe/segment, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 16; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"aW" = ( +/obj/structure/bed/chair/comfy/lime{ + dir = 8 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"bd" = ( +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"bh" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"bi" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"bk" = ( +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"bp" = ( +/obj/structure/machinery/shower{ + pixel_y = 21 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan2" + }, +/area/adminlevel/ert_station/upp_station) +"bM" = ( +/obj/structure/machinery/power/apc/antag{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "green4" + }, +/area/adminlevel/ert_station/upp_station) +"bY" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/recharger, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"ce" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"cj" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"cl" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"cs" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"cC" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/closet/fireaxecabinet{ + pixel_y = 29 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"cJ" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/obj/structure/largecrate/random/secure, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"cO" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"da" = ( +/turf/closed/shuttle/elevator{ + dir = 5 + }, +/area/adminlevel/ert_station/upp_station) +"dh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/upp{ + pixel_y = 1; + pixel_x = -3 + }, +/obj/item/reagent_container/food/snacks/upp{ + pixel_y = 10; + pixel_x = 2 + }, +/obj/item/reagent_container/food/snacks/upp{ + pixel_y = 4; + pixel_x = 3 + }, +/obj/item/reagent_container/food/drinks/bottle/vodka{ + pixel_y = 9; + pixel_x = -7 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/adminlevel/ert_station/upp_station) +"di" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/obj/structure/platform_decoration/kutjevo, +/turf/open/space, +/area/space) +"dz" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"dB" = ( +/turf/open/floor/strata{ + icon_state = "green4" + }, +/area/adminlevel/ert_station/upp_station) +"dH" = ( +/obj/structure/largecrate/random/secure, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"dK" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Station Hallway" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"dL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/dice{ + pixel_x = 10; + pixel_y = 9 + }, +/obj/item/toy/deck{ + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"dW" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"eo" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"ev" = ( +/obj/item/tool/wet_sign, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 2; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"eT" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/vodka{ + pixel_y = 4; + pixel_x = 5 + }, +/obj/item/reagent_container/food/drinks/flask/canteen{ + pixel_y = 7; + pixel_x = -5 + }, +/obj/item/reagent_container/food/drinks/bottle/vodka, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"eU" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "darkyellowfull2" + }, +/area/adminlevel/ert_station/upp_station) +"eV" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"eX" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"eY" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/turf/open/space, +/area/space) +"fc" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"fd" = ( +/obj/structure/largecrate/random/barrel/green, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 16; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"fi" = ( +/obj/structure/machinery/door/airlock/almayer/medical/colony{ + name = "\improper Morgue" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"fk" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "purp3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"fA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"fE" = ( +/obj/structure/target{ + name = "punching bag" + }, +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/adminlevel/ert_station/upp_station) +"fK" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"fM" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"fR" = ( +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -1; + pixel_y = 13 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"fW" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"ge" = ( +/obj/structure/closet/boxinggloves, +/turf/open/asphalt/cement{ + icon_state = "cement9" + }, +/area/adminlevel/ert_station/upp_station) +"gf" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"gt" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/strata{ + dir = 2; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"gx" = ( +/obj/structure/platform_decoration/strata/metal{ + dir = 1 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"he" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"hg" = ( +/obj/structure/machinery/body_scanconsole, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"hj" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Shuttle Bay" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"hA" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space/basic, +/area/space) +"hF" = ( +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"hM" = ( +/turf/open/floor/strata{ + icon_state = "damaged3" + }, +/area/adminlevel/ert_station/upp_station) +"hO" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"hV" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"ia" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"ie" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_y = 13; + pixel_x = -10 + }, +/obj/structure/machinery/portable_atmospherics/canister/phoron, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"iB" = ( +/turf/open/floor/strata{ + dir = 10; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"iJ" = ( +/obj/structure/closet/secure_closet/brig{ + name = "Spare Prison Uniforms"; + req_one_access = null + }, +/turf/open/floor/strata{ + icon_state = "red1" + }, +/area/adminlevel/ert_station/upp_station) +"iM" = ( +/obj/structure/machinery/door/airlock/almayer/security/colony{ + dir = 8; + name = "\improper Brig Cell" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"iV" = ( +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 9 + }, +/area/adminlevel/ert_station/upp_station) +"jc" = ( +/turf/open/floor/strata{ + dir = 8; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"jg" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"jh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/bodybags, +/turf/open/floor/strata{ + dir = 10; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"jt" = ( +/obj/structure/lattice, +/obj/structure/platform_decoration/kutjevo, +/turf/open/space/basic, +/area/space) +"jH" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"kc" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"kf" = ( +/turf/open/floor/strata{ + dir = 9; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"ks" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"kF" = ( +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_y = 18 + }, +/obj/structure/barricade/handrail/wire{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement2" + }, +/area/adminlevel/ert_station/upp_station) +"kN" = ( +/obj/item/tool/weldingtool/largetank, +/obj/item/clothing/glasses/welding, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"kS" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/turf/open/floor/strata{ + icon_state = "purp3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"kT" = ( +/obj/structure/surface/rack, +/obj/item/clothing/gloves/yellow, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"lb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"le" = ( +/obj/structure/machinery/door_control{ + pixel_y = 6; + name = "Command Shutters Button"; + id = "upp_command" + }, +/turf/closed/wall/strata_outpost/reinforced, +/area/adminlevel/ert_station/upp_station) +"lm" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/largecrate/black_market/confiscated_weaponry, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"lo" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 16; + pixel_y = 13 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"lp" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"lw" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/facepaint/black, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/adminlevel/ert_station/upp_station) +"mb" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -1 + }, +/obj/structure/closet/crate/ammo/alt, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"me" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/suit/straight_jacket, +/obj/item/handcuffs{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/handcuffs, +/turf/open/floor/strata{ + icon_state = "red1" + }, +/area/adminlevel/ert_station/upp_station) +"mf" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood{ + req_access = null + }, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"mq" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"mr" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/vents/pump{ + dir = 1; + id_tag = "mining_outpost_pump" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"mz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"mG" = ( +/obj/structure/surface/table/reinforced/black, +/obj/structure/transmitter/rotary{ + name = "UPP Station"; + phone_category = "UPP"; + phone_id = "UPP Station"; + callable = 0 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"mJ" = ( +/obj/structure/lattice, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space/basic, +/area/space) +"mP" = ( +/obj/structure/machinery/computer/cameras/almayer_network/vehicle{ + dir = 1 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"ne" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/strata{ + icon_state = "orange_icorner"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"nh" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/ashtray/glass, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"nC" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"nO" = ( +/obj/structure/bed/chair, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"om" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/adminlevel/ert_station/upp_station) +"ow" = ( +/obj/item/stack/catwalk, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"oz" = ( +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan1" + }, +/area/adminlevel/ert_station/upp_station) +"oJ" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13; + icon_state = "abed" + }, +/obj/structure/bed{ + can_buckle = 0; + icon_state = "abed" + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/adminlevel/ert_station/upp_station) +"oK" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"oP" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"oS" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"pb" = ( +/turf/open/floor/strata{ + dir = 2; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"pc" = ( +/obj/structure/bed/chair/comfy/lime{ + dir = 4 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"pe" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"po" = ( +/turf/closed/wall/strata_outpost/reinforced, +/area/adminlevel/ert_station/upp_station) +"pu" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/asphalt/cement, +/area/adminlevel/ert_station/upp_station) +"pv" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"pK" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/floor/plating/prison, +/area/space) +"pN" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"qd" = ( +/obj/structure/machinery/bioprinter{ + stored_metal = 1000 + }, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"qi" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "green3" + }, +/area/adminlevel/ert_station/upp_station) +"qA" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/platform_decoration/strata/metal, +/obj/structure/curtain/open/black, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"qF" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access{ + req_access = null + }, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"qH" = ( +/turf/open/floor/strata{ + icon_state = "floorscorched2" + }, +/area/adminlevel/ert_station/upp_station) +"qM" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"qU" = ( +/turf/closed/shuttle/elevator, +/area/adminlevel/ert_station/upp_station) +"qY" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 1; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"rb" = ( +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"rf" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/bedsheetbin{ + pixel_y = 6 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/adminlevel/ert_station/upp_station) +"rk" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"rr" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"rs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"ry" = ( +/obj/structure/machinery/medical_pod/bodyscanner, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"rC" = ( +/obj/structure/closet/crate/ammo, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"rL" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/obj/structure/machinery/floodlight, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"rT" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/cm_vending/clothing/antag{ + name = "\improper Response Team Automated Equipment Rack"; + pixel_y = -32; + density = 0 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"rX" = ( +/obj/structure/machinery/cm_vending/gear/antag{ + hacked = 1; + name = "\improper Response Team Automated Gear Rack"; + use_snowflake_points = 1; + pixel_y = -32; + density = 0 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "blue3" + }, +/area/adminlevel/ert_station/upp_station) +"sb" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/prison{ + icon_state = "darkyellowfull2" + }, +/area/adminlevel/ert_station/upp_station) +"sk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/tool/pickaxe/diamonddrill, +/turf/open/floor/plating{ + icon_state = "platebot" + }, +/area/adminlevel/ert_station/upp_station) +"sr" = ( +/obj/structure/lattice, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/turf/open/space/basic, +/area/space) +"sy" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/strata{ + icon_state = "damaged3" + }, +/area/adminlevel/ert_station/upp_station) +"sz" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "floorscorched2" + }, +/area/adminlevel/ert_station/upp_station) +"sA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"sC" = ( +/obj/structure/pipes/vents/pump, +/turf/open/asphalt/cement, +/area/adminlevel/ert_station/upp_station) +"sG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"sI" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -1 + }, +/obj/structure/closet/crate/trashcart, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"sK" = ( +/obj/structure/machinery/optable, +/obj/item/tank/anesthetic, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata{ + icon_state = "white_cyan2" + }, +/area/adminlevel/ert_station/upp_station) +"sU" = ( +/obj/structure/window/framed/strata, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"sY" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"tr" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"tv" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"tx" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"tF" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"tG" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"ue" = ( +/obj/structure/lattice, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) +"uf" = ( +/obj/structure/machinery/blackbox_recorder, +/turf/open/floor/strata{ + icon_state = "green1" + }, +/area/adminlevel/ert_station/upp_station) +"uj" = ( +/turf/open/floor/strata{ + icon_state = "white_cyan2" + }, +/area/adminlevel/ert_station/upp_station) +"uE" = ( +/obj/structure/platform_decoration/strata/metal, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"uI" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"uL" = ( +/obj/structure/platform/kutjevo/smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"uP" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"uW" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"va" = ( +/obj/structure/closet/crate/ammo/alt/flame, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"ve" = ( +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"vn" = ( +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"vo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/prison{ + icon_state = "darkyellowfull2" + }, +/area/adminlevel/ert_station/upp_station) +"vw" = ( +/turf/open/floor/strata{ + dir = 1; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"vH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate, +/obj/item/reagent_container/food/snacks/upp, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"vK" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"vS" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/space, +/area/space) +"vY" = ( +/obj/structure/machinery/washing_machine, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"vZ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) +"we" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"wr" = ( +/obj/structure/platform/strata/metal{ + dir = 4 + }, +/obj/effect/decal/strata_decals/catwalk/prison{ + layer = 2.2 + }, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_sn_full_cap"; + layer = 2.5 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"ws" = ( +/turf/open/floor{ + desc = "A sophisticated device that captures and converts light from the system's star into energy for the station."; + icon_state = "solarpanel"; + name = "solarpanel" + }, +/area/space) +"wu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"wA" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/obj/structure/machinery/door_control/brbutton{ + pixel_y = 26; + id = "funny"; + name = "Elevator Button"; + desc = "A remote control-switch for the elevator. This one seems broken." + }, +/obj/structure/closet/crate/ammo, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"wS" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/strata{ + icon_state = "green3" + }, +/area/adminlevel/ert_station/upp_station) +"wY" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Station Hallway" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"xj" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"xl" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/obj/item/storage/toolbox/electrical, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"xo" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"xy" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/adminlevel/ert_station/upp_station) +"xF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/crowbar, +/obj/item/storage/bible, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"ya" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"ym" = ( +/turf/closed/shuttle/elevator/gears, +/area/adminlevel/ert_station/upp_station) +"yn" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -9; + pixel_y = 19 + }, +/turf/open/floor/strata{ + icon_state = "green4" + }, +/area/adminlevel/ert_station/upp_station) +"yt" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space, +/area/space) +"yH" = ( +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"zr" = ( +/obj/structure/machinery/photocopier, +/turf/open/floor/strata{ + icon_state = "green1" + }, +/area/adminlevel/ert_station/upp_station) +"zs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"zx" = ( +/obj/structure/machinery/chem_master, +/turf/open/floor/strata{ + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"zK" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"zL" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"zQ" = ( +/obj/structure/prop/almayer/missile_tube{ + icon_state = "missiletubesouth"; + name = "\improper AT-87 ASAT launcher system"; + desc = "Cold launch tubes that can fire a few varieties of missiles out of them, the most common being the AT-87 ASAT 11K223 ?Spigot? missile used against satellites and other spacecraft and the 11K221 ?Konkurs? missile which is used for ground attack." + }, +/turf/open/floor/strata{ + dir = 10; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"zX" = ( +/obj/structure/bed/chair/comfy/lime{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"zY" = ( +/obj/structure/bed/chair, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"Ae" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/attachable/bayonet/upp{ + pixel_y = 9; + pixel_x = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Ak" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/recharger, +/obj/item/device/defibrillator, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"Au" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/greengrid, +/area/adminlevel/ert_station/upp_station) +"Ay" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/greengrid, +/area/adminlevel/ert_station/upp_station) +"AI" = ( +/obj/structure/closet/crate, +/turf/open/floor/strata{ + dir = 4; + icon_state = "orange_edge" + }, +/area/adminlevel/ert_station/upp_station) +"AN" = ( +/turf/open/space/basic, +/area/space) +"AU" = ( +/obj/structure/monorail{ + dir = 9; + name = "launch track" + }, +/turf/open/space/basic, +/area/space) +"Bc" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/prison{ + icon_state = "darkyellowfull2" + }, +/area/adminlevel/ert_station/upp_station) +"Be" = ( +/obj/structure/filingcabinet{ + layer = 2.9 + }, +/turf/open/floor/strata{ + icon_state = "green1" + }, +/area/adminlevel/ert_station/upp_station) +"Bp" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Bq" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Bt" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Bw" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/turf/open/space/basic, +/area/space) +"BH" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"BX" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 16; + pixel_y = 13 + }, +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Ce" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 24 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"Cp" = ( +/turf/closed/wall/rock/brown, +/area/adminlevel/ert_station/upp_station) +"Cu" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/colony{ + name = "Engineering"; + dir = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Cy" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13; + icon_state = "abed" + }, +/obj/structure/bed{ + can_buckle = 0; + icon_state = "abed" + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"CG" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"CI" = ( +/turf/open/floor/strata{ + dir = 4; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"CM" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/colony{ + name = "\improper Elevator Airlock"; + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"CW" = ( +/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access{ + req_access = null + }, +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"Df" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"Dv" = ( +/turf/closed/wall/strata_outpost, +/area/adminlevel/ert_station/upp_station) +"DG" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 9; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"DK" = ( +/obj/structure/machinery/computer/emails{ + dir = 1 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Eg" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/adminlevel/ert_station/upp_station) +"El" = ( +/turf/closed/wall/strata_outpost/reinforced/hull, +/area/adminlevel/ert_station/upp_station) +"EA" = ( +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"ES" = ( +/obj/structure/window/framed/strata/reinforced, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"EZ" = ( +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/upp_station) +"Fh" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Fj" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/folder/black, +/obj/item/tool/pen, +/turf/open/floor/strata{ + icon_state = "green3" + }, +/area/adminlevel/ert_station/upp_station) +"FA" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"FF" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/platform/strata/metal, +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"FI" = ( +/obj/structure/bed/chair/comfy/black, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"FJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"FL" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/device/megaphone, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"FP" = ( +/obj/structure/morgue{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 10; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Ga" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Gb" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/greengrid, +/area/adminlevel/ert_station/upp_station) +"Gl" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Gt" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Gu" = ( +/obj/structure/lattice, +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"Gw" = ( +/turf/open/floor/strata{ + dir = 2; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"GE" = ( +/turf/closed/shuttle/elevator{ + dir = 6 + }, +/area/adminlevel/ert_station/upp_station) +"GI" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"GL" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage/antag, +/turf/open/floor/greengrid, +/area/adminlevel/ert_station/upp_station) +"GN" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/platform/strata/metal, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Hb" = ( +/obj/structure/largecrate/supply, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Hc" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space, +/area/space) +"Hl" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Hp" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + icon_state = "red4"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"Hx" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage/antag, +/turf/open/floor/greengrid, +/area/adminlevel/ert_station/upp_station) +"HR" = ( +/obj/structure/platform/strata/metal, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Is" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"IC" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space, +/area/space) +"IK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"IQ" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/obj/structure/largecrate/black_market/confiscated_equipment, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"IT" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 2; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"IV" = ( +/obj/structure/bedsheetbin{ + icon_state = "linenbin-empty"; + name = "solar lattice"; + pixel_y = 6 + }, +/turf/open/floor/almayer_hull, +/area/space) +"IX" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/processor{ + pixel_y = 10 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Jc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/mask/rebreather/scarf, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Jj" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"Jl" = ( +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan2" + }, +/area/adminlevel/ert_station/upp_station) +"Jp" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Js" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan1" + }, +/area/adminlevel/ert_station/upp_station) +"Jz" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"JB" = ( +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"JV" = ( +/obj/item/tool/wet_sign, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"JX" = ( +/obj/structure/closet/boxinggloves, +/turf/open/asphalt/cement{ + icon_state = "cement1"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"JZ" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Kb" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "green3" + }, +/area/adminlevel/ert_station/upp_station) +"Kj" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/turf/open/floor/almayer_hull, +/area/space) +"Kn" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/asphalt/cement, +/area/adminlevel/ert_station/upp_station) +"Kq" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "Toilet Shutters"; + id = "upp_toilet" + }, +/obj/structure/window/framed/strata/hull, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Kr" = ( +/obj/item/stack/catwalk, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Ks" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement3" + }, +/area/adminlevel/ert_station/upp_station) +"KF" = ( +/obj/structure/morgue, +/turf/open/floor/strata{ + dir = 10; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"KL" = ( +/turf/open/floor/strata{ + dir = 5; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"KX" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Lg" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Lk" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/colony{ + name = "Engineering" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Ln" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/strata{ + icon_state = "orange_icorner"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"Lo" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"LB" = ( +/obj/structure/closet{ + name = "boxing attire" + }, +/obj/item/clothing/under/shorts/green, +/obj/item/clothing/under/shorts/green, +/obj/item/clothing/under/shorts/grey, +/obj/item/clothing/under/shorts/grey, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/asphalt/cement{ + icon_state = "cement1"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"LG" = ( +/obj/structure/lattice, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"LI" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"LK" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"LN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flashlight, +/obj/item/attachable/bayonet/upp, +/turf/open/asphalt/cement{ + icon_state = "cement15" + }, +/area/adminlevel/ert_station/upp_station) +"LO" = ( +/obj/structure/bed/chair, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"LQ" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Station Hallway" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Mc" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/turf/open/space/basic, +/area/space) +"Mi" = ( +/obj/item/clothing/suit/chef/classic, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/head/chefhat, +/obj/structure/surface/table/reinforced, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Mk" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/belt/medical/lifesaver/upp/full, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"Mt" = ( +/obj/structure/platform/kutjevo/smooth, +/turf/open/space/basic, +/area/space) +"MB" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/obj/structure/barricade/handrail/wire{ + dir = 8 + }, +/turf/open/asphalt/cement{ + icon_state = "cement14" + }, +/area/adminlevel/ert_station/upp_station) +"ME" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/snacks/upp, +/obj/item/reagent_container/food/snacks/upp, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"MG" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"MM" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "green3" + }, +/area/adminlevel/ert_station/upp_station) +"MU" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/paper_bin{ + pixel_y = 10 + }, +/obj/item/tool/stamp{ + pixel_y = 10 + }, +/turf/open/floor/strata{ + icon_state = "green3" + }, +/area/adminlevel/ert_station/upp_station) +"Ne" = ( +/obj/structure/machinery/light/double/blue, +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Ni" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Ns" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Nz" = ( +/obj/structure/bed/chair/comfy/black, +/turf/open/floor/strata{ + dir = 2; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"NQ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) +"NU" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/curtain/medical, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"OA" = ( +/obj/structure/platform/strata/metal{ + dir = 8 + }, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_sn_full_cap"; + layer = 2.5 + }, +/obj/effect/decal/strata_decals/catwalk/prison{ + layer = 2.2 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"OK" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/autolathe/full, +/turf/open/floor/greengrid, +/area/adminlevel/ert_station/upp_station) +"OS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/large_holster/machete/full, +/turf/open/floor/strata{ + dir = 1; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"Ph" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Pj" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/turf/open/floor/almayer_hull, +/area/space) +"PI" = ( +/turf/open/floor/almayer_hull, +/area/space) +"PJ" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + name = "\improper Cryo Cells" + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"PQ" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + icon_state = "red4"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"PS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"PT" = ( +/obj/structure/machinery/sleep_console, +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata{ + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"Qu" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/strata{ + icon_state = "white_cyan2" + }, +/area/adminlevel/ert_station/upp_station) +"Qz" = ( +/obj/structure/machinery/iv_drip, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata{ + dir = 10; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"QG" = ( +/turf/closed/shuttle/elevator{ + dir = 10 + }, +/area/adminlevel/ert_station/upp_station) +"QO" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"QR" = ( +/obj/structure/machinery/medical_pod/sleeper, +/turf/open/floor/strata{ + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"Rd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/upp, +/turf/open/floor/strata{ + dir = 1; + icon_state = "red3" + }, +/area/adminlevel/ert_station/upp_station) +"Rf" = ( +/turf/open/asphalt/cement, +/area/adminlevel/ert_station/upp_station) +"Ry" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"RB" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"RC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"RK" = ( +/obj/structure/machinery/iv_drip, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"RQ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating{ + icon_state = "platebot" + }, +/area/adminlevel/ert_station/upp_station) +"RR" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out" + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"RS" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"RU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/closed/wall/strata_outpost/reinforced, +/area/adminlevel/ert_station/upp_station) +"Sa" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Sf" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/curtain/open/black, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Sh" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"Si" = ( +/obj/structure/bookcase{ + icon_state = "book-5"; + pixel_y = 18; + pixel_x = 2; + density = 0 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"Sj" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Sn" = ( +/turf/open/floor/strata{ + icon_state = "purp3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"Sq" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage/antag, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/greengrid, +/area/adminlevel/ert_station/upp_station) +"Sx" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"Sy" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata{ + icon_state = "white_cyan2" + }, +/area/adminlevel/ert_station/upp_station) +"SB" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"SC" = ( +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/upp_station) +"SI" = ( +/obj/structure/surface/table/reinforced, +/obj/item/trash/plate{ + pixel_y = 2 + }, +/obj/item/trash/plate{ + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_y = 6 + }, +/obj/item/trash/plate{ + pixel_y = 8 + }, +/obj/item/trash/plate{ + pixel_y = 10 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"SL" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"SR" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + dir = 1; + name = "\improper Toilet" + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"SS" = ( +/obj/docking_port/stationary/emergency_response/idle_port3, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"SY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Tb" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Station Hallway"; + dir = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Tj" = ( +/turf/open/asphalt/cement{ + icon_state = "cement12" + }, +/area/adminlevel/ert_station/upp_station) +"Tm" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Tr" = ( +/obj/effect/landmark/wo_supplies/storage/m56d, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"Tu" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/machinery/door_control{ + pixel_y = -22; + name = "Toilet Shutters Button"; + id = "upp_toilet" + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan2" + }, +/area/adminlevel/ert_station/upp_station) +"Ty" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Shuttle Bay" + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"TB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/surgical_tray, +/turf/open/floor/strata{ + dir = 2; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"TE" = ( +/obj/structure/machinery/cryopod/right, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"TG" = ( +/turf/open/floor/strata{ + icon_state = "green3" + }, +/area/adminlevel/ert_station/upp_station) +"TH" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray, +/obj/item/tool/kitchen/knife{ + pixel_x = 3 + }, +/obj/item/tool/kitchen/knife/butcher{ + pixel_x = -8 + }, +/obj/item/tool/kitchen/rollingpin, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"TI" = ( +/obj/structure/platform/strata/metal, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"TM" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth, +/turf/open/space/basic, +/area/space) +"TQ" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"TT" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Ug" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard, +/obj/item/paper, +/obj/item/tool/lighter{ + pixel_y = 2; + pixel_x = -9 + }, +/obj/item/tool/pen/blue, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 5 + }, +/area/adminlevel/ert_station/upp_station) +"Uh" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 2; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"Uk" = ( +/obj/structure/pipes/vents/pump{ + dir = 1; + id_tag = "mining_outpost_pump" + }, +/turf/open/floor/strata{ + dir = 10; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Ul" = ( +/obj/structure/closet/bodybag, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 4; + icon_state = "cyan1" + }, +/area/adminlevel/ert_station/upp_station) +"Um" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Uo" = ( +/turf/closed/shuttle/elevator{ + dir = 9 + }, +/area/adminlevel/ert_station/upp_station) +"Up" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical{ + desc = "A sterile mask designed to help prevent the spread of diseases. This one has already been used."; + name = "used sterile mask" + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"Uu" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0; + icon_state = "abed" + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13; + icon_state = "abed" + }, +/obj/item/bedsheet/brown{ + pixel_y = 13 + }, +/obj/item/bedsheet/brown{ + layer = 3.2 + }, +/turf/open/floor/strata{ + icon_state = "blue1" + }, +/area/adminlevel/ert_station/upp_station) +"UA" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/device/flashlight/lamp/green{ + pixel_y = -3; + pixel_x = 16 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"UB" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "Command Shutters"; + id = "upp_command" + }, +/obj/structure/window/framed/strata/hull, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"UE" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"UM" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata{ + dir = 8; + icon_state = "white_cyan2" + }, +/area/adminlevel/ert_station/upp_station) +"UU" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"UV" = ( +/obj/structure/monorail{ + dir = 4; + name = "launch track" + }, +/turf/open/space/basic, +/area/space) +"Vo" = ( +/turf/open/floor/strata{ + icon_state = "red4"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"Vp" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Vv" = ( +/obj/structure/largecrate/random/barrel/yellow, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"Vx" = ( +/turf/closed/shuttle/elevator{ + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"VA" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"VI" = ( +/turf/closed/wall/rock/brown, +/area/space) +"VZ" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"Wb" = ( +/turf/open/floor/strata{ + icon_state = "blue4" + }, +/area/adminlevel/ert_station/upp_station) +"We" = ( +/obj/structure/machinery/door/poddoor/almayer/open{ + name = "Command Shutters"; + id = "upp_command"; + dir = 4 + }, +/obj/structure/window/framed/strata/hull, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Wi" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"Wj" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "floor3" + }, +/area/adminlevel/ert_station/upp_station) +"Wr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"WK" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Station Hallway" + }, +/turf/open/floor/strata{ + icon_state = "floor2" + }, +/area/adminlevel/ert_station/upp_station) +"WL" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/strata{ + dir = 4; + icon_state = "orange_edge" + }, +/area/adminlevel/ert_station/upp_station) +"WQ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"WX" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 1 + }, +/area/adminlevel/ert_station/upp_station) +"WZ" = ( +/obj/structure/machinery/chem_dispenser, +/obj/item/reagent_container/glass/beaker/bluespace, +/turf/open/floor/strata{ + icon_state = "white_cyan3" + }, +/area/adminlevel/ert_station/upp_station) +"Xb" = ( +/obj/structure/monorail{ + dir = 5; + name = "launch track" + }, +/turf/open/space/basic, +/area/space) +"Xr" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/item/reagent_container/glass/bucket, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"Xy" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"XG" = ( +/turf/open/asphalt/cement{ + icon_state = "cement4" + }, +/area/adminlevel/ert_station/upp_station) +"XL" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -12; + pixel_y = 13 + }, +/turf/open/floor/strata{ + icon_state = "floorscorched1" + }, +/area/adminlevel/ert_station/upp_station) +"XM" = ( +/obj/structure/largecrate/random/barrel/green, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 4 + }, +/area/adminlevel/ert_station/upp_station) +"Yy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"YH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) +"YK" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) +"YO" = ( +/obj/structure/machinery/gibber{ + pixel_y = 10 + }, +/obj/structure/surface/table/reinforced, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"YS" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/light/double/blue{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 2; + icon_state = "white_cyan4" + }, +/area/adminlevel/ert_station/upp_station) +"YW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 4 + }, +/turf/open/floor/strata{ + icon_state = "green1" + }, +/area/adminlevel/ert_station/upp_station) +"YY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Zm" = ( +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/upp_station) +"Zt" = ( +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/prison{ + dir = 8; + icon_state = "floor_marked" + }, +/area/adminlevel/ert_station/upp_station) +"ZH" = ( +/obj/structure/lattice, +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/space/basic, +/area/space) +"ZM" = ( +/obj/structure/largecrate/random/case/small, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 4; + icon_state = "orange_edge" + }, +/area/adminlevel/ert_station/upp_station) +"ZR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate, +/obj/item/reagent_container/food/snacks/upp, +/turf/open/floor/strata{ + icon_state = "green3"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"ZS" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/strata{ + icon_state = "green4"; + dir = 8 + }, +/area/adminlevel/ert_station/upp_station) +"ZX" = ( +/turf/open/floor/strata{ + dir = 8; + icon_state = "blue3" + }, +/area/adminlevel/ert_station/upp_station) + +(1,1,1) = {" +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +GI +GI +GI +GI +Cp +Cp +Cp +Cp +GI +GI +eV +YK +YK +YK +oS +AN +AN +AN +AN +AN +AN +AN +"} +(2,1,1) = {" +AN +AN +AN +AN +GI +AN +GI +AN +AN +jt +LG +LG +LG +LG +LG +ZH +GI +GI +GI +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +VI +uL +ws +ws +ws +oP +GI +GI +GI +AN +AN +AN +AN +"} +(3,1,1) = {" +AN +AN +AN +GI +GI +GI +GI +GI +GI +mJ +ws +ws +ws +ws +ws +ue +AN +GI +Cp +Cp +Cp +Uo +qU +qU +qU +qU +QG +Cp +Mt +ws +IV +ws +NQ +Cp +Cp +GI +GI +AN +AN +AN +"} +(4,1,1) = {" +AN +AN +GI +GI +El +We +We +El +AN +mJ +ws +ws +ws +ws +ws +Cp +Cp +Cp +Cp +Cp +Cp +Vx +ie +SC +SC +sI +Vx +Cp +Cp +ws +ws +ws +Cp +Cp +Cp +Cp +GI +GI +AN +AN +"} +(5,1,1) = {" +AN +GI +GI +El +El +YW +YW +El +El +El +Gu +Gu +Gu +Gu +Cp +Cp +Cp +Cp +Cp +Cp +Cp +ym +rC +EZ +EZ +va +ym +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +GI +AN +AN +"} +(6,1,1) = {" +GI +GI +El +El +bM +cs +cs +ks +Be +El +El +El +El +El +El +Cp +Cp +Cp +Dv +fM +Dv +Vx +wA +SC +SC +mb +Vx +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +AN +AN +"} +(7,1,1) = {" +GI +El +El +yn +iV +Zm +yH +TG +zr +po +Tr +cJ +IQ +rL +po +Cp +zL +he +kN +Ns +sz +da +qU +SC +CM +qU +GE +Cp +Cp +Cp +po +fM +fM +po +po +Cp +Cp +Cp +Cp +AN +"} +(8,1,1) = {" +AN +UB +pc +aA +aA +nC +Sj +TG +uf +po +ve +cJ +lm +ve +po +zL +ag +hM +ve +XL +Kr +Wr +vn +Zm +yH +SB +po +Cp +Cp +po +po +Hx +GL +Sq +po +Cp +Cp +Cp +Cp +AN +"} +(9,1,1) = {" +AN +UB +UA +nh +MU +Vp +yH +le +po +po +Sn +kS +fk +Sn +po +SL +eU +Xy +ow +aV +sy +Wr +ve +yH +Zm +ce +po +po +fM +po +OK +Au +Gb +Ay +pe +Cp +Cp +Cp +Cp +AN +"} +(10,1,1) = {" +AN +UB +FL +mG +Fj +Vp +Zm +TG +oK +Zm +yH +uW +bh +Zm +WK +vo +Bc +qH +Cp +Cp +ay +sk +RQ +vK +yH +Ne +po +TT +vn +po +fR +Vp +JB +MG +xj +Cp +Cp +Cp +Cp +AN +"} +(11,1,1) = {" +AN +UB +aW +zX +zX +Bt +UE +UE +RS +UE +Bq +UU +Ga +UE +UE +sb +Cp +Cp +Cp +Cp +Cp +Cp +rb +rs +Zm +yH +dK +JV +JB +Lk +nC +Xr +ax +ia +po +Cp +Cp +Cp +GI +AN +"} +(12,1,1) = {" +GI +El +El +eX +bd +tr +bd +jg +po +JB +Vp +BX +fW +po +po +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +RB +UE +UE +UE +lo +UE +RS +Bp +Ce +kT +CG +po +Cp +Cp +Cp +GI +AN +"} +(13,1,1) = {" +GI +Cp +po +po +po +po +WX +qi +po +vn +Tb +po +po +po +po +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +fM +po +po +po +po +po +cC +JB +Hb +dH +po +Cp +Cp +GI +GI +AN +"} +(14,1,1) = {" +GI +Cp +po +Rd +xo +po +Si +TG +po +JB +Vp +po +cl +Zt +xl +TQ +zK +Cp +Cp +po +po +po +WL +WL +Ln +ne +ZM +AI +AI +po +tG +Cu +po +po +po +Cp +Cp +GI +AN +AN +"} +(15,1,1) = {" +Cp +Cp +po +Vo +CI +po +sY +hF +po +hO +VA +po +Hl +ya +ya +ya +ya +ya +ya +ya +sG +ya +ya +ya +ya +ya +ya +ya +RR +po +Bt +ev +jc +PQ +po +El +AN +GI +AN +AN +"} +(16,1,1) = {" +Cp +po +po +ES +iM +po +po +po +po +QO +Vp +po +mz +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +zs +po +Vp +Gw +aH +aH +zQ +El +GI +GI +AN +AN +"} +(17,1,1) = {" +Cp +po +me +vw +nC +UE +Bq +UE +LQ +UE +BH +Ty +fA +xy +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +SS +xy +YH +Ty +Bp +Gw +FI +mP +po +El +Mc +pK +Mc +Xb +"} +(18,1,1) = {" +Cp +po +iJ +qY +Vp +Tm +we +Zm +vn +Zm +Vp +vn +PS +xy +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +xy +YY +vn +Vp +Gw +aH +aH +zQ +El +AN +GI +AN +UV +"} +(19,1,1) = {" +Cp +po +po +po +Sf +po +po +po +po +VZ +Vp +po +Ph +xy +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +xy +FJ +po +uP +Nz +DK +po +po +El +AN +GI +AN +UV +"} +(20,1,1) = {" +Cp +Cp +po +Fh +Vp +oJ +rf +Uu +po +Kb +Vp +po +SY +xy +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +xy +Yy +po +Vp +Gw +aH +aH +zQ +El +AN +GI +AN +UV +"} +(21,1,1) = {" +Cp +El +po +Fh +Lo +UE +mr +rT +po +wS +VA +po +Ph +xy +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +xy +FJ +po +uP +Gw +FI +mP +po +El +AN +GI +AN +UV +"} +(22,1,1) = {" +GI +El +vY +Zm +dW +Cy +lw +Cy +po +TG +Vp +hj +wu +xy +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +xy +IK +hj +Vp +Gw +aH +aH +zQ +El +Mc +pK +Mc +AU +"} +(23,1,1) = {" +GI +El +po +po +Wb +ZX +ZX +rX +po +TG +Bt +RS +fA +xy +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +rb +xy +YH +RS +BH +IT +CI +Hp +po +El +GI +GI +AN +AN +"} +(24,1,1) = {" +GI +Cp +Cp +po +aO +oJ +dh +oJ +po +fK +Vp +po +mz +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +xy +zs +po +qA +po +po +po +po +El +Cp +GI +GI +AN +"} +(25,1,1) = {" +GI +Cp +El +po +po +po +po +po +po +vn +Tb +po +hV +sA +lb +sA +sA +sA +sA +sA +lb +sA +sA +sA +sA +sA +lb +sA +Gl +po +GN +ME +yH +yH +JZ +Dv +Cp +Cp +GI +AN +"} +(26,1,1) = {" +GI +GI +El +bp +UM +SR +Lg +yH +yH +yH +Vp +po +po +RU +RU +RU +RU +RU +RU +RU +RU +RU +RU +RU +RU +RU +RU +RU +po +po +GN +bY +dz +tx +TH +Dv +Cp +Cp +Cp +AN +"} +(27,1,1) = {" +AN +GI +Kq +Jl +Tu +Dv +Bt +UE +Jp +UE +Ga +UE +Um +UE +Bq +UE +wY +UE +UE +Ry +bi +UE +Bq +UE +bi +UE +UE +Bq +bi +UE +FF +SI +Zm +uI +KX +Dv +Cp +Cp +Cp +AN +"} +(28,1,1) = {" +AN +GI +El +Cp +Cp +Dv +fi +Dv +Dv +Jj +Df +yH +ac +LK +Vp +yH +vn +dB +EA +tF +EA +eo +am +zY +ZR +ZR +aP +tv +Zm +vn +gx +OA +cO +rr +Mi +Dv +Cp +Cp +Cp +AN +"} +(29,1,1) = {" +AN +GI +Cp +Cp +Cp +Dv +Vp +jh +Dv +Dv +Dv +Dv +Dv +Dv +uI +qM +Dv +Vv +Is +fd +XM +Ug +Ni +nO +aF +Ae +MM +tv +Zm +vn +uE +wr +Zm +FA +Sa +Dv +Cp +Cp +GI +AN +"} +(30,1,1) = {" +AN +GI +GI +Cp +Cp +fM +Vp +KF +KF +KF +Dv +YS +bk +aS +Vp +oz +Dv +Dv +Dv +Dv +Dv +dL +bd +LO +eT +vH +ZS +Bt +gf +Wj +TI +IX +Zm +pv +mq +Cp +Cp +ZH +GI +AN +"} +(31,1,1) = {" +AN +AN +AN +Cp +Cp +Cp +Vp +oz +oz +Js +Dv +qF +uj +WZ +Bt +UE +NU +UE +gt +aS +Dv +Dv +kF +Ks +Ks +MB +Jz +Bp +Tm +yH +HR +YO +kc +yH +Cp +Cp +PI +sr +AN +AN +"} +(32,1,1) = {" +AN +AN +AN +Cp +Cp +Dv +Lo +UE +UE +Uk +Dv +Mk +uj +zx +Vp +Uh +Dv +TB +DG +iB +lp +Dv +fE +Kn +sC +Eg +Dv +PJ +Dv +Dv +Dv +Dv +Cp +Cp +Cp +Mt +PI +Bw +AN +AN +"} +(33,1,1) = {" +AN +AN +AN +Cp +Cp +Dv +Dv +oz +oz +Ul +Dv +Ak +uj +QR +Vp +ry +sU +mf +Sy +sK +pb +Dv +fE +pu +Kn +Tj +Dv +cj +RC +RC +Jc +Dv +Cp +Cp +GI +uL +PI +Bw +AN +AN +"} +(34,1,1) = {" +AN +AN +AN +AN +Cp +Cp +Dv +FP +FP +FP +Dv +CW +uj +PT +Vp +hg +sU +qd +KL +uj +pb +Dv +XG +Rf +Rf +om +Dv +jH +Gt +dW +xF +Dv +Cp +GI +AN +Mt +PI +Bw +AN +AN +"} +(35,1,1) = {" +AN +AN +AN +AN +AN +Cp +Dv +Dv +fM +fM +Dv +Dv +Qu +Qz +Sh +kf +Dv +Dv +OS +Up +RK +Dv +ge +LB +JX +LN +Dv +TE +Sx +rk +Cp +Cp +Cp +GI +AN +Mt +PI +Bw +AN +AN +"} +(36,1,1) = {" +AN +AN +AN +AN +AN +Cp +Cp +Cp +Cp +Cp +Cp +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Cp +Cp +Cp +di +yt +WQ +yt +hA +PI +Bw +AN +AN +"} +(37,1,1) = {" +AN +AN +AN +AN +AN +AN +GI +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +ws +ws +ws +TM +ws +ws +ws +IC +PI +Bw +AN +AN +"} +(38,1,1) = {" +AN +AN +AN +AN +AN +AN +GI +GI +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +uL +ws +IV +ws +Kj +ws +IV +ws +Pj +PI +Bw +AN +AN +"} +(39,1,1) = {" +AN +AN +AN +AN +AN +AN +AN +GI +GI +GI +GI +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +GI +GI +uL +ws +ws +ws +vZ +ws +ws +ws +eY +LI +fc +AN +AN +"} +(40,1,1) = {" +AN +AN +AN +AN +AN +AN +AN +AN +AN +AN +GI +GI +GI +Cp +Cp +Cp +Cp +Cp +Cp +Cp +Cp +GI +GI +GI +GI +GI +AN +pN +vS +Wi +vS +Hc +vS +Wi +au +fc +AN +AN +AN +AN +"} diff --git a/maps/templates/weyland_ert_station.dmm b/maps/templates/weyland_ert_station.dmm new file mode 100644 index 000000000000..171bd8d9ac6e --- /dev/null +++ b/maps/templates/weyland_ert_station.dmm @@ -0,0 +1,5844 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ab" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"al" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"ap" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"au" = ( +/turf/open/floor/corsat{ + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"aG" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/emails{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"bf" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/tool/stamp/internalaffairs{ + pixel_y = 9; + pixel_x = -5 + }, +/obj/item/paper_bin/wy, +/obj/item/tool/pen, +/obj/item/device/flashlight/lamp{ + pixel_x = 5; + pixel_y = 13 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"bk" = ( +/obj/structure/machinery/medical_pod/sleeper, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"bp" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/manifold/fourway/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"bv" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"bw" = ( +/obj/structure/bed, +/obj/structure/window/reinforced/toughened{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced/toughened{ + dir = 8 + }, +/obj/item/bedsheet/orange, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"bG" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"bV" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"ck" = ( +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/weyland_station) +"cm" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"cn" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"cq" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"cr" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/shower{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"cw" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor/corsat{ + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"cz" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper, +/obj/item/tool/pen, +/obj/item/tool/pen{ + pixel_y = 3 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"cK" = ( +/obj/structure/surface/table, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"cU" = ( +/turf/open/floor/corsat{ + dir = 9; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"cW" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"cX" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"cY" = ( +/obj/structure/closet/firecloset/full, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "yellowcorner"; + dir = 4 + }, +/area/adminlevel/ert_station/weyland_station) +"cZ" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"dc" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"dx" = ( +/obj/structure/window/framed/corsat/indestructible/research, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_aft_medbay"; + name = "\improper Aft Medbay Shutters" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"dy" = ( +/obj/item/clothing/suit/chef/classic, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/head/chefhat, +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"dz" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/corsat{ + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"dC" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"dE" = ( +/turf/open/floor/corsat{ + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"dM" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"dO" = ( +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"dT" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/obj/structure/morgue, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"ee" = ( +/obj/structure/bed/roller, +/turf/open/floor/corsat{ + icon_state = "darkgreen" + }, +/area/adminlevel/ert_station/weyland_station) +"eh" = ( +/obj/structure/machinery/shower{ + pixel_y = 21 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"ei" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"ek" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"el" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"er" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/toy/deck, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"eA" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/clothing/gloves/yellow, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"eB" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood{ + req_access = null + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"eG" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"eJ" = ( +/obj/structure/machinery/door/airlock/almayer/security/colony{ + dir = 1; + name = "\improper Brig Cell 2" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"eO" = ( +/turf/open/floor/corsat{ + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"eQ" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"eX" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"fe" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_meeting"; + name = "\improper Meeting Room Shutters"; + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sigma" + }, +/area/adminlevel/ert_station/weyland_station) +"fl" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_10" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"fy" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"fC" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"fD" = ( +/obj/structure/closet/emcloset{ + pixel_y = 15; + pixel_x = 8; + density = 0 + }, +/obj/structure/closet/firecloset/full{ + pixel_y = 15; + pixel_x = -8; + density = 0 + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"fF" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"fI" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Laundry Room" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"fX" = ( +/turf/closed/wall/r_wall/biodome, +/area/adminlevel/ert_station/weyland_station) +"gf" = ( +/obj/structure/machinery/body_scanconsole, +/obj/structure/machinery/autodoc_console{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"gh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"gj" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/device/taperecorder, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"gm" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"gq" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"gC" = ( +/obj/structure/closet/crate/ammo/alt/flame, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"gH" = ( +/obj/item/reagent_container/glass/bucket/janibucket{ + pixel_x = -1; + pixel_y = 13 + }, +/obj/item/tool/mop, +/obj/item/reagent_container/glass/bucket{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"gK" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"gL" = ( +/obj/structure/surface/table, +/obj/item/storage/box/wy_mre, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"gW" = ( +/obj/structure/machinery/chem_dispenser, +/obj/item/reagent_container/glass/beaker/bluespace, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"ha" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/processor{ + pixel_y = 10 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"ho" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "whitetancorner" + }, +/area/adminlevel/ert_station/weyland_station) +"hu" = ( +/obj/structure/machinery/optable, +/obj/item/tank/anesthetic, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "darkgreen" + }, +/area/adminlevel/ert_station/weyland_station) +"hz" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"hC" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_center_medbay"; + name = "\improper Central Medbay Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"hG" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"hK" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "whitetancorner" + }, +/area/adminlevel/ert_station/weyland_station) +"hM" = ( +/obj/structure/machinery/light/double, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"hZ" = ( +/obj/structure/closet/secure_closet/brig{ + pixel_y = 16; + pixel_x = 7; + density = 0 + }, +/obj/structure/closet/secure_closet/brig{ + pixel_y = 16; + pixel_x = -7; + density = 0 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"ib" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "arrow_east" + }, +/area/adminlevel/ert_station/weyland_station) +"id" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"ik" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"in" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"iw" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin{ + pixel_y = 10 + }, +/obj/item/device/flashlight/lamp/green{ + pixel_y = 20; + pixel_x = 16 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"iE" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/green, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"iJ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"iP" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_y = 32 + }, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"iT" = ( +/obj/structure/surface/table/reinforced, +/obj/item/tool/kitchen/tray, +/obj/item/tool/kitchen/knife{ + pixel_x = 3 + }, +/obj/item/tool/kitchen/knife/butcher{ + pixel_x = -8 + }, +/obj/item/tool/kitchen/rollingpin, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"iU" = ( +/obj/structure/closet/crate/internals, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"iV" = ( +/obj/structure/machinery/autolathe/full, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"jb" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"je" = ( +/obj/structure/reagent_dispensers/water_cooler/stacks{ + density = 0; + pixel_x = -9; + pixel_y = 19 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"jm" = ( +/obj/structure/machinery/cm_vending/clothing/antag{ + name = "\improper Response Team Automated Equipment Rack" + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"jz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"jE" = ( +/obj/structure/machinery/shower{ + pixel_y = 21 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "damaged1" + }, +/area/adminlevel/ert_station/weyland_station) +"jK" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"jY" = ( +/obj/structure/machinery/medical_pod/sleeper, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"ka" = ( +/obj/structure/closet/crate/medical, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"kn" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"kq" = ( +/obj/structure/bed/chair/wheelchair, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"kr" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"ky" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/suit/storage/hazardvest/blue, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"kA" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"kF" = ( +/obj/structure/machinery/power/smes, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"kM" = ( +/obj/structure/largecrate/supply/weapons/flamers, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"kO" = ( +/obj/structure/window/framed/corsat/research, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_center_medbay_or"; + name = "\improper Central Medbay Operation Room Shutters"; + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"kV" = ( +/obj/structure/surface/table, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"kW" = ( +/obj/structure/machinery/sleep_console{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"la" = ( +/obj/structure/machinery/light/double, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"lh" = ( +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"ll" = ( +/obj/item/storage/firstaid/adv, +/obj/item/storage/belt/medical/lifesaver/full, +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"lo" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"lq" = ( +/obj/structure/bed{ + icon_state = "psychbed" + }, +/obj/item/bedsheet/rd, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"lv" = ( +/obj/structure/surface/table, +/obj/item/reagent_container/food/snacks/milosoup{ + pixel_y = 10 + }, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"lw" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"lx" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"lD" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"lE" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/structure/machinery/light/small/built{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"lH" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"lI" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor/corsat{ + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"lS" = ( +/obj/structure/largecrate/supply/medicine/blood, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"lT" = ( +/obj/structure/machinery/cryopod/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"lU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"lY" = ( +/obj/structure/window/framed/corsat/indestructible, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"md" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"mg" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"mh" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"mn" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"mv" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/shower{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/strata{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"mx" = ( +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/obj/structure/largecrate/random/case/small, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"mE" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"mI" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"mV" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + name = "\improper Telecomms" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"nb" = ( +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = 8; + density = 0 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"ng" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage/antag, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"nq" = ( +/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access{ + req_access = null + }, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"ns" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Bathroom" + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/adminlevel/ert_station/weyland_station) +"nw" = ( +/obj/structure/surface/rack, +/obj/item/weapon/gun/rifle/m41a/elite{ + pixel_y = 1 + }, +/obj/item/weapon/gun/rifle/m41a/elite{ + pixel_y = -4 + }, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"nG" = ( +/obj/structure/machinery/autolathe/full, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"nI" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"nJ" = ( +/obj/item/roller, +/obj/item/roller, +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"nQ" = ( +/obj/structure/surface/table/reinforced, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"nS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/obj/structure/closet/emcloset{ + pixel_y = 15; + pixel_x = 8; + density = 0 + }, +/obj/structure/closet/firecloset/full{ + pixel_y = 15; + pixel_x = -8; + density = 0 + }, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "whitecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"nT" = ( +/obj/structure/showcase{ + icon_state = "broadcast receiver"; + name = "Subspace Receiver" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"nY" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"ob" = ( +/obj/structure/closet/secure_closet/chemical{ + req_access_txt = "100" + }, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"og" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"ou" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/firstaid/adv, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"oE" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "bluecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"oL" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"oM" = ( +/obj/structure/window/framed/corsat/research, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_aft_medbay"; + name = "\improper Aft Medbay Shutters" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"oQ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"oT" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"oX" = ( +/obj/structure/surface/rack, +/obj/item/storage/fancy/vials/random, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"pa" = ( +/obj/vehicle/powerloader/ft{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"pc" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"pf" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/ammo_box/magazine/m39/ap{ + pixel_y = 8 + }, +/obj/item/ammo_box/magazine/ap, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"pq" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"pv" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"pB" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/antag_guns{ + hacked = 1; + name = "\improper Response Team Automated Guns Rack"; + use_power = 0; + use_snowflake_points = 1 + }, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"pE" = ( +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"pF" = ( +/turf/open/floor/corsat{ + icon_state = "theta" + }, +/area/adminlevel/ert_station/weyland_station) +"pK" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage/antag, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"pY" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "arrow_east" + }, +/area/adminlevel/ert_station/weyland_station) +"qu" = ( +/obj/structure/machinery/door/airlock/almayer/security/colony{ + dir = 1; + name = "\improper Brig Cell 3" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"qv" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"qD" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/folder/black, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"qF" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"qL" = ( +/obj/structure/morgue, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"qV" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"rc" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/light/double/blue, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "damaged1" + }, +/area/adminlevel/ert_station/weyland_station) +"ro" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"rB" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage/antag, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"rD" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"rF" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"rK" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"rN" = ( +/obj/structure/bed/chair/comfy/orange, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"rX" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "bluecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"rY" = ( +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"sg" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"sq" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"sr" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin/wy, +/obj/item/tool/pen/clicky, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"su" = ( +/obj/structure/bed/chair/office/light, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"sy" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"sA" = ( +/obj/structure/machinery/blackbox_recorder, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"sB" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"sH" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/emails{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"sM" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"sO" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"sX" = ( +/obj/structure/window/framed/corsat/research, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_center_medbay"; + name = "\improper Central Medbay Shutters"; + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"sY" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "whitetancorner" + }, +/area/adminlevel/ert_station/weyland_station) +"tc" = ( +/obj/structure/bed/sofa/south/white/right, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"td" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"th" = ( +/obj/structure/closet/secure_closet/surgical{ + pixel_y = 30 + }, +/obj/item/reagent_container/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "WY_center_medbay_or"; + name = "Center Medbay Operation Room Shutters"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "1" + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "darkgreen" + }, +/area/adminlevel/ert_station/weyland_station) +"ts" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"tz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"tR" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_meeting"; + name = "\improper Meeting Room Shutters" + }, +/obj/structure/window/framed/corsat, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"tW" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer3/laptop/secure_data, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"tX" = ( +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"ul" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"uv" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"uw" = ( +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 21; + pixel_x = 1 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"uE" = ( +/obj/structure/surface/rack, +/obj/item/weapon/gun/rifle/m41a/elite{ + pixel_y = 1 + }, +/obj/item/weapon/gun/rifle/m41a/elite{ + pixel_y = -4 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"uR" = ( +/obj/structure/closet/secure_closet/freezer/fridge/full, +/obj/item/reagent_container/food/condiment/enzyme, +/obj/structure/machinery/light/small/built{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"uX" = ( +/obj/structure/surface/table, +/obj/item/reagent_container/food/snacks/meatsteak{ + pixel_y = -2 + }, +/obj/item/ashtray/bronze{ + pixel_x = 7; + pixel_y = 9 + }, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"va" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"vb" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Barracks"; + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"vc" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"vh" = ( +/turf/open/floor/corsat{ + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"vv" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"vz" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"vN" = ( +/obj/structure/window/framed/corsat/research, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"vP" = ( +/obj/structure/machinery/light/double, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"vU" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"vW" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"vX" = ( +/obj/structure/machinery/cryopod/right, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"wa" = ( +/obj/item/device/defibrillator/upgraded, +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "darkgreen" + }, +/area/adminlevel/ert_station/weyland_station) +"wE" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"wU" = ( +/obj/structure/surface/rack, +/obj/item/storage/pill_bottle/tramadol, +/obj/item/storage/pill_bottle/bicaridine{ + pixel_x = 5 + }, +/obj/item/storage/pill_bottle/kelotane{ + pixel_x = -7 + }, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"xg" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor/corsat{ + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"xh" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"xk" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/fancy/cigarettes/wypacket{ + pixel_y = 4; + pixel_x = -5 + }, +/obj/item/tool/lighter/zippo/gold, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"xA" = ( +/turf/open/floor/corsat{ + dir = 10; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"xD" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_meeting"; + name = "\improper Meeting Room Shutters"; + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sigma" + }, +/area/adminlevel/ert_station/weyland_station) +"xE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"xN" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"xT" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"xZ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/green, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"ya" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"yb" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"yj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "whitecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"yo" = ( +/obj/structure/machinery/light/double, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"yp" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + name = "\improper Toxicity & Poison Treatment" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_aft_medbay"; + name = "\improper Aft Medbay Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"yD" = ( +/obj/structure/bed{ + icon_state = "psychbed" + }, +/obj/item/bedsheet/orange, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"yH" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"yM" = ( +/turf/open/floor/corsat{ + dir = 6; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"zh" = ( +/turf/open/floor/corsat{ + dir = 10; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"zC" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ + name = "Morgue"; + req_one_access = null + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"zD" = ( +/obj/structure/surface/rack, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"zH" = ( +/obj/item/ashtray/bronze{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = 10; + pixel_y = 15 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/clothing/mask/cigarette{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/structure/surface/table/reinforced/black, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"zI" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/microwave{ + pixel_y = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"zN" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"zR" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "darkgreencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"zS" = ( +/obj/structure/closet/coffin, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"zT" = ( +/obj/structure/window/reinforced/toughened, +/obj/structure/closet/crate/ammo, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Ai" = ( +/obj/item/device/defibrillator/upgraded, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "WY_center_medbay"; + name = "Center Medbay Shutters"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "1" + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Ak" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"Ax" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/closet/hydrant{ + pixel_y = -30 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"AA" = ( +/obj/structure/machinery/portable_atmospherics/powered/pump, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"AD" = ( +/obj/structure/surface/table/reinforced/black, +/obj/effect/spawner/random/facepaint, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "bluecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"AG" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"AH" = ( +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"AO" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"AQ" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/obj/structure/closet/l3closet/virology, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"AR" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"AU" = ( +/turf/open/floor/corsat{ + icon_state = "arrow_east" + }, +/area/adminlevel/ert_station/weyland_station) +"AV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/machinery/light/double, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"AY" = ( +/obj/structure/machinery/washing_machine, +/obj/structure/machinery/washing_machine{ + layer = 3.5; + pixel_y = 15 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Bk" = ( +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"Bu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/window{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"Bx" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"Bz" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Barracks" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"BG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out" + }, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "whitecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"BL" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/corsat{ + icon_state = "theta" + }, +/area/adminlevel/ert_station/weyland_station) +"BM" = ( +/obj/structure/surface/table, +/obj/item/ashtray/glass, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"BT" = ( +/obj/structure/window/framed/corsat, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_meeting"; + name = "\improper Meeting Room Shutters" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"BV" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "bluecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Cm" = ( +/obj/structure/showcase{ + icon_state = "hub"; + name = "Telecommunication Hub" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"Cv" = ( +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"Cw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/colony{ + name = "Cryogenics" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"Cy" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/weyland_station) +"CI" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"CK" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/toy/deck{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"CU" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"De" = ( +/obj/structure/pipes/standard/simple/visible{ + dir = 9 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Dk" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/firstaid/rad{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/item/storage/firstaid/toxin, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Dn" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Dr" = ( +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Ds" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "bluecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"DF" = ( +/obj/structure/bookcase{ + icon_state = "book-5" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"DH" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/ashtray/glass, +/obj/item/trash/cigbutt/cigarbutt{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = 13 + }, +/obj/item/device/flashlight/lamp/green{ + pixel_y = 21; + pixel_x = 16 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"DL" = ( +/obj/structure/showcase{ + icon_state = "processor"; + name = "Processor Unit" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"DO" = ( +/obj/structure/showcase{ + icon_state = "relay"; + name = "Telecommunication Relay" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"DT" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/black, +/obj/item/tool/pen/blue, +/obj/structure/machinery/light/double, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"DZ" = ( +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Eg" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + name = "\improper Medical & Surgery" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_center_medbay"; + name = "\improper Central Medbay Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"El" = ( +/obj/structure/surface/table/reinforced, +/obj/item/reagent_container/food/drinks/shaker, +/obj/structure/machinery/light/double, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"Er" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"EB" = ( +/obj/structure/barricade/handrail/wire, +/turf/open/floor/corsat{ + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"EC" = ( +/turf/open/floor/corsat{ + icon_state = "yellowcorner"; + dir = 4 + }, +/area/adminlevel/ert_station/weyland_station) +"ED" = ( +/obj/structure/morgue, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"EG" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"ES" = ( +/obj/docking_port/stationary/emergency_response/idle_port2, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"EW" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/chem_dispenser/beer{ + density = 0; + pixel_y = 23 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"Fr" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin{ + pixel_y = 10 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"Fs" = ( +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"FA" = ( +/obj/structure/bed, +/obj/structure/window/reinforced/toughened{ + dir = 1; + layer = 2.9 + }, +/obj/item/bedsheet/orange, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"FD" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/tool/weldingtool/largetank, +/obj/item/clothing/glasses/welding, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"FE" = ( +/obj/structure/machinery/sleep_console, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"FO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"Gb" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Gd" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"Gg" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Gs" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Gx" = ( +/obj/item/tool/weldpack{ + pixel_x = 5 + }, +/obj/structure/surface/rack, +/obj/item/tool/weldpack{ + pixel_x = -2 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"Gz" = ( +/obj/structure/pipes/standard/cap/hidden, +/obj/structure/machinery/cryo_cell{ + layer = 3.20 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"GM" = ( +/obj/structure/machinery/blackbox_recorder, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"Hc" = ( +/obj/structure/closet/medical_wall{ + pixel_x = -30 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"He" = ( +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"Hh" = ( +/obj/structure/closet/crate, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"Hk" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"Hr" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"HE" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"HN" = ( +/obj/structure/bed{ + icon_state = "psychbed" + }, +/obj/item/bedsheet/captain, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"Id" = ( +/obj/structure/machinery/door/airlock/almayer/medical/colony, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"If" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Ik" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 23; + pixel_x = 1 + }, +/turf/open/floor/corsat{ + icon_state = "damaged1" + }, +/area/adminlevel/ert_station/weyland_station) +"Im" = ( +/obj/structure/closet/coffin, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Iv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/corsat{ + icon_state = "theta" + }, +/area/adminlevel/ert_station/weyland_station) +"IB" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/weyland_station) +"II" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"IQ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"IV" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + icon_state = "bluecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Jc" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"Jd" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Je" = ( +/turf/open/floor/corsat{ + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"Jk" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -11 + }, +/obj/structure/mirror{ + pixel_x = -28 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "darkgreen" + }, +/area/adminlevel/ert_station/weyland_station) +"Jr" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Js" = ( +/obj/structure/surface/table/reinforced/black, +/obj/structure/transmitter/rotary{ + name = "Weyland-Yutani Station CiC"; + phone_category = "W-Y"; + phone_id = "W-Y Station CiC"; + callable = 0 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Jt" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "darkgreencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Ju" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/door_control{ + id = "WY_meeting"; + name = "Meeting Room Shutters"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "1" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"Jw" = ( +/obj/structure/closet/cabinet, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"Jy" = ( +/obj/structure/reagent_dispensers/beerkeg{ + density = 0 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"JA" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "bluecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"JK" = ( +/turf/open/floor/corsat{ + icon_state = "whitetancorner" + }, +/area/adminlevel/ert_station/weyland_station) +"JQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"Kd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"Kg" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control{ + id = "WY_aft_medbay"; + name = "Aft Medbay Shutters"; + pixel_x = -7; + pixel_y = 9; + req_access_txt = "1" + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Kk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"Ku" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/chem_dispenser/soda{ + density = 0; + pixel_y = 22 + }, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"KC" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + dir = 1; + name = "\improper Meeting Room" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_meeting"; + name = "\improper Meeting Room Shutters"; + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sigma" + }, +/area/adminlevel/ert_station/weyland_station) +"KD" = ( +/obj/structure/barricade/handrail/wire{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"KF" = ( +/turf/open/floor/corsat{ + dir = 6; + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"KK" = ( +/obj/structure/surface/table/reinforced/black, +/obj/structure/machinery/computer/communications{ + dir = 8 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"KM" = ( +/obj/item/weapon/gun/shotgun/combat{ + pixel_y = 9 + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/weapon/gun/shotgun/combat{ + pixel_y = -6 + }, +/obj/item/weapon/gun/shotgun/combat{ + pixel_y = 2 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"KP" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access{ + req_access = null + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"KW" = ( +/obj/structure/window/framed/corsat/indestructible/security, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"KZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/item/tool/wet_sign, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"Le" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/recharger, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Ls" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "tcomms" + }, +/area/adminlevel/ert_station/weyland_station) +"Lz" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"LF" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"LP" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Ma" = ( +/turf/open/floor/corsat{ + dir = 5; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"Mn" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_aft_medbay"; + name = "\improper Aft Medbay Shutters" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"MA" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"MP" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"MQ" = ( +/obj/structure/pipes/unary/freezer{ + icon_state = "freezer_1" + }, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"MV" = ( +/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/mask/surgical, +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "darkgreen" + }, +/area/adminlevel/ert_station/weyland_station) +"MW" = ( +/obj/structure/surface/table, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = -7; + pixel_y = 16 + }, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"Nd" = ( +/obj/structure/window/framed/corsat/research, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_center_medbay_or"; + name = "\improper Central Medbay Operation Room Shutters" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"Nf" = ( +/obj/structure/machinery/medical_pod/bodyscanner, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Np" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/effect/spawner/random/facepaint, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Nr" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/effect/spawner/random/goggles/lowchance, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Ns" = ( +/obj/structure/machinery/bioprinter{ + stored_metal = 1000 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "darkgreen" + }, +/area/adminlevel/ert_station/weyland_station) +"NC" = ( +/obj/structure/pipes/standard/manifold/visible, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"NK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/manifold/fourway/hidden/green, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"NN" = ( +/turf/open/floor/corsat{ + icon_state = "omega" + }, +/area/adminlevel/ert_station/weyland_station) +"NO" = ( +/obj/structure/showcase{ + icon_state = "bus" + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"NR" = ( +/obj/structure/machinery/light/double{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"NS" = ( +/obj/structure/closet/emcloset, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "yellowcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Oc" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "arrow_west" + }, +/area/adminlevel/ert_station/weyland_station) +"Og" = ( +/turf/open/floor/corsat{ + icon_state = "arrow_west" + }, +/area/adminlevel/ert_station/weyland_station) +"Oj" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"On" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"Oo" = ( +/obj/structure/surface/rack, +/obj/item/storage/pill_bottle/inaprovaline{ + pixel_x = 7 + }, +/obj/item/storage/pill_bottle/dexalin, +/obj/item/storage/pill_bottle/antitox{ + pixel_x = -5 + }, +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Oq" = ( +/obj/structure/surface/table/reinforced, +/obj/structure/machinery/gibber{ + pixel_y = 10 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"Ot" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Ov" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"OD" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"OE" = ( +/obj/structure/closet/wardrobe/chemistry_white, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"OG" = ( +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"OY" = ( +/obj/structure/machinery/vending/cola, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"Pc" = ( +/turf/open/floor/corsat{ + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"Pk" = ( +/obj/structure/machinery/light/double, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"PL" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Dormitories" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/adminlevel/ert_station/weyland_station) +"Qa" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "bluecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Qb" = ( +/obj/structure/machinery/shower{ + pixel_y = 21 + }, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/strata{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/adminlevel/ert_station/weyland_station) +"Qc" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "tcomms" + }, +/area/adminlevel/ert_station/weyland_station) +"Qk" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/obj/structure/closet/l3closet/virology, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Qr" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/weapon/gun/smg/m39/elite, +/obj/item/weapon/gun/smg/m39/elite{ + pixel_y = -8 + }, +/obj/item/weapon/gun/smg/m39/elite{ + pixel_y = 9 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"QI" = ( +/obj/structure/bed/sofa/south/white/left, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"QQ" = ( +/obj/structure/pipes/standard/cap/hidden, +/obj/structure/machinery/cryo_cell{ + layer = 3.20 + }, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"QR" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"QT" = ( +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, +/area/adminlevel/ert_station/weyland_station) +"QV" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 18 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"QZ" = ( +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"Rb" = ( +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/weyland_station) +"Rd" = ( +/obj/structure/machinery/chem_master, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Re" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"Rj" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Rr" = ( +/obj/structure/window/framed/corsat/cell/security, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Rv" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/masks, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"RB" = ( +/obj/structure/machinery/shower{ + dir = 8 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/weyland_station) +"RE" = ( +/obj/structure/machinery/cm_vending/gear/antag{ + hacked = 1; + name = "\improper Response Team Automated Gear Rack"; + use_snowflake_points = 1 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"RF" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"RG" = ( +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/weyland_station) +"RL" = ( +/obj/structure/window/framed/corsat, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_meeting"; + name = "\improper Meeting Room Shutters"; + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/weyland_station) +"RQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "theta" + }, +/area/adminlevel/ert_station/weyland_station) +"RT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/item/tool/wet_sign, +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"RZ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"Si" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Sr" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "brown"; + dir = 1 + }, +/area/adminlevel/ert_station/weyland_station) +"Ss" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"St" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_y = 29 + }, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"Sw" = ( +/obj/structure/pipes/standard/simple/visible{ + dir = 5 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "greencorner" + }, +/area/adminlevel/ert_station/weyland_station) +"SE" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/transmitter/rotary{ + name = "Weyland-Yutani Station Meeting Room"; + phone_category = "W-Y"; + phone_id = "W-Y Station Meeting Room"; + callable = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"SH" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"SI" = ( +/turf/open/floor/almayer{ + icon_state = "tcomms" + }, +/area/adminlevel/ert_station/weyland_station) +"SJ" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/firstaid/fire, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"SM" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"SO" = ( +/obj/structure/machinery/cryopod/right{ + pixel_y = 6 + }, +/turf/open/floor/corsat{ + icon_state = "cargo" + }, +/area/adminlevel/ert_station/weyland_station) +"SY" = ( +/obj/structure/surface/table/reinforced, +/obj/item/trash/plate{ + pixel_y = 2 + }, +/obj/item/trash/plate{ + pixel_y = 4 + }, +/obj/item/trash/plate{ + pixel_y = 6 + }, +/obj/item/trash/plate{ + pixel_y = 8 + }, +/obj/item/trash/plate{ + pixel_y = 10 + }, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"Ta" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"Tf" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, +/obj/item/stack/sheet/glass{ + amount = 50; + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"Tk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/closet/hydrant{ + pixel_y = 30 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"Tx" = ( +/obj/structure/bed/roller, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"TL" = ( +/obj/structure/machinery/medical_pod/autodoc/unskilled{ + dir = 1 + }, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 5; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"TN" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/corsat{ + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"TT" = ( +/obj/structure/bed/chair/comfy/orange{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"TW" = ( +/obj/structure/largecrate/random/barrel/green, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/corsat{ + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"Ub" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"Ud" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "browncorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Uk" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + dir = 1; + name = "\improper Toilet" + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"Us" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Uu" = ( +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"Ux" = ( +/turf/open/space/basic, +/area/space) +"UJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"UV" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Vm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"Vp" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"VA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"VJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"VZ" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"Wj" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"Wo" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/colony{ + name = "Engineering" + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"Wu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/closet/emcloset{ + pixel_y = 15; + pixel_x = 8; + density = 0 + }, +/obj/structure/closet/firecloset/full{ + pixel_y = 15; + pixel_x = -8; + density = 0 + }, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/corsat{ + icon_state = "whitecorner" + }, +/area/adminlevel/ert_station/weyland_station) +"WD" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_10"; + pixel_y = 19 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"WE" = ( +/turf/open/floor/corsat{ + dir = 4; + icon_state = "whitetan" + }, +/area/adminlevel/ert_station/weyland_station) +"WU" = ( +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"WW" = ( +/obj/structure/bed/chair, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Xh" = ( +/obj/structure/window/reinforced/toughened{ + dir = 4 + }, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"Xi" = ( +/obj/structure/pipes/standard/tank/oxygen, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Xj" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper, +/obj/item/tool/pen, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"Xn" = ( +/obj/structure/surface/rack, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Xo" = ( +/obj/structure/machinery/vending/dinnerware, +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) +"Xs" = ( +/obj/structure/target, +/turf/open/floor/corsat{ + icon_state = "theta" + }, +/area/adminlevel/ert_station/weyland_station) +"Xt" = ( +/turf/open/floor/corsat{ + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Xw" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + dir = 10; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"Xx" = ( +/obj/structure/coatrack{ + pixel_y = 21 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"XD" = ( +/obj/structure/machinery/vending/coffee, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "red" + }, +/area/adminlevel/ert_station/weyland_station) +"XQ" = ( +/turf/open/floor/corsat{ + icon_state = "brown"; + dir = 1 + }, +/area/adminlevel/ert_station/weyland_station) +"XR" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "brown" + }, +/area/adminlevel/ert_station/weyland_station) +"Ya" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/closet/medical_wall{ + pixel_x = 30 + }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "white" + }, +/area/adminlevel/ert_station/weyland_station) +"Yb" = ( +/obj/structure/surface/table/woodentable/fancy, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"Yj" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/corsat{ + dir = 6; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"Yt" = ( +/obj/structure/bed/chair/comfy/orange, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"Yv" = ( +/obj/structure/surface/table/reinforced/black, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "blue" + }, +/area/adminlevel/ert_station/weyland_station) +"YB" = ( +/obj/structure/machinery/photocopier{ + pixel_y = 16; + density = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/weyland_station) +"YC" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"YN" = ( +/obj/structure/bedsheetbin, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/turf/open/floor/corsat{ + icon_state = "squares" + }, +/area/adminlevel/ert_station/weyland_station) +"YZ" = ( +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 21; + pixel_x = 1 + }, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/weyland_station) +"Za" = ( +/obj/structure/morgue, +/turf/open/floor/corsat{ + dir = 9; + icon_state = "green" + }, +/area/adminlevel/ert_station/weyland_station) +"Zl" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony{ + name = "\improper Fridge" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/adminlevel/ert_station/weyland_station) +"Zn" = ( +/turf/open/floor/corsat{ + dir = 1; + icon_state = "tan" + }, +/area/adminlevel/ert_station/weyland_station) +"Zt" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + dir = 8; + icon_state = "redcorner" + }, +/area/adminlevel/ert_station/weyland_station) +"Zu" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + dir = 1; + name = "\improper Meeting Room" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_meeting"; + name = "\improper Meeting Room Shutters"; + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "sigma" + }, +/area/adminlevel/ert_station/weyland_station) +"ZH" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor/corsat{ + dir = 4; + icon_state = "yellow" + }, +/area/adminlevel/ert_station/weyland_station) +"ZU" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/corsat{ + icon_state = "plate" + }, +/area/adminlevel/ert_station/weyland_station) +"ZV" = ( +/obj/structure/machinery/shower{ + dir = 4 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/corsat{ + icon_state = "retrosquareslight" + }, +/area/adminlevel/ert_station/weyland_station) +"ZX" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/corsat{ + icon_state = "sterileplate" + }, +/area/adminlevel/ert_station/weyland_station) + +(1,1,1) = {" +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +"} +(2,1,1) = {" +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +"} +(3,1,1) = {" +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +QT +QT +lY +lY +lY +QT +QT +QT +lY +lY +lY +QT +QT +QT +lY +lY +lY +QT +QT +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +"} +(4,1,1) = {" +Ux +Ux +Ux +Ux +Ux +QT +QT +lY +lY +QT +QT +Wu +tz +va +va +va +lU +va +va +va +va +va +lU +va +va +va +tz +BG +QT +QT +lY +lY +QT +QT +Ux +Ux +Ux +Ux +Ux +Ux +"} +(5,1,1) = {" +Ux +Ux +Ux +Ux +Ux +QT +rN +zH +Yv +ap +fX +Vm +vz +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +vz +fy +fX +Tf +iV +ky +nG +QT +Ux +Ux +Ux +Ux +Ux +Ux +"} +(6,1,1) = {" +Ux +Ux +Ux +Ux +QT +QT +Yt +Js +gj +Ss +fX +Vm +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +ES +QZ +KZ +Wo +Dr +WU +Dr +vh +QT +QT +Ux +Ux +Ux +Ux +Ux +"} +(7,1,1) = {" +Ux +QT +lY +lY +QT +cU +BV +Dr +xh +au +fX +Vm +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +Kk +jb +dc +IQ +JQ +ts +zh +QT +lY +lY +QT +Ux +Ux +"} +(8,1,1) = {" +Ux +QT +GM +TT +vc +BV +rK +dc +eQ +au +fX +Vm +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +AV +fX +cY +Dr +ZU +Dr +ts +oL +oL +Xw +QT +Ux +Ux +"} +(9,1,1) = {" +Ux +QT +bf +KK +qD +JA +Ds +AD +al +oE +fX +Tk +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +Ax +fX +uv +eO +Bk +mx +EC +Gx +rB +vh +lY +Ux +Ux +"} +(10,1,1) = {" +Ux +QT +fX +fX +fX +dC +yo +fX +md +AG +fX +Vm +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +AV +fX +NS +EB +cn +pa +KD +pK +ng +vh +lY +Ux +Ux +"} +(11,1,1) = {" +Ux +KW +CK +xA +Rr +Ak +AO +fX +Qa +Dr +WU +Vm +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +fy +Wo +Dr +EB +ul +AU +KD +eA +yb +VZ +lY +Ux +Ux +"} +(12,1,1) = {" +Ux +KW +lE +CI +eJ +Hk +cw +fX +vv +dc +IQ +xg +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +RT +jb +dc +lx +gH +oL +II +AA +FD +vh +lY +Ux +Ux +"} +(13,1,1) = {" +Ux +QT +fX +fX +fX +hZ +AO +fX +dM +IV +fX +Vm +Gd +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +QZ +Gd +fy +fX +St +EC +Dr +eO +Re +sg +hz +Yj +QT +Ux +Ux +"} +(14,1,1) = {" +Ux +KW +lD +RF +qu +Hk +jz +fX +rX +oE +fX +nS +NK +Jc +UJ +Ya +Jc +Jc +Jc +UJ +Jc +Jc +Jc +Ya +UJ +Jc +NK +yj +fX +fX +mn +ZH +mh +fX +fX +fX +fX +QT +Ux +Ux +"} +(15,1,1) = {" +Ux +KW +lE +yM +Rr +Ma +eG +fX +md +AG +fX +fX +Oc +Og +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +AU +ib +fX +fX +fX +fX +fX +fX +fX +Za +Us +qL +QT +Ux +Ux +"} +(16,1,1) = {" +QT +QT +fX +fX +fX +fX +fX +fX +xT +Zn +fX +fX +md +AG +fX +th +Jk +Ns +fX +fX +KP +Hc +nq +fX +fX +lh +oQ +fX +fX +fX +Xn +Us +jY +vN +Dn +Dr +kn +QT +QT +Ux +"} +(17,1,1) = {" +lY +ZV +fX +Jw +aG +Yb +fX +sY +xT +JK +fX +MP +fF +TN +fX +hu +Dr +ee +Nd +eB +el +Dr +qF +nJ +fX +MP +fF +TN +oM +QQ +Sw +Dr +FE +vN +ED +xh +qF +dT +dx +Ux +"} +(18,1,1) = {" +QT +Ik +ns +He +AR +mg +PL +ik +CU +ya +fX +rY +Dr +hM +fX +MV +pq +zR +Nd +gW +Dr +YC +Dr +ll +fX +kA +Dr +xN +oM +Xi +NC +YC +kW +vN +Dn +al +Dr +Xt +dx +Ux +"} +(19,1,1) = {" +lY +ck +fX +yD +xZ +zD +fX +hK +rF +id +fX +kA +Bx +lI +fX +wa +Jt +al +Nd +Rd +Dr +al +WU +ob +fX +kA +Bx +lI +oM +Gz +NC +in +bk +vN +zS +al +dE +Im +dx +Ux +"} +(20,1,1) = {" +QT +fX +fX +fX +fX +fX +fX +cX +kV +cK +fX +kA +Dr +xN +fX +kO +kO +Id +fX +Ai +Dr +al +WU +OE +fX +dO +Dr +vP +fX +MQ +De +RQ +Xt +fX +vN +zC +vN +fX +QT +Ux +"} +(21,1,1) = {" +lY +Rb +fX +Jw +sr +xk +fX +ho +kV +lv +fX +On +Dr +xN +fX +Nf +Us +ei +SH +el +Dr +al +pF +Dr +Eg +Dr +NN +al +yp +Dr +WU +al +qF +SH +el +al +Xt +fX +QT +Ux +"} +(22,1,1) = {" +QT +Ik +ns +He +AR +mg +PL +ik +Ub +qV +fX +cz +Dr +xN +fX +gf +Dr +BL +dc +IQ +IQ +cZ +dc +dc +hC +dc +dc +iE +Mn +dc +IQ +iE +Jd +mI +mI +LP +qF +Qk +dx +Ux +"} +(23,1,1) = {" +lY +RB +fX +HN +xZ +Yb +fX +hK +rF +id +fX +er +Dr +hM +fX +TL +Gb +Dr +Dr +Dr +Dr +Dr +dE +kq +fX +AH +Dr +la +fX +iP +pF +al +ek +ou +Kg +WW +WU +oX +dx +Ux +"} +(24,1,1) = {" +QT +fX +fX +fX +fX +fX +fX +cX +kV +uX +fX +QI +Bx +lI +fX +fX +oT +Gg +MA +Si +Gg +eX +Tx +fX +fX +kA +Bx +lI +oM +iU +Dr +in +ek +SJ +Rv +WW +WU +wU +dx +Ux +"} +(25,1,1) = {" +lY +ZV +fX +Jw +aG +Yb +fX +ho +kV +MW +fX +tc +NN +Zt +td +fX +sX +sX +sX +fX +sX +sX +sX +fX +fD +UV +WU +Hh +oM +ka +Dr +ZU +ek +Dk +Le +WW +WU +Oo +dx +Ux +"} +(26,1,1) = {" +QT +Ik +ns +He +AR +mg +PL +ik +bp +Wj +fX +OY +Dr +al +fC +cq +hG +hG +hG +jK +hG +hG +hG +cq +UV +Dr +rK +TW +oM +lS +Gb +Dr +qF +Us +Us +el +dE +AQ +dx +Ux +"} +(27,1,1) = {" +lY +ck +fX +lq +xZ +DF +fX +hK +rF +id +fX +XD +Dr +Ot +iJ +QR +pv +dc +iJ +sq +If +dc +pv +Jr +If +dc +eQ +dz +fX +fX +nY +nb +nb +nb +Gg +eX +ab +fX +QT +Ux +"} +(28,1,1) = {" +QT +fX +fX +fX +fX +fX +fX +cX +BM +cK +fX +rY +bG +Rj +mE +fX +fe +KC +RL +RL +RL +xD +Zu +fX +fX +WU +vb +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +QT +Ux +"} +(29,1,1) = {" +lY +Rb +fX +Jw +tW +Xj +fX +ho +kV +gL +fX +kA +RZ +Je +fX +fX +NR +He +fl +Yb +fl +He +Pk +fX +fX +Dr +bV +og +Vp +Vp +yH +Ud +vU +gC +zT +jm +RE +pB +QT +Ux +"} +(30,1,1) = {" +QT +Ik +ns +He +AR +mg +PL +Lz +Ta +qV +fX +fX +fI +fX +fX +Xx +VJ +He +He +He +He +He +VJ +SM +fX +WU +pc +kM +KM +uE +Sr +pv +pY +Er +OG +OG +OG +OG +lY +Ux +"} +(31,1,1) = {" +lY +RB +fX +lq +xZ +DF +fX +sB +WE +KF +fX +YN +al +Dr +tR +QV +He +ro +ro +ro +ro +ro +VJ +sM +fX +Dr +Oj +pf +Qr +nw +XQ +in +Xs +Pc +FA +gK +Nr +gK +lY +Ux +"} +(32,1,1) = {" +QT +QT +fX +fX +fX +fX +fX +Bu +SY +El +fX +AY +sy +Dr +BT +YB +He +Yb +DH +Yb +Fr +iw +VJ +bv +fX +uw +zN +XR +Uu +Uu +lH +al +DZ +Fs +OG +OG +Xh +QT +QT +Ux +"} +(33,1,1) = {" +Ux +QT +EW +tX +tX +tX +tX +gm +tX +nQ +fX +fX +fX +fX +BT +WD +He +Yb +SE +aG +Ju +Yb +VJ +sA +fX +fX +fX +fX +fX +fX +fX +OD +Pc +FA +Np +gK +wE +lY +Ux +Ux +"} +(34,1,1) = {" +Ux +QT +Ku +ZX +lw +lw +lw +cm +VA +zI +fX +nT +Ls +DO +BT +je +He +sO +sO +sO +sO +sO +su +sH +fX +eh +mv +mv +cW +Bz +Gs +EG +pE +Vp +Vp +Vp +yH +lY +Ux +Ux +"} +(35,1,1) = {" +Ux +QT +QT +dy +iT +Oq +ha +Xo +gm +Jy +fX +kF +SI +NO +fX +Cv +He +He +He +HE +He +He +He +DT +fX +Qb +RG +RG +kr +WU +Dr +Pc +bw +gK +gK +gq +QT +QT +Ux +Ux +"} +(36,1,1) = {" +Ux +Ux +QT +lY +lY +lY +lY +QT +Zl +fX +fX +Cm +SI +DL +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +jE +RG +RG +rc +fX +fX +fX +QT +lY +lY +lY +QT +Ux +Ux +Ux +"} +(37,1,1) = {" +Ux +Ux +Ux +Ux +Ux +Ux +Ux +QT +vW +tX +fX +Cm +SI +YC +mV +xE +gh +Iv +FO +gh +FO +Iv +gh +FO +Cw +kr +RG +RG +nI +Uk +IB +Cy +QT +Ux +Ux +Ux +Ux +Ux +Ux +Ux +"} +(38,1,1) = {" +Ux +Ux +Ux +Ux +Ux +Ux +Ux +QT +uR +Hr +fX +DL +Qc +qv +IQ +Kd +LF +LF +LF +LF +LF +LF +LF +LF +Ov +lo +cr +cr +rD +fX +YZ +ck +QT +Ux +Ux +Ux +Ux +Ux +Ux +Ux +"} +(39,1,1) = {" +Ux +Ux +Ux +Ux +Ux +Ux +Ux +QT +QT +QT +QT +QT +QT +QT +QT +QT +vX +lT +SO +vX +lT +vX +lT +SO +QT +QT +QT +QT +QT +QT +QT +QT +QT +Ux +Ux +Ux +Ux +Ux +Ux +Ux +"} +(40,1,1) = {" +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +QT +QT +QT +QT +QT +QT +QT +QT +QT +QT +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +Ux +"} diff --git a/maps/tents/tent_big.dmm b/maps/tents/tent_big.dmm new file mode 100644 index 000000000000..f341e67ce2aa --- /dev/null +++ b/maps/tents/tent_big.dmm @@ -0,0 +1,78 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/tent/big, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"n" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) +"s" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) +"v" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/turf/template_noop, +/area/template_noop) +"x" = ( +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"G" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"J" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) +"O" = ( +/turf/template_noop, +/area/template_noop) +"S" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +O +J +v +a +"} +(2,1,1) = {" +O +S +O +x +"} +(3,1,1) = {" +O +n +s +G +"} diff --git a/maps/tents/tent_cmd.dmm b/maps/tents/tent_cmd.dmm new file mode 100644 index 000000000000..e7260ca9bccf --- /dev/null +++ b/maps/tents/tent_cmd.dmm @@ -0,0 +1,73 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/bed/chair, +/turf/template_noop, +/area/template_noop) +"d" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/bed/chair, +/turf/template_noop, +/area/template_noop) +"o" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/surface/table, +/obj/structure/transmitter/tent{ + phone_category = "Command"; + phone_id = "Ground Command"; + pixel_x = -2; + pixel_y = 6 + }, +/turf/template_noop, +/area/template_noop) +"p" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"A" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/surface/table, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/machinery/computer/overwatch/tent, +/turf/template_noop, +/area/template_noop) +"X" = ( +/obj/structure/tent/cmd, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +p +A +a +X +"} +(2,1,1) = {" +p +o +d +v +"} diff --git a/maps/tents/tent_med.dmm b/maps/tents/tent_med.dmm new file mode 100644 index 000000000000..fcb446a68e25 --- /dev/null +++ b/maps/tents/tent_med.dmm @@ -0,0 +1,68 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/turf/template_noop, +/area/template_noop) +"o" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/bed/roller, +/turf/template_noop, +/area/template_noop) +"p" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) +"A" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/bed/roller, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/tent{ + pixel_y = 22 + }, +/turf/template_noop, +/area/template_noop) +"H" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"X" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent/med, +/obj/structure/machinery/iv_drip, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +p +A +a +X +"} +(2,1,1) = {" +p +o +v +H +"} diff --git a/maps/tents/tent_reqs.dmm b/maps/tents/tent_reqs.dmm new file mode 100644 index 000000000000..7d9cf926e698 --- /dev/null +++ b/maps/tents/tent_reqs.dmm @@ -0,0 +1,108 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"d" = ( +/obj/structure/blocker/tent, +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/filingcabinet, +/turf/template_noop, +/area/template_noop) +"k" = ( +/obj/structure/surface/rack, +/turf/template_noop, +/area/template_noop) +"m" = ( +/obj/structure/tent/reqs, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"n" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/machinery/cm_vending/sorted/vehicle_supply/tent, +/turf/template_noop, +/area/template_noop) +"w" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) +"B" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/bed/chair, +/obj/structure/transmitter/tent{ + pixel_y = 30; + pixel_x = 16; + phone_category = "Command"; + phone_id = "Ground Requisitions" + }, +/turf/template_noop, +/area/template_noop) +"J" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/machinery/computer/ordercomp/tent{ + pixel_y = 25 + }, +/turf/template_noop, +/area/template_noop) +"S" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/surface/table, +/turf/template_noop, +/area/template_noop) +"U" = ( +/obj/structure/blocker/tent, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +a +B +S +m +"} +(2,1,1) = {" +a +J +a +c +"} +(3,1,1) = {" +a +w +U +k +"} +(4,1,1) = {" +a +n +d +k +"} diff --git a/maps/whiskey_outpost_v2.json b/maps/whiskey_outpost_v2.json index f55f14d73ca6..4c8f2f6551e4 100644 --- a/maps/whiskey_outpost_v2.json +++ b/maps/whiskey_outpost_v2.json @@ -7,6 +7,7 @@ "perf_mode": 31, "disable_ship_map": true, "nightmare_path": "maps/Nightmare/maps/Whiskey_Outpost_v2/", + "camouflage": "desert", "gamemodes": [ "Whiskey Outpost" ] diff --git a/strings/marinetips.txt b/strings/marinetips.txt index 620dc8710400..cf808884f1e5 100644 --- a/strings/marinetips.txt +++ b/strings/marinetips.txt @@ -28,7 +28,7 @@ Examine your gun and click [See combat statistics] to view information such as d Xenomorphs who resist while on fire are stunned for some time and emit light. Use that time to catch up and finish them off! When you have shrapnel embedded, take out your boot knife and use it in your hand to rip them out of your body. If your weapon has a bayonet, you can manually pry open unpowered doors by clicking on them with the gun. Click on the door again to close it. UPP bayonets can pry them open quicker. -Items on the floor can be shot. Shoot a misthrown HEDP away to save your buddies! +Items on the floor can be shot. Shoot a poorly thrown HEDP away to save your buddies! You can hold a bayonet or throwing knife on your mask slot. Always be prepared. Xenomorphs can't apply huggers to marines if they're on fire. Dragging a Nanomed onto yourself instantly gives a Health Analyzer report. Always know what's wrong with you. @@ -46,18 +46,18 @@ By right clicking your medical belt and selecting "toggle belt mode", you can ta You can put screwdrivers, cigarettes, and some other things in your second ear slot! Pilots : there is one of each engine upgrade in the hangar at the start of the round, saving you the point cost of having to print out a pair of each. You can use a hand labeler (as found in squad prep rooms) to name your equipment and make it less likely to be stolen. -You can use a health analyser in hand (Z key) to check the last scan readout from it. +You can use a health analyzer in hand (Z key) to check the last scan readout from it. Holocards are a useful triage tool for doctors and medics. Ensure you assign them (examine the marine with shift-click and select an appropriate holocard) to marines who have taken damage that cannot be healed without surgery. (Hint : major organ damage or larval infection = red card!) Escape pods are designed for only three occupants - more than that, or if a larger xenomorph is in the pod, and it will malfunction and blow up on launch. A misloaded OB can deviate severely from the intended target area - ensure you load them correctly! -The XO and CO are trained in powerloader use and engineering, and can load the OB. +The XO and CO are trained in Power Loader use and engineering, and can load the OB. You can change what your SL tracker beacon is tracking by right clicking on your headset and clicking "Switch Tracker Target". Boilers emit light - not every glow from around the corner is friendly! You can carry a variety of items inside your helmet - from gauze and cigarettes to flares and screwdrivers. CIC staff can track every USCM-aligned person via the suit sensors console and overwatch console - useful for finding escaped prisoners or dead marines. When the M7 RPG is fired, it creates a substantial shockwave behind it that can stun and harm marines standing too close. Watch your backblast! Remember that you need to put a defibrillator's paddles away in order to store it. -W-Y PMCs do not have marine IFF. Don't fire smartguns through them! +W-Y PMCs do not have marine IFF. Don't fire Smartguns through them! To talk on multiple radio channels at once, put a COMMA [,] before your message and add up to four prefixes. E.g, ,abcd talks on all squad channels at once. Put .w or :w before your message to whisper. Another way to whisper is to use the verb "whisper" in the IC tab or command bar. For Vehicle Crewmen : it is often safer to repair the parts of your APC or tank inside the vehicle than outside it. @@ -75,13 +75,13 @@ Intel Officers can be put in a squad by going to CIC and requesting it. Any marine can perform CPR. On dead marines, this will increase the time they have until they become unrevivable. If you've been pounced on and your squad is unloading into the target, you can hit the 'rest' button to stay down so you don't get filled with lead after getting up. You can check the landing zone as a marine in the status panel. -Functioning night vision goggles can be recharged with batteries. Broken night vision goggles can be repaired by an Engineer with a screwdriver. Not the loadout ones though, those are unfixable and unchargeable. -You can put a pistol belt on your suit slot. (Just grab a rifle instead..) +Functioning night vision goggles can be recharged with batteries. Broken night vision goggles can be repaired by an Engineer with a screwdriver. Not the loadout ones though, those cannot be fixed. +You can put a pistol belt on your suit slot. (Just grab a rifle instead.) Alt-clicking the Squad Leader tracker lets you track your fireteam leader instead. -Armor has a randomized reduction in effectiveness, and does not protect the digits. Take the wiki damage values as a best case scenario. +Armor has a randomized reduction in effectiveness, and does not protect the digits. Take the wiki damage values as a best-case scenario. You can click on your Security Access Tuner (multitool) in your hand to locate the area's APC if there is one. Clicking on your sprite with help intent will let you check your body, seeing where your fractures and other wounds are. Armor has insulative properties - taking it off will help you cool off and take less damage faster if you've been set on fire. -Both foldable cades & plasteel cades if loosened and folded down can be transported in crates! In this way, you can use the crate as a portable breach-repair kit, or dragged (or carried via Powerloader) to an unsecure area for quick defensive set up. +Both foldable cades & plasteel cades if loosened and folded down can be transported in crates! In this way, you can use the crate as a portable breach-repair kit, or dragged (or carried via Power Loader) to an unsecure area for quick defensive set up. The fuel tank pouch doesn't just carry fuel for an incinerator- they can also carry full-size extinguishers. Toolbelts & tool pouches also may hold miniature extinguishers. -The M2C heavy machinegunner belt rig can also carry C4, breaching charges, and most tools. +The M2C heavy machine gunner belt rig can also carry C4, breaching charges, and most tools. diff --git a/strings/metatips.txt b/strings/metatips.txt index 4b1acc2b534a..f694da02b5bf 100644 --- a/strings/metatips.txt +++ b/strings/metatips.txt @@ -1,14 +1,13 @@ -Remember hotkeys and marcos can be customized to your liking. Hotkeys can be accessed in your preferences, and macros can be edited in the Byond macro editor, available in the top left drop down menu (click the Byond logo in the corner of the game window). -If you're unsure about a gameplay mechanic, use the 'mentorhelp' verb in the Admins tab to ask veteran players on the subject. +Remember hotkeys and macros can be customized to your liking. Hotkeys can be accessed in your preferences, and macros can be edited in the Byond macro editor, available in the top left drop down menu (click the Byond logo in the corner of the game window). +If you're unsure about a gameplay mechanic, use the 'mentorhelp' verb in the Admin tab to ask veteran players on the subject. Try not to get too mad about dying. We’re all here to have fun. After dying, ask yourself what you did wrong and make a mental note to not make the same mistake again. Communication, be it from a marine to a marine, a drone to the queen, or command to everyone, is vital and information on flanks can change how the entire round plays out. As an alien or marine, be careful of the flank, regardless of if the push is going well or stalling out. Half of getting good is knowing to be aggressive. The other half is knowing when not to be aggressive. -Alt-click a storage item to draw the last item in it (last non-weapon if it's a weapon belt). Middle-click a storage item to inmediately open it, and middle-click structures to attempt to vault them. -Use "North, South, East, West" when referring to locations in-game rather than "up, down, left, right". +Alt-click a storage item to draw the last item in it (last non-weapon if it's a weapon belt). Middle-click a storage item to immediately open it, and middle-click structures to attempt to vault them. +Use "North, South, West, East" when referring to locations in-game rather than "up, down, left, right". You shouldn't ignore what your allies are up to. Sometimes they can be organizing a flank in hivemind/radio, sometimes they can be walking up behind you with a slug-loaded shotgun. Either way, it pays to be alert to what they're doing, as much to as what the enemies are. -The Wiki (https://cm-ss13.com/wiki) is a very useful repository of information about the game, such as weapons, equipment, xenomorph castes and their strains. It may not be fully up to date the majority of the time, but the basics are usually accurate. +The Wiki (https://cm-ss13.com/wiki) is a very useful repository of information about the game, such as weapons, equipment, xenomorph castes and their strains. It may not be fully up to date much of the time, but the basics are usually accurate. As an observer, you may see how much remaining hijack time is left in the status panel. Embrace the suck. -Any applied damage has a small chance of being a critical hit, reducing armor's reduction of it to its minimal efficiency. For some reason. diff --git a/strings/xenotips.txt b/strings/xenotips.txt index 4e98be577a61..2ca2964ae2d5 100644 --- a/strings/xenotips.txt +++ b/strings/xenotips.txt @@ -1,6 +1,6 @@ Acid pillars can be sneakily placed next to a door in order to surprise marines. -Alien structures like clusters, walls, or pillars are absolutely vital to your victory, be it as cover or to delay and funnel marines. -Always thank your drones and hivelords for supporting the hive! +Alien structures like clusters, walls, or pillars are vital to your victory, be it as cover or to delay and funnel marines. +Always thank your drones and Hivelords for supporting the hive! Don't underestimate survivors. They have no armor but that makes them very fast, they're inherently hardier than marines and have various tricks up their sleeves. While the Queen is de-ovied, the hive does not gain evolution points. Try out new castes or strains that you might have passed up initially. You might find them to be surprisingly fun. @@ -16,21 +16,21 @@ If a fellow alien is stunned, be sure to drag them to safety. On help intent, click a xenomorph who is on fire to pat them out. This works on marines too! Frenzy increases your speed and damage, Recovery increases your health regeneration, and Warding increases the time you have until you bleed out in critical health. Remember that, as a Xenomorph, you can fully disable your night-vision. This helps put into perspective how hidden your position is to marines onscreen. -You can devour bursted corpses in order to transport them to the Spawn Pool or Egg Morpher easier. +You can devour burst corpses in order to transport them to the Spawn Pool or Egg Morpher easier. The bigger you are, the more time it'll take to enter a tunnel. -Drag yourself onto a hole in a wall as a medium-sized or smaller xeno to pass through it. +Drag yourself onto a hole in a wall as a medium-sized or smaller Xeno to pass through it. Claymores have directional explosions. Set them off early by slashing them from behind. If you have difficulty clicking marines, try using Directional Slashing, though there's no directional slashing for abilities. You can diagonally pounce through the corners of fire as a Lurker or Runner without getting ignited. -When playing as xeno, consider aiming at the limbs instead of the chest. Marine armour doesn't protect the arms and legs as well as it does the body. -As xeno, you can break Night-Vision goggles that some marines wear on their helmets. Just aim for the head and slash until the goggles shatter. +When playing as Xeno, consider aiming at the limbs instead of the chest. Marine armor doesn't protect the arms and legs as well as it does the body. +As Xeno, you can break Night-Vision goggles that some marines wear on their helmets. Just aim for the head and slash until the goggles shatter. Pounces are ineffective on marines who are laying down. -You may rest inmediately during a pounce to pounce straight through mobs. It's not very practical or useful though. -Pouncing someone who is buckled to a chair will still stun them, but you won't jump into their tile and they will not be knocked to the grund. -Starshell dust from said grenades is just as meltable as normal flares. -You can join the hive as a living facehugger by clicking on the hive's eggmorpher. This works on other hives too.. -Playable facehuggers can leap onto targets with a one-second windup, but this will only infect them if they are adjacent to it. Otherwise, it will simply knock them down for a small duration. -As a facehugger, you cannot talk in hivemind, but you can still open Hive Status and overwatch your sisters. This can be useful if you're locating other facehuggers, flanker castes, or trying to learn from experienced facehugger players. +You may rest immediately during a pounce to pounce straight through mobs. It's not very practical or useful though. +Pouncing someone who is buckled to a chair will still stun them, but you won't jump into their tile and they will not be knocked to the ground. +Star shell dust from said grenades is just as meltable as normal flares. +You can join the hive as a living Facehugger by clicking on the hive's Eggmorpher. This works on other hives too.. +Playable Facehuggers can leap onto targets with a one-second windup, but this will only infect them if they are adjacent to it. Otherwise, it will simply knock them down for a small duration. +As a Facehugger, you cannot talk in hivemind, but you can still open Hive Status and overwatch your sisters. This can be useful if you're locating other Facehuggers, flanker castes, or trying to learn from experienced Facehugger players. Shift-clicking the Queen indicator will tell you what area you are in, on the map. -Resisting on a water tile will inmediately put out fires. Make sure you're alone though - It's usually better to let a friendly Xenomorph pat you out than it is to expose yourself to open water. +Resisting on a water tile will immediately put out fires. Make sure you're alone though - It's usually better to let a friendly Xenomorph pat you out than it is to expose yourself to open water. You can filter out the Xenomorphs displayed in hive status by health, allowing you to look only for wounded sisters. diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index e81fd5f75b63..a73003e13267 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -34,6 +34,7 @@ export const MESSAGE_TYPE_COMBAT = 'combat'; export const MESSAGE_TYPE_ADMINCHAT = 'adminchat'; export const MESSAGE_TYPE_MODCHAT = 'modchat'; export const MESSAGE_TYPE_MENTOR = 'mentor'; +export const MESSAGE_TYPE_STAFF_IC = 'staff_ic'; export const MESSAGE_TYPE_EVENTCHAT = 'eventchat'; export const MESSAGE_TYPE_ADMINLOG = 'adminlog'; export const MESSAGE_TYPE_ATTACKLOG = 'attacklog'; @@ -113,6 +114,12 @@ export const MESSAGE_TYPES = [ name: 'Unsorted', description: 'Everything we could not sort, always enabled', }, + { + type: MESSAGE_TYPE_STAFF_IC, + name: 'Staff IC', + description: 'IC interaction with staff', + selector: '.staff_ic', + }, // Admin stuff { type: MESSAGE_TYPE_ADMINCHAT, diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 5fc39895149e..28a5639e884d 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -456,6 +456,10 @@ em { color: #6685f5; } +.staff_ic { + color: #6685f5; +} + .tinynotice { color: #6685f5; font-size: 85%; diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 981b2dbfa73c..adbb56ed9b89 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -492,6 +492,10 @@ h2.alert { color: #000099; } +.staff_ic { + color: #000099; +} + .tinynotice { color: #000099; font-size: 85%; diff --git a/tgui/packages/tgui/interfaces/AresInterface.js b/tgui/packages/tgui/interfaces/AresInterface.js new file mode 100644 index 000000000000..6bf85e96522f --- /dev/null +++ b/tgui/packages/tgui/interfaces/AresInterface.js @@ -0,0 +1,1493 @@ +import { useBackend } from '../backend'; +import { Flex, Box, Section, Button, Stack } from '../components'; +import { Window } from '../layouts'; + +const PAGES = { + 'login': () => Login, + 'main': () => MainMenu, + 'announcements': () => AnnouncementLogs, + 'bioscans': () => BioscanLogs, + 'bombardments': () => BombardmentLogs, + 'apollo': () => ApolloLog, + 'access_log': () => AccessLogs, + 'delete_log': () => DeletionLogs, + 'talking': () => ARESTalk, + 'deleted_talks': () => DeletedTalks, + 'read_deleted': () => ReadingTalks, + 'security': () => Security, + 'requisitions': () => Requisitions, + 'antiair': () => AntiAir, + 'emergency': () => Emergency, +}; + +export const AresInterface = (props, context) => { + const { data } = useBackend(context); + const { current_menu } = data; + const PageComponent = PAGES[current_menu](); + + return ( + + + + + + ); +}; + +const Login = (props, context) => { + const { act } = useBackend(context); + + return ( + + ARES v3.2 Interface + + WY-DOS Executive + + Version 8.2.3 + Copyright © 2182, Weyland Yutani Corp. + +