diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml index b0e15788158c..308236011621 100644 --- a/.github/workflows/compile_changelogs.yml +++ b/.github/workflows/compile_changelogs.yml @@ -3,6 +3,7 @@ name: Compile changelogs on: schedule: - cron: "0 0 * * *" + workflow_dispatch: jobs: compile: @@ -44,12 +45,12 @@ jobs: - name: Commit if: steps.value_holder.outputs.CL_ENABLED run: | - git config --local user.email "action@github.com" - git config --local user.name "Changelogs" + git config --local user.email "${{ secrets.BOT_EMAIL }}" + git config --local user.name "${{ secrets.BOT_NAME }}" git pull origin master git commit -m "Automatic changelog compile [ci skip]" -a || true - name: "Push" if: steps.value_holder.outputs.CL_ENABLED uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.BOT_TOKEN }} diff --git a/.gitignore b/.gitignore index dd20fecd22c4..ed4b6b4d7e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -215,13 +215,14 @@ tools/CreditsTool/obj/* #dmdoc default folder /dmdoc +/config/* +!/config/example +!/config/example/* + # Ignore custom music and title screens (amend as appropriate) -/config/jukebox_music/sounds/* -!/config/jukebox_music/sounds/exclude -/config/title_music/sounds/* -!/config/title_music/sounds/exclude -/config/title_screens/images/* -!/config/title_screens/images/exclude +/config/example/jukebox_music/sounds/exclude +/config/example/title_music/sounds/exclude +/config/example/title_screens/images/exclude #Linux docker tools/LinuxOneShot/SetupProgram/obj/* diff --git a/ModularTegustation/Teguicons/32x32.dmi b/ModularTegustation/Teguicons/32x32.dmi index bce84b256369..19e53c82bddf 100644 Binary files a/ModularTegustation/Teguicons/32x32.dmi and b/ModularTegustation/Teguicons/32x32.dmi differ diff --git a/ModularTegustation/Teguicons/lc13_left.dmi b/ModularTegustation/Teguicons/lc13_left.dmi index 899eb36e159e..fe2046ad38da 100644 Binary files a/ModularTegustation/Teguicons/lc13_left.dmi and b/ModularTegustation/Teguicons/lc13_left.dmi differ diff --git a/ModularTegustation/Teguicons/lc13_right.dmi b/ModularTegustation/Teguicons/lc13_right.dmi index 42b617c483a2..72b50a35ef4b 100644 Binary files a/ModularTegustation/Teguicons/lc13_right.dmi and b/ModularTegustation/Teguicons/lc13_right.dmi differ diff --git a/ModularTegustation/Teguicons/lc13_weapons.dmi b/ModularTegustation/Teguicons/lc13_weapons.dmi index 35bf1068dcc3..0055e2cb91ee 100644 Binary files a/ModularTegustation/Teguicons/lc13_weapons.dmi and b/ModularTegustation/Teguicons/lc13_weapons.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/10x10.dmi b/ModularTegustation/Teguicons/room_spawners/10x10.dmi new file mode 100644 index 000000000000..1b31b047c450 Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/10x10.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/13x15.dmi b/ModularTegustation/Teguicons/room_spawners/13x15.dmi new file mode 100644 index 000000000000..3b71d8b08310 Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/13x15.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/16x8.dmi b/ModularTegustation/Teguicons/room_spawners/16x8.dmi new file mode 100644 index 000000000000..95206b35db9c Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/16x8.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/20x20.dmi b/ModularTegustation/Teguicons/room_spawners/20x20.dmi new file mode 100644 index 000000000000..91f2cf4003ba Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/20x20.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/30x30.dmi b/ModularTegustation/Teguicons/room_spawners/30x30.dmi new file mode 100644 index 000000000000..96832d6e4722 Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/30x30.dmi differ diff --git a/ModularTegustation/Teguicons/room_spawners/7x7.dmi b/ModularTegustation/Teguicons/room_spawners/7x7.dmi new file mode 100644 index 000000000000..b510587e2f34 Binary files /dev/null and b/ModularTegustation/Teguicons/room_spawners/7x7.dmi differ diff --git a/ModularTegustation/Teguicons/status_sprites.dmi b/ModularTegustation/Teguicons/status_sprites.dmi index ed24c8afac4e..6b9eb8ab9d31 100644 Binary files a/ModularTegustation/Teguicons/status_sprites.dmi and b/ModularTegustation/Teguicons/status_sprites.dmi differ diff --git a/ModularTegustation/ego_weapons/melee/aleph.dm b/ModularTegustation/ego_weapons/melee/aleph.dm index 2230bb108c63..929b1e7797ae 100644 --- a/ModularTegustation/ego_weapons/melee/aleph.dm +++ b/ModularTegustation/ego_weapons/melee/aleph.dm @@ -750,6 +750,10 @@ attacking = TRUE //ALWAYS blocking ranged attacks +/obj/item/ego_weapon/shield/distortion/Initialize() + . = ..() + aggro_on_block *= 4 + /obj/item/ego_weapon/shield/distortion/EgoAttackInfo(mob/user) return span_notice("It deals [force * 4] red, white, black and pale damage combined.") diff --git a/ModularTegustation/ego_weapons/melee/non_abnormality/echo_office.dm b/ModularTegustation/ego_weapons/melee/non_abnormality/echo_office.dm new file mode 100644 index 000000000000..7ad7b5e81f84 --- /dev/null +++ b/ModularTegustation/ego_weapons/melee/non_abnormality/echo_office.dm @@ -0,0 +1,174 @@ +/obj/item/ego_weapon/city/echo + name = "echo weapon" + desc = "You should not see this." + icon_state = "miraecane" + force = 50 + damtype = WHITE_DAMAGE + + attack_verb_continuous = list("slashes", "cuts") + attack_verb_simple = list("slash", "cut") + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) + +//Electric Fixer Weapons +/obj/item/ego_weapon/city/echo/twins + name = "twins" + desc = "Soon, All of the wicked shall be punished..." + special = "Upon hit the targets WHITE vulnerability is increased by 0.2. \ + When using both sodom and gomorrah, increase their attack speed by 0.2" + hitsound = 'sound/weapons/fixer/generic/knife3.ogg' + icon_state = "sodom" + force = 18 + attack_speed = 0.5 + damtype = WHITE_DAMAGE + var/attack_speed_buff = 0.2 + + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60, + ) + +/obj/item/ego_weapon/city/echo/twins/attack(mob/living/target, mob/living/user) + var/old_attack_speed = attack_speed + if ((locate(/obj/item/ego_weapon/city/echo/twins/gomorrah) in user.held_items) && (locate(/obj/item/ego_weapon/city/echo/twins/sodom) in user.held_items)) + attack_speed -= attack_speed_buff + + . = ..() + + if(!.) + return FALSE + + attack_speed = old_attack_speed + + if(isliving(target)) + var/mob/living/simple_animal/M = target + if(!ishuman(M) && !M.has_status_effect(/datum/status_effect/rend_white)) + new /obj/effect/temp_visual/cult/sparks(get_turf(M)) + M.apply_status_effect(/datum/status_effect/rend_white) + +/obj/item/ego_weapon/city/echo/twins/gomorrah + name = "gomorrah" + icon_state = "gomorrah" + +/obj/item/ego_weapon/city/echo/twins/sodom + name = "sodom" + icon_state = "sodom" + + +//Metal Fixer Weapons +/obj/item/ego_weapon/shield/eria + name = "eria" + desc = "It has been quite a while since I last used you two. I missed the feeling." + special = "This weapon restores health on a successful block." + icon_state = "eria" + icon = 'ModularTegustation/Teguicons/lc13_weapons.dmi' + lefthand_file = 'ModularTegustation/Teguicons/lc13_left.dmi' + righthand_file = 'ModularTegustation/Teguicons/lc13_right.dmi' + force = 30 + attack_speed = 1.5 + damtype = BLACK_DAMAGE + attack_verb_continuous = list("bashes", "hammers", "smacks") + attack_verb_simple = list("bash", "hammer", "smack") + hitsound = 'sound/weapons/fixer/generic/club2.ogg' + reductions = list(40, 20, 80, 10) // 150 + projectile_block_duration = 0.5 SECONDS + block_duration = 1 SECONDS + block_cooldown = 3 SECONDS + block_sound = 'sound/weapons/ego/clash1.ogg' + projectile_block_message ="Your shield swats the projectile away!" + block_message = "You attempt to block the attack!" + hit_message = "blocks the attack!" + block_cooldown_message = "You rearm your sheild" + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 60, + ) + +/obj/item/ego_weapon/shield/eria/attack_self(mob/user)//FIXME: Find a better way to use this override! + if(block == 0) //Extra check because shields returns nothing on 1 + if(..()) + RegisterSignal(user, COMSIG_ATOM_ATTACK_HAND, PROC_REF(NoParry), override = TRUE)//creates runtimes without overrides, double check if something's fucked + RegisterSignal(user, COMSIG_PARENT_ATTACKBY, PROC_REF(NoParry), override = TRUE)//728 and 729 must be able to unregister the signal of 730 + return TRUE + else + return FALSE + +/obj/item/ego_weapon/shield/eria/proc/NoParry(mob/living/carbon/human/user, obj/item/L)//Disables AnnounceBlock when attacked by an item or a human + SIGNAL_HANDLER + UnregisterSignal(user, COMSIG_MOB_APPLY_DAMGE)//y'all can't behave + +/obj/item/ego_weapon/shield/eria/AnnounceBlock(mob/living/carbon/human/source, damage, damagetype, def_zone) + if (damagetype == PALE_DAMAGE) + to_chat(source,span_nicegreen("Your [src] withers at the touch of death!")) + return ..() + to_chat(source,span_nicegreen("You are healed by [src].")) + source.adjustBruteLoss(-25) + ..() + +/obj/item/ego_weapon/city/echo/iria + name = "iria" + desc = "Experiences have shaped me this way." + icon_state = "iria" + special = "When attacking while using both iria and eria, deal 0.3 more damage and increase the knockback caused by iria." + force = 45 + attack_speed = 1.5 + damtype = BLACK_DAMAGE + var/damage_multiplier = 1.3 + attack_verb_continuous = list("bashes", "hammers", "smacks") + attack_verb_simple = list("bash", "hammer", "smack") + hitsound = 'sound/weapons/fixer/generic/fist1.ogg' + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 60, + ) + +/obj/item/ego_weapon/city/echo/iria/attack(mob/living/target, mob/living/user) + var/old_force_multiplier = force_multiplier + if ((locate(/obj/item/ego_weapon/city/echo/iria) in user.held_items) && (locate(/obj/item/ego_weapon/shield/eria) in user.held_items)) + force_multiplier = damage_multiplier + knockback = KNOCKBACK_MEDIUM + . = ..() + + if(!.) + return FALSE + + force_multiplier = old_force_multiplier + knockback = KNOCKBACK_LIGHT + +//Flame Fixer Weapon +/obj/item/ego_weapon/city/echo/sunstrike + name = "sunstrike" + desc = "A heavy spear decorated with vibrant patterns on the head. Etched with the name 'Helios' on the grip." + special = "This weapon inflicts burn on hit." + icon_state = "sunstrike" + force = 42 + attack_speed = 1.5 + reach = 2 + stuntime = 5 + damtype = RED_DAMAGE + var/inflict_burn = 2 + attack_verb_continuous = list("pokes", "jabs", "tears", "lacerates", "gores") + attack_verb_simple = list("poke", "jab", "tear", "lacerate", "gore") + hitsound = 'sound/weapons/ego/spear1.ogg' + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 60, + ) + +/obj/item/ego_weapon/city/echo/sunstrike/attack(mob/living/target, mob/living/carbon/human/user) + if(!CanUseEgo(user)) + return + ..() + target.apply_lc_burn(inflict_burn) diff --git a/ModularTegustation/ego_weapons/melee/non_abnormality/wcorp.dm b/ModularTegustation/ego_weapons/melee/non_abnormality/wcorp.dm index 401424ecd6c5..9d5ef5820e86 100644 --- a/ModularTegustation/ego_weapons/melee/non_abnormality/wcorp.dm +++ b/ModularTegustation/ego_weapons/melee/non_abnormality/wcorp.dm @@ -211,6 +211,7 @@ /datum/status_effect/interventionshield/wcorp statuseffectvisual = icon('ModularTegustation/Teguicons/tegu_effects.dmi', "pale_shield") + respectivedamage = list(RED_DAMAGE, WHITE_DAMAGE, BLACK_DAMAGE, PALE_DAMAGE) /obj/item/ego_weapon/city/wcorp/shield name = "w-corp type-C shieldblade" diff --git a/ModularTegustation/ego_weapons/melee/subtype/shield.dm b/ModularTegustation/ego_weapons/melee/subtype/shield.dm index dfdd067204e3..5bb0b25cd73c 100644 --- a/ModularTegustation/ego_weapons/melee/subtype/shield.dm +++ b/ModularTegustation/ego_weapons/melee/subtype/shield.dm @@ -43,6 +43,7 @@ var/block_sound_volume = 50 var/projectile_timer var/parry_timer + var/aggro_on_block /obj/item/ego_weapon/shield/Initialize() . = ..() @@ -56,6 +57,7 @@ resistances_list += list("BLACK" = reductions[3]) if(reductions[4] != 0) resistances_list += list("PALE" = reductions[4]) + aggro_on_block = force * 3 //Allows the user to deflect projectiles for however long recovery time is set to on a hit /obj/item/ego_weapon/shield/melee_attack_chain(mob/user, atom/target, params) @@ -96,6 +98,10 @@ shield_user.physiology.black_mod *= max(0.001, (1 - ((reductions[3]) / 100))) shield_user.physiology.pale_mod *= max(0.001, (1 - ((reductions[4]) / 100))) RegisterSignal(user, COMSIG_MOB_APPLY_DAMGE, PROC_REF(AnnounceBlock)) + for(var/mob/living/simple_animal/hostile/H in hearers(3, user)) + if(H.stat != CONSCIOUS || H.AIStatus == AI_OFF || H.client) + continue + H.RegisterAggroValue(user, aggro_on_block, AGGRO_DAMAGE) if(QDELING(src)) DisableBlock(shield_user) else diff --git a/ModularTegustation/ego_weapons/melee/teth.dm b/ModularTegustation/ego_weapons/melee/teth.dm index b9716a0a1d02..da6f6f4750f4 100644 --- a/ModularTegustation/ego_weapons/melee/teth.dm +++ b/ModularTegustation/ego_weapons/melee/teth.dm @@ -576,6 +576,17 @@ charge_speed_cap = 2 couch_cooldown_time = 3 SECONDS +/obj/item/ego_weapon/kikimora + name = "kiki mora" + desc = "Many would speak her name." + icon_state = "kikimora" + force = 35 + attack_speed = 1.6 + damtype = RED_DAMAGE + attack_verb_continuous = list("beats", "smacks") + attack_verb_simple = list("beat", "smack") + hitsound = 'sound/weapons/fixer/generic/gen1.ogg' + /obj/item/ego_weapon/denial name = "denial" desc = "Unregulated ingestion of Enkephalin may cause a wide range of unverified psychopathological symptoms." diff --git a/ModularTegustation/ego_weapons/ranged/ego_bullets/teth.dm b/ModularTegustation/ego_weapons/ranged/ego_bullets/teth.dm index deb6645d266f..9f5362acbaf0 100644 --- a/ModularTegustation/ego_weapons/ranged/ego_bullets/teth.dm +++ b/ModularTegustation/ego_weapons/ranged/ego_bullets/teth.dm @@ -136,3 +136,10 @@ speed = 0.45 range = 14 hit_nondense_targets = TRUE + +/obj/projectile/ego_bullet/ego_tough + name = "9mm tough bullet" + damage = 16 // Being bald is the optimal gameplay choice! + damage_type = WHITE_DAMAGE + + diff --git a/ModularTegustation/ego_weapons/ranged/ego_bullets/zayin.dm b/ModularTegustation/ego_weapons/ranged/ego_bullets/zayin.dm index aeb6632933c3..07b5c138f9ae 100644 --- a/ModularTegustation/ego_weapons/ranged/ego_bullets/zayin.dm +++ b/ModularTegustation/ego_weapons/ranged/ego_bullets/zayin.dm @@ -1,8 +1,3 @@ -/obj/projectile/ego_bullet/ego_tough - name = "9mm tough bullet" - damage = 12 // Being bald is the optimal gameplay choice! - damage_type = WHITE_DAMAGE - /obj/projectile/ego_bullet/ego_soda name = "9mm soda bullet" damage = 11 @@ -57,3 +52,4 @@ name = "oceanic" damage = 11 //Worse than tough lol damage_type = WHITE_DAMAGE + diff --git a/ModularTegustation/ego_weapons/ranged/teth.dm b/ModularTegustation/ego_weapons/ranged/teth.dm index fb979c5db079..54df1e9dfdaf 100644 --- a/ModularTegustation/ego_weapons/ranged/teth.dm +++ b/ModularTegustation/ego_weapons/ranged/teth.dm @@ -210,3 +210,64 @@ weapon_weight = WEAPON_HEAVY autofire = 0.6 SECONDS fire_sound = 'sound/items/handling/paper_pickup.ogg' //Mostly just using this for a lack of a better "card-flicking" noise + +/obj/item/ego_weapon/ranged/pistol/tough + name = "tough pistol" + desc = "A glock reminiscent of a certain detective who fought evil for 25 years, losing hair as time went by." + special = "Use this weapon in your hand when wearing matching armor to turn others nearby bald." + icon_state = "bald" + inhand_icon_state = "bald" + damtype = WHITE_DAMAGE + projectile_path = /obj/projectile/ego_bullet/ego_tough + burst_size = 1 + fire_delay = 10 + fire_sound = 'sound/weapons/gun/pistol/shot.ogg' + vary_fire_sound = FALSE + fire_sound_volume = 70 + var/pulse_cooldown + var/pulse_cooldown_time = 60 SECONDS + var/blast_delay = 3 SECONDS + +/obj/item/ego_weapon/ranged/pistol/tough/attack_self(mob/user) + if(!ishuman(user)) + return + var/mob/living/carbon/human/H = user + if(pulse_cooldown > world.time) + to_chat(H, "You have used this ability too recently!") + return + var/obj/item/clothing/suit/armor/ego_gear/zayin/tough/T = H.get_item_by_slot(ITEM_SLOT_OCLOTHING) + if(!istype(T)) + to_chat(H, "You must have the corrosponding armor equipped to use this ability!") + return + to_chat(H, "You use the [src] to create a field of baldness!") + H.playsound_local(get_turf(H), 'sound/abnormalities/wrath_servant/hermit_magic.ogg', 25, 0) + BaldBlast(user) + pulse_cooldown = world.time + pulse_cooldown_time + +/obj/item/ego_weapon/ranged/pistol/tough/proc/BaldBlast(mob/living/carbon/human/user ,list/baldtargets = list(), burst_chain) + for(var/mob/living/carbon/human/L in livinginview(5, user)) //not even the dead are safe. + if(!ishuman(L)) + continue + if(HAS_TRAIT(L, TRAIT_BALD)) + continue + if(L in baldtargets) + to_chat(L, "You feel awesome!") + ADD_TRAIT(L, TRAIT_BALD, "ABNORMALITY_BALD") + L.hairstyle = "Bald" + L.update_hair() + continue + + baldtargets += L + to_chat(L, "You have been hit by the baldy-bald psychological attack. If a non-bald person is reading this, they will be granted the privilege of going bald at an extremely rapid pace if they stay within range of [user]!") + if(!burst_chain) + addtimer(CALLBACK(src, PROC_REF(BaldBlast), user, baldtargets, TRUE), blast_delay) + +/obj/item/ego_weapon/ranged/pistol/tough/SpecialEgoCheck(mob/living/carbon/human/H) + if(HAS_TRAIT(H, TRAIT_BALD)) + return TRUE + to_chat(H, "Only the ones with dedication to clean hairstyle can use [src]!") + return FALSE + +/obj/item/ego_weapon/ranged/pistol/tough/SpecialGearRequirements() + return "\nThe user must have clean hairstyle." + diff --git a/ModularTegustation/ego_weapons/ranged/waw.dm b/ModularTegustation/ego_weapons/ranged/waw.dm index 1eed0e4cb2b5..657fdd144315 100644 --- a/ModularTegustation/ego_weapons/ranged/waw.dm +++ b/ModularTegustation/ego_weapons/ranged/waw.dm @@ -487,7 +487,7 @@ fire_sound = 'sound/weapons/bowfire.ogg' icon_state = "warring_drawn" if(1) - if(do_after(user, 1, src, IGNORE_USER_LOC_CHANGE)) + if(!do_after(user, 1, src, IGNORE_USER_LOC_CHANGE)) return if(drawn != 1 || charge_amount < charge_cost) return diff --git a/ModularTegustation/ego_weapons/ranged/zayin.dm b/ModularTegustation/ego_weapons/ranged/zayin.dm index 2a7a1669b91e..62a47345ea53 100644 --- a/ModularTegustation/ego_weapons/ranged/zayin.dm +++ b/ModularTegustation/ego_weapons/ranged/zayin.dm @@ -1,64 +1,4 @@ // All zayin pistols use the default 6 force for ego_gun pistols -/obj/item/ego_weapon/ranged/pistol/tough - name = "tough pistol" - desc = "A glock reminiscent of a certain detective who fought evil for 25 years, losing hair as time went by." - special = "Use this weapon in your hand when wearing matching armor to turn others nearby bald." - icon_state = "bald" - inhand_icon_state = "bald" - damtype = WHITE_DAMAGE - projectile_path = /obj/projectile/ego_bullet/ego_tough - burst_size = 1 - fire_delay = 10 - fire_sound = 'sound/weapons/gun/pistol/shot.ogg' - vary_fire_sound = FALSE - fire_sound_volume = 70 - var/pulse_cooldown - var/pulse_cooldown_time = 60 SECONDS - var/blast_delay = 3 SECONDS - -/obj/item/ego_weapon/ranged/pistol/tough/attack_self(mob/user) - if(!ishuman(user)) - return - var/mob/living/carbon/human/H = user - if(pulse_cooldown > world.time) - to_chat(H, "You have used this ability too recently!") - return - var/obj/item/clothing/suit/armor/ego_gear/zayin/tough/T = H.get_item_by_slot(ITEM_SLOT_OCLOTHING) - if(!istype(T)) - to_chat(H, "You must have the corrosponding armor equipped to use this ability!") - return - to_chat(H, "You use the [src] to create a field of baldness!") - H.playsound_local(get_turf(H), 'sound/abnormalities/wrath_servant/hermit_magic.ogg', 25, 0) - BaldBlast(user) - pulse_cooldown = world.time + pulse_cooldown_time - -/obj/item/ego_weapon/ranged/pistol/tough/proc/BaldBlast(mob/living/carbon/human/user ,list/baldtargets = list(), burst_chain) - for(var/mob/living/carbon/human/L in livinginview(5, user)) //not even the dead are safe. - if(!ishuman(L)) - continue - if(HAS_TRAIT(L, TRAIT_BALD)) - continue - if(L in baldtargets) - to_chat(L, "You feel awesome!") - ADD_TRAIT(L, TRAIT_BALD, "ABNORMALITY_BALD") - L.hairstyle = "Bald" - L.update_hair() - continue - - baldtargets += L - to_chat(L, "You have been hit by the baldy-bald psychological attack. If a non-bald person is reading this, they will be granted the privilege of going bald at an extremely rapid pace if they stay within range of [user]!") - if(!burst_chain) - addtimer(CALLBACK(src, PROC_REF(BaldBlast), user, baldtargets, TRUE), blast_delay) - -/obj/item/ego_weapon/ranged/pistol/tough/SpecialEgoCheck(mob/living/carbon/human/H) - if(HAS_TRAIT(H, TRAIT_BALD)) - return TRUE - to_chat(H, "Only the ones with dedication to clean hairstyle can use [src]!") - return FALSE - -/obj/item/ego_weapon/ranged/pistol/tough/SpecialGearRequirements() - return "\nThe user must have clean hairstyle." - /obj/item/ego_weapon/ranged/pistol/soda name = "soda pistol" desc = "A pistol painted in a refreshing purple. Whenever this EGO is used, a faint scent of grapes wafts through the air." diff --git a/ModularTegustation/fishing/code/fish/LC13_fish/freshwater_fish.dm b/ModularTegustation/fishing/code/fish/LC13_fish/freshwater_fish.dm index cc478daeba47..5c6e985a7411 100644 --- a/ModularTegustation/fishing/code/fish/LC13_fish/freshwater_fish.dm +++ b/ModularTegustation/fishing/code/fish/LC13_fish/freshwater_fish.dm @@ -156,10 +156,21 @@ /obj/item/food/fish/fresh_water/boxin_man name = "Boxin Man" desc = "I'm boxin' here!" - icon_state = "walkin_man" + icon_state = "boxin_man" random_case_rarity = FISH_RARITY_VERY_RARE fillet_type = /obj/item/food/freshfish/white sprite_width = 8 sprite_height = 8 average_size = 50 average_weight = 5600 + +/obj/item/food/fish/fresh_water/weever_blue_album + name = "Weever Blue Album" + desc = "Only in Dreams!" + icon_state = "weever_blue_album" + random_case_rarity = FISH_RARITY_VERY_RARE + fillet_type = /obj/item/food/freshfish/slime + sprite_width = 8 + sprite_height = 8 + average_size = 50 + average_weight = 10000 diff --git a/ModularTegustation/fishing/code/fish_market.dm b/ModularTegustation/fishing/code/fish_market.dm index 750cfe868054..705e513386fa 100644 --- a/ModularTegustation/fishing/code/fish_market.dm +++ b/ModularTegustation/fishing/code/fish_market.dm @@ -83,7 +83,7 @@ /obj/machinery/fish_market/attackby(obj/item/I, mob/user, params) if(SSfishing.IsAligned(/datum/planet/uranus)) - to_chat(usr, span_notice("Uranus is aligned with earth. All fish points are increaed by 1.5x")) + to_chat(user, span_notice("Uranus is aligned with earth. All fish point output increased by 1.5x")) if(istype(I, /obj/item/stack/fish_points)) var/obj/item/stack/fish_points/more_points = I AdjustPoints(more_points.amount) @@ -103,14 +103,15 @@ var/obj/item/storage/bag/fish/bag = I var/fish_value = 0 for(var/item in bag.contents) + if(istype(item, /obj/item/stack/fish_points)) + continue + if(istype(item, /obj/item/fishing_component/hook/bone)) fish_value += 5 if(istype(item, /obj/item/food/fish)) fish_value += ValueFish(item) - else - continue qdel(item) AdjustPoints(fish_value) @@ -176,6 +177,7 @@ //More nets new /datum/data/extraction_cargo("Fishing Net ", /obj/item/fishing_net, 100) = 1, + new /datum/data/extraction_cargo("Big Baited Fishing Net ", /obj/item/fishing_net/big_bait, 200) = 1, new /datum/data/extraction_cargo("Nylon Fishing Net ", /obj/item/fishing_net/nylon, 300) = 1, new /datum/data/extraction_cargo("Steel Fishing Net ", /obj/item/fishing_net/steel, 300) = 1, new /datum/data/extraction_cargo("Baited Fishing Net ", /obj/item/fishing_net/baited, 300) = 1, diff --git a/ModularTegustation/fishing/code/fishing_items/fishing_net.dm b/ModularTegustation/fishing/code/fishing_items/fishing_net.dm index d6325468620d..5c62ed2381ac 100644 --- a/ModularTegustation/fishing/code/fishing_items/fishing_net.dm +++ b/ModularTegustation/fishing/code/fishing_items/fishing_net.dm @@ -23,7 +23,7 @@ var/fishin_cooldown_delay = 1 SECONDS var/fishin_power = 0.8 var/turf/open/water/deep/open_waters - var/enemy_chance = 15 //chance of getting enemies + var/enemy_chance = 15 //chance of getting enemies var/capacity = 5 /obj/structure/destructible/fishing_net/Initialize() @@ -57,7 +57,7 @@ if(CheckPlanetAligned(FISHGOD_VENUS)) enemy_chance/=2 - if(enemy_chance>5) //gotta have more than 5% + if(enemy_chance>5) //gotta have more than 5% if(prob(enemy_chance)) SpawnEnemy(dropoff, user) qdel(src) @@ -77,7 +77,7 @@ if(prob(1) && SSfishing.IsAligned(/datum/planet/mars)) spawning = /mob/living/simple_animal/hostile/distortion/shrimp_rambo/easy - if(prob(5)) //Super rares first + if(prob(5)) //Super rares first spawning = /mob/living/simple_animal/hostile/shrimp_soldier if(prob(20)) spawning = pick(/mob/living/simple_animal/hostile/shrimp_rifleman, /mob/living/simple_animal/hostile/senior_shrimp) @@ -103,7 +103,7 @@ debris = list(/obj/item/fishing_net/nylon = 1) net_type = /obj/item/fishing_net/nylon fishin_cooldown = 15 SECONDS - fishin_power = 0.7 //Slightly worse + fishin_power = 0.7 //Slightly worse enemy_chance = 10 @@ -123,7 +123,7 @@ icon_state_fished = "trawling_net_steel_full" debris = list(/obj/item/fishing_net/steel = 1) net_type = /obj/item/fishing_net/steel - fishin_cooldown = 30 SECONDS //Slower. + fishin_cooldown = 30 SECONDS //Slower. fishin_power = 1.4 enemy_chance = 10 @@ -144,7 +144,7 @@ icon_state_fished = "trawling_net_bait_full" debris = list(/obj/item/fishing_net/baited = 1) net_type = /obj/item/fishing_net/baited - fishin_cooldown = 15 SECONDS //Slower. + fishin_cooldown = 15 SECONDS fishin_power = 1.4 enemy_chance = 30 @@ -165,3 +165,24 @@ debris = list(/obj/item/fishing_net/hicap = 1) net_type = /obj/item/fishing_net/hicap capacity = 10 + +//Shrimp Bait net +/obj/item/fishing_net/big_bait + name = "big baited fishing net" + desc = "Big Baited nets are much slower the normal nets, however they have a near guaranteed chance at catching hostile lifeforms" + icon = 'ModularTegustation/fishing/icons/fishing.dmi' + icon_state = "shrimp_net" + w_class = WEIGHT_CLASS_HUGE + deploy_type = /obj/structure/destructible/fishing_net/big_bait + +/obj/structure/destructible/fishing_net/big_bait + name = "big baited fishing net" + desc = "A wall of twine and wires that traps fish. Alt click to harvest." + icon_state = "trawling_shrimp_net" + icon_state_fished = "trawling_shrimp_net_full" + debris = list(/obj/item/fishing_net/big_bait = 1) + net_type = /obj/item/fishing_net/big_bait + fishin_cooldown = 45 SECONDS //Much Slower + fishin_power = 1 + enemy_chance = 95 + capacity = 1 diff --git a/ModularTegustation/fishing/code/fishing_items/fishing_rod.dm b/ModularTegustation/fishing/code/fishing_items/fishing_rod.dm index 2a58a4eaef44..30fa2ee400e3 100644 --- a/ModularTegustation/fishing/code/fishing_items/fishing_rod.dm +++ b/ModularTegustation/fishing/code/fishing_items/fishing_rod.dm @@ -189,7 +189,7 @@ to_chat(user, span_nicegreen("[FISHGOD_MERCURY] smiles upon you!.")) if(user.god_aligned == FISHGOD_MERCURY) - size_modifier*=2 + size_modifier *= 2 fishie.randomize_weight_and_size(size_modifier) @@ -198,7 +198,8 @@ new /obj/item/stack/spacecash/c50(get_turf(user)) if(CheckPlanetAligned(FISHGOD_SATURN)) - to_chat(user, span_nicegreen("Saturn is in alignment. You feel like better for fishing.")) + var/list/possible_messages = list("Your mind feels clearer after fishing.", "You feel relaxed in [FISHGOD_SATURN]'s light.") + to_chat(user, span_nicegreen("Saturn is in alignment. [pick(possible_messages)]")) user.adjustSanityLoss(-5) to_chat(user, span_nicegreen("You caught [fishie.name].")) diff --git a/ModularTegustation/fishing/code/turfs.dm b/ModularTegustation/fishing/code/turfs.dm index 8c3be001686c..9abefb0c5496 100644 --- a/ModularTegustation/fishing/code/turfs.dm +++ b/ModularTegustation/fishing/code/turfs.dm @@ -264,12 +264,15 @@ /obj/item/clothing/head/beret/fishing_hat = 5, ) loot_level3 = list( + /obj/item/food/fish/fresh_water/ufo = 5, + /obj/item/food/fish/fresh_water/unidentifiedfishobject = 1, /obj/item/food/fish/fresh_water/ratfish = 25, /obj/item/food/fish/fresh_water/waterflea = 20, /obj/item/food/fish/fresh_water/yin = 20, /obj/item/food/fish/fresh_water/yang = 20, /mob/living/simple_animal/hostile/retaliate/frog = 10, /obj/item/food/fish/emulsijack = 5, + /obj/item/food/fish/fresh_water/weever_blue_album = 5, ) /turf/open/water/deep/saltwater @@ -284,6 +287,7 @@ /obj/item/stack/sheet/mineral/wood = 10, ) loot_level2 = list( + /obj/item/food/fish/salt_water/seabunny = 5, /obj/item/food/fish/trout = 35, /obj/item/food/fish/salt_water/cardinal = 25, /obj/item/food/fish/salt_water/sheephead = 10, @@ -293,6 +297,8 @@ /obj/item/clothing/head/beret/fishing_hat = 5, ) loot_level3 = list( + /obj/item/food/fish/salt_water/fishmael = 8, + /obj/item/food/fish/salt_water/searabbit = 5, /obj/item/food/fish/salt_water/lanternfish = 60, /obj/item/food/fish/salt_water/smolshark = 10, /obj/item/food/fish/salt_water/tuna_pallid = 10, @@ -325,15 +331,16 @@ /mob/living/simple_animal/hostile/shrimp = 2, ) loot_level3 = list( + /obj/item/food/fish/fresh_water/boxin_man = 10, + /obj/item/food/fish/fresh_water/walkin_man = 10, + /obj/item/food/fish/fresh_water/unidentifiedfishobject = 5, /obj/item/food/fish/fresh_water/mosb = 25, /obj/item/food/fish/salt_water/tuna_pallid = 25, /obj/item/food/fish/salt_water/piscine_mermaid = 45, /obj/item/food/fish/emulsijack = 5, + /obj/item/food/fish/fresh_water/weever_blue_album = 6, ) -/turf/open/water/deep/polluted/ObjSink(atom/movable/sinkin_thing) - return TRUE - /* Change this later so that it is not a subtype since the variable is in the deep type. Safe subtype isnt nessesary since it pre sets safe to TRUE when we can just set it to true individually.-IP*/ @@ -342,14 +349,18 @@ * Safe turfs, they wont sink you when you enter them */ +/turf/open/water/deep/saltwater + density = FALSE + /turf/open/water/deep/saltwater/safe/IsSafe() return TRUE /turf/open/water/deep/obsessing_water - safe = TRUE name = "Obsessing water" desc = "A strange black and teal water." icon_state = "obsessing_water" + safe = TRUE + density = FALSE loot_level1 = list( /obj/item/stack/sheet/mineral/wood = 30, /obj/item/food/grown/harebell = 35, diff --git a/ModularTegustation/fishing/icons/fish_sprites.dmi b/ModularTegustation/fishing/icons/fish_sprites.dmi index a4715df22f65..78dfd9bc21f0 100644 Binary files a/ModularTegustation/fishing/icons/fish_sprites.dmi and b/ModularTegustation/fishing/icons/fish_sprites.dmi differ diff --git a/ModularTegustation/fishing/icons/fishing.dmi b/ModularTegustation/fishing/icons/fishing.dmi index d8b1720dde61..98ee1afa0326 100644 Binary files a/ModularTegustation/fishing/icons/fishing.dmi and b/ModularTegustation/fishing/icons/fishing.dmi differ diff --git a/ModularTegustation/lc13_machinery.dm b/ModularTegustation/lc13_machinery.dm index ec1d74aada20..02610c39ddf9 100644 --- a/ModularTegustation/lc13_machinery.dm +++ b/ModularTegustation/lc13_machinery.dm @@ -1,3 +1,12 @@ +/obj/machinery/vending/can_be_unfasten_wrench(mob/user, silent) + . = ..() + if(!.) + return FAILED_UNFASTEN + + // Mechanics are in pain right now, as this is the most real thing ever + to_chat(user, span_warning("Aw dangit, your wrench is for 20 size bolts, but this vendor has size 17 bolts, your wrench keeps slipping!")) + return FAILED_UNFASTEN + //Links to abnormality consoles when the console spawns /obj/machinery/containment_panel name = "containment panel" diff --git a/ModularTegustation/_adventure_console/adventure_events/_event.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/_event.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/_event.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/_event.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/abnormality/aleph/giant.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/aleph/giant.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/abnormality/aleph/giant.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/aleph/giant.dm diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/he/singing_machine.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/he/singing_machine.dm new file mode 100644 index 000000000000..fe3f07bdaa77 --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/he/singing_machine.dm @@ -0,0 +1,59 @@ +/datum/adventure_event/singing_machine + name = "Singing_Machine" + desc = "YOU SEE A BOXY MACHINE" + require_abno = /mob/living/simple_animal/hostile/abnormality/singing_machine + adventure_cords = list( + "A sharp smell of iron and violence fills the room as you enter.
\ + Inside, is a large boxy machine with a person slumped against it.
\ + Each of their limbs has been ripped to shreds, with small fleshy gibs hanging from the machine.
\ + \"You there!\" Turning towards you.
\ + \"Throw yourself into the Machine! I need to hear it one more time!\"", + + "Putting yourself into the machine seems a bit extreme.
\ + However, if the sound it makes is that good you might have to listen.
\ + Against your better judgement you open the machine slipping a finger inside trying to keep it above the gnashing teeth.
\ + Slowly you inch closer, until it grabs you, yanking you towards the machine.
\ + Before you can stop yourself your arm is dragged into the depths, a new tune bursting forth amidst your screams.
\ + It is the most beautiful thing you’ve heard.", + + "Ability Challenge", + + "In a single fluid motion you pick up the person and toss them into the machine.
\ + Their cry isn’t one of fear, but exaltation thanking you for feeding them into the machine.
\ + As their body falls into the mesh of teeth and gears music begins to play.
\ + It’s a sound so lovely you understand the mperson's cheers.", + + "Reaching down you try to pick the person up, but they smack you away cutting your arm with a shard of bone.
\ + \"Stay away! If you aren’t going to give me music, then leave!\
\ + Sighing, you try again to pick them up, this time succeeding.
\ + However when you try to throw them they thrash around, falling out of your grasp.
\ + And knocking your arm into the machine.
\ + You scream as the machine tears into your arm.
\ + But the music it makes transcends beauty.", + + "Deciding you want nothing to do with any of this you turn to leave.
\ + \"Wait! Where are you going?\" The person cries reaching out with it’s jagged stump. \"Don’t you want to listen to ecstasy?\"
\ + You simply leave them there to rot.", + ) + +/datum/adventure_event/singing_machine/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "PUT YOUR FINGER IN THE MACHINE", M) + BUTTON_FORMAT(3, "THROW THE PERSON IN THE MACHINE", M) + BUTTON_FORMAT(4, "JUST LEAVE", M) + return + if(2) + AdjustHitPoint(-30) + AdjustStatNum(LUST_STAT, ADV_EVENT_STAT_EASY) + if(3) + CHANCE_BUTTON_FORMAT(ReturnStat(WRATH_STAT), "WRATH", M) + CHANCE_BUTTON_FORMAT(ReturnStat(LUST_STAT), "LUST", M) + . += CoinFlipping(M) + return + if(4) + AdjustStatNum(LUST_STAT, ADV_EVENT_STAT_EASY) + if(5) + AdjustStatNum(LUST_STAT, ADV_EVENT_STAT_EASY) + AdjustHitPoint(-30) + return..() diff --git a/ModularTegustation/_adventure_console/adventure_events/abnormality/he/tsa_woods.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/he/tsa_woods.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/abnormality/he/tsa_woods.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/he/tsa_woods.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/abnormality/teth/forsaken_murderer.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/forsaken_murderer.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/abnormality/teth/forsaken_murderer.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/forsaken_murderer.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/abnormality/teth/old_lady.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/old_lady.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/abnormality/teth/old_lady.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/old_lady.dm diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/ppodae.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/ppodae.dm new file mode 100644 index 000000000000..795de4c1f7db --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/ppodae.dm @@ -0,0 +1,60 @@ +/** + *Ppodae is the cutist. + *-ML + */ +/datum/adventure_event/ppodae + name = "Ppodae" + desc = "YOU SEE THE CUTEST THING EVER" + require_abno = /mob/living/simple_animal/hostile/abnormality/ppodae + adventure_cords = list( + "Entering the room, you notice it's near identical to a Lobotomy Corporation Contaiment Unit.
\ + Specifically one for a large sized Abnormality
\ + The only thing in it is a small fluffy boy with a petite mouth and large adorable eyes.
\ + It hops over to you, tail eagerly wagging as it looks up at you with pleading eyes.
\ + It is so adorable, so cute! Nothing could ever compare!
\ + There has to be SOMETHING you can do for him!", + + "Clearly no one has fed him recently! His bowl is nearly half empty!
\ + This can not go uncorrected! Thus, you being your quest to correc this neglect!
\ + The hallway outside the containment unit is devoid of anything.
\ + Returning to the chambers you strangely find the food in a closet inside the containment unit.
\ + Clearly someone had the good idea to alter the unit to make it more hospitable!
\ + There’s a few bones from a sekeleton for the good boy to chew on as well, you take some with as a treat.
\ + He looks so cute chowing down! It warms your soul to see him so happy.", + + "How could something this photogenic possibly exist?
\ + Taking out your phone you snap picture after picture, catching the good boy from every angle.
\ + Every single one of these pictures is too good to keep to yourself.
\ + As quickly as you take them you share them with others, deluging the net with Ppodae.
\ + Comments roll in, all of them in love with this most wonderous cutie.", + + "This little cutie can’t be left like this!
\ + He’s so lonely and needs attention.
\ + Thankfully you’re able to find a bone in a closet that shouldn’t be there for him to fetch!
\ + You toss it a couple of times, each time he takes it back showing off just how powerful his adorable body is!
\ + Wait, why’s he growing larger?", + + "Surely the managers didn’t make a mistake and put an actual dog in containment.
\ + After searching around you find the management notes in the workstation.
\ + Sure enough this is an abnormality, with a very long list of deaths it caused.
\ + Maybe playing with it isn’t the best idea...", + ) + +/datum/adventure_event/ppodae/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "FEED THE GOODEST BOY!", M) + BUTTON_FORMAT(3, "TAKE PICTURES! SO MANY PICTURES!", M) + BUTTON_FORMAT(4, "PLAY WITH HIM!", M) + BUTTON_FORMAT(5, "ISN'T THIS STILL AN ABNORMALITY?", M) + if(2) + AdjustHitPoint(5) + if(3) + AdjustCurrency(ADV_EVENT_COIN_EASY) + if(4) + CauseBattle( + "Ppodae: A mountiain of muscle with the facade of a puppy.", + MON_DAMAGE_EASY, + 30 + ) + return ..() diff --git a/ModularTegustation/_adventure_console/adventure_events/abnormality/teth/scorched_girl.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/scorched_girl.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/abnormality/teth/scorched_girl.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/scorched_girl.dm diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/void_dream.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/void_dream.dm new file mode 100644 index 000000000000..b028b09833a7 --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/teth/void_dream.dm @@ -0,0 +1,61 @@ +/** + *Void Dream is fairly straight forward. + *It’s about dreams and the desire to give up on the waking world + *and instead live in a place where things are more pleasant + *either generally or for things more specifically. -ML + */ +/datum/adventure_event/void_dream + name = "Void Dream" + desc = "YOU SEE A WOOLY CREATURE SLEEPING IN THE VOID." + require_abno = /mob/living/simple_animal/hostile/abnormality/voiddream + adventure_cords = list("The cold darkness of the void embraces you and the creature before you.
\ + Its wool is white, illuminated by the light of countless stars.
\ + From the mass of wool two eyes peak at you, it's head tucked away elsewhere.
\ + Brushing your hand against it you feel at ease, like it’s inviting you to join it's slumber.
\ + You feel drowsy, and some other feeling.
\ + Like a part of your heart is fading into the past.
\ + Maybe, you could take a moment to rest your eyes?", + + "Ability Challenge", + + "The floating ball of fluff and wool is warm and oh so comfortable.
\ + It doesn't take long to drift off to sleep,and when you do you dream.
\ + You’re taken back to a time you’d almost forgotten.
\ + There’s someone else there, together you walk, you talk, and you laugh.
\ + It feels so deeply nostalgic, but you can’t remember why.
\ + \"Hey !@)(!@&)&*%(%@!@#*(#\"
\ + You stop. That isn’t right, they had a name.
\ + You wake with start, sleep blurring your thoughts as they mix together.
\ + Wondering why you're here you look around, and seeing nothing but a ball of void, leave.
\ + It feels like you left something important behind", + + "You lay down to rest, nestling up into its warm, inviting, wool.
\ + You toss and turn, trying to get some rest, trying to escape into a dream.
\ + Then everything begins to fade away, and you wake up with a start.
\ + Turning around you see its eyes watching you and a thin tongue reaching out from a beak to lick you.
\ + It slowly tastes you and you feel your memories of the dream slowly fade.
\ + No, you can’t let it take them. Those are your memories, and you have to keep it that way.
\ + Turning you flee, and it drifts back to sleep.", + + "No, now isn’t the time for rest.
\ + Sleep is inviting, but this is still an abnormality and you shouldn’t trust it.
\ + Turning away you leave it to sleep.", + ) + + +/datum/adventure_event/void_dream/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "FALL ASLEEP", M) + BUTTON_FORMAT(5, "STAY AWAKE", M) + return + if(2) + CHANCE_BUTTON_FORMAT(ReturnStat(GLOOM_STAT), "Gloom", M) + CHANCE_BUTTON_FORMAT(ReturnStat(SLOTH_STAT), "Sloth", M) + . += CoinFlipping(M) + return + if(3) + AdjustStatNum(GLOOM_STAT, ADV_EVENT_STAT_EASY) + if(4) + AdjustCurrency(ADV_EVENT_COIN_EASY) + return ..() diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/waw/general_bee.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/waw/general_bee.dm new file mode 100644 index 000000000000..cf477f996653 --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/waw/general_bee.dm @@ -0,0 +1,50 @@ +/datum/adventure_event/general_bee + name = "Arms Inspection" + desc = "THE SOUND OF TRUMPETS" + require_abno = /mob/living/simple_animal/hostile/abnormality/general_b + adventure_cords = list( + "Passing underneath a gate on the road, you are accosted by
\ + a woman wearing a bright yellow and black jacket.
\ + 'HALT. Lay down your arms!'
\ + She demands you hand over your weapons.
\ + 'You are entering the domain of the queen!", + + "You lay your weapons down.
\ + The guard picks them up for inspection before handing them back.
\ + 'Nothing seems to be out of order.'
\ + She gives you a puzzled look.
\ + 'But I've never seen anything like these before.'
\ + The guard hands you your weapons back, and waves you on.", + + "You don't think that's quite a good idea.
\ + Shaking your head, you turn and leave.
\ + You hope you never pass this way again.", + + "You grip your weapon tightly. You will not be stopped.
\ + The guard sighs and draws her weapon.
\ + You both know how this is going to end,
\ + and you decide that bloodshed is better than inconvenience.", + + ) + +/datum/adventure_event/general_bee/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "LAY DOWN YOUR WEAPONS", M) + BUTTON_FORMAT(3, "REFUSE AND TURN AWAY", M) + BUTTON_FORMAT(4, "ASSAULT THE GUARD", M) + return + if(2) + AdjustStatNum(PRIDE_STAT, -1) + AdjustStatNum(WRATH_STAT, ADV_EVENT_STAT_EASY *2) + //No option for 3, because you just leave. + if(4) + AdjustStatNum(PRIDE_STAT, ADV_EVENT_STAT_NORMAL) + CauseBattle( + "Yellow-Clad Guard: A somewhat tall guard carrying a large spear. She's clad in yellow and black.", + MON_DAMAGE_NORMAL, + MON_HP_RAND_NORMAL, + ) + gamer.travel_mode = ADVENTURE_MODE_BATTLE + + return ..() diff --git a/ModularTegustation/_adventure_console/adventure_events/abnormality/waw/thunder_bird.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/waw/thunder_bird.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/abnormality/waw/thunder_bird.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/waw/thunder_bird.dm diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/fairy_festival.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/fairy_festival.dm new file mode 100644 index 000000000000..9933c82a3445 --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/fairy_festival.dm @@ -0,0 +1,66 @@ +/** + *Both Ruina and Lobotomy Corporation have the fairies as something that’s predatory, but they show it in two different ways. + *In their first appearance, they attempt to eat people if they think that it endangers their food supply, and in their second they are all under the rule of a Fairy queen who eats them to sate her hunger. + *I wanted to include both these aspects, while also keeping some of the innocence they use to attract agents as prey. + */ +/datum/adventure_event/festival + name = "Fairy Festival" + desc = "YOU SEE FAIRY LIGHTS HOVERING IN THE GROVE" + require_abno = /mob/living/simple_animal/hostile/abnormality/fairy_festival + adventure_cords = list( + "You enter a forest grove, ripe with dew and the scents of spring.
\ + Small lights flit between the trees, hiding amongst the greenery as they observe you.
\ + Slowy they come closer their tiny round forms coming into focus. Beating their small wings, they rush around you investigating this new intruder.
\ + Eventually one brave little one approaches you, hugging you it’s plump face grins up at you.
\ + After the first, the others follow hovering around you as they poke and prod, seemingly curious about what you are.
\ + Amid the commotion, one larger than the rest grabs onto you trying to tug you deeper into the grove.", + + "Following the fairy it brings you deeper and deeper into the forest, as the trees close in around you feel something's eyes.", + + "Ability Challenge", + + "Something shifts in the darkness, looking around you see it rise out of the undergrowth.
\ + It's gaunt, it's limbs practically skeletal, but still unmistakably a massive fairy.
\ + Its eyes fixate on the thing the fairy brought to it and you can feel its hungering gaze bore into you.
\ + Drool slowly drips from its mouth as it stares down at it's next meal.
\ + Thinking quickly, you grab the fairy that led you here and a few others presenting them to the beast.
\ + It takes them, turning its kin into a pulp in the flash of an eye before swallowing just as quickly.
\ + Unsatisfied, its eyes turn back to you, and you present another fairy, then another and another.
\ + As it feast you take the chance to sneak away, leaving the grove behind you.", + + "A sound of snapping branches and crunching leaves fills the forest as something rises out of the woods behind you.
\ + It looks like the fairies, but near skeletal and far far larger towering over not just them but you.
\ + The fairy tugs you forward, and you follow it just one more step.
\ + The giant grabs at you, mouth watering at the thought of the delectable meal you'll make.
\ + Pain erupts in your limbs as it's teeth rip into you, panicing you tear away running away from the grove.", + + "After a few minutes it stops, letting go of you and disappearing into the woods.
\ + The others don’t care, instead continuing to surround you as they find more and more of interest.
\ + Eventually either wandering away, or hunkering down around you.
\ + With nothing left to find you turn and leave the grove, feeling strangely refreshed though it feels like something’s watching you.", + + "With a smack the fairy turns into a green stain on your hand. The others freeze.
\ + Suddenly their gentle airs are gone, their lips peel back showing sharpened teeth.
\ + Then they swarm you. Swatting them away, you fight your way out of the grove as they gnaw at you.
\ + Eventually they let up, leaving gashes in your body that nothing that small should be able to.", + ) + +/datum/adventure_event/festival/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + CHANCE_BUTTON_FORMAT(2, "FOLLOW IT", M) + BUTTON_FORMAT(3, "RESIST IT", M) + BUTTON_FORMAT(4, "SQUISH IT", M) + return + if(2) + CHANCE_BUTTON_FORMAT(ReturnStat(PRIDE_STAT), "PRIDE", M) + CHANCE_BUTTON_FORMAT(ReturnStat(GLUTT_STAT), "GLUTTONY", M) + . += CoinFlipping(M) + return + if(3) + AdjustHitPoint(10) + return + if(4) + AdjustHitPoint(-5) + return + return ..() diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/oceanic.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/oceanic.dm new file mode 100644 index 000000000000..473809ce4121 --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/oceanic.dm @@ -0,0 +1,100 @@ +/datum/adventure_event/oceanic_waves + name = "An old orange vending machine" + desc = "YOU SEE A FAINT LIGHT" //All of the vending machine ones will use this. + require_abno = /mob/living/simple_animal/hostile/abnormality/oceanicwaves + adventure_cords = list( + "In front of you is a bright orange vending machine.
\ + There's dozens of buttons, and it's prompting you to pick one.
\ + You pass over the 'STALE BLOOD' and 'BABY FORMULA' flavors,
\ + and about 6 catch your eye.", + + "You press the button labelled INFINITE WEALTH.
\ + A wide-brimmed mason jar is dispensed with an orange liquid inside.
\ + It tastes strongly of orange.
\ + ...
\ + Something falls onto your teeth from inside the can, and it hurts a little.
\ + reaching in, you pull out a few coins.", + + + "You press the button labelled DOUBLE COCAINE.
\ + An unlabeled silver can is dispensed.
\ + It tastes like a mixture of bitterness and pennies.
\ + ...
\ + You feel awful.", + + + "You press the button labelled WELLCHEERS CHAOS MAX.
\ + A can with cobalt blue labeling is dispensed.
\ + It is rather tasty. It's quite sweet and has a light blueberry taste.
\ + ...
\ + You feel pretty good.", + + "You press the button labelled DOCTOR PEPPER.
\ + A red can is dispensed with the brand name in silver wording on it.
\ + Taking a sip, it tastes somewhat similar to cola.
\ + You have a hard time describing the taste, but you do really enjoy it.
\ + Despite never hearing of this soda before, you decide to keep an eye out for it again.", + + "You press the button labelled SKIN.
\ + A beige can is dispensed.
\ + Picking up the can, it's textured similar to skin, but you manage to open it.
\ + ...
\ + You recognize this metallic taste, and decide to not continue drinking.", + + "You press the button labelled SWEAT OF FREEDOM.
\ + A dark grey can with yellow accents is dispensed.
\ + Cracking it open, you take a cautious swig.
\ + It tastes like sweat. You don't know what you were expecting.
\ + ...
\ + You were so thirsty, you managed to choke it all back.
\ + Despite that, you feel pretty good.", + + "You press the button labelled SUPER DEATH.
\ + A black can with a white skull is dispensed. There is no other labelling.
\ + You take a drink.
\ + It tastes like sparkling water.
\ + ...
\ + You feel your mind drift into darkness.", + + ) + +//This machine doesn't favor any one stat, it's random which ones show up. +/datum/adventure_event/oceanic_waves/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "INFINITE WEALTH", M) + BUTTON_FORMAT(3, "DOUBLE COCAINE", M) + BUTTON_FORMAT(4, "WELLCHEERS CHAOS MAX ", M) + BUTTON_FORMAT(5, "DOCTOR PEPPER", M) + BUTTON_FORMAT(6, "SKIN", M) + BUTTON_FORMAT(7, "SWEAT OF FREEDOM", M) + BUTTON_FORMAT(8, "SUPER DEATH", M) + return + if(2) + AdjustCurrency(3) + AdjustHitPoint(-1) //funny + if(3) + AdjustStatNum(RAND_STAT,-3) + AdjustStatNum(RAND_STAT,3) + AdjustStatNum(RAND_STAT,-3) + AdjustStatNum(RAND_STAT,3) + if(4) + AdjustHitPoint(30) //Heals you a bit + if(5) + AdjustStatNum(RAND_STAT,1) //I like doctor pepper + if(6) + AdjustHitPoint(-10) + AdjustStatNum(RAND_STAT,2) + if(7) + AdjustHitPoint(100) + AdjustStatNum(RAND_STAT,-1) + if(7) + AdjustHitPoint(-100) + AdjustStatNum(WRATH_STAT,1) + AdjustStatNum(LUST_STAT,1) + AdjustStatNum(SLOTH_STAT,1) + AdjustStatNum(GLUTT_STAT,1) + AdjustStatNum(GLOOM_STAT,1) + AdjustStatNum(PRIDE_STAT,1) + AdjustStatNum(ENVY_STAT,1) + return ..() diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/we_can_change_anything.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/we_can_change_anything.dm new file mode 100644 index 000000000000..bc9e0d024900 --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/abnormality/zayin/we_can_change_anything.dm @@ -0,0 +1,37 @@ +/datum/adventure_event/wcca + name = "Pain Machine" + desc = "YOUR VOICE SCREAMING" + require_abno = /mob/living/simple_animal/hostile/abnormality/we_can_change_anything + adventure_cords = list( + "In front of you is a machine with space for one.", + + "As you enter the machine, the door closes behind you.
\ + You hear a dinging noise as a spike plunges into your back,
\ + and something clinks to the ground outside of the machine.", + + "The machine spits you out.
\ + You call back to the clinking outside of the machine, seeing
\ + a pile of coins lie outside for you to take." + ) + var/machine_coins = 0 + +/datum/adventure_event/wcca/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "ENTER THE MACHINE", M) + BUTTON_FORMAT(2, "ENTER THE MACHINE", M) + BUTTON_FORMAT(2, "ENTER THE MACHINE", M) + return + if(2) + BUTTON_FORMAT(2, "ENJOY THE MACHINE", M) + BUTTON_FORMAT(2, "ENJOY THE MACHINE", M) + BUTTON_FORMAT(3, "LEAVE THE MACHINE", M) + BUTTON_FORMAT(2, "ENJOY THE MACHINE", M) + BUTTON_FORMAT(2, "ENJOY THE MACHINE", M) + AdjustHitPoint(-10) + machine_coins++ + return + if(3) + AdjustCurrency(machine_coins) + + return ..() diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/Man_Sand.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/Man_Sand.dm new file mode 100644 index 000000000000..ece37db32dde --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/Man_Sand.dm @@ -0,0 +1,45 @@ +/** + * This event was just based on the way some rich people flaunt their wealth as a way of escaping the lonliness that comes from their position. + * -ML + */ +/datum/adventure_event/man_sand + name = "All the Sand in the World" + desc = "SAND IS EVERYWHERE" + adventure_cords = list( + "As you enter the room it opens up, its ceiling so high that it disappears into a single point.
\ + The only thing in it is a pile of glistening grains of sand, piled so high that it disappears into the ceiling.
\ + \"Welcome!\" a voice shouts. At first you see nothing, and then a figure begins to form itself from the sand.
\ + It slowly rises. \"Isn’t it wondrous? My collection?\" It grins, waving around at the empty room.
\ + \"Feel free to indulge yourself in its splendor!\"
\ + When you don’t immediately begin applauding it backs away, confused.
\ + In a flash it builds a few effigies of itself, each of them clapping until they collapse.", + + "You decide to humor the thing, telling it how impresive all the sand is.", + + "\"See?\" The figure says, turning towards the smaller versions of itself.
\ + \"Even this intruder recognizes how spectacular I am!\"
\ + They continue boasting to their constructed audience, ignoring you taking your leave.", + + "\"Why do you mock me?\" The figure cries, thrashing around kicking up clouds of sand.
\ + Throwing fistfuls of sand that carry their own degrading hands with them they shout: \"Begone, begone!\"
\ + As you leave you notice the sand solidifying into nuggets of gold in your hand.", + + "\"Wait,\" The figure cries rushing to try and grab you. \"Where are you going?\"
\ + As soon as its foot leaves the pile it’s body crumbles into sand.
\ + You simply leave. Behind you it continues to whine, demanding you come back.", + ) + +/datum/adventure_event/jazz_end/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "HUMOR IT", M) + BUTTON_FORMAT(5, "Leave", M) + if(2) + CHANCE_BUTTON_FORMAT(ReturnStat(GLUTT_STAT), "GLUTTONY", M) + CHANCE_BUTTON_FORMAT(ReturnStat(SLOTH_STAT), "SLOTH", M) + . += CoinFlipping(M) + if(3) + AdjustStatNum(SLOTH_STAT, ADV_EVENT_STAT_EASY) + if(4) + AdjustCurrency(ADV_EVENT_COIN_EASY) + return ..() diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/fun_contract.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/fun_contract.dm new file mode 100644 index 000000000000..6e8d2cf331c1 --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/fun_contract.dm @@ -0,0 +1,25 @@ +/** + *This on just started as a joke of an event that straight up killed you. + */ +/datum/adventure_event/fun_contract + name = "Sign away your life!" + desc = "YOU SEE A PAPER AND PEN" + adventure_cords = list( + "\"Hello.\" A light turns on, illuminating a desk with only a pen and paper on it.
\ + \"I'm here to offer you a deal.\"
\ + The paper reads, sign here to die.
\ + \"Please,\" The voice says as a line begins to appear on the paper. \"Sign here.\"", + + "You sign the paper, and everything goes black.", + + "What sort of idiot would sign?", + ) + +/datum/adventure_event/fun_contract/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "SIGN", M) + BUTTON_FORMAT(3, "DON'T SIGN", M) + if(2) + AdjustHitPoint(-100) + return ..() diff --git a/ModularTegustation/_adventure_console/adventure_events/general/jazz_end.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/jazz_end.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/general/jazz_end.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/jazz_end.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/general/legacy.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/legacy.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/general/legacy.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/legacy.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/general/quiz.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/quiz.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/general/quiz.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/quiz.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/general/sinking_bell.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/sinking_bell.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/general/sinking_bell.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/sinking_bell.dm diff --git a/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/vending machine.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/vending machine.dm new file mode 100644 index 000000000000..295602ffcf88 --- /dev/null +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/general/vending machine.dm @@ -0,0 +1,31 @@ +/datum/adventure_event/vending_machine + name = "Vending Machine" + desc = "YOU SEE A FAINT LIGHT" + adventure_cords = list( + "As you are walking down the alley, you see a faint light.
\ + After first checking to see if you are being followed, you
\ + investigate to find a vending machine in the darkness.
\ + It's simply asking you for a coin.", + + "A coin is inserted into the machine, and a drink is dispensed.
\ + It tastes like the faint memory of cherry cola.
\ + ...
\ + You don't think it tastes very good, but it's likely not poison.
\ + Walking off into the night, you quickly forget what transpired.", + + "You leave the vending machine be. Who knows what it could dispense?
\ + Forgetting where you were going, you continue back the way you came.", + ) + +/datum/adventure_event/vending_machine/EventChoiceFormat(obj/machinery/M, mob/living/carbon/human/H) + switch(cords) + if(1) + BUTTON_FORMAT(2, "INSERT A COIN", M) + BUTTON_FORMAT(3, "LEAVE IT BE", M) + return + if(2) + AdjustCurrency(-1) + AdjustHitPoint(100) + if(3) + AdjustStatNum(SLOTH_STAT,1) + return ..() diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/allaround_cleaner.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/allaround_cleaner.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/allaround_cleaner.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/allaround_cleaner.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/ambling_pearl.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/ambling_pearl.dm similarity index 98% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/ambling_pearl.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/ambling_pearl.dm index d59af5311802..790f4602ff2b 100644 --- a/ModularTegustation/_adventure_console/adventure_events/limbus_company/ambling_pearl.dm +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/ambling_pearl.dm @@ -1,6 +1,6 @@ /datum/adventure_event/ambling_pearl name = "Mirror Shard:Ambling Pearl" - desc = null + desc = "THE SMELL OF ROT" adventure_cords = list( "The barren mudflat reeks of salt and rot.
\ What little jade-colored seawater is left there
\ diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/ardor_blossom.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/ardor_blossom.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/ardor_blossom.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/ardor_blossom.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/blubbering_toad.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/blubbering_toad.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/blubbering_toad.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/blubbering_toad.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/chicken_strife.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/chicken_strife.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/chicken_strife.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/chicken_strife.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/coffin_return.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/coffin_return.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/coffin_return.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/coffin_return.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/fourthfront_smokewar.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/fourthfront_smokewar.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/fourthfront_smokewar.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/fourthfront_smokewar.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/golden_grip.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/golden_grip.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/golden_grip.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/golden_grip.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/kqe.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/kqe.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/kqe.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/kqe.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/lost_mind.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/lost_mind.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/lost_mind.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/lost_mind.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/monkey_tree.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/monkey_tree.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/monkey_tree.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/monkey_tree.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/nymph.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/nymph.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/nymph.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/nymph.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/poultry_passion_tango.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/poultry_passion_tango.dm similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/poultry_passion_tango.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/poultry_passion_tango.dm diff --git a/ModularTegustation/_adventure_console/adventure_events/limbus_company/readme.md b/ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/readme.md similarity index 100% rename from ModularTegustation/_adventure_console/adventure_events/limbus_company/readme.md rename to ModularTegustation/lc13_obj/_adventure_console/adventure_events/limbus_company/readme.md diff --git a/ModularTegustation/_adventure_console/adventure_layout.dm b/ModularTegustation/lc13_obj/_adventure_console/adventure_layout.dm similarity index 91% rename from ModularTegustation/_adventure_console/adventure_layout.dm rename to ModularTegustation/lc13_obj/_adventure_console/adventure_layout.dm index 24da2f4b2252..084f47446f19 100644 --- a/ModularTegustation/_adventure_console/adventure_layout.dm +++ b/ModularTegustation/lc13_obj/_adventure_console/adventure_layout.dm @@ -1,4 +1,5 @@ /** + * ADVENTURE CONSOLE V1.1 * TEXT BASED ADVENTURES * Adventures that are mostly predefined paths. * This was difficult to finalize since i havent made a text based adventure before. @@ -84,8 +85,35 @@ new /datum/data/extraction_cargo("CAT", /mob/living/simple_animal/pet/cat, 50) = 1, new /datum/data/extraction_cargo("CAK", /mob/living/simple_animal/pet/cat/cak, 100) = 1, new /datum/data/extraction_cargo("SNAKE", /mob/living/simple_animal/hostile/retaliate/poison/snake, 100) = 1, + + //Actual Shit + new /datum/data/extraction_cargo("SOME AHN", /obj/item/stack/spacecash/c500, 10) = 1, + new /datum/data/extraction_cargo("POSITIVE ENKEPHALIN", /obj/item/rawpe, 20) = 1, + ) + var/list/exchange_upgrade_list = list( + //DICE + new /datum/data/adventure_upgrade("COMBAT DICE UPGRADE 1-8","1d8", 1, "DICE") = 1, + new /datum/data/adventure_upgrade("COMBAT DICE UPGRADE 2-12","2d6", 3, "DICE") = 1, + //Health + new /datum/data/adventure_upgrade("RESTORE 7 HEALTH ", 7, 1, "HP") = 1, ) + /*-----------------\ + |Stat Upgrade Datum| + \-----------------*/ +/datum/data/adventure_upgrade + var/stuff_name = "ERROR" + var/stat_value = 0 + var/cost = 0 + var/trade_type = "HP" + +/datum/data/adventure_upgrade/New(name, stat_amt, cost, trading_type) + src.stuff_name = name + src.stat_value = stat_amt + src.cost = cost + src.trade_type = trading_type + +//--- /datum/adventure_layout/New(set_debug_menu = FALSE) . = ..() if(!events.len) @@ -192,7 +220,11 @@ PHYSICAL_MERCHANDISE
" //Code taken from fish_market.dm for(var/datum/data/extraction_cargo/A in exchange_shop_list) - . += " [A.equipment_name]([A.cost] Points)
" + . += " [A.equipment_name]([A.cost] Coins)
" + . += "--------------------|
\ + STAT UPGRADES
" + for(var/datum/data/adventure_upgrade/U in exchange_upgrade_list) + . += " [U.stuff_name]([U.cost] Coins)
" . += "--------------------|
" /datum/adventure_layout/proc/TravelUI(obj/machinery/call_machine) @@ -373,6 +405,11 @@ /*-----------------------\ |Numerical Variable Edits| \-----------------------*/ +/datum/adventure_layout/proc/ChangeDice(dice) + if(!istext(dice)) + return FALSE + virtual_damage = dice + return dice /datum/adventure_layout/proc/AdjustCoins(num) virtual_coins += round(num) @@ -387,6 +424,21 @@ /datum/adventure_layout/proc/AdjustProgress(num) program_progress += num +// Easy proc for buying stats. Possibly redundant and should be two seperate procs. +/datum/adventure_layout/proc/BuyStats(cost = 0, value, type) + if(!value || !type) + return FALSE + switch(type) + if("HP") + if(virtual_integrity >= 100) + return FALSE + AdjustHP(value) + if("DICE") + if(virtual_damage == value) + return FALSE + ChangeDice(value) + AdjustCoins(cost) + /*---------\ |Misc Procs| \---------*/ diff --git a/ModularTegustation/_adventure_console/console.dm b/ModularTegustation/lc13_obj/_adventure_console/console.dm similarity index 90% rename from ModularTegustation/_adventure_console/console.dm rename to ModularTegustation/lc13_obj/_adventure_console/console.dm index fca8e98f416c..9f8c4ae7a94c 100644 --- a/ModularTegustation/_adventure_console/console.dm +++ b/ModularTegustation/lc13_obj/_adventure_console/console.dm @@ -156,7 +156,7 @@ if(href_list["purchase"]) var/datum/data/extraction_cargo/product_datum = locate(href_list["purchase"]) in adventure_data.exchange_shop_list //The href_list returns the individual number code and only works if we have it in the first column. -IP if(!product_datum) - to_chat(usr, span_warning("ERROR.")) + to_chat(usr, span_warning("ERROR PRODUCT MISS")) return FALSE if(adventure_data.virtual_coins < product_datum.cost) to_chat(usr, span_warning("ERROR: INSUFFICENT CURRENCY.")) @@ -168,6 +168,22 @@ updateUsrDialog() return TRUE + //Exchange Shop for exchanging coins for stats + if(href_list["upgrade"]) + var/datum/data/adventure_upgrade/product_datum = locate(href_list["upgrade"]) in adventure_data.exchange_upgrade_list + if(!product_datum) + to_chat(usr, span_warning("ERROR UPGRADE MISS")) + return FALSE + if(adventure_data.virtual_coins < product_datum.cost) + to_chat(usr, span_warning("ERROR: INSUFFICENT CURRENCY.")) + playsound(get_turf(src), 'sound/machines/terminal_prompt_deny.ogg', 50, TRUE) + return FALSE + + adventure_data.BuyStats(-1 * product_datum.cost, product_datum.stat_value, product_datum.trade_type) + playsound(get_turf(src), 'sound/machines/terminal_prompt_confirm.ogg', 50, TRUE) + updateUsrDialog() + return TRUE + /obj/machinery/text_adventure_console/proc/ProfileMenu(href, href_list) . = "\ -------------------
\ diff --git a/code/game/machinery/computer/abnormality_archive.dm b/ModularTegustation/lc13_obj/lc13_computers/abnormality_archive.dm similarity index 100% rename from code/game/machinery/computer/abnormality_archive.dm rename to ModularTegustation/lc13_obj/lc13_computers/abnormality_archive.dm diff --git a/code/game/machinery/computer/abnormality_auxiliary.dm b/ModularTegustation/lc13_obj/lc13_computers/abnormality_auxiliary.dm similarity index 100% rename from code/game/machinery/computer/abnormality_auxiliary.dm rename to ModularTegustation/lc13_obj/lc13_computers/abnormality_auxiliary.dm diff --git a/code/game/machinery/computer/abnormality_ego.dm b/ModularTegustation/lc13_obj/lc13_computers/abnormality_ego.dm similarity index 100% rename from code/game/machinery/computer/abnormality_ego.dm rename to ModularTegustation/lc13_obj/lc13_computers/abnormality_ego.dm diff --git a/code/game/machinery/computer/abnormality_logs.dm b/ModularTegustation/lc13_obj/lc13_computers/abnormality_logs.dm similarity index 100% rename from code/game/machinery/computer/abnormality_logs.dm rename to ModularTegustation/lc13_obj/lc13_computers/abnormality_logs.dm diff --git a/code/game/machinery/computer/abnormality_queue.dm b/ModularTegustation/lc13_obj/lc13_computers/abnormality_queue.dm similarity index 100% rename from code/game/machinery/computer/abnormality_queue.dm rename to ModularTegustation/lc13_obj/lc13_computers/abnormality_queue.dm diff --git a/code/game/machinery/computer/abnormality_work.dm b/ModularTegustation/lc13_obj/lc13_computers/abnormality_work.dm similarity index 100% rename from code/game/machinery/computer/abnormality_work.dm rename to ModularTegustation/lc13_obj/lc13_computers/abnormality_work.dm diff --git a/code/game/machinery/regenerator.dm b/ModularTegustation/lc13_obj/regenerator.dm similarity index 100% rename from code/game/machinery/regenerator.dm rename to ModularTegustation/lc13_obj/regenerator.dm diff --git a/ModularTegustation/tegu_items/associations/vending.dm b/ModularTegustation/tegu_items/associations/vending.dm index 51cdd2617a06..69e2a542ae84 100644 --- a/ModularTegustation/tegu_items/associations/vending.dm +++ b/ModularTegustation/tegu_items/associations/vending.dm @@ -235,16 +235,22 @@ /obj/item/organ/eyes/robotic/glow = 100, /obj/item/organ/ears/cybernetic = 100, /obj/item/organ/cyberimp/arm/zippy = 100, + /obj/item/organ/cyberimp/arm/fixertools = 100, ) premium = list( /obj/item/shears = 1, /obj/item/bodypart/l_arm/robot/explosive = 100, /obj/item/bodypart/r_arm/robot/explosive = 100, + //obj/item/bodypart/l_arm/robot/timestop = 100, + //obj/item/bodypart/r_arm/robot/timestop = 100, /obj/item/organ/cyberimp/arm/mantis = 100, /obj/item/organ/cyberimp/arm/mantis/black = 100, /obj/item/organ/cyberimp/arm/chainsword = 100, + /obj/item/organ/cyberimp/arm/briefcase = 100, /obj/item/organ/cyberimp/arm/surgery = 100, + /obj/item/organ/cyberimp/arm/overdrive = 100, + /obj/item/organ/cyberimp/arm/observation = 100, /obj/item/extra_arm = 100, /obj/item/extra_arm/double = 100, ) diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm index 06f7768d9785..f17e853158c6 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/bossroom.dm @@ -1,15 +1,15 @@ /obj/effect/spawner/room/backstreets/bossroom name = "bossroom backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/20x20.dmi' + icon_state = "" room_width = 20 room_height = 20 room_type = "backstreets_bossroom" - /datum/map_template/random_room/backstreets/bossroom name = "Jacques - Bossroom" room_id = "jacques_boss" mappath = "_maps/RandomRooms/backstreets/bossroom/jacques.dmm" - centerspawner = FALSE template_width = 20 template_height = 20 stock = 1 @@ -39,3 +39,8 @@ name = "Metal - Bossroom" room_id = "metal_fixer" mappath = "_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm" + +/datum/map_template/random_room/backstreets/bossroom/slime_office + name = "Slime Office - Bossroom" + room_id = "slime_office" + mappath = "_maps/RandomRooms/backstreets/bossroom/slime_office.dmm" diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm index ebf48bffabd3..1f8cb95acc0f 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/connector.dm @@ -1,15 +1,15 @@ /obj/effect/spawner/room/backstreets/connector name = "connector backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/13x15.dmi' + icon_state = "" room_width = 13 room_height = 15 room_type = "backstreets_connector" - /datum/map_template/random_room/backstreets/connector name = "Courtyard - Connector" room_id = "courtyard" mappath = "_maps/RandomRooms/backstreets/connector/courtyard.dmm" - centerspawner = FALSE template_width = 13 template_height = 15 stock = 2 @@ -44,3 +44,20 @@ name = "Choke Point - Connector" room_id = "choke_point" mappath = "_maps/RandomRooms/backstreets/connector/choke_point.dmm" + +/datum/map_template/random_room/backstreets/connector/apartments + name = "Apartments - Connector" + room_id = "apartments_ca" + mappath = "_maps/RandomRooms/backstreets/connector/apartments_ca.dmm" + +/datum/map_template/random_room/backstreets/connector/toughshit + name = "Tough Shit - Connector" + room_id = "toughshit" + mappath = "_maps/RandomRooms/backstreets/connector/toughshit.dmm" + weight = 3 //1/3rd as common, Joke template + +/datum/map_template/random_room/backstreets/connector/water + name = "Water - Connector" + room_id = "water_ca" + mappath = "_maps/RandomRooms/backstreets/connector/water_ca.dmm" + weight = 3 //1/3rd as common, Joke template diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm index 7f71ac1af25f..3b6cb29fdbf2 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/bigrooms/pointofinterest.dm @@ -1,15 +1,15 @@ /obj/effect/spawner/room/backstreets/pointofinterest name = "pointofinterest backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/30x30.dmi' + icon_state = "" room_width = 30 room_height = 30 room_type = "backstreets_pointofinterest" - /datum/map_template/random_room/backstreets/pointofinterest name = "Robot City - Point of Interest" room_id = "robot_city_poi" mappath = "_maps/RandomRooms/backstreets/pointofinterest/robot_city.dmm" - centerspawner = FALSE template_width = 30 template_height = 30 stock = 1 @@ -22,5 +22,15 @@ /datum/map_template/random_room/backstreets/pointofinterest/love_train name = "Love Train - Point of Interest" - room_id = "love_train" + room_id = "love_train_poi" mappath = "_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm" + +/datum/map_template/random_room/backstreets/pointofinterest/lcorp + name = "L-Corp - Point of Interest" + room_id = "lcorp_poi" + mappath = "_maps/RandomRooms/backstreets/pointofinterest/lcorp.dmm" + +/datum/map_template/random_room/backstreets/pointofinterest/inquisition + name = "Inquisition - Point of Interest" + room_id = "n_corp_poi" + mappath = "_maps/RandomRooms/backstreets/pointofinterest/n_corp.dmm" diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm index 97b32a225b16..39b3916f77e4 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/large/north.dm @@ -1,21 +1,22 @@ /obj/effect/spawner/room/backstreets/large_north name = "large north backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/16x8.dmi' + icon_state = "" + dir = NORTH room_width = 16 room_height = 8 room_type = "backstreets_large_north" - /datum/map_template/random_room/backstreets/large_north name = "Apartment - Large North A" room_id = "apartment_lna" mappath = "_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm" - centerspawner = FALSE template_width = 16 template_height = 8 stock = 3 room_type = "backstreets_large_north" -/datum/map_template/random_room/backstreets/large_north/medicallna +/datum/map_template/random_room/backstreets/large_north/medical_lna name = "Medical - Large North A" room_id = "medical_lna" mappath = "_maps/RandomRooms/backstreets/large_north/medical_lna.dmm" @@ -32,6 +33,11 @@ room_id = "robot_lna" mappath = "_maps/RandomRooms/backstreets/large_north/robot_lna.dmm" +/datum/map_template/random_room/backstreets/large_north/robot_lnb + name = "Robots - Large North B" + room_id = "robot_lnb" + mappath = "_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm" + /datum/map_template/random_room/backstreets/large_north/scorp name = "S-Corp Real Base of Operations" room_id = "scorp" @@ -56,6 +62,7 @@ name = "Laboratory - Large North" room_id = "lab_ln" mappath = "_maps/RandomRooms/backstreets/large_north/lab_ln.dmm" + weight = 3 /datum/map_template/random_room/backstreets/large_north/electric_room name = "Amber Knight - Large North" @@ -68,3 +75,19 @@ room_id = "town_lna" mappath = "_maps/RandomRooms/backstreets/large_north/town_lna.dmm" stock = 1 + +/datum/map_template/random_room/backstreets/large_north/apartment_lnb + name = "Apartments - Large North B" + room_id = "apartment_lnb" + mappath = "_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm" + +/datum/map_template/random_room/backstreets/large_north/limbus_lna + name = "Limbus - Large North A" + room_id = "limbus_lna" + mappath = "_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm" + +/datum/map_template/random_room/backstreets/large_north/blade_lineage + name = "Blade Lineage - Large North" + room_id = "blade_lineage_ln" + mappath = "_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm" + diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm index 720bf25b859d..bb374c4fda77 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/large/south.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/large_south name = "large south backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/16x8.dmi' + icon_state = "" + dir = SOUTH room_width = 16 room_height = 8 room_type = "backstreets_large_south" - /datum/map_template/random_room/backstreets/large_south name = "Apartment - Large south A" room_id = "apartment_lsa" mappath = "_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm" - centerspawner = FALSE template_width = 16 template_height = 8 stock = 3 @@ -40,3 +41,9 @@ name = "G Corp Armory - Large South" room_id = "gcorp_armory" mappath = "_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm" + +/datum/map_template/random_room/backstreets/large_south/gcorp_armory + name = "Papa Bongy's Chicken - Large South" + room_id = "bongy" + mappath = "_maps/RandomRooms/backstreets/large_south/bongy.dmm" + stock = 1 //There can only be one papa bongy's chicken diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm index a0373f8f4f42..dd5a23641c75 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/east.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/medium_east name = "medium east backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/10x10.dmi' + icon_state = "" + dir = EAST room_width = 6 room_height = 10 room_type = "backstreets_medium_east" - /datum/map_template/random_room/backstreets/medium_east name = "Apartment - Medium East A" room_id = "apartment_mea" mappath = "_maps/RandomRooms/backstreets/medium_east/apartment_mea.dmm" - centerspawner = FALSE template_width = 6 template_height = 10 stock = 3 @@ -31,29 +32,34 @@ mappath = "_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm" /datum/map_template/random_room/backstreets/medium_east/zwei_office_mea - name = "Zwei Office - Medium East" + name = "Zwei Office - Medium East A" room_id = "zwei_office_mea" mappath = "_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm" +/datum/map_template/random_room/backstreets/medium_east/zwei_office_meb + name = "Zwei Office - Medium East B" + room_id = "zwei_office_meb" + mappath = "_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm" + /datum/map_template/random_room/backstreets/medium_east/church - name = "Church - Medium East" - room_id = "church" - mappath = "_maps/RandomRooms/backstreets/medium_east/church.dmm" + name = "Church - Medium East" + room_id = "church" + mappath = "_maps/RandomRooms/backstreets/medium_east/church.dmm" /datum/map_template/random_room/backstreets/medium_east/roach_mafia - name = "Roach Mafia - Medium East" - room_id = "roach_mafia" - mappath = "_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm" + name = "Roach Mafia - Medium East" + room_id = "roach_mafia" + mappath = "_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm" /datum/map_template/random_room/backstreets/medium_east/robot_mea - name = "Robot - Medium East A" - room_id = "robot_mea" - mappath = "_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm" + name = "Robot - Medium East A" + room_id = "robot_mea" + mappath = "_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm" /datum/map_template/random_room/backstreets/medium_east/clan_mechs - name = "Clan - Medium East A" - room_id = "clan_mechs" - mappath = "_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm" + name = "Clan - Medium East A" + room_id = "clan_mechs" + mappath = "_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm" /datum/map_template/random_room/backstreets/medium_east/worm_cave name = "Worm Cave - Medium East A" @@ -64,3 +70,15 @@ name = "Shrimp Office - Medium East A" room_id = "shrimp_office" mappath = "_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm" + +/datum/map_template/random_room/backstreets/medium_east/prosthetics + name = "Prosthetics Clinic - Medium East" + room_id = "pros_clinic_me" + mappath = "_maps/RandomRooms/backstreets/medium_east/prosthetics_me.dmm" + stock = 1 // Only one, but it's common + +/datum/map_template/random_room/backstreets/medium_east/workshop + name = "Workshop - Medium East" + room_id = "workshop_me" + mappath = "_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm" + stock = 1 // Only one, but it's common diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm index 54c39312d98f..32e2028d669c 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/north.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/medium_north name = "medium north backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/10x10.dmi' + icon_state = "" + dir = NORTH room_width = 10 room_height = 6 room_type = "backstreets_medium_north" - /datum/map_template/random_room/backstreets/medium_north name = "Bloody Office - Medium North" room_id = "bloody_office" mappath = "_maps/RandomRooms/backstreets/medium_north/office_bloody.dmm" - centerspawner = FALSE template_width = 10 template_height = 6 stock = 3 @@ -62,9 +63,18 @@ room_id = "gmanager_house" mappath = "_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm" -/datum/map_template/random_room/backstreets/medium_north/lab_ln - name = "Strange Lab - Medium North A" - room_id = "lab_ln" - mappath = "_maps/RandomRooms/backstreets/medium_north/lab_ln.dmm" - stock = 1 - weight = 2 //1/5th as common +/datum/map_template/random_room/backstreets/medium_north/casino_mn + name = "Casino - Medium North" + room_id = "casino_mn" + mappath = "_maps/RandomRooms/backstreets/medium_north/casino_mn.dmm" + stock = 1 // Only one, but it's common + +/datum/map_template/random_room/backstreets/medium_north/shrimp_gym + name = "Shrimp Gym - Medium North" + room_id = "shrimp_gym" + mappath = "_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm" + +/datum/map_template/random_room/backstreets/medium_north/slime_hut + name = "Slime Hut - Medium North A" + room_id = "slime_hut" + mappath = "_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm" diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm index 0a48943745cc..64e1fb5e0389 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/south.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/medium_south name = "medium south backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/10x10.dmi' + icon_state = "" + dir = SOUTH room_width = 10 room_height = 6 room_type = "backstreets_medium_south" - /datum/map_template/random_room/backstreets/medium_south name = "Apartment - Medium south A" room_id = "bedroom_msa" mappath = "_maps/RandomRooms/backstreets/medium_south/bedroom_msa.dmm" - centerspawner = FALSE template_width = 10 template_height = 6 stock = 3 @@ -50,11 +51,6 @@ room_id = "town_msa" mappath = "_maps/RandomRooms/backstreets/medium_south/town_msa.dmm" -/datum/map_template/random_room/backstreets/medium_south/town_msa - name = "Lovetown - Medium South A" - room_id = "town_msa" - mappath = "_maps/RandomRooms/backstreets/medium_south/town_msa.dmm" - /datum/map_template/random_room/backstreets/medium_south/mech_bay name = "Mech Bay - Medium South A" room_id = "mech_bay" diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm index 8f829a879a39..3c0bc07022e4 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/medium/west.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/medium_west name = "medium west backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/10x10.dmi' + icon_state = "" + dir = WEST room_width = 6 room_height = 10 room_type = "backstreets_medium_west" - /datum/map_template/random_room/backstreets/medium_west name = "Medical - Medium west A" room_id = "medical_mwa" mappath = "_maps/RandomRooms/backstreets/medium_west/medical_mwa.dmm" - centerspawner = FALSE template_width = 6 template_height = 10 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm index c95437678048..d4b1600cfc2c 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/small/east.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/small_east name = "small east backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/7x7.dmi' + icon_state = "" + dir = EAST room_width = 5 room_height = 7 room_type = "backstreets_small_east" - /datum/map_template/random_room/backstreets/small_east name = "Garbage Bins" room_id = "garbage_se" mappath = "_maps/RandomRooms/backstreets/small_east/garbage.dmm" - centerspawner = FALSE template_width = 5 template_height = 7 stock = 3 @@ -44,3 +45,36 @@ name = "Paper - Small East A" room_id = "paper_pushed" mappath = "_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm" + +/datum/map_template/random_room/backstreets/small_east/limbus_sea + name = "Limbus - Small East A" + room_id = "limbus_sea" + mappath = "_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm" + +/datum/map_template/random_room/backstreets/small_east/limbus_seb + name = "Limbus - Small East B" + room_id = "limbus_seb" + mappath = "_maps/RandomRooms/backstreets/small_east/limbus_seb.dmm" + +/datum/map_template/random_room/backstreets/small_east/shrimp_research + name = "Shrimp Research - Small East" + room_id = "oceanic_se" + mappath = "_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm" + +/datum/map_template/random_room/backstreets/small_east/cigarettes_se + name = "500 Cigarettes - Small East" + room_id = "cigarettes_se" + mappath = "_maps/RandomRooms/backstreets/small_east/cigarettes_se.dmm" + stock = 1 + +/datum/map_template/random_room/backstreets/small_east/binah + name = "Binah - Small East" + room_id = "binah_se" + mappath = "_maps/RandomRooms/backstreets/small_east/binah.dmm" + stock = 1 + +/datum/map_template/random_room/backstreets/small_east/ukulele + name = "Ukulele - Small East" + room_id = "ukulele" + mappath = "_maps/RandomRooms/backstreets/small_east/ukulele.dmm" + weight = 2 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm index 183a3bb51d36..4dafb71d2291 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/small/north.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/small_north name = "small north backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/7x7.dmi' + icon_state = "" + dir = NORTH room_width = 7 room_height = 5 room_type = "backstreets_small_north" - /datum/map_template/random_room/backstreets/small_north name = "Medical - Small North A" room_id = "medical_sna" mappath = "_maps/RandomRooms/backstreets/small_north/medical_sna.dmm" - centerspawner = FALSE template_width = 7 template_height = 5 stock = 3 @@ -30,7 +31,6 @@ room_id = "coffee_break" mappath = "_maps/RandomRooms/backstreets/small_north/coffee_break.dmm" - /datum/map_template/random_room/backstreets/small_north/kcorp_stash_sna name = "KCorp Stash - Small North A" room_id = "kcorp_stash_sna" @@ -56,17 +56,17 @@ room_id = "small_clan_hideout" mappath = "_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm" -/datum/map_template/random_room/backstreets/small_north/grey_parrizan - name = "Grey Parrizan - Small North A" - room_id = "grey_parrizan" - mappath = "_maps/RandomRooms/backstreets/small_north/grey_parrizan.dmm" - -/datum/map_template/random_room/backstreets/small_north/apartment_sna - name = "Apartment - Small North A" +/datum/map_template/random_room/backstreets/small_north/apartment_snb + name = "Apartment - Small North B" room_id = "apartment_sna" - mappath = "_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm" + mappath = "_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm" /datum/map_template/random_room/backstreets/small_north/bird_box - name = "Bird Box - Small North A" + name = "Bird Box - Small North" room_id = "bird_box" mappath = "_maps/RandomRooms/backstreets/small_north/bird_box.dmm" + +/datum/map_template/random_room/backstreets/small_north/wellcheers_interrogation + name = "Wellcheers Interrogation - Small North" + room_id = "wellcheers_interrogation" + mappath = "_maps/RandomRooms/backstreets/small_north/wellcheers_interrogation.dmm" diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm index 3c5c676902f9..aacf4d73c47b 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/small/south.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/small_south name = "small south backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/7x7.dmi' + icon_state = "" + dir = SOUTH room_width = 7 room_height = 5 room_type = "backstreets_small_south" - /datum/map_template/random_room/backstreets/small_south name = "A Small Drink - Small South" room_id = "drink_sn" mappath = "_maps/RandomRooms/backstreets/small_south/open_drink.dmm" - centerspawner = FALSE template_width = 7 template_height = 5 stock = 3 diff --git a/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm b/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm index a27732d591f1..91d462f82a30 100644 --- a/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm +++ b/ModularTegustation/tegu_items/backstreets/random_rooms/small/west.dm @@ -1,15 +1,16 @@ /obj/effect/spawner/room/backstreets/small_west name = "small west backstreets spawner" + icon = 'ModularTegustation/Teguicons/room_spawners/7x7.dmi' + icon_state = "" + dir = WEST room_width = 5 room_height = 7 room_type = "backstreets_small_west" - /datum/map_template/random_room/backstreets/small_west name = "Robot - Small West" room_id = "robot_swa" mappath = "_maps/RandomRooms/backstreets/small_west/robot_swa.dmm" - centerspawner = FALSE template_width = 5 template_height = 7 stock = 3 @@ -55,8 +56,14 @@ name = "Risk of Rain Reference - Small West" room_id = "risk_rain_reference_robot" mappath = "_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm" + weight = 2 //Reference rooms are rare. /datum/map_template/random_room/backstreets/small_west/booby_trapped name = "Booby Trapped - Small West" room_id = "booby_trapped" mappath = "_maps/RandomRooms/backstreets/small_west/booby_trapped.dmm" + +/datum/map_template/random_room/backstreets/small_west/runaway_bird + name = "Runaway Birds - Small West" + room_id = "runaway_bird" + mappath = "_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm" diff --git a/ModularTegustation/tegu_items/backstreets/templates.dm b/ModularTegustation/tegu_items/backstreets/templates.dm index ab74715d0930..bff3c5316384 100644 --- a/ModularTegustation/tegu_items/backstreets/templates.dm +++ b/ModularTegustation/tegu_items/backstreets/templates.dm @@ -9,7 +9,6 @@ name = "Regular Template" room_id = "template_a" mappath = "_maps/RandomRooms/backstreetlayout/standard.dmm" - centerspawner = FALSE template_width = 254 template_height = 109 room_type = "backstreets_template" @@ -29,7 +28,13 @@ room_id = "tunnels_backstreets" mappath = "_maps/RandomRooms/backstreetlayout/tunnels_backstreets.dmm" -/datum/map_template/random_room/backstreet_template/lcorp_ruin - name = "L-Corp Ruin Template" - room_id = "lcorp_ruin" +/datum/map_template/random_room/backstreet_template/abandoned_lcorp + name = "Abandoned L-Corp Template" + room_id = "abandoned_lcorp" mappath = "_maps/RandomRooms/backstreetlayout/lcorp_backstreets.dmm" + +/datum/map_template/random_room/backstreet_template/la_mancha_land + name = "La Mancha Land Template" + room_id = "la_mancha_land_backstreets" + mappath = "_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm" + weight = 5 diff --git a/ModularTegustation/tegu_items/debug_items.dm b/ModularTegustation/tegu_items/debug_items.dm index bb3a91d4e23b..ff3276c3f2a3 100644 --- a/ModularTegustation/tegu_items/debug_items.dm +++ b/ModularTegustation/tegu_items/debug_items.dm @@ -206,7 +206,8 @@ */ /obj/item/lc_debug/sephirah_action_granter name = "debug sephirah action granter" - desc = "A strange wooden sign with the words\"THE ROBITS GRIFF ME!!!\" inscribed upon it" + desc = "A strange wooden sign with the words \"THE ROBITS GRIFF ME!!!\" inscribed upon it" + icon = 'icons/obj/items_and_weapons.dmi' icon_state = "picket" /obj/item/lc_debug/sephirah_action_granter/examine(mob/user) diff --git a/ModularTegustation/tegu_items/gadgets/manager_bullets.dm b/ModularTegustation/tegu_items/gadgets/manager_bullets.dm index bc68802e540c..da605732bdd9 100644 --- a/ModularTegustation/tegu_items/gadgets/manager_bullets.dm +++ b/ModularTegustation/tegu_items/gadgets/manager_bullets.dm @@ -52,7 +52,7 @@ var/statuseffectvisual = icon('ModularTegustation/Teguicons/tegu_effects.dmi', "red_shield") var/shieldhealth = 100 var/damagetaken = 0 - var/respectivedamage = RED_DAMAGE + var/list/respectivedamage = list(RED_DAMAGE) var/faltering = 0 /datum/status_effect/interventionshield/on_apply() @@ -65,11 +65,11 @@ /datum/status_effect/interventionshield/proc/OnApplyDamage(datum_source, amount, damagetype, def_zone) SIGNAL_HANDLER - if(damagetype != respectivedamage) + if(!(damagetype in respectivedamage)) return var/mob/living/carbon/human/H = owner - var/suitarmor = H.getarmor(null, respectivedamage) / 100 + var/suitarmor = H.getarmor(null, damagetype) / 100 damagetaken = amount * (1 - suitarmor) if(damagetaken <= 0) return @@ -104,17 +104,23 @@ /datum/status_effect/interventionshield/white id = "trauma shield" statuseffectvisual = icon('ModularTegustation/Teguicons/tegu_effects.dmi', "white_shield") - respectivedamage = WHITE_DAMAGE + respectivedamage = list(WHITE_DAMAGE) /datum/status_effect/interventionshield/black id = "erosion shield" statuseffectvisual = icon('ModularTegustation/Teguicons/tegu_effects.dmi', "black_shield") - respectivedamage = BLACK_DAMAGE + respectivedamage = list(BLACK_DAMAGE) /datum/status_effect/interventionshield/pale id = "pale shield" statuseffectvisual = icon('ModularTegustation/Teguicons/tegu_effects.dmi', "pale_shield") - respectivedamage = PALE_DAMAGE + respectivedamage = list(PALE_DAMAGE) + +/datum/status_effect/interventionshield/perfect + id = "perfect shield" + statuseffectvisual = icon('ModularTegustation/Teguicons/tegu_effects.dmi', "manager_shield") + respectivedamage = list(RED_DAMAGE, WHITE_DAMAGE, BLACK_DAMAGE, PALE_DAMAGE) + //other bullets /obj/item/managerbullet/red @@ -174,3 +180,15 @@ /obj/item/managerbullet/slowdown/bulletshatter(mob/living/L) L.apply_status_effect(/datum/status_effect/qliphothoverload) + +/obj/item/managerbullet/perfect + name = "perfect manager bullet" + desc = "A bullet used in a manager console." + icon = 'icons/obj/ammo.dmi' + icon_state = "sleeper-live" + color = "yellow" + +/obj/item/managerbullet/perfect/bulletshatter(mob/living/L) + if(!ishuman(L)) + return + L.apply_status_effect(/datum/status_effect/interventionshield/perfect) diff --git a/ModularTegustation/tegu_items/gadgets/unpowered.dm b/ModularTegustation/tegu_items/gadgets/unpowered.dm index 182b84ee8d69..ced1789759e1 100644 --- a/ModularTegustation/tegu_items/gadgets/unpowered.dm +++ b/ModularTegustation/tegu_items/gadgets/unpowered.dm @@ -44,6 +44,8 @@ icon = 'ModularTegustation/Teguicons/teguitems.dmi' icon_state = "gadget3" var/paperstock = 1 + w_class = WEIGHT_CLASS_SMALL + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS /obj/item/portacopier/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/paper)) @@ -103,6 +105,8 @@ Needs to be recharged at a printer." icon = 'ModularTegustation/Teguicons/teguitems.dmi' icon_state = "gadget3" + w_class = WEIGHT_CLASS_SMALL + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS var/mob/living/simple_animal/hostile/abnormality/target_abno var/mob/living/carbon/human/target_agent var/print_charges = 1 diff --git a/ModularTegustation/tegu_items/prosthetics/extrarm.dm b/ModularTegustation/tegu_items/prosthetics/extrarm.dm deleted file mode 100644 index 8f0d77b9cc3e..000000000000 --- a/ModularTegustation/tegu_items/prosthetics/extrarm.dm +++ /dev/null @@ -1,40 +0,0 @@ - -/obj/item/bodypart/chest/robot/extraarm - name = "extra arms torso" - desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell." - inhand_icon_state = "buildpipe" - icon = 'icons/mob/augmentation/augments.dmi' - custom_premium_price = 1400 - -/obj/item/bodypart/chest/robot/extraarm/set_owner(new_owner) - ..() - playsound(get_turf(owner), 'sound/weapons/circsawhit.ogg', 50, TRUE) - var/limbs = owner.held_items.len - owner.change_number_of_hands(limbs+1) - - -//Mechandrites for the Mechanicus - -/obj/item/mechandrites - name = "\improper Mechandrite Implanter" - desc = "An implanter for mechandrites, allowing a follower of the Omnissiah to gain newly found dexterity and handiness" - icon = 'icons/obj/device.dmi' - icon_state = "autoimplanter" - var/uses = 1 - -/obj/item/mechandrites/attack_self(mob/user) - if(!uses) - to_chat(user, span_notice("[src] has already been used. The tools are dull and won't reactivate.")) - return - var/limbs = user.held_items.len - if(limbs >= 4) - to_chat(user, span_alert("You already have an extra arm.")) - return - user.change_number_of_hands(limbs+1) - user.visible_message(span_notice("[user] presses a button on [src], and you hear a short mechanical noise."), span_notice("You feel a sharp sting as [src] plunges into your body.")) - to_chat(user, span_notice("Your mechandrites whirr with life")) - playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, TRUE) - if(uses == 1) - uses-- - if(!uses) - desc = "[initial(desc)] Looks like it's been used up." diff --git a/ModularTegustation/tegu_items/prosthetics/fixertools.dm b/ModularTegustation/tegu_items/prosthetics/fixertools.dm new file mode 100644 index 000000000000..be42773ebd89 --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/fixertools.dm @@ -0,0 +1,13 @@ +/obj/item/organ/cyberimp/arm/fixertools + name = "fixer tools implant" + desc = "A variety of important fixer tools is stored here. A flashlight, crowbar and hunting knife is included." + contents = newlist(/obj/item/flashlight/seclite, /obj/item/crowbar, /obj/item/kitchen/knife/combat/survival, /obj/item/pda) + +/obj/item/organ/cyberimp/arm/fixertools/l + zone = BODY_ZONE_L_ARM + +/obj/item/organ/cyberimp/arm/fixertools/Extend(obj/item/item) + ..() + //little bit of stam loss + owner.adjustStaminaLoss(owner.maxHealth*0.3, TRUE, TRUE) + diff --git a/ModularTegustation/tegu_items/prosthetics/icons/generic.dmi b/ModularTegustation/tegu_items/prosthetics/icons/generic.dmi index 7452fa98a4ae..8b4b32468963 100644 Binary files a/ModularTegustation/tegu_items/prosthetics/icons/generic.dmi and b/ModularTegustation/tegu_items/prosthetics/icons/generic.dmi differ diff --git a/ModularTegustation/tegu_items/prosthetics/icons/observation_head.dmi b/ModularTegustation/tegu_items/prosthetics/icons/observation_head.dmi new file mode 100644 index 000000000000..6b275d686655 Binary files /dev/null and b/ModularTegustation/tegu_items/prosthetics/icons/observation_head.dmi differ diff --git a/ModularTegustation/tegu_items/prosthetics/icons/timestoparm.dmi b/ModularTegustation/tegu_items/prosthetics/icons/timestoparm.dmi new file mode 100644 index 000000000000..517a157d04a6 Binary files /dev/null and b/ModularTegustation/tegu_items/prosthetics/icons/timestoparm.dmi differ diff --git a/ModularTegustation/tegu_items/prosthetics/mantis.dm b/ModularTegustation/tegu_items/prosthetics/mantis.dm index 26f072f24503..6bf22c3be7c6 100644 --- a/ModularTegustation/tegu_items/prosthetics/mantis.dm +++ b/ModularTegustation/tegu_items/prosthetics/mantis.dm @@ -1,6 +1,6 @@ /obj/item/organ/cyberimp/arm/mantis name = "Mantis blade implants" - desc = "Mantis blades designed by some sicko in district." + desc = "Mantis blades designed by some sicko in district 6." contents = newlist(/obj/item/ego_weapon/city/mantis) syndicate_implant = TRUE @@ -38,7 +38,7 @@ /obj/item/organ/cyberimp/arm/mantis/black name = "Mantis blade (B) implants" - desc = "Mantis blades designed by some sicko in district." + desc = "Mantis blades designed by some sicko in district 6." contents = newlist(/obj/item/ego_weapon/city/mantis/black) syndicate_implant = TRUE diff --git a/ModularTegustation/tegu_items/prosthetics/overdrive.dm b/ModularTegustation/tegu_items/prosthetics/overdrive.dm new file mode 100644 index 000000000000..db51cb76148e --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/overdrive.dm @@ -0,0 +1,34 @@ +/obj/item/organ/cyberimp/arm/overdrive + name = "overdrive implant" + desc = "An implant that deals toxin damage on extention and retraction, but increases your movement speed." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/generic.dmi' + icon_state = "overdrive" + contents = newlist(/obj/item/overdrive) + +/obj/item/organ/cyberimp/arm/overdrive/l + zone = BODY_ZONE_L_ARM + +/obj/item/organ/cyberimp/arm/overdrive/Extend(obj/item/item) + ..() + //little bit of stam loss + owner.adjustToxLoss(owner.maxHealth*0.25, TRUE, TRUE) + + owner.add_movespeed_modifier(/datum/movespeed_modifier/overdrive) + addtimer(CALLBACK(src, PROC_REF(Retract)), 10 SECONDS) + +/datum/movespeed_modifier/overdrive + variable = TRUE + multiplicative_slowdown = -0.5 + +/obj/item/organ/cyberimp/arm/overdrive/Retract() + ..() + owner.remove_movespeed_modifier(/datum/movespeed_modifier/overdrive) + + +//Just a dummy item. +/obj/item/overdrive + name = "overdrive system" + desc = "A core that increases your movement speed." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/generic.dmi' + icon_state = "overdrive" + diff --git a/ModularTegustation/tegu_items/prosthetics/scrying.dm b/ModularTegustation/tegu_items/prosthetics/scrying.dm new file mode 100644 index 000000000000..860e25c74acf --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/scrying.dm @@ -0,0 +1,22 @@ +/obj/item/organ/cyberimp/arm/observation + name = "obvservation implant" + desc = "A device that lets you oversee the surrounding area." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/generic.dmi' + icon_state = "investigation" + contents = newlist(/obj/item/scrying/observation) + custom_premium_price = 3600 + +/obj/item/organ/cyberimp/arm/observation/l + zone = BODY_ZONE_L_ARM + +/obj/item/organ/cyberimp/arm/observation/Extend(obj/item/item) + ..() + //little bit of stam loss + owner.adjustStaminaLoss(owner.maxHealth*0.5, TRUE, TRUE) + + +/obj/item/scrying/observation + name = "observation system" + desc = "A way to see what cannot be seen." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/generic.dmi' + icon_state = "investigation" diff --git a/ModularTegustation/tegu_items/prosthetics/storage.dm b/ModularTegustation/tegu_items/prosthetics/storage.dm new file mode 100644 index 000000000000..b11d07cbd889 --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/storage.dm @@ -0,0 +1,14 @@ +/obj/item/organ/cyberimp/arm/briefcase + name = "briefcase implant" + desc = "A retractable briefcase!" + contents = newlist(/obj/item/storage/briefcase) + icon = 'ModularTegustation/tegu_items/prosthetics/icons/generic.dmi' + icon_state = "briefcase" + +/obj/item/organ/cyberimp/arm/briefcase/Extend(obj/item/item) + ..() + //little bit of stam loss + owner.adjustStaminaLoss(owner.maxHealth*0.5, TRUE, TRUE) + +/obj/item/organ/cyberimp/arm/briefcase/l + zone = BODY_ZONE_L_ARM diff --git a/ModularTegustation/tegu_items/prosthetics/timestop.dm b/ModularTegustation/tegu_items/prosthetics/timestop.dm new file mode 100644 index 000000000000..fd67e0cfb998 --- /dev/null +++ b/ModularTegustation/tegu_items/prosthetics/timestop.dm @@ -0,0 +1,27 @@ +/obj/item/bodypart/l_arm/robot/timestop + name = "timestop left arm" + desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case. This arm releases a timestop phial when damaged, allowing for the user to escape damage." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/timestoparm.dmi' + icon_state = "timestop_l_arm" + max_damage = 20 + brute_reduction = 0 + burn_reduction = 0 + + +/obj/item/bodypart/l_arm/robot/timestop/on_disabled() + new /obj/effect/timestop(get_turf(owner), 3, 5 SECONDS, list(owner)) + + +/obj/item/bodypart/r_arm/robot/timestop + name = "timestop right arm" + desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case. This arm releases a timestop phial when damaged, allowing for the user to escape damage." + icon = 'ModularTegustation/tegu_items/prosthetics/icons/timestoparm.dmi' + icon_state = "timestop_r_arm" + max_damage = 20 + brute_reduction = 0 + burn_reduction = 0 + + +/obj/item/bodypart/r_arm/robot/timestop/on_disabled() + new /obj/effect/timestop(get_turf(owner), 3, 5 SECONDS, list(owner)) + diff --git a/ModularTegustation/tegu_items/rcorp/landmarks.dm b/ModularTegustation/tegu_items/rcorp/landmarks.dm index fa6e1f79e670..347efe1ebe19 100644 --- a/ModularTegustation/tegu_items/rcorp/landmarks.dm +++ b/ModularTegustation/tegu_items/rcorp/landmarks.dm @@ -179,3 +179,23 @@ GLOBAL_LIST_INIT(raidboss, list(/mob/living/simple_animal/hostile/distortion/shr //To do: Deshit this. +/obj/effect/landmark/nobasic_incorp_move + name = "incorp barrier" + desc = "no basic incorp move" + icon = 'icons/effects/landmarks_static.dmi' + icon_state = "x2" + +/obj/effect/landmark/nobasic_incorp_move/Initialize() + ..() + var/turf/T = get_turf(src) + T.turf_flags |= NO_BASIC_INCORP_MOVE + return INITIALIZE_HINT_LATELOAD + +/obj/effect/landmark/nobasic_incorp_move/Destroy() + var/turf/T = get_turf(src) + T.turf_flags &= ~NO_BASIC_INCORP_MOVE + . = ..() + +/obj/effect/landmark/nobasic_incorp_move/disappearing + name = "disappearing incorp barrier" + desc = "no basic incorp move" diff --git a/ModularTegustation/tegu_items/rcorp/objective.dm b/ModularTegustation/tegu_items/rcorp/objective.dm index e87a0e7b31ba..1546fa7fd086 100644 --- a/ModularTegustation/tegu_items/rcorp/objective.dm +++ b/ModularTegustation/tegu_items/rcorp/objective.dm @@ -162,19 +162,24 @@ GLOBAL_VAR_INIT(rcorp_payload, null) light_on = FALSE update_light() - //Round End Effects - SSticker.SetRoundEndSound('sound/abnormalities/donttouch/end.ogg') - SSticker.force_ending = 1 - for(var/mob/M in GLOB.player_list) - to_chat(M, span_userdanger("[uppertext(user.real_name)] has collected the bough!")) - - switch(GLOB.rcorp_wincondition) - if(0) - to_chat(M, span_userdanger("R-CORP MAJOR VICTORY.")) - if(1) - to_chat(M, span_userdanger("R-CORP MINOR VICTORY.")) - if(2) - to_chat(M, span_userdanger("R-CORP SUPREME VICTORY.")) + if(!SSticker.force_ending) + //Round End Effects + SSticker.SetRoundEndSound('sound/abnormalities/donttouch/end.ogg') + SSticker.force_ending = 1 + for(var/mob/M in GLOB.player_list) + to_chat(M, span_userdanger("[uppertext(user.real_name)] has collected the bough!")) + + switch(GLOB.rcorp_wincondition) + if(0) + to_chat(M, span_userdanger("R-CORP MAJOR VICTORY.")) + if(1) + to_chat(M, span_userdanger("R-CORP MINOR VICTORY.")) + if(2) + to_chat(M, span_userdanger("R-CORP SUPREME VICTORY.")) + else + var/turf/turf = get_turf(src) + new /obj/effect/decal/cleanable/confetti(turf) + playsound(turf, 'sound/misc/sadtrombone.ogg', 100) else user.gib() //lol, idiot. @@ -191,11 +196,16 @@ GLOBAL_VAR_INIT(rcorp_payload, null) /mob/living/simple_animal/hostile/shrimp_vip/death(gibbed) - for(var/mob/M in GLOB.player_list) - to_chat(M, span_userdanger("THE VIP HAS BEEN SLAIN.")) - to_chat(M, span_userdanger("R-CORP MAJOR VICTORY.")) - SSticker.force_ending = 1 - ..() + if(!SSticker.force_ending) + for(var/mob/M in GLOB.player_list) + to_chat(M, span_userdanger("THE VIP HAS BEEN SLAIN.")) + to_chat(M, span_userdanger("R-CORP MAJOR VICTORY.")) + SSticker.force_ending = 1 + else + var/turf/turf = get_turf(src) + new /obj/effect/decal/cleanable/confetti(turf) + playsound(turf, 'sound/misc/sadtrombone.ogg', 100) + return ..() //Arbiter /obj/effect/mob_spawn/human/arbiter/rcorp @@ -239,15 +249,19 @@ GLOBAL_VAR_INIT(rcorp_payload, null) resistance_flags &= ~INDESTRUCTIBLE /obj/structure/rcorpcomms/deconstruct(disassembled = TRUE) - for(var/mob/M in GLOB.player_list) - to_chat(M, span_userdanger("RCORP'S COMMUNICATIONS HAVE BEEN DESTROYED.")) - switch(GLOB.rcorp_wincondition) - if(0) - to_chat(M, span_userdanger("ABNORMALITY MAJOR VICTORY.")) - if(1) - to_chat(M, span_userdanger("ABNORMALITY SUPREME VICTORY.")) - if(2) - to_chat(M, span_userdanger("ABNORMALITY MINOR VICTORY.")) - SSticker.force_ending = 1 - ..() - + if(!SSticker.force_ending) + for(var/mob/M in GLOB.player_list) + to_chat(M, span_userdanger("RCORP'S COMMUNICATIONS HAVE BEEN DESTROYED.")) + switch(GLOB.rcorp_wincondition) + if(0) + to_chat(M, span_userdanger("ABNORMALITY MAJOR VICTORY.")) + if(1) + to_chat(M, span_userdanger("ABNORMALITY SUPREME VICTORY.")) + if(2) + to_chat(M, span_userdanger("ABNORMALITY MINOR VICTORY.")) + SSticker.force_ending = 1 + else + var/turf/turf = get_turf(src) + new /obj/effect/decal/cleanable/confetti(turf) + playsound(turf, 'sound/misc/sadtrombone.ogg', 100) + return ..() diff --git a/ModularTegustation/tegu_items/rcorp/random_caves.dm b/ModularTegustation/tegu_items/rcorp/random_caves.dm index 4297c305479c..e1dc2361432b 100644 --- a/ModularTegustation/tegu_items/rcorp/random_caves.dm +++ b/ModularTegustation/tegu_items/rcorp/random_caves.dm @@ -44,11 +44,11 @@ mappath = "_maps/RandomRooms/rcorp/caves/hallway.dmm" weight = 5 -/datum/map_template/random_room/rcorp_caves/elevator - name = "R-Corp Caves - Elevator" - room_id = "rcorp_caves_elevator" - mappath = "_maps/RandomRooms/rcorp/caves/elevator.dmm" - weight = 2 //Meme template, less common +// /datum/map_template/random_room/rcorp_caves/elevator +// name = "R-Corp Caves - Elevator" +// room_id = "rcorp_caves_elevator" +// mappath = "_maps/RandomRooms/rcorp/caves/elevator.dmm" +// weight = 2 //Meme template, less common /datum/map_template/random_room/rcorp_caves/river name = "R-Corp Caves - River" diff --git a/ModularTegustation/tegu_items/rcorp/random_maps.dm b/ModularTegustation/tegu_items/rcorp/random_maps.dm index 908e712f9ae6..123c555a6f85 100644 --- a/ModularTegustation/tegu_items/rcorp/random_maps.dm +++ b/ModularTegustation/tegu_items/rcorp/random_maps.dm @@ -88,15 +88,15 @@ mappath = "_maps/RandomRooms/rcorp/facility/raidboss.dmm" weight = 10 -/datum/map_template/random_room/rcorp/zombies - name = "Rcorp - City" - room_id = "rcorp_inside_city" - mappath = "_maps/RandomRooms/rcorp/facility/city.dmm" - weight = 10 - -/datum/map_template/random_room/rcorp/xenos - name = "Rcorp - Xenos" - room_id = "rcorp_inside_xenos" - mappath = "_maps/RandomRooms/rcorp/facility/xenos.dmm" +// /datum/map_template/random_room/rcorp/zombies +// name = "Rcorp - City" +// room_id = "rcorp_inside_city" +// mappath = "_maps/RandomRooms/rcorp/facility/city.dmm" +// weight = 10 + +// /datum/map_template/random_room/rcorp/xenos +// name = "Rcorp - Xenos" +// room_id = "rcorp_inside_xenos" +// mappath = "_maps/RandomRooms/rcorp/facility/xenos.dmm" // weight = 10 Currently instantly ends the round for reasons known only to god. diff --git a/ModularTegustation/tegu_items/representative/items/pcorp.dm b/ModularTegustation/tegu_items/representative/items/pcorp.dm index 7a3329cc789b..40ac973a5571 100644 --- a/ModularTegustation/tegu_items/representative/items/pcorp.dm +++ b/ModularTegustation/tegu_items/representative/items/pcorp.dm @@ -162,7 +162,7 @@ /obj/item/food/canned/pcorp_icecream name = "p-corp canned ice cream" desc = "P corp's specialty canned ice cream." - icon_state = "pcorp_can_icecream" + icon_state = "pcorp_icecream" trash_type = /obj/item/trash/can/food/pcorp_icecream food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/sal_acid = 5) tastes = list("strawberry" = 1, "mint" = 1, "chocolate" = 1,"butterscotch" = 1) @@ -182,7 +182,7 @@ /obj/item/trash/can/food/pcorp_icecream name = "canned ice cream" icon = 'icons/obj/food/food.dmi' - icon_state = "pcorp_can_icecream_empty" + icon_state = "pcorp_icecream_empty" /obj/item/trash/can/food/pcorp_burger name = "canned burger" diff --git a/ModularTegustation/tegu_items/wcorp/mapping.dm b/ModularTegustation/tegu_items/wcorp/mapping.dm index 380c9ef3353b..1ed8fa850feb 100644 --- a/ModularTegustation/tegu_items/wcorp/mapping.dm +++ b/ModularTegustation/tegu_items/wcorp/mapping.dm @@ -74,3 +74,21 @@ room_id = "wcorp_kitchen" mappath = "_maps/RandomRooms/wcorp/kitchen.dmm" weight = 5 + +/datum/map_template/random_room/wcorp/stage + name = "Wcorp - Stage" + room_id = "wcorp_stage" + mappath = "_maps/RandomRooms/wcorp/stage.dmm" + weight = 5 + +/datum/map_template/random_room/wcorp/storage1 + name = "Wcorp - Storage 1" + room_id = "wcorp_storage1" + mappath = "_maps/RandomRooms/wcorp/storage1.dmm" + weight = 5 + +/datum/map_template/random_room/wcorp/zoo + name = "Wcorp - Zoo" + room_id = "wcorp_zoo" + mappath = "_maps/RandomRooms/wcorp/zoo.dmm" + weight = 5 diff --git a/ModularTegustation/tegu_mobs/apocalypse_bird.dm b/ModularTegustation/tegu_mobs/apocalypse_bird.dm index c81100c82791..3c77376d6e8a 100644 --- a/ModularTegustation/tegu_mobs/apocalypse_bird.dm +++ b/ModularTegustation/tegu_mobs/apocalypse_bird.dm @@ -24,6 +24,7 @@ occupied_tiles_left = 3 occupied_tiles_right = 3 occupied_tiles_up = 2 + damage_effect_scale = 1.25 blood_volume = BLOOD_VOLUME_NORMAL del_on_death = TRUE death_message = "finally stops moving, falling to the ground." diff --git a/ModularTegustation/tegu_mobs/lc13_corrosions.dm b/ModularTegustation/tegu_mobs/lc13_corrosions.dm index d6a6636b523b..54e3ac3f92de 100644 --- a/ModularTegustation/tegu_mobs/lc13_corrosions.dm +++ b/ModularTegustation/tegu_mobs/lc13_corrosions.dm @@ -247,12 +247,12 @@ return FALSE ..() -/mob/living/simple_animal/hostile/ordeal/snake_corrosion/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/snake_corrosion/AttackingTarget(atom/attacked_target) if(!can_act) return FALSE - ..() - if(isliving(target)) - var/mob/living/H = target + . = ..() + if(isliving(attacked_target)) + var/mob/living/H = attacked_target H.apply_venom(applied_venom) /mob/living/simple_animal/hostile/ordeal/snake_corrosion/OpenFire() @@ -409,16 +409,16 @@ return ..() -/mob/living/simple_animal/hostile/ordeal/dog_corrosion/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/dog_corrosion/AttackingTarget(atom/attacked_target) if(charging) return if(dash_cooldown <= world.time && !client && charge_ready) - PrepCharge(target) + PrepCharge(attacked_target) return . = ..() - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.health < 0) H.gib() playsound(src, "sound/abnormalities/clouded_monk/eat.ogg", 75, 1) diff --git a/ModularTegustation/tegu_mobs/lc13_humanoids.dm b/ModularTegustation/tegu_mobs/lc13_humanoids.dm index 79f0d786b617..988601616fe4 100644 --- a/ModularTegustation/tegu_mobs/lc13_humanoids.dm +++ b/ModularTegustation/tegu_mobs/lc13_humanoids.dm @@ -45,7 +45,7 @@ Skittish, they prefer to move in groups and will run away if the enemies are in attack_verb_simple = "slice" del_on_death = TRUE retreat_distance = 0 - butcher_results = list(/obj/item/food/meat/slab/human = 1) + butcher_results = list(/obj/item/food/meat/slab/human = 1, /obj/item/stack/spacecash/c10 = 1) silk_results = list(/obj/item/stack/sheet/silk/human_simple = 1) var/retreat_distance_default = 0 @@ -120,12 +120,12 @@ Skittish, they prefer to move in groups and will run away if the enemies are in return FALSE return ..() -/mob/living/simple_animal/hostile/humanoid/rat/knife/AttackingTarget() +/mob/living/simple_animal/hostile/humanoid/rat/knife/AttackingTarget(atom/attacked_target) if(!can_act) return ..() if(dash_cooldown < world.time) - BackstreetsDash(target) + BackstreetsDash(attacked_target) return /mob/living/simple_animal/hostile/humanoid/rat/knife/OpenFire() @@ -243,7 +243,22 @@ Skittish, they prefer to move in groups and will run away if the enemies are in attack_verb_simple = "slice" del_on_death = TRUE var/can_act = TRUE + var/list/loot_weapon = list( + ) + var/list/loot_armor = list( + ) + +/mob/living/simple_animal/hostile/humanoid/fixer/drop_loot() + var/list/loot + if (prob(50)) + loot = loot_armor + else + loot = loot_weapon + + if(loot?.len) + for(var/i in loot) + new i(loc) /mob/living/simple_animal/hostile/humanoid/fixer/Move() if(!can_act) @@ -256,14 +271,14 @@ Skittish, they prefer to move in groups and will run away if the enemies are in return ..() /mob/living/simple_animal/hostile/humanoid/fixer/metal - name = "Metal Fixer" + name = "Memory Forger" desc = "A dude covered in a full white cloak and always wear a white mask. He seems to be wearing a tactical vest." icon_state = "metal_fixer" icon_living = "metal_fixer" icon_dead = "metal_fixer" var/icon_attacking = "metal_fixer_weapon" - maxHealth = 1500 - health = 1500 + maxHealth = 2000 + health = 2000 damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.6, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.3) move_to_delay = 5 melee_damage_lower = 12 @@ -275,6 +290,13 @@ Skittish, they prefer to move in groups and will run away if the enemies are in attack_verb_simple = "slice" del_on_death = TRUE ranged = TRUE + loot_weapon = list ( + /obj/item/ego_weapon/shield/eria, + /obj/item/ego_weapon/city/echo/iria, + ) + loot_armor = list ( + /obj/item/clothing/suit/armor/ego_gear/city/echo/plated, + ) var/statue_type = /mob/living/simple_animal/hostile/metal_fixer_statue var/shots_cooldown = 50 var/max_statues = 12 @@ -343,7 +365,9 @@ Skittish, they prefer to move in groups and will run away if the enemies are in adjustHealth(self_damage_statue) var/mutable_appearance/colored_overlay = mutable_appearance(icon, "small_stagger", layer + 0.1) add_overlay(colored_overlay) + ChangeResistances(list(RED_DAMAGE = 1.2, WHITE_DAMAGE = 2, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 2.6)) SLEEP_CHECK_DEATH(stun_duration) + ChangeResistances(list(RED_DAMAGE = 0.6, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.3)) cut_overlays() can_act = TRUE @@ -396,7 +420,7 @@ Skittish, they prefer to move in groups and will run away if the enemies are in adjustHealth(-(P.damage/4)) playsound(src, 'sound/abnormalities/voiddream/skill.ogg', 50, TRUE, 2) - visible_message(span_warning("[P] contacts with [src] and heals them!")) + visible_message(span_warning("[P] contacts with [src] and heals them!")) DamageEffect(P.damage_type) /obj/projectile/metal_fixer @@ -422,11 +446,19 @@ Skittish, they prefer to move in groups and will run away if the enemies are in //var/mob/living/simple_animal/hostile/humanoid/fixer/metal/M = target qdel(src) return BULLET_ACT_BLOCK - return ..() + var/mob/living/simple_animal/hostile/humanoid/fixer/metal/M = firer + + if (istype(target, /mob)) + + var/mob/MOB = target + if (MOB.faction_check_mob(M, FALSE)) + return BULLET_ACT_BLOCK + . = ..() + /mob/living/simple_animal/hostile/metal_fixer_statue name = "Memory Statue" - desc = "A statue created by the Metal Fixer." + desc = "A statue created by the Memory Forger." icon = 'ModularTegustation/Teguicons/tegumobs.dmi' icon_state = "memory_statute" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.5, WHITE_DAMAGE = 0, BLACK_DAMAGE = 2, PALE_DAMAGE = 2) @@ -474,7 +506,7 @@ Skittish, they prefer to move in groups and will run away if the enemies are in /mob/living/simple_animal/hostile/metal_fixer_statue/proc/heal_metal_fixer() if(metal) metal.adjustHealth(-heal_per_tick) - visible_message("The statue heals the Metal Fixer!") + visible_message("The statue heals the Memory Forger!") playsound(src, 'sound/abnormalities/rosesign/rose_summon.ogg', 75, TRUE, 2) icon_state = "memory_statute_heal" // Set the initial icon state to the rising animation flick("memory_statute_heal", src) // Play the rising animation @@ -489,13 +521,13 @@ Skittish, they prefer to move in groups and will run away if the enemies are in return FALSE /mob/living/simple_animal/hostile/humanoid/fixer/flame - name = "Flame Fixer" + name = "Sanguine Flame" desc = "A lanky young man with fair skin, dark eyes, and an often overoptimistic expression. A heavy spear decorated with vibrant patterns on the head." icon_state = "flame_fixer" icon_living = "flame_fixer" icon_dead = "flame_fixer" maxHealth = 2500 - health = 1500 + health = 2500 damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.4, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 1, PALE_DAMAGE = 1.3) move_to_delay = 4 melee_damage_lower = 20 @@ -508,7 +540,12 @@ Skittish, they prefer to move in groups and will run away if the enemies are in del_on_death = TRUE ranged = TRUE ranged_cooldown_time = 45 - melee_reach = 2 + loot_weapon = list ( + /obj/item/ego_weapon/city/echo/sunstrike, + ) + loot_armor = list ( + /obj/item/clothing/suit/armor/ego_gear/city/echo/faux, + ) var/burn_stacks = 2 projectiletype = /obj/projectile/flame_fixer var/damage_reflection = FALSE @@ -519,6 +556,10 @@ Skittish, they prefer to move in groups and will run away if the enemies are in var/counter_cooldown = 30 var/last_voice_line = 0 var/voice_line_cooldown = 250 + var/counter_timer + var/counter_duration = 4 SECONDS + var/got_hit = FALSE + /mob/living/simple_animal/hostile/humanoid/fixer/flame/proc/TripleDash() // if dash is off cooldown stun until the end of dashes and say quote @@ -527,6 +568,7 @@ Skittish, they prefer to move in groups and will run away if the enemies are in // repeat 3 times with 1 sec delay between each // unstun if (world.time > last_dash + dash_cooldown) + got_hit = FALSE last_dash = world.time can_act = FALSE say("Dissatisfaction.") @@ -537,9 +579,13 @@ Skittish, they prefer to move in groups and will run away if the enemies are in Dash(target) icon_state = initial(icon_state) last_dash = world.time - can_act = TRUE + if (!got_hit) + can_act = TRUE + got_hit = FALSE /mob/living/simple_animal/hostile/humanoid/fixer/flame/proc/Dash(dash_target) + if (got_hit) + return if (!dash_target) return var/turf/target_turf = get_turf(dash_target) @@ -563,7 +609,7 @@ Skittish, they prefer to move in groups and will run away if the enemies are in continue new /obj/effect/temp_visual/mech_fire(T) for(var/mob/living/L in T) - if(!faction_check_mob(L, FALSE) || locate(L) in hit_mob) + if(!faction_check_mob(L, FALSE) && !(locate(L) in hit_mob)) L.apply_damage(dash_damage, RED_DAMAGE, null, L.run_armor_check(null, RED_DAMAGE), spread_damage = TRUE) LAZYADD(hit_mob, L) @@ -590,28 +636,36 @@ Skittish, they prefer to move in groups and will run away if the enemies are in // counter has random cooldown 15-40 sec if (!can_act) return - TripleDash() if (world.time > last_counter + counter_cooldown) last_counter = world.time + got_hit = FALSE can_act = FALSE icon_state = "flame_fixer_counter_start" say("Debilitation.") SLEEP_CHECK_DEATH(10) - damage_reflection = TRUE - icon_state = "flame_fixer_counter" - SLEEP_CHECK_DEATH(40) + if (!got_hit) + damage_reflection = TRUE + icon_state = "flame_fixer_counter" + counter_timer = addtimer(CALLBACK(src, PROC_REF(EndCounter)), counter_duration, TIMER_STOPPABLE) + return + + . = ..() + if (istype(attacked_target, /mob/living)) + var/mob/living/L = attacked_target + L.apply_lc_burn(burn_stacks) + TripleDash() + +/mob/living/simple_animal/hostile/humanoid/fixer/flame/proc/EndCounter() + if (damage_reflection) + //delete timer + if (counter_timer !=0) + deltimer(counter_timer) damage_reflection = FALSE can_act = TRUE icon_state = initial(icon_state) last_counter = world.time counter_cooldown = rand(100, 250) - return - - . = ..() - if (istype(target, /mob/living)) - var/mob/living/L = target - L.apply_lc_burn(burn_stacks) /mob/living/simple_animal/hostile/humanoid/fixer/flame/bullet_act(obj/projectile/Proj, def_zone, piercing_hit = FALSE) ..() @@ -671,12 +725,16 @@ Skittish, they prefer to move in groups and will run away if the enemies are in L.apply_lc_burn(burn_stacks) if(firer==target) var/mob/living/simple_animal/hostile/humanoid/fixer/flame/F = target + F.EndCounter() + F.got_hit = TRUE qdel(src) F.can_act = FALSE F.say("Derealization...") var/mutable_appearance/colored_overlay = mutable_appearance(F.icon, "small_stagger", F.layer + 0.1) F.add_overlay(colored_overlay) + F.ChangeResistances(list(RED_DAMAGE = 0.8, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 2, PALE_DAMAGE = 2.6)) sleep(stun_duration) + F.ChangeResistances(list(RED_DAMAGE = 0.4, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 1, PALE_DAMAGE = 1.3)) F.cut_overlays() F.can_act = TRUE return BULLET_ACT_BLOCK diff --git a/ModularTegustation/tegu_mobs/lc13_outskirtdwellers.dm b/ModularTegustation/tegu_mobs/lc13_outskirtdwellers.dm index 9f55fc37ba6d..46ffbbf9c86c 100644 --- a/ModularTegustation/tegu_mobs/lc13_outskirtdwellers.dm +++ b/ModularTegustation/tegu_mobs/lc13_outskirtdwellers.dm @@ -43,7 +43,7 @@ butcher_results = list(/obj/item/food/meat/slab/worm = 1) guaranteed_butcher_results = list(/obj/item/food/meat/slab/worm = 1) silk_results = list(/obj/item/stack/sheet/silk/amber_simple = 1) - food_type = list(/obj/effect/decal/cleanable/blood/gibs/, /obj/item/organ, /obj/item/bodypart/head, /obj/item/bodypart/r_arm, /obj/item/bodypart/l_arm, /obj/item/bodypart/l_leg, /obj/item/bodypart/r_leg) + wanted_objects = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/organ, /obj/item/bodypart/head, /obj/item/bodypart/r_arm, /obj/item/bodypart/l_arm, /obj/item/bodypart/l_leg, /obj/item/bodypart/r_leg) var/current_size = RESIZE_DEFAULT_SIZE /mob/living/simple_animal/hostile/morsel/examine(mob/user) @@ -52,10 +52,10 @@ if(maxHealth >= 250) . += span_notice("Drag yourself onto [src] in order to ride them.") -/mob/living/simple_animal/hostile/morsel/AttackingTarget() +/mob/living/simple_animal/hostile/morsel/AttackingTarget(atom/attacked_target) retreat_distance = 0 - if(is_type_in_typecache(target,food_type)) //we eats - qdel(target) + if(is_type_in_typecache(attacked_target, wanted_objects)) //we eats + qdel(attacked_target) buffed = (buffed + 1) if(buffed >= 10) PustuleChurn() @@ -87,10 +87,10 @@ return return ..() -/mob/living/simple_animal/hostile/morsel/AttackingTarget() +/mob/living/simple_animal/hostile/morsel/AttackingTarget(atom/attacked_target) . = ..() if(.) - var/dir_to_target = get_dir(get_turf(src), get_turf(target)) + var/dir_to_target = get_dir(get_turf(src), get_turf(attacked_target)) animate(src, pixel_y = (base_pixel_y + 18), time = 2) addtimer(CALLBACK(src, PROC_REF(AnimateBack)), 2) for(var/i = 1 to 2) @@ -106,7 +106,7 @@ SLEEP_CHECK_DEATH(2) /mob/living/simple_animal/hostile/morsel/attackby(obj/item/O, mob/user, params) - if(!is_type_in_list(O, food_type)) + if(!is_type_in_list(O, wanted_objects)) return ..() if(stat == DEAD) to_chat(user, span_warning("[src] is dead!")) @@ -127,7 +127,7 @@ /mob/living/simple_animal/hostile/morsel/CanAttack(atom/the_target) if(isobj(the_target)) - if(is_type_in_typecache(the_target, food_type)) + if(is_type_in_typecache(the_target, wanted_objects)) return TRUE return ..() @@ -735,11 +735,11 @@ Mobs that mostly focus on dealing RED damage, they are all a bit more frail than return FALSE return ..() -/mob/living/simple_animal/hostile/lovetown/slumberer/AttackingTarget() +/mob/living/simple_animal/hostile/lovetown/slumberer/AttackingTarget(atom/attacked_target) if(countering) return if(grab_ready) - return OpenFire(target) + return OpenFire(attacked_target) return ..() /mob/living/simple_animal/hostile/lovetown/slumberer/OpenFire(target) @@ -1039,8 +1039,8 @@ Mobs that mostly focus on dealing RED damage, they are all a bit more frail than if(current_stage == 2) adjustBruteLoss(-40) //self damages at stage 2 - if(ishuman(target)) - if(Finisher(target)) + if(ishuman(attacked_target)) + if(Finisher(attacked_target)) return if(countering) @@ -1053,7 +1053,7 @@ Mobs that mostly focus on dealing RED damage, they are all a bit more frail than DisableCounter() return if(counter_ready) - return OpenFire(target) + return OpenFire(attacked_target) return AoeAttack() /mob/living/simple_animal/hostile/lovetown/abomination/OpenFire(target) diff --git a/SQL/lc13_schema.sql b/SQL/lc13_schema.sql new file mode 100644 index 000000000000..3e65a204e7e9 --- /dev/null +++ b/SQL/lc13_schema.sql @@ -0,0 +1,716 @@ +-- MySQL dump 10.13 Distrib 8.0.19, for Win64 (x86_64) +-- +-- Host: localhost Database: lc13_dev +-- ------------------------------------------------------ +-- Server version 11.4.2-MariaDB-ubu2404 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!50503 SET NAMES utf8mb4 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `achievement_metadata` +-- + +DROP TABLE IF EXISTS `achievement_metadata`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `achievement_metadata` ( + `achievement_key` varchar(32) NOT NULL, + `achievement_version` smallint(5) unsigned NOT NULL DEFAULT 0, + `achievement_type` enum('achievement','score','award') DEFAULT NULL, + `achievement_name` varchar(64) DEFAULT NULL, + `achievement_description` varchar(512) DEFAULT NULL, + PRIMARY KEY (`achievement_key`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `achievements` +-- + +DROP TABLE IF EXISTS `achievements`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `achievements` ( + `ckey` varchar(32) NOT NULL, + `achievement_key` varchar(32) NOT NULL, + `value` int(11) DEFAULT NULL, + `last_updated` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + PRIMARY KEY (`ckey`,`achievement_key`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `admin` +-- + +DROP TABLE IF EXISTS `admin`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `admin` ( + `ckey` varchar(32) NOT NULL, + `rank` varchar(32) NOT NULL, + `feedback` varchar(255) DEFAULT NULL, + PRIMARY KEY (`ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `admin_log` +-- + +DROP TABLE IF EXISTS `admin_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `admin_log` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `datetime` datetime NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `adminckey` varchar(32) NOT NULL, + `adminip` int(10) unsigned NOT NULL, + `operation` enum('add admin','remove admin','change admin rank','add rank','remove rank','change rank flags') NOT NULL, + `target` varchar(32) NOT NULL, + `log` varchar(1000) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `admin_ranks` +-- + +DROP TABLE IF EXISTS `admin_ranks`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `admin_ranks` ( + `rank` varchar(32) NOT NULL, + `flags` smallint(5) unsigned NOT NULL, + `exclude_flags` smallint(5) unsigned NOT NULL, + `can_edit_flags` smallint(5) unsigned NOT NULL, + PRIMARY KEY (`rank`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `ban` +-- + +DROP TABLE IF EXISTS `ban`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `ban` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `bantime` datetime NOT NULL, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `role` varchar(32) DEFAULT NULL, + `expiration_time` datetime DEFAULT NULL, + `applies_to_admins` tinyint(1) unsigned NOT NULL DEFAULT 0, + `reason` varchar(2048) NOT NULL, + `ckey` varchar(32) DEFAULT NULL, + `ip` int(10) unsigned DEFAULT NULL, + `computerid` varchar(32) DEFAULT NULL, + `a_ckey` varchar(32) NOT NULL, + `a_ip` int(10) unsigned NOT NULL, + `a_computerid` varchar(32) NOT NULL, + `who` varchar(2048) NOT NULL, + `adminwho` varchar(2048) NOT NULL, + `edits` text DEFAULT NULL, + `unbanned_datetime` datetime DEFAULT NULL, + `unbanned_ckey` varchar(32) DEFAULT NULL, + `unbanned_ip` int(10) unsigned DEFAULT NULL, + `unbanned_computerid` varchar(32) DEFAULT NULL, + `unbanned_round_id` int(11) unsigned DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_ban_isbanned` (`ckey`,`role`,`unbanned_datetime`,`expiration_time`), + KEY `idx_ban_isbanned_details` (`ckey`,`ip`,`computerid`,`role`,`unbanned_datetime`,`expiration_time`), + KEY `idx_ban_count` (`bantime`,`a_ckey`,`applies_to_admins`,`unbanned_datetime`,`expiration_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `connection_log` +-- + +DROP TABLE IF EXISTS `connection_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `connection_log` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `datetime` datetime DEFAULT NULL, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `ckey` varchar(45) DEFAULT NULL, + `ip` int(10) unsigned NOT NULL, + `computerid` varchar(45) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `death` +-- + +DROP TABLE IF EXISTS `death`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `death` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `pod` varchar(50) NOT NULL, + `x_coord` smallint(5) unsigned NOT NULL, + `y_coord` smallint(5) unsigned NOT NULL, + `z_coord` smallint(5) unsigned NOT NULL, + `mapname` varchar(32) NOT NULL, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) NOT NULL, + `tod` datetime NOT NULL COMMENT 'Time of death', + `job` varchar(32) NOT NULL, + `special` varchar(32) DEFAULT NULL, + `name` varchar(96) NOT NULL, + `byondkey` varchar(32) NOT NULL, + `laname` varchar(96) DEFAULT NULL, + `lakey` varchar(32) DEFAULT NULL, + `bruteloss` smallint(5) unsigned NOT NULL, + `brainloss` smallint(5) unsigned NOT NULL, + `fireloss` smallint(5) unsigned NOT NULL, + `oxyloss` smallint(5) unsigned NOT NULL, + `toxloss` smallint(5) unsigned NOT NULL, + `cloneloss` smallint(5) unsigned NOT NULL, + `staminaloss` smallint(5) unsigned NOT NULL, + `last_words` varchar(255) DEFAULT NULL, + `suicide` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `discord_links` +-- + +DROP TABLE IF EXISTS `discord_links`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `discord_links` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `ckey` varchar(32) NOT NULL, + `discord_id` bigint(20) DEFAULT NULL, + `timestamp` timestamp NOT NULL DEFAULT current_timestamp(), + `one_time_token` varchar(100) NOT NULL, + `valid` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `feedback` +-- + +DROP TABLE IF EXISTS `feedback`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `feedback` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `datetime` datetime NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `key_name` varchar(32) NOT NULL, + `key_type` enum('text','amount','tally','nested tally','associative') NOT NULL, + `version` tinyint(3) unsigned NOT NULL, + `json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`json`)), + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `ipintel` +-- + +DROP TABLE IF EXISTS `ipintel`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `ipintel` ( + `ip` int(10) unsigned NOT NULL, + `date` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `intel` double NOT NULL DEFAULT 0, + PRIMARY KEY (`ip`), + KEY `idx_ipintel` (`ip`,`intel`,`date`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `legacy_population` +-- + +DROP TABLE IF EXISTS `legacy_population`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `legacy_population` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `playercount` int(11) DEFAULT NULL, + `admincount` int(11) DEFAULT NULL, + `time` datetime NOT NULL, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) unsigned NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `library` +-- + +DROP TABLE IF EXISTS `library`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `library` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `author` varchar(45) NOT NULL, + `title` varchar(45) NOT NULL, + `content` text NOT NULL, + `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, + `ckey` varchar(32) NOT NULL DEFAULT 'LEGACY', + `datetime` datetime NOT NULL, + `deleted` tinyint(1) unsigned DEFAULT NULL, + `round_id_created` int(11) unsigned NOT NULL, + PRIMARY KEY (`id`), + KEY `deleted_idx` (`deleted`), + KEY `idx_lib_id_del` (`id`,`deleted`), + KEY `idx_lib_del_title` (`deleted`,`title`), + KEY `idx_lib_search` (`deleted`,`author`,`title`,`category`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `messages` +-- + +DROP TABLE IF EXISTS `messages`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `messages` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `type` enum('memo','message','message sent','note','watchlist entry') NOT NULL, + `targetckey` varchar(32) NOT NULL, + `adminckey` varchar(32) NOT NULL, + `text` varchar(2048) NOT NULL, + `timestamp` datetime NOT NULL, + `server` varchar(32) DEFAULT NULL, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `secret` tinyint(1) unsigned NOT NULL, + `expire_timestamp` datetime DEFAULT NULL, + `severity` enum('high','medium','minor','none') DEFAULT NULL, + `playtime` int(11) unsigned DEFAULT NULL, + `lasteditor` varchar(32) DEFAULT NULL, + `edits` text DEFAULT NULL, + `deleted` tinyint(1) unsigned NOT NULL DEFAULT 0, + `deleted_ckey` varchar(32) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`,`deleted`), + KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`,`deleted`), + KEY `idx_msg_type_ckey_time_odr` (`type`,`targetckey`,`timestamp`,`deleted`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `patreon_ranks` +-- + +DROP TABLE IF EXISTS `patreon_ranks`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `patreon_ranks` ( + `ckey` varchar(100) NOT NULL, + `patreon_key` varchar(100) DEFAULT NULL, + `patreon_rank` varchar(100) DEFAULT NULL, + PRIMARY KEY (`ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `player` +-- + +DROP TABLE IF EXISTS `player`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `player` ( + `ckey` varchar(32) NOT NULL, + `byond_key` varchar(32) DEFAULT NULL, + `firstseen` datetime NOT NULL, + `firstseen_round_id` int(11) unsigned NOT NULL, + `lastseen` datetime NOT NULL, + `lastseen_round_id` int(11) unsigned NOT NULL, + `ip` int(10) unsigned NOT NULL, + `computerid` varchar(32) NOT NULL, + `lastadminrank` varchar(32) NOT NULL DEFAULT 'Player', + `accountjoindate` date DEFAULT NULL, + `flags` smallint(5) unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`ckey`), + KEY `idx_player_cid_ckey` (`computerid`,`ckey`), + KEY `idx_player_ip_ckey` (`ip`,`ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `poll_option` +-- + +DROP TABLE IF EXISTS `poll_option`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `poll_option` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `pollid` int(11) NOT NULL, + `text` varchar(255) NOT NULL, + `minval` int(3) DEFAULT NULL, + `maxval` int(3) DEFAULT NULL, + `descmin` varchar(32) DEFAULT NULL, + `descmid` varchar(32) DEFAULT NULL, + `descmax` varchar(32) DEFAULT NULL, + `default_percentage_calc` tinyint(1) unsigned NOT NULL DEFAULT 1, + `deleted` tinyint(1) unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + KEY `idx_pop_pollid` (`pollid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `poll_question` +-- + +DROP TABLE IF EXISTS `poll_question`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `poll_question` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `polltype` enum('OPTION','TEXT','NUMVAL','MULTICHOICE','IRV') NOT NULL, + `created_datetime` datetime NOT NULL, + `starttime` datetime NOT NULL, + `endtime` datetime NOT NULL, + `question` varchar(255) NOT NULL, + `subtitle` varchar(255) DEFAULT NULL, + `adminonly` tinyint(1) unsigned NOT NULL, + `multiplechoiceoptions` int(2) DEFAULT NULL, + `createdby_ckey` varchar(32) NOT NULL, + `createdby_ip` int(10) unsigned NOT NULL, + `dontshow` tinyint(1) unsigned NOT NULL, + `allow_revoting` tinyint(1) unsigned NOT NULL, + `deleted` tinyint(1) unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + KEY `idx_pquest_question_time_ckey` (`question`,`starttime`,`endtime`,`createdby_ckey`,`createdby_ip`), + KEY `idx_pquest_time_deleted_id` (`starttime`,`endtime`,`deleted`,`id`), + KEY `idx_pquest_id_time_type_admin` (`id`,`starttime`,`endtime`,`polltype`,`adminonly`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `poll_textreply` +-- + +DROP TABLE IF EXISTS `poll_textreply`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `poll_textreply` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `datetime` datetime NOT NULL, + `pollid` int(11) NOT NULL, + `ckey` varchar(32) NOT NULL, + `ip` int(10) unsigned NOT NULL, + `replytext` varchar(2048) NOT NULL, + `adminrank` varchar(32) NOT NULL, + `deleted` tinyint(1) unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + KEY `idx_ptext_pollid_ckey` (`pollid`,`ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `poll_vote` +-- + +DROP TABLE IF EXISTS `poll_vote`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `poll_vote` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `datetime` datetime NOT NULL, + `pollid` int(11) NOT NULL, + `optionid` int(11) NOT NULL, + `ckey` varchar(32) NOT NULL, + `ip` int(10) unsigned NOT NULL, + `adminrank` varchar(32) NOT NULL, + `rating` int(2) DEFAULT NULL, + `deleted` tinyint(1) unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + KEY `idx_pvote_pollid_ckey` (`pollid`,`ckey`), + KEY `idx_pvote_optionid_ckey` (`optionid`,`ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `role_time` +-- + +DROP TABLE IF EXISTS `role_time`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `role_time` ( + `ckey` varchar(32) NOT NULL, + `job` varchar(32) NOT NULL, + `minutes` int(10) unsigned NOT NULL, + PRIMARY KEY (`ckey`,`job`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `role_timeTloginsert` AFTER INSERT ON `role_time` FOR EACH ROW BEGIN INSERT into role_time_log (ckey, job, delta) VALUES (NEW.ckey, NEW.job, NEW.minutes); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `role_timeTlogupdate` AFTER UPDATE ON `role_time` FOR EACH ROW BEGIN INSERT into role_time_log (ckey, job, delta) VALUES (NEW.CKEY, NEW.job, NEW.minutes-OLD.minutes); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO' */ ; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`root`@`%`*/ /*!50003 TRIGGER `role_timeTlogdelete` AFTER DELETE ON `role_time` FOR EACH ROW BEGIN INSERT into role_time_log (ckey, job, delta) VALUES (OLD.ckey, OLD.job, 0-OLD.minutes); +END */;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; + +-- +-- Table structure for table `role_time_log` +-- + +DROP TABLE IF EXISTS `role_time_log`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `role_time_log` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `ckey` varchar(32) NOT NULL, + `job` varchar(128) NOT NULL, + `delta` int(11) NOT NULL, + `datetime` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + PRIMARY KEY (`id`), + KEY `ckey` (`ckey`), + KEY `job` (`job`), + KEY `datetime` (`datetime`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `round` +-- + +DROP TABLE IF EXISTS `round`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `round` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `initialize_datetime` datetime NOT NULL, + `start_datetime` datetime DEFAULT NULL, + `shutdown_datetime` datetime DEFAULT NULL, + `end_datetime` datetime DEFAULT NULL, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `commit_hash` char(40) DEFAULT NULL, + `game_mode` varchar(32) DEFAULT NULL, + `game_mode_result` varchar(64) DEFAULT NULL, + `end_state` varchar(64) DEFAULT NULL, + `shuttle_name` varchar(64) DEFAULT NULL, + `map_name` varchar(32) DEFAULT NULL, + `station_name` varchar(80) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `schema_revision` +-- + +DROP TABLE IF EXISTS `schema_revision`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `schema_revision` ( + `major` tinyint(3) unsigned NOT NULL, + `minor` tinyint(3) unsigned NOT NULL, + `date` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + PRIMARY KEY (`major`,`minor`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `stickyban` +-- + +DROP TABLE IF EXISTS `stickyban`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `stickyban` ( + `ckey` varchar(32) NOT NULL, + `reason` varchar(2048) NOT NULL, + `banning_admin` varchar(32) NOT NULL, + `datetime` datetime NOT NULL DEFAULT current_timestamp(), + PRIMARY KEY (`ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `stickyban_matched_cid` +-- + +DROP TABLE IF EXISTS `stickyban_matched_cid`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `stickyban_matched_cid` ( + `stickyban` varchar(32) NOT NULL, + `matched_cid` varchar(32) NOT NULL, + `first_matched` datetime NOT NULL DEFAULT current_timestamp(), + `last_matched` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + PRIMARY KEY (`stickyban`,`matched_cid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `stickyban_matched_ckey` +-- + +DROP TABLE IF EXISTS `stickyban_matched_ckey`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `stickyban_matched_ckey` ( + `stickyban` varchar(32) NOT NULL, + `matched_ckey` varchar(32) NOT NULL, + `first_matched` datetime NOT NULL DEFAULT current_timestamp(), + `last_matched` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `exempt` tinyint(1) NOT NULL DEFAULT 0, + PRIMARY KEY (`stickyban`,`matched_ckey`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `stickyban_matched_ip` +-- + +DROP TABLE IF EXISTS `stickyban_matched_ip`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `stickyban_matched_ip` ( + `stickyban` varchar(32) NOT NULL, + `matched_ip` int(10) unsigned NOT NULL, + `first_matched` datetime NOT NULL DEFAULT current_timestamp(), + `last_matched` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + PRIMARY KEY (`stickyban`,`matched_ip`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `ticket` +-- + +DROP TABLE IF EXISTS `ticket`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `ticket` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `server_ip` int(10) unsigned NOT NULL, + `server_port` smallint(5) unsigned NOT NULL, + `round_id` int(11) unsigned NOT NULL, + `ticket` smallint(11) unsigned NOT NULL, + `action` varchar(20) NOT NULL DEFAULT 'Message', + `message` text NOT NULL, + `timestamp` datetime NOT NULL, + `recipient` varchar(32) DEFAULT NULL, + `sender` varchar(32) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_ticket_act_recip` (`action`,`recipient`), + KEY `idx_ticket_act_send` (`action`,`sender`), + KEY `idx_ticket_tic_rid` (`ticket`,`round_id`), + KEY `idx_ticket_act_time_rid` (`action`,`timestamp`,`round_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping routines for database 'lc13_dev' +-- +/*!50003 DROP PROCEDURE IF EXISTS `set_poll_deleted` */; +/*!50003 SET @saved_cs_client = @@character_set_client */ ; +/*!50003 SET @saved_cs_results = @@character_set_results */ ; +/*!50003 SET @saved_col_connection = @@collation_connection */ ; +/*!50003 SET character_set_client = utf8mb3 */ ; +/*!50003 SET character_set_results = utf8mb3 */ ; +/*!50003 SET collation_connection = utf8mb3_general_ci */ ; +/*!50003 SET @saved_sql_mode = @@sql_mode */ ; +/*!50003 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO' */ ; +DELIMITER ;; +CREATE DEFINER=`root`@`%` PROCEDURE `set_poll_deleted`( + IN `poll_id` INT +) + SQL SECURITY INVOKER +BEGIN +UPDATE `poll_question` SET deleted = 1 WHERE id = poll_id; +UPDATE `poll_option` SET deleted = 1 WHERE pollid = poll_id; +UPDATE `poll_vote` SET deleted = 1 WHERE pollid = poll_id; +UPDATE `poll_textreply` SET deleted = 1 WHERE pollid = poll_id; +END ;; +DELIMITER ; +/*!50003 SET sql_mode = @saved_sql_mode */ ; +/*!50003 SET character_set_client = @saved_cs_client */ ; +/*!50003 SET character_set_results = @saved_cs_results */ ; +/*!50003 SET collation_connection = @saved_col_connection */ ; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; + +-- Dump completed on 2024-12-05 6:42:50 diff --git a/_maps/RandomRooms/backstreetlayout/dungeon_backstreets.dmm b/_maps/RandomRooms/backstreetlayout/dungeon_backstreets.dmm index 7d9e410ad33f..8be3fbff3b65 100644 --- a/_maps/RandomRooms/backstreetlayout/dungeon_backstreets.dmm +++ b/_maps/RandomRooms/backstreetlayout/dungeon_backstreets.dmm @@ -8521,14 +8521,14 @@ L i i i -L -L -L -L -L -L -L -E +c +c +c +c +c +c +c +Q E E E @@ -8638,8 +8638,8 @@ c c c c -Q -E +c +c E E E @@ -8750,7 +8750,7 @@ c c c c -E +c E E E @@ -8861,7 +8861,7 @@ c c c c -E +c E E E @@ -8972,7 +8972,7 @@ c c c c -E +c E E E @@ -9083,7 +9083,7 @@ c c c c -E +c E E E @@ -9194,7 +9194,7 @@ c c c c -E +c E E E @@ -9305,7 +9305,7 @@ c c c c -E +c E E E @@ -9416,7 +9416,7 @@ c c c c -E +c E E E @@ -9527,7 +9527,7 @@ c c c c -E +c E E E @@ -9638,7 +9638,7 @@ c c c c -E +c E E E @@ -9749,7 +9749,7 @@ c c c c -E +c E E E @@ -9860,7 +9860,7 @@ c c c c -E +c E E E @@ -9971,7 +9971,7 @@ c c c c -E +c E E E @@ -10082,7 +10082,7 @@ c c c c -E +c E E E @@ -10193,7 +10193,7 @@ c c c c -E +c E E E @@ -10297,13 +10297,13 @@ i i i i -c -c -c -c -c -c -c +L +E +E +E +E +E +E E E E @@ -10408,7 +10408,7 @@ i i L L -E +L E E E @@ -10523,6 +10523,7 @@ c c c c +c Q E E @@ -10536,7 +10537,6 @@ E E E E -E "} (95,1,1) = {" E @@ -10635,7 +10635,7 @@ c c c c -E +c E E E @@ -10746,7 +10746,7 @@ c c c c -E +c E E E @@ -10857,7 +10857,7 @@ c c c c -E +c E E E @@ -10968,7 +10968,7 @@ c c c c -E +c E E E @@ -11079,7 +11079,7 @@ c c c c -E +c E E E @@ -11190,7 +11190,7 @@ c c c c -E +c E E E @@ -11301,7 +11301,7 @@ c c c c -E +c E E E @@ -11412,7 +11412,7 @@ c c c c -E +c E E E @@ -11523,7 +11523,7 @@ c c c c -E +c E E E @@ -11634,7 +11634,7 @@ c c c c -E +c E E E @@ -11745,7 +11745,7 @@ c c c c -E +c E E E @@ -11856,7 +11856,7 @@ c c c c -E +c E E E @@ -11967,7 +11967,7 @@ c c c c -E +c E E E @@ -12078,7 +12078,7 @@ c c c c -E +c E E E @@ -12189,7 +12189,7 @@ c c c c -E +c E E E @@ -13564,6 +13564,8 @@ E E E E +E +E L i i @@ -13576,8 +13578,6 @@ E E E E -E -E c c c @@ -13671,6 +13671,8 @@ i i L E +E +E c c c @@ -13687,8 +13689,6 @@ E E E E -E -E c c c @@ -13782,6 +13782,8 @@ i i L E +E +E c c c @@ -13798,8 +13800,6 @@ E E E E -E -E c c c @@ -13893,6 +13893,8 @@ i a L E +E +E c c c @@ -13909,8 +13911,6 @@ E E E E -E -E c c c @@ -14004,6 +14004,8 @@ a a L E +E +E c c c @@ -14025,8 +14027,6 @@ E E E E -E -E L i i @@ -14115,6 +14115,8 @@ a a L E +E +E c c c @@ -14136,8 +14138,6 @@ E E E E -E -E L i i @@ -14226,6 +14226,8 @@ a a L E +E +E c c c @@ -14247,8 +14249,6 @@ E E E E -E -E L i i @@ -14337,6 +14337,8 @@ a a L E +E +E c c c @@ -14358,8 +14360,6 @@ E E E E -E -E L i i @@ -14447,6 +14447,8 @@ A a a L +L +L E E E @@ -14469,8 +14471,6 @@ E E E E -E -E L i T @@ -14556,7 +14556,9 @@ E L a a -a +i +i +i L E E @@ -14580,8 +14582,6 @@ E E E E -E -E L i i @@ -14668,6 +14668,8 @@ L i i i +i +i L E E @@ -14691,8 +14693,6 @@ E E E E -E -E L a i @@ -14757,7 +14757,9 @@ E E "} (133,1,1) = {" -E +c +c +c c c c @@ -14802,8 +14804,6 @@ E E E E -E -E L a i @@ -14868,7 +14868,9 @@ E E "} (134,1,1) = {" -E +c +c +c c c c @@ -14913,8 +14915,6 @@ E E E E -E -E L i i @@ -14979,7 +14979,9 @@ E E "} (135,1,1) = {" -E +c +c +c c c c @@ -14999,7 +15001,7 @@ c c L i -T +a i L E @@ -15024,8 +15026,6 @@ E E E E -E -E L i i @@ -15090,7 +15090,9 @@ E E "} (136,1,1) = {" -E +c +c +c c c c @@ -15110,8 +15112,8 @@ c c L i -i -i +a +a L c c @@ -15129,8 +15131,6 @@ c c D E -E -E c c c @@ -15201,7 +15201,9 @@ E E "} (137,1,1) = {" -E +c +c +c c c c @@ -15221,8 +15223,8 @@ c c L i -i -i +a +a L c c @@ -15240,8 +15242,6 @@ c c c E -E -E c c c @@ -15312,7 +15312,9 @@ E E "} (138,1,1) = {" -E +c +c +c c c c @@ -15332,8 +15334,8 @@ c c L i -i -i +a +a L c c @@ -15351,8 +15353,6 @@ c c c E -E -E c c c @@ -15423,7 +15423,9 @@ E E "} (139,1,1) = {" -E +c +c +c c c c @@ -15443,8 +15445,8 @@ c c L i -i -i +a +a L c c @@ -15462,8 +15464,6 @@ c c c E -E -E c c c @@ -15534,7 +15534,9 @@ E E "} (140,1,1) = {" -E +c +c +c c c c @@ -15554,8 +15556,8 @@ c c I i -i -i +a +a L c c @@ -15573,8 +15575,6 @@ c c c L -L -L c c c @@ -15645,7 +15645,9 @@ L L "} (141,1,1) = {" -E +c +c +c c c c @@ -15665,8 +15667,8 @@ c c i i -i -i +a +a i c c @@ -15683,8 +15685,6 @@ c c c c -a -a T i i @@ -15756,7 +15756,9 @@ U U "} (142,1,1) = {" -E +c +c +c c c c @@ -15776,8 +15778,8 @@ c c i i -i -i +a +a i c c @@ -15794,8 +15796,6 @@ c c c c -a -a i i a @@ -15867,7 +15867,9 @@ i U "} (143,1,1) = {" -E +c +c +c c c c @@ -15887,8 +15889,8 @@ c c i i -i -i +a +a i c c @@ -15911,8 +15913,6 @@ i i i i -i -i T i i @@ -15978,7 +15978,9 @@ U U "} (144,1,1) = {" -E +c +c +c c c c @@ -15998,8 +16000,8 @@ c c I i -i -i +a +a L c c @@ -16017,8 +16019,6 @@ c c c L -L -L c c c @@ -16089,7 +16089,9 @@ L L "} (145,1,1) = {" -E +c +c +c c c c @@ -16109,8 +16111,8 @@ c c L i -i -i +a +a L c c @@ -16128,8 +16130,6 @@ c c c E -E -E c c c @@ -16200,7 +16200,9 @@ E E "} (146,1,1) = {" -E +c +c +c c c c @@ -16219,9 +16221,9 @@ c c c L -i -i T +a +a L c c @@ -16239,8 +16241,6 @@ c c c E -E -E c c c @@ -16311,7 +16311,9 @@ E E "} (147,1,1) = {" -E +c +c +c c c c @@ -16331,8 +16333,8 @@ c c L i -i -i +a +a L c c @@ -16350,8 +16352,6 @@ c c c E -E -E c c c @@ -16422,7 +16422,9 @@ E E "} (148,1,1) = {" -E +c +c +c c c c @@ -16441,8 +16443,8 @@ c c c L -i -i +a +a a L c @@ -16461,8 +16463,6 @@ c c c E -E -E c c c @@ -16533,7 +16533,9 @@ E E "} (149,1,1) = {" -E +c +c +c c c c @@ -16578,8 +16580,6 @@ E E E E -E -E L i i @@ -16644,7 +16644,9 @@ E E "} (150,1,1) = {" -E +c +c +c c c c @@ -16689,8 +16691,6 @@ E E E E -E -E L i i @@ -16755,7 +16755,9 @@ E E "} (151,1,1) = {" -E +c +c +c c c c @@ -16774,7 +16776,7 @@ c c c L -i +a a a L @@ -16800,8 +16802,6 @@ E E E E -E -E L i i @@ -16866,7 +16866,9 @@ E E "} (152,1,1) = {" -E +c +c +c c c c @@ -16885,8 +16887,6 @@ c c c L -i -a a a i @@ -16895,6 +16895,8 @@ i i i i +i +i a a a @@ -16911,8 +16913,6 @@ E E E E -E -E L i a @@ -16996,9 +16996,11 @@ E E E L +L +L +a i i -a i i i @@ -17022,8 +17024,6 @@ E E E E -E -E L i a @@ -17118,6 +17118,8 @@ i i i i +i +i a a L @@ -17133,8 +17135,6 @@ E E E E -E -E L i a @@ -17232,8 +17232,8 @@ L L L L -E -E +L +L E E E diff --git a/_maps/RandomRooms/backstreetlayout/lcorp.dmm b/_maps/RandomRooms/backstreetlayout/lcorp.dmm index 3000b2fb11c3..677519d66623 100644 --- a/_maps/RandomRooms/backstreetlayout/lcorp.dmm +++ b/_maps/RandomRooms/backstreetlayout/lcorp.dmm @@ -1,12 +1,218 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ai" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/showcase/machinery/cloning_pod, +/obj/structure/window/reinforced/spawner/east, +/obj/structure/window/reinforced/spawner/west, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"al" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) "ao" = ( /obj/effect/spawner/room/backstreets/bossroom, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"az" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/spider/stickyweb/genetic, +/mob/living/simple_animal/hostile/poison/giant_spider/tarantula{ + melee_damage_lower = 50; + melee_damage_upper = 60; + health = 1000; + speed = 3; + damage_coeff = list("red" = 1.2, "white" = 0.6, "black" = 0.2, "pale" = 1.5, "stamina" = 0, "oxygen" = 1); + faction = list("hostile"); + maxHealth = 1000 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"aE" = ( +/obj/structure/sign/poster/contraband/syndicate_recruitment, +/turf/closed/indestructible/syndicate, +/area/city/backstreets_room) +"aI" = ( +/turf/closed/indestructible/wood, +/area/city/backstreets_room) +"aL" = ( +/obj/structure/sign/warning/firingrange, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_room) +"bd" = ( +/obj/effect/forcefield/cult/permanent, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"bk" = ( +/mob/living/simple_animal/hostile/debugdummy, +/turf/open/floor/bluespace, +/area/centcom/supplypod) +"bl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"br" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"by" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/telecomms/processor/preset_two, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"bB" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"bK" = ( +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop/food_random, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"bL" = ( +/obj/structure/chair/sofa{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/centcom/supplypod) +"bN" = ( +/obj/structure/trap/stun/hunter, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"bO" = ( +/obj/item/grown/bananapeel/specialpeel, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"bY" = ( +/obj/structure/flora/rock/pile, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"ce" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"cm" = ( +/obj/structure/flora/icestalactite, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"cs" = ( +/obj/structure/flora/rock/pile, +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"ct" = ( +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"cF" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"cH" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"cI" = ( +/obj/structure/flora/tree/jungle/small, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"cS" = ( +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"cV" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/bluespace, +/area/centcom/supplypod) "df" = ( /obj/effect/spawner/room/backstreets/pointofinterest, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"dn" = ( +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"dz" = ( +/obj/structure/sign/poster/contraband/masked_men, +/turf/closed/wall/mineral/cult, +/area/city/backstreets_room) +"dD" = ( +/obj/machinery/telecomms/server/presets/security, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"dX" = ( +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"eh" = ( +/obj/item/a_gift, +/obj/item/a_gift, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"eq" = ( +/obj/machinery/door/airlock/bananium, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"ey" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/turf/open/floor/material, +/area/city/backstreets_room) +"eB" = ( +/obj/structure/barricade/wooden/snowed, +/obj/structure/barricade/wooden/crude/snow, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) "eC" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -17,17 +223,273 @@ /obj/effect/landmark/backstreetspawnwest, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) +"eK" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/scorched, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"eO" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/trap/stun/hunter, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) "eY" = ( /obj/effect/landmark/backstreetspawneast, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) +"fi" = ( +/obj/structure/sign/poster/contraband/steppy, +/turf/closed/wall/mineral/bananium, +/area/city/backstreets_room) +"fP" = ( +/obj/structure/lootcrate/seven, +/turf/open/water/jungle, +/area/city/backstreets_room) +"gm" = ( +/obj/structure/chair/comfy{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"gq" = ( +/obj/structure/table/wood/fancy/red, +/obj/item/melee/cultblade/dagger, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"gu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"gJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/russian, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"gZ" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/cobweb, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"hc" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"hz" = ( +/obj/structure/flora/rock/pile, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"hM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/grass/fakebasalt, +/area/city/backstreets_room) +"hO" = ( +/obj/structure/table/reinforced, +/obj/item/folder/syndicate/red, +/obj/item/documents/syndicate/red, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"hQ" = ( +/obj/structure/spider/cocoon/spider_bud, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"hW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/mineral/ash_rock, +/area/city/backstreets_room) +"hY" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"ig" = ( +/obj/structure/flora/rock/icy, +/obj/structure/lootcrate/money, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"is" = ( +/obj/structure/showcase/perfect_employee, +/turf/open/floor/bluespace, +/area/centcom/supplypod) +"iu" = ( +/obj/structure/mineral_door/iron, +/obj/structure/barricade/wooden, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/material, +/area/city/backstreets_room) +"iv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood/xsplatter, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"iw" = ( +/obj/structure/flora/rock/pile/icy, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"iG" = ( +/turf/closed/indestructible/fakeglass, +/area/centcom/supplypod) +"iN" = ( +/obj/item/toy/plush/bongbong, +/obj/machinery/jukebox, +/turf/open/floor/plasteel, +/area/centcom/supplypod) "iW" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) +"iX" = ( +/mob/living/simple_animal/hostile/jungle/mook{ + health = 250; + faction = list("hostile") + }, +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/city/backstreets_room) +"jc" = ( +/obj/structure/fluff/iced_abductor, +/turf/open/floor/plating/ice, +/area/city/backstreets_room) +"jd" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"jg" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/item/paper/fluff/awaymissions/caves/work_notice, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"jh" = ( +/obj/structure/sign/poster/contraband/red_rum, +/turf/closed/wall/mineral/bananium, +/area/city/backstreets_room) +"jj" = ( +/obj/item/food/grown/banana, +/obj/effect/mob_spawn/human/clown/corpse, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"jx" = ( +/obj/machinery/telecomms/message_server/preset, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"jB" = ( +/obj/structure/fluff/iced_abductor, +/obj/structure/fluff/iced_abductor, +/obj/structure/fluff/iced_abductor, +/obj/structure/fluff/iced_abductor, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"jC" = ( +/obj/structure/sign/poster/contraband/lamarr, +/turf/closed/wall/mineral/bananium, +/area/city/backstreets_room) +"jF" = ( +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"jO" = ( +/obj/structure/bed, +/obj/item/bedsheet/clown, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/effect/landmark/cratespawn, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"jV" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) "jZ" = ( /obj/effect/spawner/room/backstreets/small_east, /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) +"kj" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/grown/bananapeel/specialpeel, +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"ko" = ( +/obj/structure/railing/corner, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"kp" = ( +/obj/structure/statue/snow/snowlegion, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"kq" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/centcom/supplypod) +"ks" = ( +/obj/structure/mineral_door/iron, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"kt" = ( +/obj/structure/destructible/cult/tome, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"kx" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"kH" = ( +/obj/structure/railing, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"kJ" = ( +/obj/structure/lootcrate/backstreets, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"kO" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/centcom/supplypod) +"kZ" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/kod, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"ld" = ( +/obj/item/flashlight/lantern/syndicate, +/obj/item/flashlight/lantern/syndicate, +/obj/item/flashlight/lantern/syndicate, +/obj/item/flashlight/lantern/syndicate, +/obj/item/flashlight/lantern/syndicate, +/obj/item/flashlight/lantern/syndicate, +/obj/item/flashlight/lantern/syndicate, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"lg" = ( +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"lm" = ( +/turf/closed/wall/mineral/cult, +/area/city/backstreets_room) "ln" = ( /obj/effect/spawner/room/backstreets/medium_west, /turf/closed/indestructible/reinforced, @@ -36,3060 +498,2260 @@ /obj/effect/spawner/room/backstreets/medium_north, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"lr" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/city/backstreets_room) +"lB" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/spider/stickyweb/genetic, +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"lN" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"lS" = ( +/mob/living/simple_animal/hostile/ooze/grapes{ + health = 500; + maxHealth = 500 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"lT" = ( +/obj/machinery/telecomms/relay/preset/telecomms, +/obj/structure/emergency_shield, +/obj/effect/turf_decal/bot, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"lV" = ( +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"ma" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"mm" = ( +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"mo" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/city/backstreets_room) +"mp" = ( +/obj/machinery/door/airlock/cult/weak, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"mq" = ( +/obj/structure/lootcrate/seven, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"mr" = ( +/obj/item/grown/bananapeel/specialpeel, +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"mI" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/telecomms/receiver/preset_left, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"mK" = ( +/obj/structure/spider/cocoon/spider_bud, +/obj/structure/spider/stickyweb/genetic, +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"mQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"mX" = ( +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/city/backstreets_room) +"nl" = ( +/obj/structure/bed, +/obj/item/bedsheet/clown, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"no" = ( +/turf/closed/indestructible/reinforced, +/area/centcom/supplypod) +"nu" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"nw" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/gebura, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"nI" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/cocoon/spider_bud, +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"nL" = ( +/obj/item/toy/plush/nihil, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"nP" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"nQ" = ( +/obj/machinery/telecomms/server/presets/engineering, +/obj/effect/turf_decal/bot, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"nS" = ( +/obj/structure/showcase/mecha/marauder, +/turf/open/floor/bluespace, +/area/centcom/supplypod) +"og" = ( +/obj/structure/table/wood/fancy, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen, +/turf/open/floor/wood, +/area/city/backstreets_room) +"ol" = ( +/obj/structure/statue/snow/snowman, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"om" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 9 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"on" = ( +/obj/structure/flora/rock/pile, +/obj/structure/spider/cocoon/spider_bud, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"op" = ( +/obj/item/bedsheet/black, +/obj/structure/bed/pod, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel, +/area/city/backstreets_room) "os" = ( /obj/effect/landmark/distortion, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"ou" = ( +/obj/effect/turf_decal/siding/brown/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"ox" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"oy" = ( +/obj/machinery/door/airlock/vault, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) +"oN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/painting/library, +/turf/closed/indestructible/iron, +/area/city/backstreets_room) +"oP" = ( +/mob/living/simple_animal/hostile/faithless{ + health = 400; + maxHealth = 400 + }, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"oU" = ( +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/centcom/supplypod) +"oY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/showcase/machinery/cloning_pod, +/obj/structure/window/reinforced/spawner/west, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"oZ" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/syndicate, +/obj/item/paper/fluff/ruins/listeningstation/reports/april, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"pd" = ( +/obj/structure/flora/icestalagmite, +/turf/open/floor/plating/ice, +/area/city/backstreets_room) +"pi" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/paper/crumpled/retired_designs, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"pn" = ( +/obj/machinery/telecomms/server/presets/supply, +/obj/effect/turf_decal/bot, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"pq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"pt" = ( +/obj/structure/barricade/wooden/snowed, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"pH" = ( +/obj/structure/spider/cocoon/spider_bud, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"pL" = ( +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"pS" = ( +/obj/structure/chair/sofa/corp/corner{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"qg" = ( +/obj/effect/decal/cleanable/blood/splatter/over_window, +/turf/closed/mineral/ash_rock, +/area/city/backstreets_room) +"qh" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/showcase/horrific_experiment, +/obj/structure/showcase/horrific_experiment, +/obj/structure/showcase/horrific_experiment, +/obj/structure/showcase/horrific_experiment, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced/spawner, +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) "qi" = ( /obj/effect/spawner/room/backstreets/medium_north, /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) +"qu" = ( +/obj/structure/statue/snow/snowman, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"qA" = ( +/obj/structure/bed, +/obj/item/bedsheet/clown, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/effect/landmark/cratespawn, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"qB" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) "qG" = ( /obj/effect/spawner/room/backstreets/small_east, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"qM" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"qT" = ( +/obj/structure/flora/rock/pile, +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/cocoon/spider_bud, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"qU" = ( +/mob/living/simple_animal/pet/penguin/baby, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"rs" = ( +/turf/open/floor/plating/ice, +/area/city/backstreets_room) +"rF" = ( +/obj/effect/forcefield/cult/permanent, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"rH" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"rO" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/clothing/suit/armor/ego_gear/city/misc/second, +/obj/item/clothing/suit/armor/ego_gear/city/misc/second, +/obj/item/clothing/suit/armor/ego_gear/city/misc/second, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"rS" = ( +/obj/effect/portal/permanent{ + id = "chillc"; + name = "chill room" + }, +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"rV" = ( +/obj/effect/landmark/cratespawn, +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"rW" = ( +/obj/item/target, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"sl" = ( +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/mob/living/simple_animal/hostile/retaliate/clown/longface, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"sp" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/industrial_lift, +/obj/structure/showcase/machinery/cloning_pod, +/obj/structure/window/reinforced/spawner/east, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"ss" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"sz" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/mosb, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"sB" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + dir = 9 + }, +/turf/open/floor/bluespace, +/area/centcom/supplypod) +"sD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 10 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"sH" = ( +/obj/structure/bed, +/obj/item/bedsheet/clown, +/mob/living/simple_animal/hostile/retaliate/clown/mutant/glutton{ + health = 5000; + damage_coeff = list("red" = 0.5, "white" = 0.2, "black" = 1.5, "pale" = 2, "stamina" = 0, "oxygen" = 1); + melee_damage_lower = 20; + melee_damage_upper = 25; + maxHealth = 5000 + }, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"sJ" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"td" = ( +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"tg" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"th" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/telecomms/bus/preset_four, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"tm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 5 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"tn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"tp" = ( +/obj/structure/spider/stickyweb/genetic, +/turf/closed/mineral/ash_rock, +/area/city/backstreets_room) +"tv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"tD" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1 + }, +/obj/machinery/camera/autoname{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"tH" = ( +/obj/effect/portal/permanent{ + id = "chilld"; + name = "chill room" + }, +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"tN" = ( +/obj/structure/statue/bananium/clown, +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"uf" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"ug" = ( +/obj/machinery/telecomms/server/presets/common, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"uh" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/telecomms/processor/preset_four, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"uk" = ( +/obj/structure/flora/rock/pile/icy, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"ul" = ( +/obj/item/food/grown/banana, +/mob/living/simple_animal/hostile/retaliate/clown/honkling, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"uE" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"uJ" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/cocoon/spider_bud, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"uL" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"uU" = ( +/obj/machinery/telecomms/server/presets/science, +/obj/effect/turf_decal/bot, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) "va" = ( /obj/effect/landmark/backstreetspawneast, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"vc" = ( +/obj/machinery/door/airlock/vault, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"vd" = ( +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/centcom/supplypod) +"vf" = ( +/obj/machinery/telecomms/server/presets/command{ + name = "Command Server" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"vi" = ( +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"vn" = ( +/obj/structure/statue/snow/snowman, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"vr" = ( +/obj/structure/table/wood/fancy/red, +/obj/item/clothing/suit/hooded/cultrobes/eldritch, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"vt" = ( +/turf/closed/indestructible/syndicate, +/area/city/backstreets_room) +"vF" = ( +/obj/effect/portal/permanent{ + id = "chillb"; + name = "chill room"; + alpha = 10 + }, +/turf/open/floor/plating/grass, +/area/city/backstreets_alley) +"vO" = ( +/mob/living/simple_animal/hostile/retaliate/clown/fleshclown, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"vR" = ( +/obj/structure/spider/stickyweb/genetic, +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"vS" = ( +/turf/open/floor/plating/grass, +/area/city/backstreets_alley) "vT" = ( /obj/effect/spawner/room/backstreets/connector, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"wa" = ( +/obj/structure/flora/rock/pile, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/lootcrate/backstreets, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) "wq" = ( /obj/effect/spawner/room/backstreets/large_south, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"wv" = ( +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"wy" = ( +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"wC" = ( +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"wE" = ( +/mob/living/simple_animal/hostile/jungle/mook{ + health = 250; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/city/backstreets_room) +"wI" = ( +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"wL" = ( +/turf/closed/indestructible/necropolis, +/area/city/backstreets_room) +"wM" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/bigbird, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"wP" = ( +/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead, +/obj/structure/flora/tree/dead, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"wR" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/showcase/horrific_experiment, +/obj/structure/window/reinforced/spawner/west, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) "wU" = ( /obj/effect/spawner/room/backstreets/small_north, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"EU" = ( -/obj/effect/spawner/room/backstreets/medium_south, -/turf/closed/indestructible/reinforced, +"xa" = ( +/turf/open/floor/mineral/bananium, /area/city/backstreets_room) -"IV" = ( -/obj/effect/spawner/room/backstreets/large_north, +"xh" = ( +/obj/structure/fluff/arc/angela, +/turf/open/floor/plating/grass, +/area/centcom/supplypod) +"xp" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"xs" = ( +/obj/structure/flora/rock/icy, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"xE" = ( +/obj/structure/sacrificealtar, +/obj/effect/mob_spawn/human/corpse/cargo_tech, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"xH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"xR" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/camera/autoname{ + dir = 9 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"xU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/russian/ranged, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"yr" = ( +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"yt" = ( +/obj/structure/flora/rock/pile/largejungle, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"yx" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"yA" = ( +/obj/machinery/syndicatebomb/training, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"yB" = ( +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 6 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"yD" = ( +/obj/structure/flora/rock/pile/largejungle, +/obj/structure/lootcrate/seven, +/obj/structure/lootcrate/seven, +/turf/open/water/jungle, +/area/city/backstreets_room) +"yF" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/cocoon/spider_bud, +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"yO" = ( +/obj/structure/lootcrate/workshopallas, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"yX" = ( +/obj/structure/rack, +/obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"zj" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"zk" = ( +/obj/effect/portal/permanent{ + id = "chillb"; + name = "chill room" + }, +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"zm" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/ego_weapon/city/axegang, +/obj/item/flashlight/flare/torch, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"zn" = ( +/turf/closed/indestructible/rock/snow/ice/ore, +/area/city/backstreets_room) +"zo" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"zp" = ( +/obj/structure/destructible/cult/forge, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"zr" = ( +/obj/item/grown/bananapeel, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"zt" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/abductor, +/obj/item/toy/plush/ayin, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"zw" = ( +/obj/item/kirbyplants/random, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"zD" = ( +/obj/structure/mineral_door/uranium, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"zI" = ( +/obj/structure/closet/crate/wooden, +/turf/open/floor/wood, +/area/city/backstreets_room) +"zJ" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"zM" = ( +/mob/living/simple_animal/hostile/ooze/grapes{ + health = 500; + maxHealth = 500 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Ad" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"Ai" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/carmen, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"Aj" = ( +/obj/structure/table/wood/fancy, +/obj/item/ego_weapon/support/letter_opener, +/obj/item/ego_weapon/support/letter_opener, +/obj/item/clothing/suit/armor/ego_gear/zayin/letter_opener, +/obj/item/clothing/suit/armor/ego_gear/zayin/letter_opener, +/turf/open/floor/wood, +/area/city/backstreets_room) +"As" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/syndicate{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"Aw" = ( +/mob/living/simple_animal/hostile/skeleton/ice{ + faction = list("hostile"); + health = 150; + melee_damage_type = "white"; + obj_damage = 0; + maxHealth = 150 + }, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"Ax" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/ego_weapon/city/axegang/leader, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"AE" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"AG" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"AJ" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/qoh, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"AO" = ( +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"AP" = ( +/obj/structure/flora/tree/dead, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"AQ" = ( +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/obj/machinery/door/airlock/bananium, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"AS" = ( +/obj/effect/gibspawner/human/bodypartless, +/mob/living/simple_animal/hostile/faithless{ + health = 400; + maxHealth = 400 + }, +/obj/effect/mob_spawn/human/corpse, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"AV" = ( +/obj/structure/chair/sofa/right{ + dir = 1 + }, +/turf/open/floor/carpet/orange, +/area/centcom/supplypod) +"Ba" = ( +/obj/structure/fluff/drake_statue, +/turf/open/floor/grass/fakebasalt, +/area/city/backstreets_room) +"Br" = ( +/obj/item/target/syndicate, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"BD" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 6 + }, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"BM" = ( +/obj/item/bedsheet/hos, +/obj/structure/bed, +/turf/open/floor/carpet, +/area/city/backstreets_room) +"Cg" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/indestructible/rock/snow/ice/ore, +/area/city/backstreets_room) +"Ci" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 9 + }, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"Cn" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"Co" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 + }, +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"Cs" = ( +/obj/effect/gibspawner/human/bodypartless, +/obj/effect/mob_spawn/human/corpse, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Cv" = ( +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"CA" = ( +/turf/closed/wall/mineral/iron, +/area/city/backstreets_room) +"CC" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"CK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/effect/decal/cleanable/xenoblood/xsplatter, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"CL" = ( +/obj/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/bluespace, +/area/centcom/supplypod) +"CP" = ( +/obj/structure/table/wood, +/obj/item/toy/plush/awakenedplushie, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"CX" = ( +/obj/structure/table/wood/fancy, +/obj/item/stack/rods/fifty{ + bypassmode = 1 + }, +/obj/item/stack/rods/fifty{ + bypassmode = 1 + }, +/obj/item/stack/tile/carpet/red/fifty, +/obj/item/stack/tile/carpet/red/fifty, +/turf/open/floor/wood, +/area/city/backstreets_room) +"CY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Df" = ( +/obj/effect/portal/permanent{ + id = "chilla"; + name = "chill room" + }, +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"Di" = ( +/obj/item/food/grown/banana, +/obj/effect/mob_spawn/human/clown/corpse, +/obj/effect/gibspawner/human/bodypartless, +/obj/item/grown/bananapeel/specialpeel, +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"Dl" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/telecomms/bus/preset_two, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"Dp" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/carpet, +/area/city/backstreets_room) +"Dt" = ( +/obj/structure/chair/sofa/corp, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"Dv" = ( +/obj/structure/spider/stickyweb/genetic, +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"DM" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"DQ" = ( +/obj/structure/chair/sofa/corp/corner{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"DR" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 10 + }, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"DT" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/telecomms/bus/preset_one, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"Ee" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"Es" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/city/backstreets_room) +"Et" = ( +/obj/structure/sign/poster/contraband/hacking_guide, +/turf/closed/wall/mineral/cult, +/area/city/backstreets_room) +"Ey" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"EL" = ( +/obj/item/food/grown/banana, +/obj/effect/mob_spawn/human/clown/corpse, +/obj/effect/gibspawner/human/bodypartless, +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"ER" = ( +/obj/structure/sign/poster/contraband/bountyhunters, +/turf/closed/wall/mineral/cult, +/area/city/backstreets_room) +"EU" = ( +/obj/effect/spawner/room/backstreets/medium_south, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"Fw" = ( +/obj/structure/lootcrate/backstreets, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"FA" = ( +/mob/living/simple_animal/pet/penguin/emperor/shamebrero, +/turf/open/floor/wood, +/area/city/backstreets_room) +"FB" = ( +/obj/item/food/grown/banana, +/obj/effect/mob_spawn/human/clown/corpse, +/obj/effect/gibspawner/human/bodypartless, +/obj/item/food/grown/banana, +/obj/effect/landmark/cratespawn, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"FG" = ( +/obj/structure/statue/sandstone/venus, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"FL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"FR" = ( +/obj/structure/table/wood/fancy, +/turf/open/floor/wood, +/area/city/backstreets_room) +"FU" = ( +/obj/structure/flora/rock/pile, +/obj/effect/landmark/cratespawn, +/obj/effect/landmark/cratespawn, +/obj/item/kitchen/knife/bloodletter, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"Gp" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"GG" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/facility/dark, +/area/centcom/supplypod) +"GJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/fence/door/opened, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"GP" = ( +/obj/item/food/grown/banana, +/mob/living/simple_animal/hostile/retaliate/clown/mutant/slow, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"GY" = ( +/mob/living/simple_animal/hostile/poison/giant_spider/tarantula{ + melee_damage_lower = 50; + melee_damage_upper = 60; + health = 1000; + speed = 3; + damage_coeff = list("red" = 1.2, "white" = 0.6, "black" = 0.2, "pale" = 1.5, "stamina" = 0, "oxygen" = 1); + faction = list("hostile"); + maxHealth = 1000 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Hc" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Hd" = ( +/obj/effect/landmark/cratespawn, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Hh" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/jukebox/disco/indestructible, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/centcom/supplypod) +"Hk" = ( +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Hp" = ( +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_alley) +"Hv" = ( +/obj/structure/closet/crate/trashcart/filled, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"Hx" = ( +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"HB" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"HH" = ( +/obj/item/clothing/mask/gas/mad_clown, +/obj/effect/landmark/cratespawn, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"HI" = ( +/obj/structure/flora/rock, +/turf/open/floor/grass/fakebasalt, +/area/city/backstreets_room) +"HK" = ( +/obj/structure/trap/stun/hunter, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"HN" = ( +/turf/open/water/jungle, +/area/city/backstreets_room) +"HP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"HQ" = ( +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop/food_random, +/turf/open/floor/carpet/orange, +/area/centcom/supplypod) +"HU" = ( +/turf/closed/wall/mineral/bananium, +/area/city/backstreets_room) +"Iy" = ( +/obj/structure/chair/sofa/corp{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"IB" = ( +/obj/effect/mob_spawn/human/corpse, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"IH" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"IJ" = ( +/obj/structure/showcase/machinery/tv, +/obj/structure/showcase/machinery/tv, +/obj/structure/showcase/machinery/tv, +/obj/structure/showcase/machinery/tv, +/obj/machinery/camera/autoname, +/turf/open/floor/carpet/orange, +/area/centcom/supplypod) +"IV" = ( +/obj/effect/spawner/room/backstreets/large_north, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"Jc" = ( +/obj/effect/gibspawner/human/bodypartless, +/obj/item/grown/bananapeel, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Jl" = ( +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/forcefield/cult/permanent, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Jp" = ( +/obj/item/food/grown/banana, +/obj/item/paper/fluff/ruins/crashedship/old_diary, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"Jt" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Jw" = ( +/obj/machinery/telecomms/server/presets/medical, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"JE" = ( +/turf/open/floor/grass/fakebasalt, +/area/city/backstreets_room) +"JG" = ( +/obj/structure/flora/rock, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"JR" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"JS" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"JX" = ( +/mob/living/simple_animal/pet/penguin/emperor, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"Kk" = ( +/obj/structure/mineral_door/iron, +/obj/structure/barricade/wooden, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/material, +/area/city/backstreets_room) +"Ky" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 10 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) "KQ" = ( /obj/effect/spawner/room/backstreets/small_west, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"Lr" = ( +/obj/structure/chair/sofa/corp/corner, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"Lt" = ( +/obj/structure/flora/rock/pile, +/obj/structure/lootcrate/workshopallas, +/obj/structure/lootcrate/workshopallas, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/portal/permanent{ + id = "chilld"; + name = "chill room"; + alpha = 10 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"LB" = ( +/obj/item/a_gift, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"LC" = ( +/obj/structure/table/wood/fancy, +/obj/item/stack/rods/fifty{ + bypassmode = 1 + }, +/obj/item/stack/rods/fifty{ + bypassmode = 1 + }, +/obj/item/stack/tile/carpet/royalblack/fifty, +/obj/item/stack/tile/carpet/royalblack/fifty, +/obj/item/storage/toolbox/artistic, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, +/turf/open/floor/wood, +/area/city/backstreets_room) +"LK" = ( +/obj/machinery/light, +/turf/open/floor/bluespace, +/area/centcom/supplypod) "LM" = ( /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) +"LT" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/telecomms/processor/preset_one, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"Md" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/cocoon/spider_bud, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"My" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"MF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/showcase/machinery/cloning_pod, +/obj/structure/window/reinforced/spawner/east, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"MH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"MI" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/melt, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"MJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"MK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"MN" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Nh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/secure_closet/freezer/fridge/open, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"Nj" = ( +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"No" = ( +/obj/effect/landmark/cratespawn, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Np" = ( +/obj/structure/spider/stickyweb/genetic, +/mob/living/simple_animal/hostile/poison/giant_spider/tarantula{ + melee_damage_lower = 50; + melee_damage_upper = 60; + health = 1000; + speed = 3; + damage_coeff = list("red" = 1.2, "white" = 0.6, "black" = 0.2, "pale" = 1.5, "stamina" = 0, "oxygen" = 1); + faction = list("hostile"); + maxHealth = 1000 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) "Ns" = ( -/turf/open/space/basic, -/area/space) -"Qe" = ( -/obj/effect/landmark/backstreetspawnwest, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_alley) -"Sc" = ( -/obj/effect/landmark/backstreetspawn, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_alley) -"St" = ( -/obj/machinery/door/poddoor/shutters/indestructible{ - name = "Malfunctioning Backstreets Shutters" +/turf/closed/mineral/ash_rock, +/area/city/backstreets_room) +"NA" = ( +/mob/living/simple_animal/hostile/skeleton/ice{ + faction = list("hostile"); + health = 150; + melee_damage_type = "white"; + obj_damage = 0; + maxHealth = 150 }, -/turf/open/floor/plating/asteroid/basalt, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"NJ" = ( +/obj/structure/lootcrate/backstreets, +/obj/structure/lootcrate/backstreets, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"NM" = ( +/obj/structure/table/wood/fancy, +/obj/item/stack/sheet/mineral/wood/fifty{ + bypassmode = 1 + }, +/obj/item/stack/sheet/mineral/wood/fifty{ + bypassmode = 1 + }, +/obj/item/stack/sheet/mineral/wood/fifty{ + bypassmode = 1 + }, +/obj/item/stack/sheet/mineral/wood/fifty{ + bypassmode = 1 + }, +/obj/item/stack/sheet/plasteel/fifty{ + bypassmode = 1 + }, +/obj/item/stack/sheet/plasteel/fifty{ + bypassmode = 1 + }, +/obj/item/stack/sheet/plasteel/fifty{ + bypassmode = 1 + }, +/obj/item/stack/sheet/mineral/wood/fifty{ + bypassmode = 1 + }, +/obj/item/stack/sheet/mineral/wood/fifty{ + bypassmode = 1 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"NP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 6 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"NR" = ( +/obj/effect/portal/permanent{ + id = "chilla"; + name = "chill room"; + alpha = 10 + }, +/turf/open/floor/plating/grass, /area/city/backstreets_alley) -"SO" = ( -/obj/effect/spawner/room/backstreets/medium_east, -/turf/closed/indestructible/reinforced, +"NU" = ( +/turf/open/floor/plating/ashplanet/wateryrock, /area/city/backstreets_room) -"SQ" = ( -/obj/effect/spawner/room/backstreets/small_south, -/turf/closed/indestructible/reinforced, +"Oi" = ( +/obj/structure/flora/rock/pile, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/landmark/cratespawn, +/obj/effect/landmark/cratespawn, +/turf/open/floor/plating/ashplanet/wateryrock, /area/city/backstreets_room) -"UZ" = ( -/turf/closed/indestructible/rock, -/area/space) -"WG" = ( +"Ou" = ( +/obj/structure/lootcrate/backstreets, +/obj/structure/lootcrate/backstreets, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"Ox" = ( +/obj/effect/gibspawner/human/bodypartless, +/obj/effect/landmark/cratespawn, +/obj/item/kitchen/knife/bloodletter, /turf/open/floor/plating/ashplanet/rocky, -/area/city/backstreets_alley) -"WY" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 8 +/area/city/backstreets_room) +"OF" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 }, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_alley) -"Xj" = ( -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_alley) -"Yt" = ( -/turf/closed/indestructible/reinforced, +/turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_room) - -(1,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(2,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(3,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(4,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(5,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(6,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -St -St -St -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(7,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -ao -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -Xj -Qe -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(8,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -St -St -St -Yt -Yt -Yt -Yt -SQ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(9,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -St -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(10,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -St -Xj -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(11,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -St -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Qe -Xj -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -iW -iW -iW -iW -iW -iW -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(12,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -Xj -Xj -Xj -iW -iW -iW -iW -iW -iW -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -iW -Xj -Qe -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(13,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -iW -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(14,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -WY -WY -WY -iW -iW -iW -iW -iW -iW -iW -iW -iW -Xj -Xj -Xj -iW -UZ -UZ -iW -iW -iW -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -iW -iW -iW -iW -iW -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(15,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -iW -UZ -UZ -iW -St -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -iW -UZ -Yt -Yt -Yt -Yt -wU -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -ln -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(16,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -iW -UZ -UZ -iW -St -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Xj -Xj -iW -UZ -Yt -Yt -Yt -Yt -Yt -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(17,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Qe -Xj -Xj -iW -UZ -UZ -iW -St -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -iW -UZ -Yt -Yt -Yt -Yt -Yt -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(18,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Qe -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -iW -UZ -UZ -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -Xj -iW -iW -iW -iW -iW -iW -Xj -Xj -Xj -iW -UZ -Yt -Yt -Yt -Yt -Yt -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(19,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -eC -eC -eC -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -Yt -Yt -Yt -Yt -Yt -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(20,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -iW -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -Xj -iW -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -Yt -Yt -Yt -Yt -Yt -Xj -Xj -Xj -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(21,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -iW -iW -iW -iW -Xj -iW -UZ -UZ -iW -St -St -St -iW -UZ -Yt -Yt -Yt -Yt -Yt -Qe -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -LM -LM -LM -Xj -LM -LM -LM -LM -LM -LM -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(22,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Xj -Xj -iW -Xj -iW -UZ -UZ -iW -iW -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Xj -Qe -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Qe -Xj -LM -LM -LM -Xj -LM -LM -LM -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(23,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Xj -Xj -iW -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -Xj -LM -LM -LM -LM -LM -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(24,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -os -Xj -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -Yt -Yt -Yt -Yt -Yt -Yt -qG -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW -eF -LM -LM -iW -UZ -iW -iW -iW -iW -iW -UZ -UZ -UZ -UZ -"} -(25,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Xj -Xj -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -LM -LM -LM -iW -UZ -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -"} -(26,1,1) = {" -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -LM -LM -LM -iW -UZ -iW -Xj -iW -Xj -iW -UZ -UZ -UZ -UZ -"} -(27,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -iW -iW -iW -iW -iW -iW -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -UZ +"OG" = ( +/obj/structure/bed, +/obj/item/bedsheet/clown, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/effect/landmark/cratespawn, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"OO" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/telecomms/bus/preset_three, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"OW" = ( +/turf/open/floor/bluespace, +/area/centcom/supplypod) +"Pb" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/paper/fluff/awaymissions/caves/safety_notice, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"Pc" = ( +/obj/structure/table/wood/fancy/red, +/obj/item/melee/cultblade/ghost, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"Pi" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/lootcrate/backstreets, +/obj/structure/lootcrate/backstreets, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Ps" = ( +/obj/structure/flora/tree/pine, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"Pt" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/sow, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"PD" = ( +/turf/open/floor/carpet, +/area/city/backstreets_room) +"PI" = ( +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"PM" = ( +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/obj/item/toy/snowball, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"PN" = ( +/obj/structure/table/wood, +/obj/item/toy/plush/angela, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"PT" = ( +/obj/structure/flora/tree/pine/xmas, +/obj/item/a_gift, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"Qa" = ( +/obj/structure/table/wood/fancy/red, +/obj/structure/lootcrate/shi, +/obj/structure/lootcrate/shi, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"Qb" = ( +/obj/item/kirbyplants/random, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"Qd" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"Qe" = ( +/obj/effect/landmark/backstreetspawnwest, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_alley) +"Qo" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_room) +"QB" = ( +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"QC" = ( +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"QH" = ( +/obj/structure/sign/poster/contraband/syndicate_pistol, +/turf/closed/indestructible/syndicate, +/area/city/backstreets_room) +"QI" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"QK" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"QM" = ( +/obj/structure/fluff/arc/angela{ + dir = 4 + }, +/turf/open/floor/plating/grass, +/area/centcom/supplypod) +"QX" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"Re" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"Rr" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mob_spawn/human/corpse, +/obj/item/flashlight/flare/torch, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"Rz" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/cocoon/spider_bud, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"RA" = ( +/obj/machinery/telecomms/broadcaster/preset_right, +/obj/effect/turf_decal/bot, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"RF" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/telecomms/receiver/preset_right, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"RI" = ( +/obj/structure/necropolis_arch, +/obj/structure/necropolis_gate, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"RK" = ( +/mob/living/simple_animal/hostile/jungle/mook{ + health = 250; + faction = list("hostile") + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"RS" = ( +/obj/machinery/telecomms/server/presets/service, +/obj/effect/turf_decal/bot, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"Sc" = ( +/obj/effect/landmark/backstreetspawn, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_alley) +"Sm" = ( +/obj/effect/mob_spawn/human/corpse, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"Sn" = ( +/obj/structure/curtain/cloth, +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) +"Ss" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"St" = ( +/obj/machinery/door/poddoor/shutters/indestructible{ + name = "Malfunctioning Backstreets Shutters" + }, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_alley) +"Su" = ( +/obj/machinery/vending/medical/syndicate_access, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"SF" = ( +/obj/structure/chair/sofa/corp/corner{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"SI" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"SK" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) +"SL" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/plating/grass, +/area/centcom/supplypod) +"SM" = ( +/obj/structure/statue/sandstone/venus{ + anchored = 1; + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"SO" = ( +/obj/effect/spawner/room/backstreets/medium_east, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"SQ" = ( +/obj/effect/spawner/room/backstreets/small_south, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"Te" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Tf" = ( +/obj/structure/flora/icechunk/alt, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"Tn" = ( +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"TC" = ( +/mob/living/simple_animal/hostile/ooze/gelatinous{ + maxHealth = 750 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"TE" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"TQ" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/ntnet_relay, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"TZ" = ( +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/backstreets_room) +"Ua" = ( +/turf/open/floor/light/colour_cycle/dancefloor_b, +/area/centcom/supplypod) +"Uc" = ( +/obj/machinery/camera/autoname, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"Uk" = ( +/obj/structure/flora/rock/pile/largejungle, +/obj/structure/lootcrate/seven, +/turf/open/water/jungle, +/area/city/backstreets_room) +"Up" = ( +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop/food_random, +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"Uz" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/item/restraints/legcuffs/beartrap{ + armed = 1 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"UH" = ( +/obj/structure/flora/icestalagmite, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"UJ" = ( +/obj/structure/flora/iceshards, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"US" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/telecomms/processor/preset_three, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"UZ" = ( +/turf/closed/indestructible/rock, +/area/space) +"Vf" = ( +/obj/structure/table/reinforced, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/implanter/radio, +/obj/item/toy/plush/pinocchio, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"Vg" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/bluespace, +/area/centcom/supplypod) +"Vk" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Vo" = ( +/obj/effect/gibspawner/human/bodypartless, +/obj/effect/decal/cleanable/ash, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/obj/item/flashlight/flare, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"Vp" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/telecomms/relay/preset/telecomms, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"Vs" = ( +/obj/effect/portal/permanent{ + id = "chillc"; + name = "chill room"; + alpha = 10 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Vx" = ( +/obj/structure/flora/rock/pile, +/obj/structure/lootcrate/money, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) +"VA" = ( +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/effect/mob_spawn/human/clown/corpse, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"VF" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 + }, +/obj/effect/forcefield/cult/permanent, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"VL" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"VT" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"VW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"VX" = ( +/obj/machinery/telecomms/broadcaster/preset_left, +/obj/effect/turf_decal/bot, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"Wd" = ( +/obj/machinery/camera/autoname, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/bluespace, +/area/centcom/supplypod) +"Wk" = ( +/obj/structure/chair/sofa/corp{ + dir = 1 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"Wl" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/syndicate, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"WG" = ( +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_alley) +"WI" = ( +/obj/structure/flora/icechunk/alt, +/turf/open/floor/plating/ice, +/area/city/backstreets_room) +"WS" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"WV" = ( +/mob/living/simple_animal/hostile/poison/giant_spider/tarantula{ + melee_damage_lower = 50; + melee_damage_upper = 60; + health = 1000; + speed = 3; + damage_coeff = list("red" = 1.2, "white" = 0.6, "black" = 0.2, "pale" = 1.5, "stamina" = 0, "oxygen" = 1); + faction = list("hostile"); + maxHealth = 1000 + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"WW" = ( +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"WY" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_alley) +"Xb" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/grass/fakebasalt, +/area/city/backstreets_room) +"Xe" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"Xh" = ( +/obj/structure/lootcrate/backstreets, +/obj/structure/lootcrate/backstreets, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Xj" = ( +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_alley) +"Xk" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/telecomms/hub/preset, +/turf/open/floor/circuit/telecomms/mainframe, +/area/centcom/supplypod) +"Xu" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/lootcrate/seven, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Xy" = ( +/obj/item/food/grown/banana, +/turf/open/floor/mineral/bananium, +/area/city/backstreets_room) +"XE" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"XF" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/open/floor/light/colour_cycle/dancefloor_b, +/area/centcom/supplypod) +"XH" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle/red/syndicate, +/area/city/backstreets_room) +"XO" = ( +/mob/living/simple_animal/hostile/ooze/gelatinous{ + maxHealth = 750 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"XP" = ( +/obj/structure/chair/sofa/corp{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"Ya" = ( +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) +"Yo" = ( +/turf/open/floor/carpet/orange, +/area/centcom/supplypod) +"Yt" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"YM" = ( +/obj/structure/spider/cocoon/spider_bud, +/obj/structure/spider/stickyweb/genetic, +/mob/living/simple_animal/hostile/poison/giant_spider{ + density = 0; + health = 250; + damage_coeff = list("red" = 1.5, "white" = 1, "black" = 0.5, "pale" = 2, "stamina" = 1, "oxygen" = 1); + melee_damage_lower = 10; + melee_damage_upper = 15; + faction = list("hostile"); + maxHealth = 250 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"YU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_room) +"YV" = ( +/obj/effect/decal/cleanable/blood/splatter/over_window, +/turf/closed/wall/mineral/cult, +/area/city/backstreets_room) +"Zd" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) +"Zh" = ( +/obj/structure/table/reinforced, +/obj/item/toy/plush/kog, +/turf/open/floor/carpet/black, +/area/centcom/supplypod) +"ZL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/pcorp/shelter, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"ZM" = ( +/obj/structure/flora/rock/pile, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"ZY" = ( +/obj/effect/mob_spawn/human/corpse/damaged, +/obj/effect/gibspawner/human/bodypartless, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/grass/jungle, +/area/city/backstreets_room) + +(1,1,1) = {" UZ UZ UZ @@ -3104,23 +2766,10 @@ UZ UZ UZ UZ -iW -LM -LM -LM -iW -iW -iW -Xj -iW -Xj -iW UZ UZ UZ UZ -"} -(28,1,1) = {" UZ UZ UZ @@ -3193,13 +2842,6 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt UZ UZ UZ @@ -3215,31 +2857,12 @@ UZ UZ UZ UZ -iW -LM -LM -LM -LM -LM -Xj -Xj -iW -Xj -iW UZ UZ UZ UZ "} -(29,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +(2,1,1) = {" UZ UZ UZ @@ -3326,61 +2949,10 @@ UZ UZ UZ UZ -iW -LM -LM -LM -iW -iW -iW -iW -iW -Xj -iW -iW -iW UZ UZ -"} -(30,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -3400,6 +2972,8 @@ UZ UZ UZ UZ +"} +(3,1,1) = {" UZ UZ UZ @@ -3437,61 +3011,11 @@ UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ -iW -Xj -Xj -Xj -Xj -Xj -iW UZ UZ -"} -(31,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -3539,70 +3063,15 @@ UZ UZ UZ UZ -iW -iW -iW -iW -iW UZ UZ UZ UZ -iW -LM -eF -LM -iW UZ -iW -Xj -Xj -Xj -Xj -Xj -iW UZ UZ -"} -(32,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -3614,6 +3083,18 @@ UZ UZ UZ UZ +"} +(4,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -3650,70 +3131,15 @@ UZ UZ UZ UZ -iW -St -St -St -iW UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ -iW -Xj -Xj -os -Xj -Xj -iW UZ UZ -"} -(33,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -3761,70 +3187,17 @@ UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ -iW -Xj -Xj -Xj -Xj -Xj -iW UZ UZ "} -(34,1,1) = {" +(5,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -3865,77 +3238,15 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -IV -LM -LM -LM -iW UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ -iW -Xj -Xj -Xj -Xj -Xj -iW UZ UZ -"} -(35,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -3954,6 +3265,11 @@ UZ UZ UZ UZ +iW +iW +iW +iW +iW UZ UZ UZ @@ -3976,77 +3292,25 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -LM -LM -LM -iW UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ -iW -iW -iW -iW -iW -iW -iW UZ UZ -"} -(36,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +"} +(6,1,1) = {" +UZ +UZ +UZ +UZ UZ UZ UZ @@ -4087,27 +3351,6 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -eF -LM -LM -iW -iW -iW -iW -iW -iW -LM -LM -LM -iW UZ UZ UZ @@ -4118,46 +3361,8 @@ UZ UZ UZ UZ -"} -(37,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -4171,6 +3376,22 @@ UZ UZ UZ UZ +iW +St +St +St +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -4195,6 +3416,10 @@ UZ UZ UZ UZ +"} +(7,1,1) = {" +UZ +UZ UZ UZ UZ @@ -4206,19 +3431,19 @@ Yt Yt Yt Yt -LM -LM -LM -LM -LM -LM -LM -LM -LM -LM -LM -LM -iW +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +ao +UZ UZ UZ UZ @@ -4229,46 +3454,8 @@ UZ UZ UZ UZ -"} -(38,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -4276,6 +3463,12 @@ UZ UZ UZ UZ +iW +iW +iW +iW +iW +UZ UZ UZ UZ @@ -4284,6 +3477,21 @@ UZ UZ UZ UZ +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +Xj +Qe +Xj +iW UZ UZ UZ @@ -4309,27 +3517,6 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -Yt -Yt -Yt -LM -LM -LM -LM -LM -LM -LM -LM -LM -LM -LM -LM -iW UZ UZ UZ @@ -4341,49 +3528,81 @@ UZ UZ UZ "} -(39,1,1) = {" +(8,1,1) = {" +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ UZ +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +St +St +St +Yt +Yt +Yt +Yt +SQ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +iW UZ UZ UZ @@ -4419,6 +3638,12 @@ UZ UZ UZ UZ +"} +(9,1,1) = {" +UZ +UZ +UZ +UZ UZ Yt Yt @@ -4428,19 +3653,18 @@ Yt Yt Yt Yt -LM -LM -LM -LM -LM -LM -LM -eF -LM -LM -LM -LM -iW +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -4450,47 +3674,46 @@ UZ UZ UZ UZ +iW +St +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt UZ -"} -(40,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +iW +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +iW UZ UZ UZ @@ -4526,6 +3749,8 @@ UZ UZ UZ UZ +"} +(10,1,1) = {" UZ UZ UZ @@ -4539,19 +3764,19 @@ Yt Yt Yt Yt -LM -LM -LM -iW -iW -iW -iW -iW -iW -iW -iW -iW -iW +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ UZ UZ UZ @@ -4560,48 +3785,46 @@ UZ UZ UZ UZ +iW +St +Xj +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +UZ UZ UZ -"} -(41,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +iW +Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +iW UZ UZ UZ @@ -4637,6 +3860,8 @@ UZ UZ UZ UZ +"} +(11,1,1) = {" UZ UZ UZ @@ -4650,17 +3875,18 @@ Yt Yt Yt Yt -LM -LM -LM -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -4670,49 +3896,46 @@ UZ UZ UZ UZ +iW +St +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Qe +Xj +Yt +Yt +Yt +Yt +Yt UZ UZ UZ -"} -(42,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +iW +Xj +Xj +Xj +iW +iW +iW +iW +iW +iW +iW +Xj +Xj +Xj +iW UZ UZ UZ @@ -4748,6 +3971,8 @@ UZ UZ UZ UZ +"} +(12,1,1) = {" UZ UZ UZ @@ -4761,12 +3986,18 @@ Yt Yt Yt Yt -LM -LM -LM -iW -UZ -UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -4776,54 +4007,46 @@ UZ UZ UZ UZ +iW +iW +iW +Xj +Xj +Xj +iW +iW +iW +iW +iW +iW +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt UZ UZ UZ UZ UZ +iW +Xj +Xj +Xj +iW UZ UZ UZ -"} -(43,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +iW +Xj +Qe +Xj +iW UZ UZ UZ @@ -4859,6 +4082,8 @@ UZ UZ UZ UZ +"} +(13,1,1) = {" UZ UZ UZ @@ -4872,9 +4097,21 @@ Yt Yt Yt Yt -LM -LM -LM +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +iW +iW +iW iW UZ UZ @@ -4883,59 +4120,45 @@ UZ UZ UZ UZ +iW +Xj +Xj +Xj +iW UZ UZ UZ UZ +iW +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt UZ UZ UZ UZ UZ -UZ -UZ -UZ -"} -(44,1,1) = {" -UZ -UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -UZ +iW +Xj +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Xj +iW +UZ UZ UZ UZ @@ -4970,6 +4193,8 @@ UZ UZ UZ UZ +"} +(14,1,1) = {" UZ UZ UZ @@ -4983,69 +4208,67 @@ Yt Yt Yt Yt -LM -LM -eF +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +WY +WY +WY +iW +iW +iW +iW +iW +iW +iW +iW +iW +Xj +Xj +Xj iW -UZ -UZ UZ UZ iW iW iW +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt iW iW iW iW iW iW -iW +Xj +Xj +Xj iW UZ UZ UZ UZ -"} -(45,1,1) = {" -UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +iW +Xj +Xj +Xj +iW UZ UZ UZ @@ -5081,6 +4304,8 @@ UZ UZ UZ UZ +"} +(15,1,1) = {" UZ UZ UZ @@ -5094,79 +4319,80 @@ Yt Yt Yt Yt -LM -LM -LM +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj iW UZ UZ -UZ -UZ iW -LM -LM -LM -LM -eF -LM -LM -LM St +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj iW UZ +Yt +Yt +Yt +Yt +wU +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +ln UZ UZ UZ -"} -(46,1,1) = {" -UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -5189,105 +4415,101 @@ UZ UZ UZ UZ +"} +(16,1,1) = {" UZ UZ UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +iW UZ UZ +iW +St +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Xj +Xj +iW UZ Yt Yt Yt Yt Yt +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +Yt +Yt Yt Yt Yt -LM -LM -LM -iW UZ UZ UZ UZ -iW -LM -LM -LM -LM -LM -LM -LM -LM -St -iW UZ UZ UZ UZ -"} -(47,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -5304,6 +4526,9 @@ UZ UZ UZ UZ +"} +(17,1,1) = {" +UZ UZ UZ UZ @@ -5316,89 +4541,87 @@ Yt Yt Yt Yt -LM -LM -LM +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj +Xj iW UZ UZ -UZ -UZ iW -LM -LM -LM -LM -LM -LM -LM -LM St +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj iW UZ -UZ -UZ -UZ -"} -(48,1,1) = {" -UZ -UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -5414,6 +4637,8 @@ UZ UZ UZ UZ +"} +(18,1,1) = {" UZ UZ UZ @@ -5427,89 +4652,82 @@ Yt Yt Yt Yt -LM -LM -LM +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Qe +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj iW UZ UZ -UZ -UZ iW -LM -LM -LM +iW +iW +iW +iW +iW +iW +iW +iW +iW +Xj +iW +iW +iW +iW +iW +iW +Xj +Xj +Xj +iW +UZ +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +Yt Yt Yt Yt Yt -SQ -iW -iW UZ UZ UZ UZ -"} -(49,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -5530,6 +4748,13 @@ UZ UZ UZ UZ +"} +(19,1,1) = {" +UZ +UZ +UZ +UZ +UZ Yt Yt Yt @@ -5538,89 +4763,34 @@ Yt Yt Yt Yt -LM -LM -LM -iW -UZ -UZ -UZ -UZ -iW -LM -LM -LM Yt Yt Yt Yt Yt -UZ -UZ -UZ -UZ -UZ -UZ -"} -(50,1,1) = {" -UZ -UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +Yt +Yt +Yt +Yt +Yt +Yt +Yt +eC +eC +eC +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW UZ UZ UZ @@ -5632,9 +4802,37 @@ UZ UZ UZ UZ +iW +Xj +Xj +Xj +iW UZ UZ +iW +Xj +Xj +Xj +iW UZ +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -5648,96 +4846,52 @@ UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ UZ UZ UZ -iW -LM -LM -LM -Yt -Yt -Yt -Yt -Yt UZ UZ UZ UZ UZ UZ -"} -(51,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ +"} +(20,1,1) = {" UZ UZ UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +iW +iW +iW +iW +UZ +UZ UZ UZ UZ @@ -5759,24 +4913,57 @@ UZ UZ UZ UZ -iW -LM -LM -LM iW iW iW +Xj iW +UZ +UZ iW +Xj +Xj +Xj iW -LM -LM -LM +UZ +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +Yt Yt Yt Yt Yt Yt +Yt +Yt +Yt +Yt +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +UZ +UZ +UZ +UZ UZ UZ UZ @@ -5784,68 +4971,33 @@ UZ UZ UZ "} -(52,1,1) = {" +(21,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ UZ UZ UZ @@ -5868,99 +5020,94 @@ UZ UZ UZ UZ +iW +iW +iW +iW +iW +iW +iW +Xj +iW UZ UZ iW +St +St +St +iW +UZ +Yt +Yt +Yt +Yt +Yt +Qe +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj LM LM LM +Xj LM LM LM LM -eF -LM LM -eF LM -Yt -Yt -Yt -Yt -Yt +iW UZ UZ UZ UZ UZ UZ -"} -(53,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ +"} +(22,1,1) = {" UZ UZ UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -5981,130 +5128,92 @@ UZ UZ UZ UZ -iW -LM -eF -LM -LM -LM -LM -LM -LM -LM -LM -LM -LM -Yt -Yt -Yt -Yt -Yt UZ UZ UZ +iW +vS +Xj +Xj +Xj +Xj +iW +Xj +iW UZ UZ +iW +iW +iW +iW +iW +UZ UZ -"} -(54,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ iW +Xj +Xj +Xj +Xj +Qe +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj LM LM LM +Xj LM LM LM -LM -LM -LM -LM -LM -LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(23,1,1) = {" +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt Yt Yt Yt @@ -6116,106 +5225,31 @@ UZ UZ UZ UZ -"} -(55,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ iW +vS +Xj +vS +Xj +Xj iW -iW -iW -iW -Yt -Yt -Yt -Yt -wU -LM -LM -LM +Xj iW UZ UZ @@ -6227,94 +5261,51 @@ UZ UZ UZ UZ -"} -(56,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ +iW +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +LM +LM +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(24,1,1) = {" +UZ UZ UZ UZ @@ -6324,10 +5315,21 @@ Yt Yt Yt Yt -LM -LM -LM -iW +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -6338,106 +5340,27 @@ UZ UZ UZ UZ -"} -(57,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -LM -LM -LM +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +NR +vS +os +Xj +Xj +Xj +Xj iW UZ UZ @@ -6449,94 +5372,51 @@ UZ UZ UZ UZ -"} -(58,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ +iW +iW +iW +Yt +Yt +Yt +Yt +Yt +Yt +qG +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +eF +LM +LM +iW +UZ +iW +iW +iW +iW +iW +UZ +UZ +UZ +UZ +"} +(25,1,1) = {" +UZ UZ UZ UZ @@ -6546,10 +5426,28 @@ Yt Yt Yt Yt -LM -LM -LM -iW +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -6560,106 +5458,20 @@ UZ UZ UZ UZ -"} -(59,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -LM -LM -LM +iW +vS +vS +vS +Xj +Xj +iW +iW iW UZ UZ @@ -6671,107 +5483,25 @@ UZ UZ UZ UZ -"} -(60,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ UZ UZ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -LM -LM -LM -iW UZ UZ UZ @@ -6780,96 +5510,24 @@ UZ UZ UZ UZ +iW +LM +LM +LM +iW +UZ +iW +Xj +Xj +Xj +iW UZ UZ -"} -(61,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ +"} +(26,1,1) = {" +UZ UZ UZ UZ @@ -6879,9 +5537,50 @@ Yt Yt Yt Yt -LM -LM -LM +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +vS +vS +Xj +Xj +Xj iW UZ UZ @@ -6893,95 +5592,28 @@ UZ UZ UZ UZ -"} -(62,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -6995,6 +5627,49 @@ LM LM iW UZ +iW +Xj +iW +Xj +iW +UZ +UZ +UZ +UZ +"} +(27,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -7004,95 +5679,6 @@ UZ UZ UZ UZ -"} -(63,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -7101,9 +5687,11 @@ UZ UZ UZ iW -LM -LM -eF +iW +iW +iW +iW +iW iW UZ UZ @@ -7115,95 +5703,28 @@ UZ UZ UZ UZ -"} -(64,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -7216,105 +5737,24 @@ LM LM LM iW +iW +iW +Xj +iW +Xj +iW UZ UZ UZ UZ +"} +(28,1,1) = {" UZ UZ UZ UZ UZ UZ -"} -(65,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -7322,11 +5762,6 @@ UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ UZ UZ @@ -7337,95 +5772,70 @@ UZ UZ UZ UZ -"} -(66,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -7437,106 +5847,89 @@ iW LM LM LM +LM +LM +Xj +Xj +iW +Xj iW UZ UZ UZ UZ +"} +(29,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ UZ UZ UZ -"} -(67,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -7544,11 +5937,6 @@ UZ UZ UZ UZ -iW -LM -LM -LM -iW UZ UZ UZ @@ -7559,95 +5947,6 @@ UZ UZ UZ UZ -"} -(68,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -7660,6 +5959,95 @@ LM LM LM iW +iW +iW +iW +iW +Xj +iW +iW +iW +UZ +UZ +"} +(30,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -7670,95 +6058,6 @@ UZ UZ UZ UZ -"} -(69,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ UZ @@ -7772,6 +6071,35 @@ LM LM iW UZ +iW +Xj +Xj +Xj +Xj +Xj +iW +UZ +UZ +"} +(31,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -7781,67 +6109,6 @@ UZ UZ UZ UZ -"} -(70,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns Ns Ns Ns @@ -7877,12 +6144,73 @@ UZ UZ UZ UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +iW +iW +iW +iW +UZ +UZ +UZ +UZ iW LM -LM +eF LM iW UZ +iW +Xj +Xj +Xj +Xj +Xj +iW +UZ +UZ +"} +(32,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -7892,73 +6220,33 @@ UZ UZ UZ UZ -"} -(71,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns Ns +uL +uL +mm +wC +wC +wC +wC +wC +lg +lg +lg +lg +lg +WS Ns Ns Ns +lg +lg +lg +lg +lg +lg +lg +lg +WS Ns Ns Ns @@ -7988,13 +6276,37 @@ UZ UZ UZ UZ +UZ +UZ +iW +St +St +St +iW +UZ +UZ +UZ +UZ iW -eF LM LM +LM +iW +UZ +iW +Xj +Xj +os +Xj +Xj iW UZ UZ +"} +(33,1,1) = {" +UZ +UZ +UZ UZ UZ UZ @@ -8003,14 +6315,6 @@ UZ UZ UZ UZ -"} -(72,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns Ns Ns Ns @@ -8018,6 +6322,7 @@ Ns Ns Ns Ns +hW Ns Ns Ns @@ -8027,18 +6332,123 @@ Ns Ns Ns Ns +ZM +mm +wC +wC +wC +wC +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns +lg +lg +My +lg +lg +lg Ns +lg +My +lg +lg +Cv +lg +wC +wC +wC +Dv +wC +lg +Nj +lg +My +wC +wC +wC +Dv +wC Ns +hQ +YM +Oi Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +iW +Xj +Xj +Xj +Xj +Xj +iW +UZ +UZ +"} +(34,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ Ns +uL +mm +wC +wC +wC +lg +My +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns Ns Ns Ns Ns +dn Ns Ns Ns @@ -8046,23 +6456,131 @@ Ns Ns Ns Ns +Cv Ns +lg +lg Ns +Cv Ns Ns Ns Ns +QK +lg +lg +lg +wC +wC +Dv +Dv +wC +wC +Uz Ns +QK +wC +wC +wC +wC +Dv +wC +Np Ns +wC +TZ +pH Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +IV +LM +LM +LM +iW +UZ +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +iW +Xj +Xj +Xj +Xj +Xj +iW +UZ +UZ +"} +(35,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ Ns +uL +wC +wC +hW +wC +lg +lg Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +WS Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns +lg +lg +lg +lg Ns +lg +lg +lg +Jt Ns Ns Ns +lg +lg Ns Ns Ns @@ -8073,33 +6591,147 @@ Ns Ns Ns Ns +wC +Dv Ns +Rz +wC +Dv +wC +TZ +TZ Ns Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +iW +iW +iW +iW +iW +iW +iW +UZ +UZ +"} +(36,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ Ns +wC +mm +wC +hW +lg +lg +lg Ns +lg Ns +WS +lg Ns +lg +lg +lg +lg +lg Ns +lg +My +lg +lg +lg +My +My Ns Ns Ns +lg +lg +lg +lg Ns +lg +lg +lg +lg Ns +Hc +lg +lg +lg +lg +Uz +wC +wC +wC Ns Ns Ns +wC +dn +wC +wC Ns +Md +nI +wC +TZ +vR +TZ Ns Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +eF +LM +LM iW iW iW iW iW iW -UZ -iW LM LM LM @@ -8115,61 +6747,12 @@ UZ UZ UZ "} -(73,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(37,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns Ns @@ -8177,21 +6760,58 @@ Ns Ns Ns Ns +wC +wC +wC Ns Ns +lg +lg Ns +lg Ns Ns +lg Ns +My +lg +lg +lg +lg Ns +lg +lg +lg +lg Ns +lg +lg +lg Ns Ns +lg +My +lg +lg Ns +hz +lg +lg +lg +Cv +lg +lg +lg +HU +HU +HU Ns Ns +Dv +Rz Ns Ns +wC Ns Ns Ns @@ -8201,16 +6821,28 @@ Ns Ns Ns Ns +lg Ns Ns -iW -Xj -Xj -Xj -Xj -iW UZ -iW +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +LM +LM +LM +LM +LM +LM LM LM LM @@ -8226,55 +6858,51 @@ UZ UZ UZ "} -(74,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(38,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns Ns +lg +lg +MJ +wC +wC Ns Ns Ns Ns +WS Ns Ns +lg Ns Ns +lg Ns Ns Ns Ns +lg +lg Ns +lg +lg +WS Ns Ns Ns +lg +lg +Jt Ns +lg +lg +lg Ns Ns Ns @@ -8282,46 +6910,161 @@ Ns Ns Ns Ns +lg Ns +lg +HU +Gp +HU +HU +HU +TE +wC Ns Ns +wC +wC +wC +wC Ns +wC +td +TZ +uJ Ns +lg Ns Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +LM +LM +LM +LM +LM +LM +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(39,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns +lg +lg +lg +lg +lg +wC +dn +WS Ns Ns Ns Ns Ns +lg +lg +lg +lg Ns +lg +lg +lg +lg +lg Ns +lg Ns Ns Ns Ns Ns Ns +lg +lg Ns +lg +lg +lg +lg +lg +lg Ns +Hc +lg +lg +lg Ns +lg +HU +FB +bO +jO +HU +TE +Np Ns Ns +wC +wC +wC +Cv Ns +JR Ns +wC +Np Ns +lg Ns Ns -iW -Xj -Qe -Xj -Xj -iW UZ -iW +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +LM +LM +LM +LM +eF +LM LM LM LM @@ -8337,25 +7080,22 @@ UZ UZ UZ "} -(75,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(40,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg Ns Ns Ns Ns Ns +lg +lg Ns Ns Ns @@ -8368,27 +7108,128 @@ Ns Ns Ns Ns +lg +lg +lg Ns +lg +lg Ns Ns Ns Ns +lg +lg +lg Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +HU +kj +GP +EL +HU +wC +MJ +YM Ns +Dv +wC Ns +NU Ns +Qd Ns +wC +wC Ns +My Ns Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(41,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +My +lg Ns +WS +lg +lg +lg Ns +lg +lg +lg Ns +lg +lg +lg +lg Ns +lg +lg +lg Ns +Cv Ns +lg +lg +lg +WS Ns +lg +lg Ns Ns Ns @@ -8404,35 +7245,150 @@ Ns Ns Ns Ns +lg +HU +HU +xp +nl +HU +Dv +wC +wC Ns +Dv +Dv Ns +jF Ns +wC Ns +wC +lg Ns +lg Ns Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(42,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +My +lg +lg Ns +lg +lg Ns +lg Ns +lg +lg +lg +lg +My +lg +lg +lg Ns +lg +My +lg Ns +lg +lg +lg +lg +lg +lg Ns +lg +lg +lg +Jt +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns +HU +Xy +sl +HU +lg +lg +hQ Ns +on +mK Ns +rV Ns +wC Ns +Dv +lg Ns +lg +Jt Ns -iW -Xj -Xj -Xj -Xj -iW -iW -iW +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt LM LM LM @@ -8447,33 +7403,77 @@ UZ UZ UZ UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ "} -(76,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(43,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns +lg +lg +lg Ns +lg +lg Ns +Cv Ns Ns Ns +Cv +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns +My +lg +lg Ns +lg +lg Ns +lg +lg Ns Ns Ns +lg +lg +lg +lg +Jt Ns +lg +lg +lg +My +lg +lg +lg Ns +HU +ul +qA +HU +Cv Ns Ns Ns @@ -8482,23 +7482,86 @@ Ns Ns Ns Ns +wC Ns +lg +lg +Nj +lg +lg Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(44,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns Ns +My +lg Ns +lg +lg Ns +My +lg +lg +lg +lg Ns Ns Ns Ns Ns Ns +Cv Ns +lg Ns +lg +lg +lg Ns +lg +lg Ns +lg Ns Ns Ns @@ -8515,84 +7578,188 @@ Ns Ns Ns Ns +lg +HU +HU +mr +jj +HU +lg +lg +Cv Ns +ce +lg Ns +Hd Ns +yO Ns +lg +FL +lg +lg +lg Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +eF +iW +UZ +UZ +UZ +UZ +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +UZ +UZ +UZ +UZ +"} +(45,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns Ns +hW +lg Ns +lg +lg Ns Ns +lg +lg +lg +lg +My +lg +lg +lg +lg +lg +lg Ns +lg Ns +lg +lg +lg Ns +lg +lg +lg +lg +lg +lg +lg +My Ns Ns Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +HU +HB +xa +OG +HU +lg +NU +NU Ns +vR +wC +lg +Hk Ns +Lt Ns +GY +Nj +Nj +wC +wC Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM iW +UZ +UZ +UZ +UZ iW -Xj -Xj -Xj -Xj -Xj LM -Xj LM LM +LM +eF +LM +LM +LM +St iW UZ UZ UZ UZ +"} +(46,1,1) = {" UZ UZ UZ UZ UZ -UZ -"} -(77,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns Ns +WS +lg +Cv +lg Ns +lg +lg Ns Ns Ns @@ -8604,12 +7771,46 @@ Ns Ns Ns Ns +lg +lg Ns +WS Ns +lg +lg +lg Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns +WS +lg +lg +lg +lg +lg +lg +lg +lg +lg +AQ +Di +mr +vO +HU +NU +NU +TZ Ns +wC Ns Ns Ns @@ -8618,20 +7819,84 @@ Ns Ns Ns Ns +MJ +wC Ns Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +iW +LM +LM +LM +LM +LM +LM +LM +LM +St +iW +UZ +UZ +UZ +UZ +"} +(47,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg Ns +lg Ns +lg +lg Ns +CA +CA +CA +CA +CA +CA +Qo +CA +CA +CA +Cv Ns +hW Ns Ns +lg +My Ns Ns Ns Ns +lg Ns +mX +mo Ns Ns Ns @@ -8642,75 +7907,242 @@ Ns Ns Ns Ns +lg +lg Ns +lg +lg +HU +eq +eq +HU +HU +Ee +TZ +lB +wC +wC +wC +wC +Hk Ns +Hd Ns +Hc +lg +wC +wC Ns Ns UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ iW -Xj -Xj -Xj -Xj LM LM LM LM LM +LM +LM +LM +St iW UZ UZ UZ UZ +"} +(48,1,1) = {" UZ UZ UZ UZ UZ -UZ -"} -(78,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns Ns +lg +lg Ns +lg Ns +lg +lg +WS +CA +sp +TC +Vk +Vk +MF +TC +qh +Xu +CA +lg +lg +lg +Jt Ns +lg +lg +lg Ns Ns Ns +lg +lg +mX +HK +Ya +ox +RK +Ya +Ya +mo +mX +mX +lg +lg +lg +lg Ns +lg +lg Ns +lg +lg Ns Ns Ns +wC +wC +az +lB +wC +Hk +Hk Ns +No +Cv +wC +wC +wC +wC Ns Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +iW +LM +LM +LM +Yt +Yt +Yt +Yt +SQ +iW +iW +UZ +UZ +UZ +UZ +"} +(49,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg Ns +lg +hW +lg +lg +lg +CA +Xu +cH +HP +cH +iv +cH +VL +VW +CA +lg +lg +lg +lg Ns Ns +lg +lg +lg Ns Ns Ns Ns +mo +zJ +zj +HN +zJ +Ya +Ya +cI +Ya +mX +mo +mo +mo +lg Ns +lg +lg Ns +lg +lg Ns Ns Ns +Md +wC +wC Ns Ns Ns @@ -8721,87 +8153,307 @@ Ns Ns Ns Ns +dn Ns Ns +UZ +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +iW +LM +LM +LM +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +"} +(50,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +Cv +lg +hW +My Ns +lg +CA +VW +cH +cH +HP +cH +HP +cH +VW +CA +My +lg +lg +lg Ns Ns Ns +lg +lg +lg Ns Ns +Ya +Ya +gu +HN +HN +HN +gu +Ya +RK +zJ +zj +Ya +HK +mX +lg Ns +lg +lg Ns +lg +lg Ns Ns Ns Ns +yF +wC +lg +lg +lg +lg +lg +lg +wC +wC +wC +wC +wC +Rz Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +iW +LM +LM +LM +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +"} +(51,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg Ns Ns Ns +hW +Cv Ns +lg +CA +zM +mQ +HP +om +sD +cH +iv +CK +zD +lg +lg +lg +My Ns Ns Ns Ns +lg +lg Ns Ns +Ya +cI +RK +HN +HN +HN +fP +HN +HN Ns Ns Ns Ns +mX +lg +lg +lg +WS Ns +lg +lg +lg Ns Ns Ns Ns +QK +lg +lg +lg +Jt +lg +lg +lg +wC +wC +wC +Rz +qT Ns UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ iW -Xj -Xj -Xj LM LM -Xj +LM +iW +iW +iW +iW +iW +iW LM LM LM -iW +Yt +Yt +Yt +Yt +Yt UZ UZ UZ UZ UZ UZ +"} +(52,1,1) = {" +UZ UZ UZ UZ UZ -"} -(79,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns Ns +lg +lg +lg +lg +lg +lg Ns +lg +CA +VW +VL +cH +tm +NP +HP +cH +VW +zD +lg +lg Ns +lg Ns +lg +lg +lg +lg +My +lg Ns +zj +Ya +HN +HN +HN Ns Ns Ns @@ -8816,6 +8468,9 @@ Ns Ns Ns Ns +lg +lg +lg Ns Ns Ns @@ -8830,56 +8485,365 @@ Ns Ns Ns Ns +hW Ns Ns Ns +wL +wL +wL +wL +wL +Tn +Tn +Tn +UZ +iW +LM +LM +LM +LM +LM +LM +LM +eF +LM +LM +eF +LM +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +"} +(53,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +Ns +lg +lg +Ns +lg +CA +Vk +cH +iv +cH +cH +XO +HP +Vk +CA +lg +lg +Ns +lg +Ns +lg +lg +lg +lg +lg +lg +Ns +Ya +gu +HN +HN +yD +Ns +yt +HN +HN +HN +mq +Ya +Cn +lr +Ns +NU +NU +NU +Ss +My +lg +My +Cv +lg +lg +lg +lg +Ns +kJ +lg +lg +My +Cv +lg +Ns +lg +lg +lg +My +Ou +wL +JG +Re +wy +wL +Hp +Hp +Tn +UZ +iW +LM +eF +LM +LM +LM +LM +LM +LM +LM +LM +LM +LM +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +"} +(54,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg Ns +lg +lg Ns +lg +CA +ai +cH +lS +VL +HP +iv +VL +Xu +CA +lg +lg Ns +lg Ns Ns Ns Ns +Cv Ns Ns Ns +zJ +RK +HN Ns Ns Ns +mq +Ya +Ya +Ya +Ya +cI +Ya +mo Ns +NU +Ss +NU +IH +NU +lg +lg Ns +iw +vi +vi +vi +zn +wa +lg +My +lg Ns +lg Ns +MK +lg +WS +NU +Fw +wL +ld +Sm +wy +wL +Hp +Hp +Tn +UZ +iW +LM +LM +LM +LM +LM +LM +LM +LM +LM +LM +LM +LM +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +UZ +UZ +UZ +"} +(55,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg Ns Ns Ns +lg +lg Ns +lg +CA +MN +Xu +VW +wR +VW +oY +Vk +MN +CA +lg +lg Ns +lg Ns +lg +lg +lg +lg +lg +lg Ns +Ya +zj +HN +HN +Uk Ns +Ya +ox +ZY +Ad +gu +Ya +eO +mo Ns +Ss +My Ns Ns Ns Ns +lg +zn +zn +zn +zn +pt +zn +zn +zn +zn +zn +zn +vi +hW +lg Ns Ns Ns +wL +wL +Vo +wy +Zd +RI +Hp +Hp +Tn UZ iW -Xj -Xj -Xj -iW -iW iW iW iW iW +Yt +Yt +Yt +Yt +wU +LM +LM +LM iW UZ UZ @@ -8892,106 +8856,439 @@ UZ UZ UZ "} -(80,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(56,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +My +lg Ns +lg +CA +CA +CA +CA +CA +CA +CA +CA +CA +CA +lg +lg Ns +lg Ns +lg +lg Ns +lg +lg +lg Ns +Ya +Ya +HN +HN +HN Ns +Ya +cF +jg +RK +Es +mX +mX +wE Ns +kJ +lg +My Ns +IH +NU +My +MH +uk +zn +vi +vi +kp +UJ +PM +Cg +vi +pt +vi +lg +lg +lg +lg +lg +wy +lg +wy +pq +wy +wL +Hp +Hp +Tn +UZ +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(57,1,1) = {" +UZ +UZ +UZ +UZ +UZ +hW Ns +lg +lg +lg +lg +lg Ns +lg +lg +lg +lg +Cv +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns +lg +lg Ns +lg +lg +lg Ns +Ya +Ya +zJ +HN +HN Ns +mq +Ya +bN +mo +mo +lg +lg Ns Ns Ns Ns +My Ns +NU +NU +lg +vi +vi +pt +MH +MH +vi +vi +vi +vi +NA +zn +zn Ns Ns Ns +lg Ns +hW +wL +wL +wL +wy +wL +Hp +Hp +Tn +Tn +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(58,1,1) = {" +UZ +UZ +UZ +UZ +UZ +hW Ns Ns Ns +lg +lg +lg +lg +lg +lg +lg Ns Ns Ns Ns +lg +lg +lg Ns Ns +lg Ns Ns Ns +lg +lg Ns +lg +lg +lg Ns +gu +Ya +gu +HN +HN Ns +zJ +gu +mX +mX +lg +My +My +WS Ns +kJ +lg +lg +Cv +lg +Ss +NU +iw +vi +zn +UJ +Aw +vi +UJ +kp +zn +vi +pt +vi +lg +lg Ns +lg Ns +Hx +wC +cS +wL +wy +wL +Hp +Hp +Hp +Tn +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(59,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns Ns Ns +WS +lg +lg +lg +hW +lg +lg +lg +lg +lg Ns +lg +lg +lg +lg Ns +lg +lg +lg +lg +lg +lg Ns +lg +My +lg Ns +Ya +zJ +RK +HN +HN Ns +zj +HK +mo +lg +lg +My +lg +lg Ns Ns +lg +lg Ns Ns Ns Ns Ns +zn +zn +zn +pt +zn +zn +zn +zn +vi +zn Ns Ns +lg Ns +wC Ns -UZ -iW -Xj -Qe +hW +wC +wC +wL +wy +wL +Hp +Hp Xj -iW -UZ +Tn UZ UZ UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW UZ UZ UZ @@ -9003,96 +9300,310 @@ UZ UZ UZ "} -(81,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(60,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns Ns Ns Ns Ns +lg +lg +hW +My +lg +lg +lg Ns Ns Ns Ns Ns +Cv Ns +lg +lg +lg +lg +lg +lg Ns +lg +lg +lg Ns +mo +Ya +Ya +ox +HN Ns +iX +mX +mX +lg +lg +lg +lg +My +Jt Ns +lg +lg Ns +lg Ns +NU +JE +lg +lg +zn +vi +vi +vi +xs +zn +Aw +pt +My Ns +lg Ns +wC +dn +wC +wC +wC +wL +My +YU +Xj +Hp +Hp +Tn +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(61,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg Ns Ns +lg +lg +lg +lg Ns +WS Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +My +lg Ns +lg Ns Ns Ns +mX +gu +Ya +zj +HN Ns Ns Ns +lg +WS +My +lg +My +tv +lg Ns +lg +lg Ns +lg +lg +lg +JE +HI +Xb +zn +vi +vi +lg +lg Ns Ns Ns +My Ns +lg Ns +wC Ns Ns +wC +wC Ns +wy +YU +Hp +Xj +Hp +Tn +UZ +UZ +UZ +UZ +UZ +Yt +Yt +Yt +Yt +Yt +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(62,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +My Ns +lg +My +lg +lg Ns Ns Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +hW Ns Ns +lg +lg Ns +lg +lg +lg Ns +mo +mo +cI +Ya +HN Ns +Hc Ns Ns Ns +lg +lg +WS +lg +lg +lg +lg +lg +lg +My Ns +hM +Ba +JE +JE Ns +lg +lg +My +lg +lg +lg +lg +lg Ns +lg Ns +lg Ns Ns +dX +Pi Ns +My Ns -UZ -iW Xj Xj Xj @@ -9106,6 +9617,14 @@ UZ UZ UZ UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ UZ UZ UZ @@ -9114,62 +9633,126 @@ UZ UZ UZ "} -(82,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(63,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +My +Cv +lg +lg +lg +lg Ns Ns Ns +WS +lg +lg Ns Ns Ns Ns Ns +lg +lg +hW Ns Ns +lg +lg Ns +lg +lg +lg Ns +mX +mo +HK +Ya +Ya Ns +My +SI +wC Ns Ns Ns Ns +lg +lg +lg +lg +lg Ns +lg Ns +lg +lg +JE +NU Ns +Cv Ns Ns Ns Ns Ns Ns +lg Ns +My Ns +lg Ns Ns +tp Ns Ns +lg Ns +Hp +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +LM +LM +eF +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(64,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg Ns Ns Ns @@ -9184,26 +9767,65 @@ Ns Ns Ns Ns +hW +lg +lg +lg Ns Ns Ns +lg +lg Ns +lg +lg +lg Ns +lg +mo +mX +Ya +zJ Ns +lg Ns +wC +cS +wC +SI +Uz +lg Ns Ns +lg +lg Ns +lg Ns Ns Ns Ns +NU Ns +NU +lg +lg +lg +My +lg Ns +lg +Cv +My Ns +lg +lg +lg +lg +lg +My +lg Ns -UZ -iW Xj Xj Xj @@ -9217,6 +9839,14 @@ UZ UZ UZ UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ UZ UZ UZ @@ -9225,96 +9855,199 @@ UZ UZ UZ "} -(83,1,1) = {" -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(65,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns +lg +lg +lg +lg +lg +Cv +lg +lg +WS +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +mX +mo +gu Ns +lg Ns +SI +wC Ns +wC Ns +lg Ns Ns +lg +lg Ns +lg +lg +lg +lg +lg +My +Ss +Ss +hW Ns Ns Ns +lg Ns +lg Ns +lg Ns +lg Ns Ns +MK Ns +hW +lg Ns +Hp +Xj +Hp +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(66,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns +My +lg +lg Ns Ns Ns +lg +lg +lg +lg +lg Ns +lg +lg +lg +lg +lg +lg +lg +Jt Ns Ns +lg +lg +My +lg +lg +lg Ns +My +lg Ns +mX +mo Ns +lg Ns +wC Ns Ns +wC +tp +lg Ns Ns +lg Ns Ns Ns +Cv Ns Ns Ns +lg Ns Ns Ns +IH +Ss Ns +lg Ns +lg Ns +lg Ns +lg Ns +lg +lg +WS Ns +lg Ns -UZ -iW Xj Xj Xj @@ -9328,6 +10061,14 @@ UZ UZ UZ UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ UZ UZ UZ @@ -9336,33 +10077,126 @@ UZ UZ UZ "} -(84,1,1) = {" -Ns -Ns -Ns -Ns +(67,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns +lg +lg +lg +Cv +lg +lg +lg +My +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns +lg +lg Ns Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns +lg +lg Ns +My Ns +mm +wC +wC +SI Ns +lg Ns Ns +zr +lg +XE +lg +My +lg +zr +lg +Cv +lg Ns Ns Ns +NU Ns +lg Ns +lg Ns +lg +Cv +My Ns +Xh +lg +lg Ns +lg Ns +Xj +Hp +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(68,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns Ns +lg Ns Ns Ns @@ -9376,22 +10210,59 @@ Ns Ns Ns Ns +lg +lg Ns Ns +lg +lg Ns Ns +lg +lg +lg Ns Ns +lg +lg +My +lg +lg +lg +lg Ns +lg Ns +wC Ns Ns Ns Ns +lg Ns Ns +zr +jh +eq +HU +HU +jC +HU +lg Ns +lg +lg +lg Ns +NU +hW +NU +NU +lg +hW +lg +hW +lg Ns Ns Ns @@ -9399,40 +10270,135 @@ Ns Ns Ns Ns +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +Yt +KQ +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(69,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +wC +wC +mm +wC +wC +wC Ns Ns Ns +lg +lg +lg +lg Ns Ns +lg +Cv Ns Ns +lg +lg Ns Ns Ns Ns Ns +lg +lg Ns +lg +Jt Ns +lg Ns +ss +wC +Uz +lg +lg +lg Ns +lg +lg +HU +mr +Xy +jj +tN +HU +lg Ns Ns Ns +lg Ns +lg Ns +NU Ns +My +hW +lg Ns +lg +lg +lg +lg +wC +lg +NU Ns -UZ -iW Xj Xj Xj -iW +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +iW +LM +LM +LM +iW UZ UZ UZ @@ -9443,18 +10409,38 @@ UZ UZ UZ UZ +"} +(70,1,1) = {" UZ UZ UZ -"} -(85,1,1) = {" UZ UZ Ns +lg +lg +lg Ns Ns +wC +wC +wC +wC +mm +wC +uL Ns +lg +lg +lg +lg Ns +hW +hW +lg +lg +lg +lg Ns Ns Ns @@ -9467,83 +10453,174 @@ Ns Ns Ns Ns +lg Ns Ns +wC Ns +lg Ns Ns Ns +lg +lg +HU +lV +Jp +Xy +HH +HU +lg +lg +Jt Ns +lg +CY +My Ns +NU Ns +NU Ns Ns Ns +lg Ns +hW Ns +dn Ns +NU Ns +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +Yt +Yt +UZ +UZ +UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(71,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg Ns Ns Ns Ns +wC +mm Ns Ns +wC +uL Ns +lg +lg +lg +My +hW Ns Ns +lg +lg +lg +lg Ns Ns Ns Ns Ns Ns +lg +lg +lg +lg Ns Ns +lg +lg +lg +My Ns +lg +lg +Jt Ns +lg +XE +eq +bO +jj +xa +sH +HU +lg +My +My Ns +lg Ns +lg Ns +lg +hW +NU Ns +lg Ns +lg +WS Ns +wC +wC Ns +NU Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -UZ -iW Xj Xj Xj -iW +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +iW +eF +LM +LM +iW UZ UZ UZ @@ -9554,57 +10631,242 @@ UZ UZ UZ UZ +"} +(72,1,1) = {" UZ UZ UZ -"} -(86,1,1) = {" UZ UZ Ns +lg Ns Ns Ns Ns Ns +lg +wC Ns Ns Ns +ZM Ns Ns Ns Ns +lg +WS Ns Ns +lg +My +lg +lg +lg +lg Ns Ns +lg +lg +vi +lg +lg +lg +lg +lg +lg +My +lg +WS Ns +lg +lg +lg Ns Ns +lg +HU +Xy +bO +VA +nl +fi +lg +lg +lg Ns +lg Ns +lg Ns +My +Cv +lg Ns +NU Ns +My +lg Ns +cS +wC Ns +Ss Ns +Xj +Xj +Xj +Yt +Yt +Yt +Yt +Yt +Yt +Yt +iW +iW +UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(73,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +lg +My +My +lg Ns Ns Ns Ns +hW +My +My +lg +lg +mX Ns Ns +lg +lg +lg +lg +vi +vi +lg +lg +vi +lg +lg +zn +zn +zn +zn +vi +lg +lg +vt +vt +vt +vt +vt +lg +lg Ns +lg +HU +HU +eq +HU +HU +HU +My +lg +zr Ns +lg Ns +lg Ns +lg Ns +lg +NU +NU Ns +NU +My +hW +wC +wC Ns +Ss Ns +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +iW +UZ +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(74,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +lg +lg Ns Ns Ns @@ -9612,47 +10874,86 @@ Ns Ns Ns Ns +lg +lg +lg +mo +mX Ns +lg +lg Ns +vi +lg +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +My +My +vt +Wl +oZ +hO +vt +lg +lg Ns +lg Ns +lg +Jc +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +Cv +lg Ns Ns Ns +lg Ns Ns +NU Ns +wC +cS Ns +NU Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -UZ -iW Xj Xj Xj +Xj +Xj +Xj +Xj +Xj +Qe +Xj +Xj iW UZ +iW +LM +LM +LM +iW UZ UZ UZ @@ -9663,31 +10964,66 @@ UZ UZ UZ UZ +"} +(75,1,1) = {" UZ UZ UZ UZ UZ -"} -(87,1,1) = {" -UZ -UZ -Ns -Ns -Ns -Ns Ns +lg Ns Ns +lg +lg +lg +lg +lg +lg +lg Ns Ns Ns +lg +lg +mX +mo +RK Ns +lg +lg Ns +vi +My +eB +vi +vi +vi +UJ +vi +vi +vi +Aw +vi +Vx +zn +My +My +aE +yX +tg +gm +QH +lg +lg +lg +lg Ns Ns Ns Ns +lg Ns Ns Ns @@ -9697,10 +11033,57 @@ Ns Ns Ns Ns +lg +lg +Cv +lg +lg +lg +Ss +NU Ns +TZ +TZ Ns +NU Ns +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +Xj +iW +iW +iW +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(76,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg Ns Ns Ns @@ -9709,59 +11092,311 @@ Ns Ns Ns Ns +lg +lg Ns Ns +lg +mo +mX +Ya +cI Ns +lg +lg Ns +lg +xs +zn +vi +vi +Aw +vi +Aw +vi +vi +vi +vi +UJ +zn +lg +lg +vt +yA +xU +As +vt +vt Ns Ns +lg +lg +lg +lg +lg +lg +wC +wC +wC +wC +wC +wC +lg +lg Ns Ns +lg Ns Ns Ns Ns Ns +lg Ns +TZ Ns Ns +NU Ns +iW +Yt +Yt +Yt +Yt +Yt +Yt +qG +Xj +Xj +Xj +Xj +Xj +LM +Xj +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(77,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +lg +lg +lg +Cv +lg +lg +lg Ns Ns +mo +mo +gu +ox +zJ Ns +lg +lg Ns +lg +lg +zn +vi +zn +zn +zn +vi +vi +vi +vi +iw +vi +zn +lg +Jt +vt +Su +tg +tg +XH +vt +lg Ns Ns Ns +lg Ns Ns Ns Ns +wC Ns +wC Ns Ns Ns +lg +lg Ns +lg +lg +My +lg +lg Ns +lg +wC +wC +NU +NU +Ss Ns +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +Xj +LM +LM +LM +LM +LM +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(78,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +My +lg +lg Ns +lg +lg +lg +lg +hW +mo +Ya +zJ +Ya +HN Ns +lg +lg Ns +lg +lg +zn +UJ +vi +iw +vi +vi +zn +zn +zn +zn +zn +zn +vi +lg +vt +Br +tg +gJ +XH +vt +lg +Cv +lg +lg +lg +lg +lg +lg +wC +wC Ns +wC Ns +lg +lg +lg +lg Ns +lg +lg +lg +My +lg +hW +lg Ns Ns Ns Ns +NU Ns UZ -iW +Yt +Yt +Yt +Yt +Yt +Yt +Yt Xj Xj Xj +LM +LM +Xj +LM +LM +LM iW UZ UZ @@ -9773,102 +11408,429 @@ UZ UZ UZ UZ +"} +(79,1,1) = {" UZ UZ UZ UZ UZ -UZ -"} -(88,1,1) = {" -UZ -UZ -Ns Ns +lg Ns Ns Ns +WS +lg +lg Ns Ns +lg +lg +lg +mX +mX +Ya +gu +HN +HN +hW +lg +lg +lg +lg +lg +zn +vi +Aw +vi +vi +vi +vi +vi +vi +vi +ig +zn +My +lg +vt +Br +gJ +tg +lN +vt +lg Ns Ns Ns Ns +lg Ns Ns Ns +wC Ns +wC Ns +lg Ns Ns +lg +Cv +lg +lg Ns +lg +lg +lg +lg +lg +My +Hk Ns +NU Ns +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +iW +iW +iW +iW +iW +iW +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(80,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg Ns Ns Ns +lg +lg Ns Ns Ns +lg +lg +mX +zJ +RK +Ya +HN +HN +hW +lg +lg +lg +lg +vi +zn +vi +vi +vi +vi +MH +vi +vi +vi +vi +vi +zn +lg +lg +vt +vt +vt +ks +vt +vt +lg +lg +lg +lg +lg +lg Ns +JS Ns +wC +wC +cS +wC +lg Ns +lg +lg Ns +lg +My Ns Ns Ns +lg Ns +lg +lg +cs Ns +NU Ns +UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Xj +Qe +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(81,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg Ns Ns Ns +lg Ns Ns Ns Ns +lg +mo +gu +ox +HN +HN +fP Ns +lg +lg +lg +lg +lg +zn +ig +UJ +vi +zn +MH +vi +vi +zn +vi +vi +zn +lg +lg +lg +lg +lg +lg Ns +WS +lg +lg +lg +My +lg +lg Ns +My Ns +dX +Pi +wC Ns +lg Ns +lg +lg Ns +lg +My +Jt Ns Ns +lg Ns +lg Ns Ns Ns +lg Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(82,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +Cv +lg +lg +lg Ns Ns Ns Ns +WS +mo +cI +HN +HN +fP +yD Ns +lg +lg +lg +zn +zn +zn +zn +zn +zn +zn +iw +vi +vi +zn +vi +UJ +zn +lg Ns Ns Ns Ns +lg Ns +My +lg +lg Ns Ns Ns Ns Ns +My Ns Ns Ns Ns Ns +lg Ns +My +lg Ns +My +lg +lg +lg +lg +lg +lg +lg +lg +My Ns +lg Ns UZ +UZ +UZ +UZ +UZ +UZ +UZ iW Xj Xj @@ -9891,10 +11853,15 @@ UZ UZ UZ "} -(89,1,1) = {" +(83,1,1) = {" +UZ +UZ +UZ UZ UZ Ns +lg +lg Ns Ns Ns @@ -9914,86 +11881,303 @@ Ns Ns Ns Ns +lg +lg +lg +lg +lg +zn +zn +zn +vi +Aw +bB +zn +vi +vi +zn +vi Ns +My +bY Ns +lg Ns Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +My +lg +lg Ns +lg +lg Ns +lg +lg +My Ns +lg Ns Ns Ns +lg +lg +lg +lg Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(84,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +lg +lg +lg Ns +uL +mm +wC +wC +wC +lg +lg +lg +lg +lg +lg +lg +lg +Cv +lg +lg +lg +lg +WS +zn +zn +vn +vi +iw +zn +vi +vi +zn +lg Ns +My +lg Ns +lg +lg +lg +lg Ns Ns +My +lg +lg +lg +lg +lg +My Ns Ns +lg +lg +Cv +lg +My Ns Ns +lg Ns Ns +lg +lg +WS Ns +lg +ey +lg +MK Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(85,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +My +My +lg +lg Ns +wC +wC +mm Ns +lg Ns +Jt +lg Ns Ns Ns +lg +lg Ns +lg +lg +lg +lg +vi +xs +zn +vi +vi +UJ +zn +vi +Aw +zn +wC Ns +lg +lg +lg +lg +lg Ns Ns Ns +wC +wC +My +pL +sJ +qB +lg +lg +lg Ns Ns +lg Ns Ns +lg +Jt Ns +lg Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +lg +lg +Jt +CA +CA +aL +Kk +CA +CA +CA +UZ +UZ +UZ +UZ +UZ +UZ UZ iW Xj Xj Xj iW -iW -iW -iW -Yt -Yt -Yt -Yt -Yt -EU +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -10002,94 +12186,538 @@ UZ UZ UZ "} -(90,1,1) = {" +(86,1,1) = {" +UZ +UZ +UZ UZ UZ Ns +lg Ns Ns Ns Ns +lg +lg Ns Ns Ns +wC Ns +lg Ns +lg +lg +lg +lg +lg +lg +WS Ns +lg +lg +vi +lg +vi +vi +eB +vi +vi +vi +zn +vi +vi +zn +wC +wC +SI Ns Ns Ns Ns Ns +gZ Ns +wC +Et +lm +lm +mp +lm +lm +ER +lg +Cv +lg +lg Ns +NJ +lg +lg Ns +lg Ns +lg Ns Ns +CA +rW +tn +tn +zm +zm +CA +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(87,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +lg +lg +lg Ns Ns +lg +WS Ns +lg Ns +My +My Ns Ns Ns Ns Ns Ns +lg +lg +zn +zn +zn +zn +zn +Aw +vi +vi +zn +vi +vn +zn +wC +SI +wC +wC +uL +wC +jV +uL +cS +wC +wC +lm +kt +pL +sJ +pL +zp +lm +lg Ns Ns +lg Ns +lg +lg +My +lg +lg Ns +lg +lg +lg +aL +rW +tn +tn +tn +Pb +CA +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(88,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns +lg +lg +lg +lg +Cv +lg +lg +My +lg Ns +lg +lg +lg +lg +lg +vi +lg +pt +pt +vi +ct +vi +xs +zn +wC +wC +wC +mm +wC +WV +SI +SI +SI +wC +wC +lm +gq +pL +sJ +pL +Pc +lm +lg Ns +lg +lg +lg +lg Ns Ns Ns +lg Ns +lg +lg +ey +iu +tn +tn +oN +Rr +ZL +CA +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(89,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +My +lg Ns Ns Ns Ns Ns +lg +lg +lg +lg +lg Ns Ns Ns Ns Ns +lg +lg +Jt Ns +lg +lg +lg +lg Ns +lg +vi +vi +xs +zn +zn +zn +zn +zn +wC +wC +wC +SI +wC +cS +wC +wC +wC +cS +wC +lm +vr +pL +sJ +pL +vr +dz +lg Ns +lg Ns Ns Ns Ns +lg +lg +lg +lg +lg +lg +lg +CA +rO +Rr +pi +tn +op +CA +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Xj +iW +iW +iW +iW +Yt +Yt +Yt +Yt +Yt +EU +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(90,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns Ns +lg Ns Ns Ns Ns Ns +lg +lg +lg Ns +lg +lg +lg Ns Ns +lg +lg +vi +vi +lg +vi +lg +vi Ns +qM +SI +cS +wC +uL +cS +wC +uL +uL +wC +wC +lm +Qa +pL +xE +pL +Qa +lm +Jt Ns +lg +lg +My +lg +lg +lg Ns Ns Ns Ns Ns Ns -Ns -Ns +CA +Ax +tn +Nh +op +op +CA +UZ +UZ +UZ +UZ +UZ +UZ UZ iW Xj @@ -10116,10 +12744,45 @@ UZ (91,1,1) = {" UZ UZ +UZ +UZ +UZ Ns +lg +lg +lg +lg +lg +lg +lg +WS +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns +hW +lg +vi +lg +lg +WS Ns +lg +lg Ns Ns Ns @@ -10132,6 +12795,13 @@ Ns Ns Ns Ns +lm +lm +lm +lm +lm +lm +lm Ns Ns Ns @@ -10146,32 +12816,13 @@ Ns Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +CA +CA +CA +CA +CA +CA +CA UZ UZ UZ @@ -10179,29 +12830,6 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -UZ iW Xj Qe @@ -10227,55 +12855,52 @@ UZ (92,1,1) = {" UZ UZ +UZ +UZ +UZ Ns +lg Ns +lg Ns Ns +hW Ns Ns Ns Ns Ns +lg +lg Ns Ns Ns +lg Ns Ns +lg +lg +lg +lg Ns Ns Ns Ns +lg +lg +lg Ns Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +lg +lg +AG +AG +wI +lg +Ky +lg Ns Ns Ns @@ -10296,22 +12921,25 @@ UZ UZ UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ iW Xj @@ -10338,10 +12966,31 @@ UZ (93,1,1) = {" UZ UZ +UZ +UZ +UZ Ns +lg Ns +lg +lg +Cv +lg +My +lg +Jt +lg +lg +lg +lg +lg +Cv +lg +lg Ns Ns +lg +lg Ns Ns Ns @@ -10350,50 +12999,29 @@ Ns Ns Ns Ns +Cv +lg Ns Ns Ns Ns +lg +lg +lg +qg +lg +lg +lg +lg +XE +qg +pL +WS +qg Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ UZ UZ UZ @@ -10407,22 +13035,22 @@ UZ UZ UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ Yt Yt @@ -10449,66 +13077,66 @@ UZ (94,1,1) = {" UZ UZ +UZ +UZ +UZ Ns +lg Ns +lg +lg Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns +lg +lg Ns Ns +My +lg +lg +lg +lg +lg +WS Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +Jt +qg +lg +VF +lg +lg +SK +Jl +AG +pL +Ky Ns UZ UZ UZ UZ +UZ +UZ +UZ iW St St @@ -10518,22 +13146,22 @@ UZ UZ UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ Yt Yt @@ -10560,12 +13188,41 @@ UZ (95,1,1) = {" UZ UZ +UZ +UZ +UZ Ns +lg Ns +lg +lg Ns +lg +lg +lg +lg +vi +lg +lg +My +lg Ns +My +lg Ns Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns Ns @@ -10574,48 +13231,19 @@ Ns Ns Ns Ns +lg +lg +qg Ns Ns +lm +lm +YV +bd Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ UZ UZ UZ @@ -10629,22 +13257,22 @@ UZ UZ UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ Yt Yt @@ -10671,62 +13299,62 @@ UZ (96,1,1) = {" UZ UZ +UZ +UZ +UZ Ns +lg Ns +lg +lg Ns +WS +lg +vi +vi +vi +vi +lg +lg +lg Ns +lg +lg Ns Ns +lg +lg Ns Ns Ns Ns +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg +Jt Ns +lg +lg Ns Ns +lm +lm +Ci +wv +BD Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ UZ UZ UZ @@ -10777,67 +13405,67 @@ UZ UZ UZ UZ -UZ -"} -(97,1,1) = {" -UZ -UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +"} +(97,1,1) = {" +UZ +UZ +UZ +UZ +UZ Ns +WS +lg +lg +My Ns +lg +vi +vi +vi +vi +vi +vi +vi +lg Ns +WS +lg +lg +lg +lg +lg Ns Ns Ns Ns +lg +lg Ns Ns Ns Ns Ns +lg +lg +My +lg +lg +My +qg +lg +lg +rF Ns +lm +lg +lg +lm +lm +lm +UZ +UZ +UZ UZ UZ UZ @@ -10893,62 +13521,62 @@ UZ (98,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +zn +zn +zn +zn +zn +zn +zn +zn +vi +vi +vi +vi +zn +zn +zn +zn +zn +Cg +zn +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns +hW Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +lg +lg +lg +AG +lg +AG +Jl +lg +lg +DR +qg +lm +pL +oP +qB +AS +lm +UZ +UZ +UZ UZ UZ UZ @@ -11004,62 +13632,62 @@ UZ (99,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +rs +rs +rs +vi +vi +vi +wP +vi +vi +vi +vi +cm +vi +vi +vi +Tf +vi +Ps +zn +lg +lg +My +lg +lg +lg +lg +lg Ns Ns Ns Ns Ns Ns +lg +lg Ns Ns Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +lg +lg +pL +YV +pL +pL +My +pL +lm +UZ +UZ +UZ UZ UZ UZ @@ -11115,89 +13743,59 @@ UZ (100,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +rs +jc +vi +vi +UH +qU +vi +vi +vn +vi +vi +JX +vi +vi +vi +vi +vn +vi +zn +lg +lg +lg Ns +lg +lg Ns +lg +lg +lg +lg +Jt Ns Ns +lg +lg +lg +WS Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -UZ -UZ -UZ -UZ -iW -Xj -Xj -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +lg +OF +lg +bd +yB +lm +oP +pL +lm UZ UZ UZ @@ -11208,7 +13806,7 @@ UZ iW Xj Xj -Qe +Xj iW UZ UZ @@ -11222,66 +13820,96 @@ UZ UZ UZ UZ -"} -(101,1,1) = {" UZ UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +iW +Xj +Xj +Qe +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(101,1,1) = {" +UZ +UZ +UZ +UZ +UZ +zn +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +vi +zn +lg +lg +lg Ns +lg +lg Ns +My Ns +lg +Cv +lg +lg Ns +lg Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +lg +My +Cv +lg +lg +lg +lg +lg +qB +lm +lm +Cs +IB +lm +UZ +UZ +UZ iW iW iW @@ -11337,62 +13965,62 @@ UZ (102,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +vi +Ps +vi +aI +aI +aI +aI +Sn +Sn +aI +aI +aI +aI +aI +vi +vi +vi +rs +zn +My +lg +lg Ns +lg +lg Ns +lg Ns +lg Ns +lg +lg Ns +lg Ns +lg Ns +rF +lg +lg +rF Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +lg +lg +lm +lm +pL +My +lm +UZ +UZ +UZ iW Xj Xj @@ -11448,59 +14076,59 @@ UZ (103,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +vi +vi +vn +aI +BM +BM +aI +Xe +Xe +jd +Xe +Xe +Xe +aI +vi +vi +pd +rs +zn +lg +lg +lg +lg +lg +lg Ns +My Ns Ns Ns +lg +lg Ns +lg Ns +lg Ns +lg +lg +XE Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -UZ -UZ -UZ -UZ -UZ -UZ -UZ +lg +lm +lm +lm +Ox +oP +lm UZ UZ UZ @@ -11559,59 +14187,59 @@ UZ (104,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +vi +vi +vi +Sn +PD +PD +aI +Xe +Xe +aI +Xe +Xe +Vs +aI +vi +vi +rs +rs +zn +lg +lg +lg +lg +lg +lg Ns +My +lg +lg +hW +My +lg +lg +wC Ns +lg Ns Ns +Jt +lg Ns Ns Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -UZ -UZ -UZ -UZ -UZ -UZ -UZ +lm +lm +FU +lm UZ UZ UZ @@ -11670,10 +14298,46 @@ UZ (105,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +Tf +vi +vi +Sn +Xe +Te +aI +Xe +Xe +aI +aI +aI +aI +aI +vi +qU +vi +rs +zn +lg +lg +lg Ns +lg +lg Ns +lg +lg +lg Ns +lg +wC +wC +wC Ns +lg Ns Ns Ns @@ -11684,45 +14348,9 @@ Ns Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -UZ -UZ -UZ -UZ -UZ -UZ -UZ +lm +lm +lm UZ UZ UZ @@ -11774,44 +14402,51 @@ UZ UZ UZ UZ -UZ -UZ -UZ -"} -(106,1,1) = {" -UZ -UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +"} +(106,1,1) = {" +UZ +UZ +UZ +UZ +UZ +zn +vi +vi +vi +aI +jd +aI +aI +Xe +Xe +aI +zI +Xe +Xe +aI +vi +vi +vi +vi +zn +vi +lg +lg Ns +lg +lg Ns +Cv Ns Ns Ns Ns Ns Ns +wC Ns Ns Ns @@ -11830,13 +14465,6 @@ Ns UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ iW Xj Xj @@ -11892,52 +14520,52 @@ UZ (107,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +vi +vi +vi +aI +Xe +Xe +Xe +Xe +Xe +aI +zI +Xe +PD +aI +vi +vi +vi +vi +vi +vi +vi +lg Ns +lg +lg Ns +lg +lg +lg Ns +wC +mm +wC +mm +mm Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -12003,52 +14631,52 @@ UZ (108,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +vi +vi +vi +aI +Xe +Xe +FA +Xe +Xe +aI +Xe +Xe +PD +Dp +vi +vi +vi +vi +vi +vi +vi +lg Ns +lg +lg Ns +lg +lg +lg Ns +wC +uL +wC +wC +uL Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ UZ Yt Yt @@ -12114,7 +14742,37 @@ UZ (109,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +vi +AP +vi +Sn +Xe +LB +LB +LB +Xe +aI +Xe +Xe +PD +aI +vi +vi +vi +vi +vi +vi +lg +lg Ns +lg +lg +hW +lg Ns Ns Ns @@ -12124,42 +14782,12 @@ Ns Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ UZ Yt Yt @@ -12225,52 +14853,52 @@ UZ (110,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +UH +vi +JX +Sn +FR +QB +PT +eh +Xe +aI +Xe +Xe +LC +Sn +vi +vi +vi +vi +zn +vi +lg +lg +Cv +lg +lg Ns +lg Ns +lg +WS Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ Yt Yt @@ -12333,44 +14961,43 @@ UZ UZ UZ "} -(111,1,1) = {" -UZ -UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +(111,1,1) = {" +UZ +UZ +UZ +UZ +UZ +zn +vi +vi +qU +Sn +FR +QB +QB +QB +Xe +jd +Xe +Xe +CX +Sn +vi +JX +vi +vi +zn +lg +lg +lg Ns +lg +lg Ns +lg Ns +lg +lg Ns UZ UZ @@ -12383,6 +15010,7 @@ UZ UZ UZ UZ +UZ Yt Yt Yt @@ -12447,42 +15075,42 @@ UZ (112,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +rs +vi +vi +aI +FR +FR +og +Xe +Xe +aI +Xe +NM +Aj +aI +vi +qU +vi +vi +zn +lg +lg +lg Ns +lg +lg Ns +lg +lg +lg +lg Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ UZ UZ iW @@ -12558,44 +15186,44 @@ UZ (113,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +rs +vi +ol +aI +aI +aI +aI +aI +aI +aI +Sn +Sn +aI +aI +vi +qu +vi +rs +zn Ns Ns Ns Ns +My +lg Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +lg Ns Ns Ns Ns UZ UZ +UZ iW Xj Xj @@ -12669,44 +15297,44 @@ UZ (114,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +zn +rs +rs +vi +vi +vi +vi +vi +JX +vi +vi +vi +vi +vi +vi +vi +vi +WI +rs +zn +lg +lg +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns UZ UZ +UZ iW Xj Xj @@ -12780,44 +15408,44 @@ UZ (115,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +zn +zn +rs +vi +vi +vi +vi +vi +vi +vi +vn +vi +vi +vi +vi +vi +vi +rs +rs +zn +lg +My +lg +lg +lg +lg +lg +lg +lg +lg Ns Ns UZ UZ +UZ iW Xj Xj @@ -12891,42 +15519,42 @@ UZ (116,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +zn +rs +jB +vi +wP +vi +cm +vi +vi +vi +Ps +vi +vi +UH +vi +rs +rs +zn +zn +lg Ns Ns Ns Ns +WS +My Ns Ns Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ UZ UZ iW @@ -13002,6 +15630,29 @@ UZ (117,1,1) = {" UZ UZ +UZ +UZ +UZ +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn +zn Ns Ns Ns @@ -13014,30 +15665,7 @@ Ns Ns Ns Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ UZ UZ iW @@ -13083,16 +15711,54 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt -Yt -Xj -Xj -Xj -iW +Yt +Yt +Yt +Yt +Yt +Yt +Xj +Xj +Xj +iW +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +"} +(118,1,1) = {" +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ UZ @@ -13109,46 +15775,8 @@ UZ UZ UZ UZ -"} -(118,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns UZ UZ iW @@ -13224,42 +15852,42 @@ UZ (119,1,1) = {" UZ UZ -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns -Ns +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ +UZ UZ UZ iW @@ -20403,8 +23031,8 @@ UZ UZ UZ iW -Xj -Xj +vS +vS Xj Xj Xj @@ -20514,7 +23142,7 @@ UZ UZ UZ iW -Xj +vS Xj Xj Xj @@ -20625,8 +23253,8 @@ UZ UZ UZ iW -Xj -Xj +vF +vS os Xj Xj @@ -20736,9 +23364,9 @@ UZ UZ UZ iW -Xj -Xj -Xj +vS +vS +vS Xj Xj iW @@ -20847,7 +23475,7 @@ UZ UZ UZ iW -Xj +vS Xj Xj Xj @@ -25404,31 +28032,31 @@ Xj Xj iW UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no UZ "} (229,1,1) = {" @@ -25515,31 +28143,31 @@ Xj Xj iW UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +yr +yx +yr +no +uE +nP +PI +OW +OW +OW +OW +CL +OW +OW +OW +OW +PI +nP +uE +no +yr +yx +yr +no UZ "} (230,1,1) = {" @@ -25626,31 +28254,31 @@ Xj Xj iW UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +yr +zk +yr +iG +ko +hc +br +OW +SL +SL +SL +OW +SL +SL +SL +OW +ko +hc +br +iG +yr +rS +yr +no UZ "} (231,1,1) = {" @@ -25737,31 +28365,31 @@ Xj Xj iW UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +kx +yr +yr +iG +kH +bk +QX +OW +SL +QM +SL +OW +SL +QM +SL +OW +kH +bk +QX +iG +kx +yr +yr +no UZ "} (232,1,1) = {" @@ -25848,31 +28476,31 @@ Xj Xj iW UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +Co +Co +Co +no +DM +al +zo +OW +SL +SL +SL +OW +SL +SL +SL +OW +DM +al +zo +no +Co +Co +Co +no UZ "} (233,1,1) = {" @@ -25959,31 +28587,31 @@ Xj Xj iW UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +yr +GG +yr +oy +OW +OW +OW +cV +OW +OW +OW +OW +OW +OW +OW +cV +OW +OW +OW +oy +yr +GG +yr +no UZ "} (234,1,1) = {" @@ -26070,31 +28698,31 @@ iW iW iW UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +no +no +no +no +uE +PI +OW +no +no +iG +no +vc +no +iG +no +no +OW +PI +uE +no +no +no +no +no UZ "} (235,1,1) = {" @@ -26181,31 +28809,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +PN +bK +ma +hY +PI +PI +OW +no +nL +PI +CC +WW +AE +PI +PI +no +OW +PI +PI +GJ +bl +bl +Hv +no UZ "} (236,1,1) = {" @@ -26292,31 +28920,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +HQ +Yo +Yo +VT +ou +PI +OW +iG +PI +WW +WW +WW +WW +WW +PI +iG +OW +PI +no +no +no +no +no +no UZ "} (237,1,1) = {" @@ -26403,31 +29031,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +Yo +Yo +Yo +Yo +XF +oU +OW +iG +PI +DQ +XP +XP +XP +SF +PI +iG +OW +QC +no +Jw +jx +no +no +no UZ "} (238,1,1) = {" @@ -26514,31 +29142,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +kq +Yo +vd +Yo +kO +Ua +OW +iG +PI +Dt +Zh +nw +Vf +Wk +PI +iG +OW +PI +no +by +LT +Dl +uU +no UZ "} (239,1,1) = {" @@ -26625,31 +29253,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +Yo +HQ +bL +Yo +XF +oU +LK +no +Uc +Dt +AJ +FG +sz +Wk +Ey +no +Wd +PI +no +Xk +mI +DT +nQ +no UZ "} (240,1,1) = {" @@ -26736,31 +29364,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +IJ +HQ +bL +Yo +Hh +Ua +OW +vc +WW +Dt +kZ +zt +MI +Wk +WW +vc +OW +PI +no +uh +US +OO +pn +no UZ "} (241,1,1) = {" @@ -26847,31 +29475,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +Yo +HQ +bL +Yo +XF +oU +LK +no +QI +Dt +wM +SM +wM +Wk +Ey +no +Wd +PI +no +Vp +RF +th +RS +no UZ "} (242,1,1) = {" @@ -26935,37 +29563,12 @@ Yt Yt Yt Yt -Yt -Yt -Xj -va -Xj -iW -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +Yt +Yt +Xj +va +Xj +iW UZ UZ UZ @@ -26983,6 +29586,31 @@ UZ UZ UZ UZ +no +kq +Yo +AV +Yo +kO +Ua +OW +iG +PI +Dt +Pt +Ai +eK +Wk +PI +iG +OW +PI +no +VX +TQ +RA +vf +no UZ "} (243,1,1) = {" @@ -27069,31 +29697,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +Yo +Yo +Yo +Yo +XF +oU +OW +iG +PI +Lr +Iy +Iy +Iy +pS +PI +iG +OW +QC +no +ug +dD +no +lT +no UZ "} (244,1,1) = {" @@ -27180,31 +29808,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +HQ +Yo +Yo +rH +AO +PI +OW +iG +PI +PI +WW +WW +WW +PI +PI +no +OW +PI +no +no +no +no +no +no UZ "} (245,1,1) = {" @@ -27291,31 +29919,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +CP +Up +uf +tD +PI +PI +OW +no +PI +PI +nu +WW +xR +PI +iN +no +OW +PI +PI +GJ +xH +bl +Hv +no UZ "} (246,1,1) = {" @@ -27402,31 +30030,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +no +no +no +no +PI +PI +OW +no +no +iG +no +vc +no +iG +no +no +OW +PI +uE +no +no +no +no +no UZ "} (247,1,1) = {" @@ -27513,31 +30141,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +yr +yx +yr +no +PI +PI +PI +Vg +OW +OW +OW +OW +OW +OW +OW +Vg +OW +PI +PI +no +yr +yx +yr +no UZ "} (248,1,1) = {" @@ -27624,31 +30252,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +yr +Df +yr +iG +ko +hc +br +OW +SL +SL +SL +OW +SL +SL +SL +OW +ko +hc +br +iG +yr +tH +yr +no UZ "} (249,1,1) = {" @@ -27735,31 +30363,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +kx +yr +yr +iG +kH +nS +QX +OW +SL +xh +SL +OW +SL +xh +SL +OW +kH +is +QX +iG +kx +yr +yr +no UZ "} (250,1,1) = {" @@ -27846,31 +30474,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +Co +Co +Co +no +zw +al +zo +OW +SL +SL +SL +OW +SL +SL +SL +OW +DM +al +Qb +no +Co +Co +Co +no UZ "} (251,1,1) = {" @@ -27957,31 +30585,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +yr +GG +yr +oy +OW +sB +OW +OW +OW +OW +OW +sB +OW +OW +OW +OW +OW +sB +OW +oy +yr +GG +yr +no UZ "} (252,1,1) = {" @@ -28068,31 +30696,31 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no +no UZ "} (253,1,1) = {" diff --git a/_maps/RandomRooms/backstreetlayout/lcorp_backstreets.dmm b/_maps/RandomRooms/backstreetlayout/lcorp_backstreets.dmm index 657431783926..47f248a392de 100644 --- a/_maps/RandomRooms/backstreetlayout/lcorp_backstreets.dmm +++ b/_maps/RandomRooms/backstreetlayout/lcorp_backstreets.dmm @@ -183,7 +183,6 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/insectguts, -/mob/living/simple_animal/hostile/ordeal/indigo_dawn/invis, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "ba" = ( @@ -497,7 +496,12 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/red_shoe, +/mob/living/simple_animal/hostile/red_shoe{ + melee_damage_lower = 18; + melee_damage_upper = 18; + health = 400; + maxHealth = 400 + }, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "dq" = ( @@ -855,8 +859,8 @@ /area/city/backstreets_room) "fx" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/portal/permanent/one_way/one_use{ - id = "exit_4" +/obj/effect/portal/permanent/one_way{ + id = "exit_2" }, /turf/open/floor/facility/halls, /area/city/backstreets_room) @@ -1124,7 +1128,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/yagaslave, +/mob/living/simple_animal/hostile/yagaslave{ + melee_damage_lower = 10; + melee_damage_upper = 12 + }, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "hn" = ( @@ -1134,6 +1141,12 @@ /obj/item/powered_gadget/detector_gadget/abnormality, /turf/open/floor/carpet/orange, /area/city/backstreets_room) +"ho" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/garbage, +/obj/effect/mob_spawn/human/skeleton/alive, +/turf/open/floor/facility/halls, +/area/city/backstreets_room) "hp" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/layer1, @@ -1244,7 +1257,10 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/yagaslave, +/mob/living/simple_animal/hostile/yagaslave{ + melee_damage_lower = 10; + melee_damage_upper = 12 + }, /turf/open/floor/facility/halls, /area/city/backstreets_room) "ib" = ( @@ -1279,6 +1295,8 @@ }, /obj/item/clothing/suit/armor/ego_gear/teth/bean, /obj/item/clothing/suit/armor/ego_gear/teth/bean, +/obj/item/reagent_containers/hypospray/medipen/salacid, +/obj/item/reagent_containers/hypospray/medipen/salacid, /turf/open/floor/carpet/orange, /area/city/backstreets_room) "ii" = ( @@ -2541,7 +2559,10 @@ /obj/effect/turf_decal/siding/purple, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/yagaslave, +/mob/living/simple_animal/hostile/yagaslave{ + melee_damage_lower = 10; + melee_damage_upper = 12 + }, /turf/open/floor/facility/halls, /area/city/backstreets_room) "qj" = ( @@ -2583,7 +2604,11 @@ "qt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/bot_red, -/mob/living/simple_animal/hostile/abnormality/bottle, +/mob/living/simple_animal/hostile/abnormality/bottle{ + maxHealth = 400; + health = 400; + speak_damage = 4 + }, /turf/open/floor/facility/dark, /area/city/backstreets_room) "qu" = ( @@ -2634,6 +2659,8 @@ /obj/item/refiner_filter/blue, /obj/item/refiner_filter/blue, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/reagent_containers/hypospray/medipen/salacid, +/obj/item/reagent_containers/hypospray/medipen/salacid, /turf/open/floor/facility/halls, /area/city/backstreets_room) "qK" = ( @@ -2792,7 +2819,10 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion, +/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion{ + health = 110; + maxHealth = 110 + }, /turf/open/floor/facility/halls, /area/city/backstreets_room) "rv" = ( @@ -2804,13 +2834,11 @@ /turf/open/floor/facility/halls, /area/city/backstreets_room) "rx" = ( -/obj/machinery/light/broken{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/indigo_dawn/invis, -/turf/open/floor/facility/halls, -/area/city/backstreets_room) +/obj/item/coin/gold, +/obj/item/reagent_containers/hypospray/medipen/mental, +/turf/open/floor/plating/dirt, +/area/city/backstreets_alley) "rz" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -2883,6 +2911,8 @@ info = "

Subject T-01-118-W or General Bee appears like a humanoid shaped bee wearing a blue military cap. Looking across this abnormality you can see it has a noticeable number of wounds like broken wings, legs, a missing eye and many others.

It appears that T-01-118-W is related to T-04-50-W from the main branch. Agents sometimes report how T-01-118-W starts talks about T-04-50-W and how it will eventually break out of here and return to them.

Across the day if T-01-118-W in high spirits they will start chanting a set of commands into a radio in their hand. This will cause a small set of pods to drop off around the facility containing 10 ft tall bees wearing simple armor.

For that reason, It is recommended for all agents who work with T-01-118-W to never show any signs of weakness or give them any hope of being able to get out of here.

Yet another day I am trapped on enemy territory… However, It does seem like they are losing members! I am also noticing how there are now cracks forming around the walls. That could lead to a good sign of them…

Okay, I know just grasping for straws, I am constantly asking for help from her everyday… Yet I am getting less and less troops to try to save me… I can’t be forgotten that easily, Right? I was her pride and joy, The hope for the army to keep moving forward.

I am looking at the time passing… It has been 2 weeks since they have sent anyone. Did something happen? Are they, Giving up? No, It can’t be… I am the key part of their system, It’s not like they can replace me. I- I am a General of Squad Alpha, The most powerful sector… No, I just need to focus on keeping myself calm. Then they will come eventually and save me.

Months… It has been Months since anyone came… What did they- No, What did I do, Which is causing them to forget? I am calling them at exactly 4:00pm as always, Yet there is no one to answer… How is the queen doing? How is she forgetting me… I was her- Maybe I was that replaceable… No, I can’t be! After all, She did call m- She called all of the bees like that.

A Year… Why am I writing… That is the point in writing such logs… I am a worthless, useless bee to the queen… She must be having a wonderful time, Living her life to the fullest. What about all of the ones who did come to save me… What was the point in them coming here? Nothing ever changed due to their arrival… Lives thrown away to recover a bee which is worthless the queen…

Project Diminish Light: Success

"; name = "T-01-118-W Info" }, +/obj/item/reagent_containers/hypospray/medipen/salacid, +/obj/item/reagent_containers/hypospray/medipen/mental, /turf/open/floor/plasteel/white, /area/city/backstreets_room) "rV" = ( @@ -3294,6 +3324,8 @@ /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/lootcrate/l_corp, +/obj/item/reagent_containers/hypospray/medipen/salacid, +/obj/item/reagent_containers/hypospray/medipen/salacid, /turf/open/floor/facility/halls, /area/city/backstreets_room) "uJ" = ( @@ -3574,13 +3606,10 @@ /turf/open/floor/facility/dark, /area/city/backstreets_room) "ww" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 5 - }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/indigo_dawn/invis, -/turf/open/floor/carpet/purple, -/area/city/backstreets_room) +/obj/item/reagent_containers/hypospray/medipen/mental, +/turf/open/floor/plating/dirt, +/area/city/backstreets_alley) "wy" = ( /obj/machinery/computer/abnormality{ dir = 1 @@ -3616,8 +3645,8 @@ /area/city/backstreets_room) "wR" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/portal/permanent/one_way/one_use{ - id = "exit_3" +/obj/effect/portal/permanent/one_way{ + id = "exit_4" }, /turf/open/floor/facility/halls, /area/city/backstreets_room) @@ -3909,11 +3938,13 @@ /turf/open/floor/facility/halls, /area/city/backstreets_room) "zh" = ( -/obj/structure/rack, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/gun/ego_gun/loyalty, -/turf/open/floor/facility/halls, -/area/city/backstreets_room) +/obj/item/reagent_containers/hypospray/medipen/mental, +/obj/item/reagent_containers/hypospray/medipen/mental, +/obj/item/reagent_containers/hypospray/medipen/mental, +/obj/item/reagent_containers/hypospray/medipen/mental, +/turf/open/floor/plating/dirt, +/area/city/backstreets_alley) "zk" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -4099,8 +4130,9 @@ "AD" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ordeal/white_lake_corrosion{ - sweep_damage = 30; - health = 1500 + sweep_damage = 15; + health = 1000; + maxHealth = 1000 }, /turf/open/floor/carpet/green, /area/city/backstreets_room) @@ -4281,7 +4313,12 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/old, /obj/item/trash/waffles, -/mob/living/simple_animal/hostile/red_shoe, +/mob/living/simple_animal/hostile/red_shoe{ + melee_damage_lower = 18; + melee_damage_upper = 18; + health = 400; + maxHealth = 400 + }, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "BP" = ( @@ -4372,7 +4409,10 @@ "Cy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/insectguts, -/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion, +/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion{ + health = 110; + maxHealth = 110 + }, /turf/open/floor/plating, /area/city/backstreets_room) "CC" = ( @@ -4500,7 +4540,10 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion, +/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion{ + health = 110; + maxHealth = 110 + }, /turf/open/floor/facility/halls, /area/city/backstreets_room) "DA" = ( @@ -4556,6 +4599,8 @@ /obj/item/refiner_filter/yellow, /obj/item/refiner_filter/yellow, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/reagent_containers/hypospray/medipen/mental, +/obj/item/reagent_containers/hypospray/medipen/mental, /turf/open/floor/facility/halls, /area/city/backstreets_room) "DO" = ( @@ -4809,7 +4854,6 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/indigo_dawn/invis, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "Fj" = ( @@ -5219,7 +5263,10 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/item/trash/popcorn, -/mob/living/simple_animal/hostile/yagaslave, +/mob/living/simple_animal/hostile/yagaslave{ + melee_damage_lower = 10; + melee_damage_upper = 12 + }, /turf/open/floor/facility/halls, /area/city/backstreets_room) "HX" = ( @@ -5251,9 +5298,10 @@ /area/city/backstreets_room) "If" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/indigo_dawn/invis, -/turf/open/floor/facility/halls, -/area/city/backstreets_room) +/obj/item/coin/gold, +/obj/item/reagent_containers/hypospray/medipen/salacid, +/turf/open/floor/plating/dirt, +/area/city/backstreets_alley) "Ii" = ( /turf/open/floor/carpet/red, /area/city/backstreets_room) @@ -5339,6 +5387,8 @@ }, /obj/structure/table/glass, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/reagent_containers/hypospray/medipen/mental, +/obj/item/reagent_containers/hypospray/medipen/mental, /turf/open/floor/facility/halls, /area/city/backstreets_room) "IS" = ( @@ -5928,7 +5978,7 @@ /area/city/backstreets_room) "MM" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/portal/permanent/one_way/one_use{ +/obj/effect/portal/permanent/one_way{ id = "exit_1" }, /turf/open/floor/facility/halls, @@ -6387,7 +6437,12 @@ /area/city/backstreets_room) "PW" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/red_shoe, +/mob/living/simple_animal/hostile/red_shoe{ + melee_damage_lower = 18; + melee_damage_upper = 18; + health = 400; + maxHealth = 400 + }, /turf/open/floor/facility/halls, /area/city/backstreets_room) "PZ" = ( @@ -6609,6 +6664,7 @@ /obj/effect/decal/cleanable/insectguts, /obj/item/coin/gold, /obj/item/coin/gold, +/obj/item/reagent_containers/hypospray/medipen/salacid, /turf/open/floor/plating/dirt, /area/city/backstreets_alley) "Rp" = ( @@ -6647,7 +6703,12 @@ /area/city/backstreets_room) "Rv" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/red_shoe, +/mob/living/simple_animal/hostile/red_shoe{ + melee_damage_lower = 18; + melee_damage_upper = 18; + health = 400; + maxHealth = 400 + }, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "Rx" = ( @@ -6697,7 +6758,10 @@ "RR" = ( /obj/effect/turf_decal/siding/purple, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/yagaslave, +/mob/living/simple_animal/hostile/yagaslave{ + melee_damage_lower = 10; + melee_damage_upper = 12 + }, /turf/open/floor/carpet/purple, /area/city/backstreets_room) "RT" = ( @@ -6713,8 +6777,8 @@ /area/city/backstreets_room) "RY" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/portal/permanent/one_way/one_use{ - id = "exit_2" +/obj/effect/portal/permanent/one_way{ + id = "exit_3" }, /turf/open/floor/facility/halls, /area/city/backstreets_room) @@ -6797,14 +6861,17 @@ /turf/open/floor/plasteel/elevatorshaft, /area/city/backstreets_room) "SP" = ( -/obj/effect/turf_decal/siding/purple, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/indigo_dawn/invis, -/turf/open/floor/carpet/purple, -/area/city/backstreets_room) +/obj/item/reagent_containers/hypospray/medipen/salacid, +/turf/open/floor/plating/dirt, +/area/city/backstreets_alley) "SR" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/glass, +/obj/item/reagent_containers/hypospray/medipen/mental, +/obj/item/reagent_containers/hypospray/medipen/mental, +/obj/item/reagent_containers/hypospray/medipen/salacid, +/obj/item/reagent_containers/hypospray/medipen/salacid, /turf/open/floor/plasteel/white, /area/city/backstreets_room) "ST" = ( @@ -6853,7 +6920,10 @@ "Ti" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion, +/mob/living/simple_animal/hostile/ordeal/beanstalk_corrosion{ + health = 110; + maxHealth = 110 + }, /turf/open/floor/plating, /area/city/backstreets_room) "Tj" = ( @@ -7123,6 +7193,8 @@ /obj/item/storage/toolbox/electrical, /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, +/obj/item/reagent_containers/hypospray/medipen/mental, +/obj/item/reagent_containers/hypospray/medipen/mental, /turf/open/floor/plating, /area/city/backstreets_room) "UR" = ( @@ -7660,8 +7732,8 @@ /area/city/backstreets_room) "Yn" = ( /obj/structure/rack, -/obj/item/gun/ego_gun/pistol/oceanic, -/obj/item/gun/ego_gun/pistol/oceanic, +/obj/item/ego_weapon/ranged/pistol/oceanic, +/obj/item/ego_weapon/ranged/pistol/oceanic, /turf/open/floor/facility/halls, /area/city/backstreets_room) "Yr" = ( @@ -7728,10 +7800,8 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, -/obj/item/gun/ego_gun/pistol/nightshade, -/obj/item/gun/ego_gun/pistol/nightshade, -/obj/item/gun/ego_gun/pistol/nightshade, -/obj/item/gun/ego_gun/pistol/nightshade, +/obj/item/ego_weapon/ranged/pistol/nightshade, +/obj/item/ego_weapon/ranged/pistol/nightshade, /turf/open/floor/facility/halls, /area/city/backstreets_room) "YG" = ( @@ -8197,7 +8267,7 @@ Ox Ox Ox Ox -Ox +zh pB OP kI @@ -8307,7 +8377,7 @@ YR YR YR Ox -Ox +SP Ox Ox OP @@ -8419,7 +8489,7 @@ OP OP OP Ox -Ox +ww Ox YR YR @@ -8530,7 +8600,7 @@ xd OP OP YR -Ox +SP Ox Yc YR @@ -8642,7 +8712,7 @@ OP OP YR Ox -Ox +ww Ox YR OP @@ -8754,7 +8824,7 @@ OP YR YR Ox -Ox +SP yv OP kI @@ -12300,7 +12370,7 @@ JE YR YR Se -sm +If Rm OP kI @@ -12409,7 +12479,7 @@ fB kq BP Ox -sm +rx dq sZ Yc @@ -12515,12 +12585,12 @@ qq Rx qq nl -zh +zx GR Vh BP QQ -sm +rx sm Yc YR @@ -30406,7 +30476,7 @@ GR GR GR GR -If +GR GR GR GR @@ -30626,7 +30696,7 @@ JE JE JE JE -rx +vk GR cm JE @@ -31167,7 +31237,7 @@ WX ct EE yB -SP +sO GR Zh GR @@ -32641,8 +32711,8 @@ JE lu IN BN -oL -rb +GR +ho JE kI kI @@ -34638,7 +34708,7 @@ GR oL JE bf -ww +vJ VC Ew Yd @@ -35177,7 +35247,7 @@ GR GR GR GR -If +GR GR GR ne @@ -35401,7 +35471,7 @@ GR GR GR GR -If +GR GR GR GR diff --git a/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm b/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm new file mode 100644 index 000000000000..8e2daa79081f --- /dev/null +++ b/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm @@ -0,0 +1,30075 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ai" = ( +/obj/structure/chair/pew/left{ + dir = 1 + }, +/turf/open/floor/material, +/area/city/backstreets_alley) +"as" = ( +/obj/structure/statue/bone/skull/half, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"ay" = ( +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"aL" = ( +/obj/structure/closet/crate/bin, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"aQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"aU" = ( +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"aW" = ( +/obj/item/flashlight/lantern{ + on = 1; + color = "#cb3dff"; + anchored = 1 + }, +/turf/open/floor/stone{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"aX" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"bg" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"bj" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/city/backstreets_alley) +"bm" = ( +/obj/machinery/door/airlock/cult/friendly, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"bo" = ( +/obj/effect/spawner/room/backstreets/medium_south, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"bx" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"by" = ( +/obj/structure/flora/ash/leaf_shroom, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"bz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/material, +/area/city/backstreets_alley) +"bG" = ( +/obj/effect/spawner/room/backstreets/medium_west, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"bM" = ( +/obj/effect/spawner/room/backstreets/medium_south, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"bV" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"cb" = ( +/obj/machinery/iv_drip, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"cm" = ( +/obj/structure/chair/pew, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, +/turf/open/floor/material, +/area/city/backstreets_alley) +"cv" = ( +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"cy" = ( +/obj/structure/table/wood/fancy/red, +/obj/machinery/button/door/indestructible{ + id = "area2"; + name = "Area 2 Lockdown Button"; + pixel_y = 7; + req_access_txt = null + }, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"cz" = ( +/obj/effect/spawner/room/backstreets/medium_south, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"cI" = ( +/turf/open/floor/plasteel/chapel, +/area/city/backstreets_alley) +"cN" = ( +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"cS" = ( +/obj/machinery/vending/medical, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 18 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"cX" = ( +/obj/structure/mineral_door/iron, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"dA" = ( +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_alley) +"dI" = ( +/obj/structure/fluff/paper/stack, +/obj/structure/table/wood/fancy/black, +/turf/open/floor/plasteel/chapel, +/area/city/backstreets_alley) +"ef" = ( +/obj/machinery/door/poddoor{ + id = "area3"; + name = "Area 3 Lockdown Door"; + color = "#990012" + }, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"en" = ( +/obj/structure/railing, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/lootcrate/money, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"eu" = ( +/obj/structure/table/abductor, +/obj/item/clothing/under/dress/skirt/purple, +/obj/item/clothing/under/dress/skirt/purple, +/obj/item/clothing/gloves/color/purple, +/obj/item/clothing/gloves/color/purple, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"ev" = ( +/mob/living/simple_animal/hostile/ordeal/steel_dusk, +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"eI" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"fs" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"fE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"fP" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"fW" = ( +/obj/item/flashlight/lantern{ + on = 1; + color = "#ff3d40"; + anchored = 1 + }, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_alley) +"gh" = ( +/obj/structure/curtain/bounty, +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/city/backstreets_alley) +"gl" = ( +/obj/structure/healingfountain, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"gu" = ( +/obj/structure/fluff/paper/stack, +/obj/structure/fluff/divine/convertaltar{ + density = 1 + }, +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/city/backstreets_alley) +"gz" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"gB" = ( +/obj/structure/safe, +/obj/item/folder/syndicate/blue, +/obj/item/folder/syndicate/blue, +/obj/item/folder/syndicate/red, +/obj/item/folder/blue, +/obj/item/folder/blue, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"gE" = ( +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/city/backstreets_alley) +"gS" = ( +/obj/structure/closet/secure_closet/armory1{ + dir = 4 + }, +/obj/item/ego_weapon/city/kcorp/spear, +/obj/item/ego_weapon/ranged/pistol/kcorp/smg, +/obj/item/clothing/under/rank/k_corporation/officer, +/obj/item/clothing/under/rank/k_corporation/officer, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"ha" = ( +/obj/effect/spawner/room/backstreets/medium_east, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"hA" = ( +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"hF" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/city/backstreets_alley) +"hJ" = ( +/obj/structure/table/abductor, +/obj/item/clothing/under/dress/skirt/purple, +/obj/item/clothing/under/dress/skirt/purple, +/obj/item/clothing/under/dress/skirt/purple, +/obj/item/clothing/gloves/color/purple, +/obj/item/clothing/gloves/color/purple, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"ic" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 1 + }, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"in" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"io" = ( +/obj/effect/spawner/room/backstreets/large_north, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"ip" = ( +/obj/effect/spawner/room/backstreets/large_south, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"iq" = ( +/obj/structure/curtain/bounty, +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"it" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, +/turf/open/floor/material, +/area/city/backstreets_alley) +"iw" = ( +/mob/living/simple_animal/hostile/ordeal/indigo_dawn/skirmisher, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"iA" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel, +/area/city/backstreets_alley) +"jh" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical{ + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"ji" = ( +/obj/structure/railing, +/obj/structure/lootcrate/money, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"jk" = ( +/obj/structure/railing, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel/dark/side, +/area/city/backstreets_alley) +"jn" = ( +/turf/open/floor/wood{ + color = "#990012" + }, +/area/city/backstreets_alley) +"jr" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/chair/pew, +/turf/open/floor/material, +/area/city/backstreets_alley) +"jz" = ( +/obj/machinery/modular_computer/console/preset/research, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"jU" = ( +/obj/effect/landmark/backstreetspawnwest, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"kg" = ( +/obj/effect/rune, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"kk" = ( +/obj/effect/spawner/room/backstreets/small_north, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"kz" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/machinery/light/dim{ + dir = 4 + }, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"kI" = ( +/obj/structure/curtain, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"kT" = ( +/obj/structure/table/abductor, +/obj/item/clothing/under/color/lightpurple, +/obj/item/clothing/under/color/lightpurple, +/obj/item/clothing/suit/apron/purple_bartender, +/obj/item/clothing/suit/apron/purple_bartender, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"kW" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/chapel, +/area/city/backstreets_alley) +"kZ" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"le" = ( +/obj/structure/railing, +/obj/structure/lootcrate/limbus, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"lE" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/effect/mine/explosive, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"mb" = ( +/obj/effect/decal/cleanable/blood, +/mob/living/simple_animal/hostile/ordeal/indigo_dawn/skirmisher, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"mc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/city/backstreets_alley) +"mh" = ( +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"ml" = ( +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"mv" = ( +/obj/item/flashlight/lantern{ + on = 1; + color = "#ff3d40"; + anchored = 1 + }, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"mw" = ( +/obj/structure/flora/ash/fern, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"mE" = ( +/obj/effect/turf_decal/plaque{ + desc = "Behold, a strange creature taken from the outskirts!" + }, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"mH" = ( +/obj/structure/flora/stump, +/turf/open/floor/plating/ashplanet/ash{ + color = "#787878" + }, +/area/city/backstreets_alley) +"mO" = ( +/obj/structure/chair/pew/left, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, +/turf/open/floor/material, +/area/city/backstreets_alley) +"mP" = ( +/obj/structure/table/optable, +/obj/effect/decal/cleanable/blood, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"mR" = ( +/obj/effect/spawner/randomcolavend, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"mX" = ( +/obj/machinery/iv_drip, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"nl" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"ns" = ( +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"nM" = ( +/obj/effect/spawner/room/backstreets/medium_north, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"ok" = ( +/obj/structure/curtain, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"on" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/material, +/area/city/backstreets_alley) +"ow" = ( +/obj/effect/spawner/room/backstreets/small_east, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"oQ" = ( +/obj/structure/table/wood/fancy/red, +/obj/effect/landmark/cratespawn, +/obj/effect/landmark/cratespawn, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"pe" = ( +/obj/effect/rune, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"pf" = ( +/obj/structure/dresser, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"pF" = ( +/obj/structure/chair/pew/right{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"pH" = ( +/obj/effect/spawner/room/backstreets/medium_north, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"pL" = ( +/obj/effect/spawner/room/backstreets/medium_west, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"pM" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/city/backstreets_alley) +"pX" = ( +/obj/effect/spawner/room/backstreets/small_south, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"qh" = ( +/obj/effect/spawner/room/backstreets/medium_east, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"qo" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"qJ" = ( +/obj/structure/curtain, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"qU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"re" = ( +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"rn" = ( +/obj/structure/table/optable, +/obj/effect/decal/cleanable/blood, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"rw" = ( +/obj/structure/fluff/paper/stack, +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/city/backstreets_alley) +"ry" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/chapel, +/area/city/backstreets_alley) +"rM" = ( +/obj/effect/spawner/room/backstreets/large_south, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"rN" = ( +/obj/item/flashlight/lantern{ + on = 1; + color = "#ff3d40"; + anchored = 1 + }, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"rQ" = ( +/obj/effect/spawner/randomsnackvend, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"sb" = ( +/obj/structure/headpike, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"sl" = ( +/obj/structure/table/reinforced, +/obj/item/organ_storage, +/obj/item/storage/organbox, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"so" = ( +/obj/structure/bed/pod, +/obj/item/bedsheet/hos, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"sw" = ( +/obj/structure/table/wood/fancy/red, +/obj/structure/lootcrate/money, +/obj/structure/lootcrate/money, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"sP" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/turf/open/floor/material, +/area/city/backstreets_alley) +"ts" = ( +/obj/structure/flora/rock{ + color = "#c963ff" + }, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"tC" = ( +/obj/structure/chair/pew/right{ + dir = 1 + }, +/turf/open/floor/material, +/area/city/backstreets_alley) +"tF" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"tJ" = ( +/turf/open/floor/stone{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"tL" = ( +/obj/structure/table/wood/fancy/red, +/obj/effect/rune, +/obj/structure/lootcrate/money, +/obj/structure/lootcrate/money, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"tO" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"tV" = ( +/obj/structure/closet/crate/freezer/blood, +/turf/open/floor/material, +/area/city/backstreets_alley) +"ur" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"uu" = ( +/obj/structure/necropolis_arch, +/obj/structure/necropolis_gate/legion_gate, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_alley) +"uz" = ( +/obj/structure/curtain, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"uC" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/rune, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"uJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"uR" = ( +/obj/machinery/vending/autodrobe/all_access, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"va" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"vm" = ( +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"vB" = ( +/obj/structure/table/wood/fancy/red, +/obj/effect/landmark/cratespawn, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"vE" = ( +/obj/structure/curtain, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"vP" = ( +/obj/structure/railing, +/turf/open/floor/plasteel/dark/side, +/area/city/backstreets_alley) +"vQ" = ( +/obj/machinery/door/poddoor{ + id = "area2"; + name = "Area 2 Lockdown Door"; + color = "#990012" + }, +/turf/open/floor/wood{ + color = "#990012" + }, +/area/city/backstreets_alley) +"wi" = ( +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"wp" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lootcrate/money, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"wq" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/city/backstreets_alley) +"wr" = ( +/obj/structure/statue/bone/rib, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"xg" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/lootcrate/limbus, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"xk" = ( +/obj/machinery/computer/operating{ + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"xq" = ( +/obj/structure/meatfloor, +/obj/structure/table/wood/fancy/red, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"xr" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/curtain/bounty, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"xO" = ( +/obj/machinery/computer/operating{ + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"xZ" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"yh" = ( +/mob/living/simple_animal/hostile/morph, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"yk" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"yK" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/lootcrate/limbus, +/turf/open/floor/material, +/area/city/backstreets_alley) +"yM" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"yP" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 4 + }, +/area/city/backstreets_alley) +"zj" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/machinery/light/dim{ + dir = 8; + pixel_x = null; + pixel_y = null + }, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"zm" = ( +/obj/effect/landmark/backstreetspawneast, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"zn" = ( +/obj/item/flashlight/lantern{ + on = 1; + anchored = 1 + }, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"zv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"zD" = ( +/obj/structure/closet/crate/bin, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"zJ" = ( +/obj/structure/flora/tree/dead, +/turf/open/floor/plating/ashplanet/ash{ + color = "#787878" + }, +/area/city/backstreets_alley) +"zY" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/city/backstreets_alley) +"Aa" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"Ae" = ( +/obj/structure/chair/pew/right{ + dir = 8 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/chapel, +/area/city/backstreets_alley) +"Ai" = ( +/obj/structure/curtain, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"Am" = ( +/obj/effect/spawner/room/backstreets/medium_west, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"An" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"AF" = ( +/turf/open/floor/material, +/area/city/backstreets_alley) +"AH" = ( +/obj/effect/spawner/randomcolavend, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"AO" = ( +/obj/structure/dresser, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"AU" = ( +/mob/living/simple_animal/hostile/asteroid/goliath/beast{ + faction = list("neutral") + }, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"AW" = ( +/obj/effect/decal/cleanable/blood, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"Bl" = ( +/obj/machinery/vending/medical, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 18 + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"Bm" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/machinery/light/dim{ + dir = 8; + pixel_x = null; + pixel_y = null + }, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"Bo" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"Br" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"Bt" = ( +/mob/living/simple_animal/hostile/ordeal/indigo_noon, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"BH" = ( +/mob/living/simple_animal/hostile/carp/megacarp{ + faction = list("neutral") + }, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"BJ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/city/backstreets_alley) +"BM" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"BO" = ( +/obj/effect/rune, +/mob/living/simple_animal/hostile/ordeal/indigo_noon, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"Cd" = ( +/obj/structure/table/wood/fancy/red, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"Co" = ( +/obj/machinery/computer/operating{ + dir = 4 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"CB" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"CC" = ( +/obj/item/statuebust/hippocratic, +/turf/open/floor/material, +/area/city/backstreets_alley) +"CE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"Dj" = ( +/obj/structure/headpike, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"DC" = ( +/turf/open/floor/stone, +/area/city/backstreets_alley) +"DL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"DS" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"EA" = ( +/obj/effect/landmark/backstreetspawnwest, +/turf/open/floor/wood{ + color = "#990012" + }, +/area/city/backstreets_alley) +"ER" = ( +/obj/machinery/vending/medical, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 18 + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"Fc" = ( +/obj/structure/fluff/paper/stack, +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"Fn" = ( +/obj/structure/headpike, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"FB" = ( +/obj/item/flashlight/lantern{ + on = 1; + color = "#cb3dff"; + anchored = 1 + }, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"FE" = ( +/obj/effect/spawner/room/backstreets/small_north, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"FJ" = ( +/obj/machinery/vending/wardrobe/jani_wardrobe, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"FM" = ( +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"FV" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/machinery/light/dim{ + dir = 4 + }, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"Gk" = ( +/obj/machinery/door/poddoor{ + id = "area4"; + name = "??? Lockdown Door"; + color = "#990012" + }, +/turf/open/floor/stone{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"Gm" = ( +/obj/item/flashlight/lantern{ + on = 1; + color = "#ff3d40"; + anchored = 1 + }, +/turf/open/floor/wood{ + color = "#990012" + }, +/area/city/backstreets_alley) +"Gp" = ( +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"Ha" = ( +/obj/structure/spirit_board, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"Hs" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 1 + }, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"HD" = ( +/obj/structure/railing/corner, +/turf/open/floor/plasteel/dark/corner, +/area/city/backstreets_alley) +"HE" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"HP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"Ic" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"Ih" = ( +/obj/structure/meatfloor, +/obj/structure/dresser, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"It" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"IN" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/material, +/area/city/backstreets_alley) +"IU" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"Jf" = ( +/obj/structure/chair/pew/right, +/turf/open/floor/material, +/area/city/backstreets_alley) +"Jj" = ( +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"Jm" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical{ + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"Jt" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"JJ" = ( +/obj/structure/chair/pew, +/turf/open/floor/material, +/area/city/backstreets_alley) +"JZ" = ( +/obj/structure/table/wood/fancy/red, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"Kg" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 1 + }, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"Kj" = ( +/obj/structure/meatfloor, +/obj/structure/meatfloor, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"Kk" = ( +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"KM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/mineral_door/iron, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"KQ" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"KR" = ( +/obj/effect/spawner/room/backstreets/small_west, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"KZ" = ( +/obj/effect/spawner/randomsnackvend, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"Ld" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"Le" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"Lf" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/city/backstreets_alley) +"Lh" = ( +/obj/effect/spawner/room/backstreets/small_south, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"Ll" = ( +/obj/item/flashlight/lantern{ + on = 1; + anchored = 1 + }, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"Lp" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"Lq" = ( +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_alley) +"Lu" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/material, +/area/city/backstreets_alley) +"LB" = ( +/obj/machinery/door/airlock/cult/friendly, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"LM" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lootcrate/limbus, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"LQ" = ( +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"LX" = ( +/obj/effect/spawner/room/backstreets/medium_north, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"LY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"Mx" = ( +/obj/structure/table/reinforced, +/obj/item/organ_storage, +/obj/item/storage/organbox, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"My" = ( +/obj/structure/statue/bone/skull/half{ + dir = 1 + }, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"MH" = ( +/obj/structure/railing, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"MI" = ( +/obj/effect/portal/permanent{ + color = "#990012"; + name = "Welcome to La Macha Land..."; + id = "bloodfiends" + }, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_alley) +"MW" = ( +/obj/effect/portal/permanent{ + color = "#990012"; + name = "Welcome to La Macha Land..."; + id = "bloodfiends" + }, +/turf/open/floor/wood{ + color = "#990012" + }, +/area/city/backstreets_alley) +"Nc" = ( +/obj/effect/spawner/room/backstreets/small_west, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"Ne" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"Ni" = ( +/obj/structure/ash_walker_eggshell, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"Nj" = ( +/obj/structure/statue/bone/rib, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"NN" = ( +/obj/structure/flora/rock/pile{ + color = "#c963ff" + }, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"NS" = ( +/obj/structure/chair/pew/right{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel, +/area/city/backstreets_alley) +"Oa" = ( +/obj/structure/bed/pod, +/obj/item/bedsheet/rd, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"Ob" = ( +/obj/machinery/iv_drip, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/showroomfloor, +/area/city/backstreets_alley) +"Og" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"Oo" = ( +/obj/structure/fluff/paper/stack, +/obj/structure/chair/pew{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"Os" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"OY" = ( +/obj/effect/spawner/room/backstreets/small_south, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_alley) +"Pb" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 1 + }, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"Ph" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"Pp" = ( +/obj/structure/fluff/divine/convertaltar{ + density = 1 + }, +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"PC" = ( +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/machinery/light/dim{ + dir = 4 + }, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"PD" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"PG" = ( +/obj/structure/stairs, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"PK" = ( +/obj/structure/table/wood/fancy/purple, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"PV" = ( +/mob/living/simple_animal/hostile/blob/blobspore/weak{ + faction = list("neutral") + }, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"Qa" = ( +/obj/effect/decal/cleanable/glass, +/turf/open/floor/material, +/area/city/backstreets_alley) +"QG" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/lootcrate/limbus, +/obj/structure/lootcrate/limbus, +/turf/open/floor/material, +/area/city/backstreets_alley) +"QR" = ( +/obj/structure/curtain/bounty, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"Rh" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/plasteel/sepia{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"Rj" = ( +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_alley) +"Rl" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"Rp" = ( +/obj/effect/landmark/backstreetspawn, +/turf/open/floor/stone{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"Rx" = ( +/obj/effect/spawner/room/backstreets/small_west, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"RG" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"RN" = ( +/obj/structure/mannequin{ + anchored = 1 + }, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"Sd" = ( +/obj/machinery/atmospherics/components/unary/cryo_cell{ + plane = 0 + }, +/mob/living/carbon/human{ + anchored = 1; + pixel_y = 24 + }, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"Sn" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"SJ" = ( +/turf/closed/indestructible/rock, +/area/space) +"Tc" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/lootcrate/money, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"Tg" = ( +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"TK" = ( +/mob/living/simple_animal/hostile/ordeal/indigo_dusk/red, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) +"TX" = ( +/obj/machinery/light/warm, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"Uj" = ( +/obj/structure/headpike, +/turf/open/floor/plating/ashplanet/ash{ + color = "#787878" + }, +/area/city/backstreets_alley) +"Uo" = ( +/obj/structure/bed, +/obj/item/bedsheet/chaplain, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"Ux" = ( +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/machinery/light/dim{ + dir = 8; + pixel_x = null; + pixel_y = null + }, +/turf/open/floor/plasteel/sepia, +/area/city/backstreets_alley) +"UC" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/button/door/indestructible{ + id = "area3"; + name = "Area 3 Lockdown Button"; + pixel_y = 7; + req_access_txt = null + }, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, +/area/city/backstreets_alley) +"UG" = ( +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"UM" = ( +/obj/effect/spawner/room/backstreets/bossroom, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"Va" = ( +/obj/effect/spawner/room/backstreets/small_east, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"Vj" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_alley) +"Vl" = ( +/obj/effect/spawner/structure/window/reinforced{ + color = "#c963ff" + }, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"Vp" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"Vz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/wood/fancy/purple, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"VG" = ( +/obj/structure/table/reinforced, +/obj/item/organ_storage, +/obj/item/storage/organbox, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"VJ" = ( +/obj/structure/table/optable, +/obj/effect/decal/cleanable/blood, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"VV" = ( +/obj/machinery/door/airlock/survival_pod/glass, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"WD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"WO" = ( +/obj/structure/table/abductor, +/obj/item/clothing/under/dress/skirt/purple, +/obj/item/clothing/under/dress/skirt/purple, +/turf/open/floor/carpet/purple, +/area/city/backstreets_alley) +"WP" = ( +/obj/structure/falsewall/iron, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"WT" = ( +/obj/structure/stairs/west, +/obj/structure/curtain/bounty, +/turf/open/floor/plating/ashplanet/ash{ + color = "#787878" + }, +/area/city/backstreets_alley) +"WU" = ( +/obj/structure/table/wood/fancy/royalblack, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"WW" = ( +/mob/living/simple_animal/hostile/ordeal/indigo_noon, +/turf/open/floor/carpet/red, +/area/city/backstreets_alley) +"WX" = ( +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_alley) +"Xc" = ( +/obj/structure/mineral_door/iron, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"Xf" = ( +/obj/structure/mineral_door/iron, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"Xh" = ( +/obj/structure/closet/crate/secure/science, +/obj/item/clothing/under/rank/rnd/scientist/skirt, +/obj/item/clothing/under/rank/rnd/scientist, +/obj/item/clothing/head/helmet/space/plasmaman/science, +/obj/item/clothing/glasses/science, +/obj/item/storage/backpack/science, +/obj/item/clothing/under/plasmaman/science, +/turf/open/floor/stone, +/area/city/backstreets_alley) +"Xy" = ( +/obj/structure/closet/crate/freezer/blood, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"XP" = ( +/obj/effect/spawner/room/backstreets/medium_east, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_alley) +"XR" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical{ + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel/showroomfloor{ + color = "#990012" + }, +/area/city/backstreets_alley) +"XT" = ( +/mob/living/simple_animal/hostile/ordeal/indigo_noon, +/turf/open/floor/stone{ + color = "#f06979" + }, +/area/city/backstreets_alley) +"Yr" = ( +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"Yt" = ( +/obj/effect/spawner/room/backstreets/pointofinterest, +/turf/closed/indestructible/reinforced{ + color = "#c963ff" + }, +/area/city/backstreets_alley) +"Yz" = ( +/obj/structure/chair/pew{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/chapel{ + dir = 8 + }, +/area/city/backstreets_alley) +"YA" = ( +/obj/structure/table/reinforced, +/turf/open/floor/carpet/black, +/area/city/backstreets_alley) +"YF" = ( +/turf/open/floor/plasteel/showroomfloor{ + color = "#e29eff" + }, +/area/city/backstreets_alley) +"YG" = ( +/turf/open/floor/plating/ashplanet/ash{ + color = "#787878" + }, +/area/city/backstreets_alley) +"Zc" = ( +/obj/structure/closet/crate/bin, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/sepia{ + color = "#990012" + }, +/area/city/backstreets_alley) +"Zp" = ( +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_alley) +"Zt" = ( +/obj/structure/flora/ash/cacti, +/turf/open/floor/plating/ashplanet/ash{ + color = "#da82ff" + }, +/area/city/backstreets_alley) +"Zu" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/material, +/area/city/backstreets_alley) + +(1,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(2,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +aU +aU +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +aU +aU +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(3,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +aU +YG +YG +YG +YG +YG +YG +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +YG +YG +YG +YG +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +re +re +re +re +re +re +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(4,1,1) = {" +aU +aU +aU +aU +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +YG +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +re +re +jn +jn +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(5,1,1) = {" +aU +aU +aU +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +zJ +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +YG +YG +YG +aU +aU +aU +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(6,1,1) = {" +aU +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +RN +RN +JZ +JZ +PD +PD +pe +re +re +BM +PD +PD +BO +RN +RN +aU +Tg +Tg +Tg +Lp +Tg +Tg +Tg +Tg +LB +Tg +Tg +Tg +Tg +Tg +Nj +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(7,1,1) = {" +aU +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +zJ +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +tL +PD +Ld +PD +PD +re +re +Rl +XT +re +PD +PD +Ld +PD +PD +aU +PD +Tg +Tg +WW +Tg +IU +WW +Tg +aU +IU +Tg +Tg +IU +Lp +Tg +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(8,1,1) = {" +aU +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +YG +YG +aU +aU +aU +re +re +re +re +re +aU +cy +TK +PD +PD +PD +re +re +gl +Pb +ic +Ph +Ph +Ph +Ph +Ph +bm +eI +Hs +Kg +Hs +Hs +Tg +Tg +Tg +aU +Tg +Tg +iw +Tg +Tg +Tg +aU +wr +re +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(9,1,1) = {" +aU +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +vm +YG +YG +aU +aU +aU +re +re +re +re +re +aU +sw +Ld +PD +kg +PD +re +re +re +XT +re +PD +PD +PD +PD +PD +aU +PD +WW +Tg +Tg +WW +Tg +Tg +Tg +aU +Tg +Tg +Tg +Tg +IU +Tg +mv +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(10,1,1) = {" +aU +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +vm +YG +YG +aU +aU +aU +re +re +re +re +re +aU +RN +RN +JZ +JZ +PD +PD +qo +re +re +PD +PD +uC +Bt +RN +RN +aU +RN +Tg +Cd +vB +vB +Tg +Tg +RN +aU +Tg +Tg +Tg +Tg +IU +Tg +LB +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(11,1,1) = {" +aU +aU +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +LX +Uj +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +vm +YG +YG +aU +aU +aU +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +Tg +Tg +WW +Tg +mv +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(12,1,1) = {" +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +DC +YG +YG +vm +CC +AF +HD +Lf +Lf +zY +Lf +Lf +Lf +yP +AF +CC +vm +YG +YG +DC +DC +DC +DC +YG +vm +YG +YG +aU +aU +aU +re +re +re +re +re +aU +Tg +RN +Tg +Tg +RN +Tg +Tg +Tg +Cd +vB +Tg +Tg +Tg +Tg +RN +Tg +Tg +RN +Tg +aU +RN +Tg +Cd +oQ +Tg +RN +aU +iw +Tg +Tg +Tg +aU +wr +re +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(13,1,1) = {" +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +DC +YG +YG +vm +AF +AF +vP +gu +Yr +gE +ev +gE +Pp +hF +AF +AF +vm +YG +YG +DC +DC +DC +DC +YG +vm +YG +YG +aU +aU +aU +re +re +re +re +re +aU +IU +Tg +Tg +Tg +Tg +Tg +Tg +Tg +iw +Tg +Tg +Tg +Tg +Tg +Tg +Tg +Tg +Tg +Tg +AW +IU +Tg +iw +Tg +Tg +Tg +aU +Tg +IU +Tg +Tg +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(14,1,1) = {" +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +DC +YG +YG +vm +Qa +mO +vP +Jj +cI +UC +dI +DS +ry +BJ +ai +AF +vm +YG +YG +DC +DC +zm +DC +YG +vm +vm +YG +YG +aU +aU +re +re +re +re +re +aU +Tg +WW +Tg +IU +Tg +IU +IU +Lp +Tg +Tg +IU +IU +IU +Tg +Tg +iw +Tg +Tg +IU +LB +WW +Tg +Tg +Tg +WW +IU +aU +Tg +Tg +Tg +as +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(15,1,1) = {" +aU +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +Uj +DC +DC +DC +DC +YG +YG +vm +AF +jr +vP +gE +Fc +gE +Yr +rw +Yr +hF +it +Qa +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +aU +aU +re +re +re +re +re +aU +Tg +Tg +Tg +WW +Tg +IU +aU +Tg +Tg +Tg +aU +Tg +Tg +iw +Tg +Lp +Tg +Tg +Tg +aU +Tg +Tg +Tg +mb +Tg +Tg +aU +Tg +IU +IU +My +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(16,1,1) = {" +aU +YG +YG +YG +YG +YG +YG +zJ +YG +YG +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +AF +JJ +jk +KQ +iA +Aa +iA +Aa +Ae +hF +sP +bz +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +aU +aU +re +re +re +re +aU +aU +Tg +Tg +IU +Tg +Tg +RN +aU +vB +vB +Cd +aU +RN +Tg +Tg +Tg +Tg +Tg +Tg +Nj +aU +Nj +Tg +Tg +Tg +Tg +Tg +LB +Tg +Tg +Tg +Tg +aU +re +re +jn +jn +EA +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(17,1,1) = {" +aU +YG +YG +vm +vm +vm +vm +vm +vm +Nc +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +bz +cm +vP +wq +Yz +pM +Os +pM +pF +hF +it +bz +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +aU +aU +aU +aU +mv +LB +mv +aU +aU +aU +aU +aU +AW +aU +aU +mv +LB +mv +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(18,1,1) = {" +aU +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +AF +JJ +vP +CB +iA +Oo +kW +yk +NS +hF +sP +AF +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +re +re +wr +jn +jn +jn +wr +re +re +re +re +re +re +wr +jn +jn +jn +wr +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(19,1,1) = {" +aU +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +AF +Jf +jk +bj +Os +pM +Og +pM +pF +hF +tC +AF +vm +YG +YG +DC +DC +DC +DC +YG +zJ +vm +YG +YG +YG +aU +re +re +re +aU +re +re +re +re +jn +jn +jn +re +re +re +re +re +re +re +re +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +sb +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(20,1,1) = {" +aU +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +Qa +AF +vP +CB +iA +Aa +iA +Aa +NS +BJ +Qa +AF +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +sb +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +xO +rn +mX +vE +bg +tF +Bm +Xy +aU +jn +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(21,1,1) = {" +aU +YG +YG +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +WT +gh +iq +gh +iq +gh +iq +WT +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +zJ +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +EA +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +qU +An +Kk +qJ +mh +bg +bg +mh +bx +jn +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(22,1,1) = {" +aU +YG +zJ +vm +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +YG +vm +hA +hA +hA +Jj +cI +ns +cI +Jj +cI +hA +Zp +hA +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +Ne +Kk +Ne +vE +mh +mh +mh +mh +bx +jn +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(23,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +YG +YG +vm +hA +hA +hA +hA +hA +hA +hA +hA +LY +hA +hA +hA +vm +Uj +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +EA +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +Mx +XR +Bl +qJ +Xy +aQ +FV +Zc +aU +jn +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(24,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +YG +vm +hA +hA +hA +hA +cN +ur +cN +cN +ur +ur +ur +cN +vm +Ll +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +sb +re +re +re +jn +jn +jn +re +jn +jn +jn +re +re +re +sb +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(25,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +cN +ur +ur +cN +cN +cN +Gp +ur +cN +Xf +DC +DC +DC +DC +DC +zm +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +jn +jn +jn +re +jn +jn +jn +re +re +re +re +jn +jn +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(26,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +YG +Uj +DC +DC +DC +Uj +YG +YG +DC +DC +DC +DC +YG +YG +vm +le +hA +cX +cN +It +cN +cN +cN +cN +cN +cN +cN +vm +Ll +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +ha +re +re +re +jn +jn +EA +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +pL +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(27,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +ow +YG +DC +DC +DC +DC +YG +YG +vm +le +hA +vm +hA +CE +cN +Zp +vm +vm +vm +vm +vm +vm +Uj +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(28,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +ji +Vp +vm +hA +ur +cN +fs +vm +hA +hA +PG +AF +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(29,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +en +Vp +vm +hA +cN +cN +fs +vm +hA +Vp +Zu +AF +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(30,1,1) = {" +aU +YG +vm +vm +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +MH +hA +vm +hA +cN +cN +fs +vm +hA +WD +on +tV +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(31,1,1) = {" +aU +YG +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +Uj +vm +vm +vm +vm +hA +cN +cN +in +Le +WD +LY +on +IN +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(32,1,1) = {" +aU +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +DC +Ll +vm +cN +cN +ur +ur +cN +cN +fs +vm +hA +ml +on +yK +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +pX +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +sb +re +re +re +re +re +re +re +re +re +re +re +re +re +sb +jn +jn +jn +jn +re +re +jn +jn +jn +re +re +re +re +re +re +sb +jn +jn +jn +jn +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(33,1,1) = {" +aU +YG +vm +YG +YG +DC +DC +DC +DC +mH +YG +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +DC +DC +Xf +cN +ur +ur +Gp +ur +cN +fs +vm +ml +hA +Zu +QG +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(34,1,1) = {" +aU +aU +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +zJ +YG +DC +DC +DC +DC +DC +Ll +vm +cN +cN +ur +ur +cN +cN +Jt +WP +hA +WD +on +tV +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(35,1,1) = {" +aU +aU +vm +YG +YG +DC +DC +zm +DC +YG +YG +vm +vm +vm +vm +YG +YG +DC +DC +zm +DC +YG +Uj +vm +hA +hA +hA +hA +hA +cN +hA +vm +hA +Bo +Lu +tV +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +EA +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +EA +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(36,1,1) = {" +aU +aU +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +cX +vm +vm +vm +hA +cN +RG +vm +hA +WD +Zu +tV +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +re +re +sb +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(37,1,1) = {" +aU +aU +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +YG +mH +DC +DC +DC +DC +YG +YG +vm +hA +hA +LM +vm +hA +ur +WD +vm +vm +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +re +aU +aU +aU +aU +OY +re +aU +aU +aU +aU +aU +nM +re +re +jn +jn +jn +jn +re +re +re +re +re +re +re +re +re +sb +jn +jn +jn +jn +jn +sb +re +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(38,1,1) = {" +aU +aU +YG +vm +YG +DC +DC +DC +DC +YG +zJ +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +WD +Vp +Tc +vm +hA +cN +cN +xr +cN +Xc +yM +hA +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +re +re +re +re +re +re +re +re +jn +jn +jn +jn +re +re +re +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(39,1,1) = {" +aU +aU +zJ +vm +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +WD +WD +xg +vm +hA +Gp +cN +Le +vm +vm +YA +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +io +jn +jn +jn +re +re +re +re +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(40,1,1) = {" +aU +aU +YG +vm +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +ml +hA +wp +vm +hA +cN +cN +QR +ur +KM +tO +hA +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +re +re +re +re +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(41,1,1) = {" +aU +aU +YG +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +Nc +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +aU +aU +re +re +aU +re +jn +jn +EA +jn +jn +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +re +re +re +re +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(42,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +YG +mH +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +re +re +re +re +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(43,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +YG +vm +zJ +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(44,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +zm +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +re +EA +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(45,1,1) = {" +aU +YG +YG +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +zJ +vm +YG +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(46,1,1) = {" +aU +YG +vm +vm +YG +DC +DC +DC +DC +YG +Uj +DC +DC +DC +Uj +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(47,1,1) = {" +aU +YG +vm +vm +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(48,1,1) = {" +aU +YG +vm +zJ +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +aU +aU +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(49,1,1) = {" +aU +YG +vm +YG +YG +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +mH +YG +YG +Uj +DC +DC +DC +Uj +YG +YG +DC +DC +zm +DC +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +Ih +xq +Kj +Kj +aU +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(50,1,1) = {" +aU +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +YG +YG +vm +vm +vm +vm +vm +vm +ow +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +pX +vm +vm +vm +vm +mH +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +Tg +Tg +Tg +Tg +LB +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +aU +aU +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(51,1,1) = {" +aU +YG +vm +YG +DC +DC +DC +DC +DC +YG +DC +DC +DC +DC +DC +DC +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +so +Kj +Tg +so +aU +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +aU +aU +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(52,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +XP +YG +DC +DC +DC +DC +YG +vm +YG +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +so +so +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(53,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +YG +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(54,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +YG +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +jn +jn +EA +jn +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +jn +jn +EA +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(55,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +re +aU +aU +aU +aU +OY +re +aU +aU +aU +aU +aU +nM +re +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +re +re +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(56,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +zJ +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +re +sb +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +ip +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(57,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(58,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +Am +YG +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +LX +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +zJ +YG +YG +YG +aU +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(59,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(60,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +re +sb +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(61,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(62,1,1) = {" +aU +YG +vm +YG +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +zJ +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(63,1,1) = {" +aU +aU +vm +YG +YG +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +DC +DC +DC +zm +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +bM +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(64,1,1) = {" +aU +aU +vm +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(65,1,1) = {" +aU +aU +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +DC +mH +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +sb +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(66,1,1) = {" +aU +YG +YG +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +jn +jn +EA +jn +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +FE +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(67,1,1) = {" +aU +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +Nc +YG +YG +DC +DC +DC +DC +YG +vm +YG +YG +vm +vm +vm +vm +vm +vm +DC +DC +DC +zm +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(68,1,1) = {" +aU +YG +zJ +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +vm +YG +vm +vm +vm +vm +vm +vm +Nc +YG +DC +DC +DC +DC +YG +vm +Co +mP +Ob +ok +zv +kZ +Ux +LQ +vm +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(69,1,1) = {" +aU +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +vm +YG +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +va +gz +FM +kI +LQ +zv +zv +rQ +vm +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +re +sb +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(70,1,1) = {" +aU +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +nl +FM +nl +ok +LQ +LQ +LQ +mR +vm +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(71,1,1) = {" +aU +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +sl +jh +cS +kI +LQ +uJ +PC +aL +vm +YG +YG +aU +re +re +re +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(72,1,1) = {" +aU +YG +YG +YG +YG +zJ +vm +YG +Uj +DC +Uj +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +YG +zJ +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +HE +vm +vm +vm +vm +vm +aU +aU +aU +aU +aU +aU +re +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(73,1,1) = {" +aU +aU +YG +YG +YG +vm +vm +YG +DC +DC +DC +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +DC +DC +DC +YG +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +Uj +DC +DC +Fn +Uj +YG +YG +vm +vm +aU +aU +aU +re +re +sb +jn +jn +jn +jn +sb +re +re +re +re +re +re +re +re +re +re +re +re +re +sb +jn +jn +jn +jn +sb +re +re +re +re +re +re +re +re +re +re +re +re +rN +re +re +re +rN +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(74,1,1) = {" +aU +aU +YG +YG +YG +vm +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +Ll +vm +vm +aU +Gm +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +EA +jn +jn +jn +jn +jn +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(75,1,1) = {" +aU +aU +YG +YG +YG +vm +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +vQ +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +EA +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +EA +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +MW +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(76,1,1) = {" +aU +aU +YG +YG +YG +vm +YG +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +vQ +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(77,1,1) = {" +aU +aU +YG +YG +YG +vm +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +Ll +vm +vm +aU +Gm +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +sb +re +re +rN +re +re +re +rN +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(78,1,1) = {" +aU +aU +YG +YG +YG +vm +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +Uj +DC +DC +DC +Uj +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +jn +jn +re +re +re +re +jn +jn +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +io +re +sb +jn +jn +jn +jn +re +re +re +re +re +re +re +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(79,1,1) = {" +aU +YG +YG +YG +vm +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +pX +vm +vm +vm +vm +vm +vm +ow +vm +vm +vm +vm +vm +vm +Uj +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +cz +vm +vm +vm +vm +vm +vm +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +jn +jn +re +re +re +re +jn +jn +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +re +re +re +re +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(80,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +Uo +cN +ur +AO +vm +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +ha +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +OY +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(81,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +Uo +ur +cN +ur +Xc +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(82,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +Uo +cN +ur +WU +vm +DC +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(83,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +Uo +ur +cN +Sn +vm +Uj +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(84,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +EA +jn +jn +aU +aU +aU +aU +aU +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(85,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +zJ +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(86,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +zm +DC +DC +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +Am +YG +YG +YG +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +re +re +re +re +re +re +re +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +sb +re +aU +aU +aU +aU +aU +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(87,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +Nc +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +pL +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +re +re +aU +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(88,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +mH +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(89,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +vm +YG +YG +YG +YG +zJ +YG +YG +YG +aU +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(90,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(91,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +aU +aU +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(92,1,1) = {" +aU +YG +YG +YG +vm +zJ +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(93,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +pX +YG +YG +YG +aU +aU +re +re +re +aU +re +re +sb +re +re +re +re +jn +jn +jn +re +re +re +re +re +re +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(94,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(95,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(96,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +Uj +DC +DC +DC +Uj +YG +YG +YG +Uj +DC +DC +DC +DC +Uj +YG +YG +YG +DC +DC +DC +DC +zm +YG +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +jn +jn +jn +sb +jn +jn +jn +jn +jn +jn +re +re +re +re +re +re +re +re +re +re +re +sb +jn +EA +jn +jn +re +aU +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(97,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +XP +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +XP +YG +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +re +jn +re +re +re +jn +re +re +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +io +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(98,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +ha +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(99,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(100,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(101,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +zm +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +YG +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(102,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(103,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +vm +AO +cN +ur +Uo +vm +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(104,1,1) = {" +aU +aU +YG +YG +vm +mH +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +mH +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +Xc +ur +ur +cN +Uo +vm +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(105,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +mH +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +vm +WU +cN +ur +Uo +vm +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(106,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +YG +vm +Sn +ur +cN +Uo +vm +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(107,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +Am +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +Am +YG +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +YG +YG +aU +aU +re +re +re +aU +re +re +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +EA +re +aU +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(108,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +zm +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +aU +re +re +jn +jn +aU +aU +aU +aU +aU +aU +KR +aU +aU +aU +aU +aU +aU +KR +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(109,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +mH +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +aU +re +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(110,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +aU +re +re +re +re +aU +re +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +ip +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(111,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +YG +YG +vm +YG +zJ +YG +YG +YG +aU +aU +re +re +re +re +aU +re +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(112,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +aU +re +re +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(113,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +Uj +DC +DC +DC +Uj +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +Uj +DC +DC +DC +Uj +YG +YG +YG +DC +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +aU +re +sb +jn +jn +jn +jn +jn +jn +jn +re +re +re +re +jn +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(114,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +vm +YG +YG +YG +YG +YG +aU +aU +re +re +aU +aU +aU +aU +aU +aU +jn +jn +jn +jn +jn +jn +re +re +re +sb +jn +jn +jn +sb +re +re +re +re +re +re +re +re +re +re +re +re +jn +jn +jn +jn +jn +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(115,1,1) = {" +aU +YG +YG +YG +vm +zJ +YG +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +YG +YG +YG +YG +YG +YG +aU +aU +re +re +aU +Ih +xq +Kj +Kj +aU +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +EA +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(116,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +zJ +YG +YG +YG +YG +YG +aU +aU +re +re +aU +Tg +Tg +Tg +Tg +LB +jn +jn +jn +jn +EA +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(117,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +YG +YG +YG +YG +YG +YG +aU +aU +re +re +aU +so +Kj +Tg +so +aU +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(118,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +Uj +DC +DC +DC +Uj +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +aU +aU +re +re +aU +aU +so +so +aU +aU +re +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(119,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +ow +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +rM +YG +YG +YG +aU +aU +re +re +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +sb +jn +jn +jn +jn +sb +re +re +re +re +re +re +re +re +re +re +re +jn +jn +sb +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(120,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +AU +DC +WX +bV +DC +Xh +vm +YG +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +re +aU +re +re +re +re +re +re +re +re +re +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +pL +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(121,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +vm +DC +AU +WX +DC +jz +TX +vm +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(122,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +vm +AU +DC +WX +DC +DC +DC +mc +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +vB +Cd +vB +Cd +Tg +Tg +Tg +Tg +Tg +aU +re +re +EA +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(123,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +zm +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +zJ +vm +WX +WX +WX +Sd +DC +DC +mc +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +Tg +Tg +Tg +jU +Tg +Tg +Tg +RN +Tg +aU +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(124,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +BH +DC +WX +DC +DC +DC +mc +Uj +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +RN +Tg +Lp +Tg +Tg +Tg +Tg +Tg +Tg +LB +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(125,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +DC +DC +WX +DC +DC +DC +vm +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +Tg +Tg +jU +Tg +Tg +Tg +Tg +Tg +Tg +aU +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(126,1,1) = {" +aU +YG +YG +YG +vm +mH +YG +DC +DC +DC +DC +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +WX +WX +WX +gB +DC +DC +Xf +DC +DC +zm +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +Tg +Tg +Tg +Tg +Tg +Tg +Tg +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +jn +jn +jn +re +re +re +re +re +re +re +jn +jn +re +re +aU +aU +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(127,1,1) = {" +aU +YG +YG +vm +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +pX +YG +YG +YG +YG +YG +vm +PV +DC +WX +DC +DC +DC +Xf +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +Tg +Tg +Tg +aU +Tg +Tg +Lp +Tg +Cd +aU +re +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +re +aU +re +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(128,1,1) = {" +aU +aU +YG +vm +vm +YG +YG +DC +DC +DC +DC +YG +Uj +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +vm +PV +DC +WX +DC +DC +DC +vm +DC +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +uR +Tg +Tg +aU +RN +Tg +Tg +Tg +vB +aU +re +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +re +aU +re +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(129,1,1) = {" +aU +aU +YG +vm +YG +YG +YG +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +vm +WX +WX +WX +Sd +DC +DC +mc +Uj +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +RN +Tg +Tg +aU +Ha +jU +Tg +Tg +Cd +aU +re +re +jn +jn +EA +jn +sb +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +sb +re +re +re +re +aU +re +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(130,1,1) = {" +aU +aU +YG +vm +zJ +YG +YG +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +zJ +YG +YG +vm +DC +yh +WX +DC +DC +DC +mc +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +uR +Tg +Tg +aU +RN +Tg +Tg +Tg +vB +aU +re +re +jn +jn +jn +jn +re +re +jn +re +re +re +jn +re +re +jn +re +re +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(131,1,1) = {" +aU +aU +YG +vm +YG +YG +YG +DC +DC +zm +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +vm +DC +DC +WX +DC +DC +DC +mc +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +aU +aU +re +re +re +re +re +aU +Tg +Tg +Tg +aU +Tg +Tg +Tg +aU +aU +aU +re +sb +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +ha +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(132,1,1) = {" +aU +aU +YG +vm +YG +YG +YG +DC +DC +DC +DC +YG +Uj +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +vm +WX +WX +WX +DC +jz +TX +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +aU +aU +re +re +re +re +aU +Tg +Tg +Tg +Tg +Tg +Tg +jU +Tg +Tg +aU +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(133,1,1) = {" +aU +YG +YG +vm +YG +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +vm +gS +DC +VV +DC +DC +bV +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +aU +aU +re +re +re +re +aU +Tg +Tg +Tg +Tg +Tg +Tg +Tg +Tg +Tg +LB +jn +jn +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(134,1,1) = {" +aU +YG +YG +vm +YG +mH +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +aU +aU +re +re +re +re +aU +RN +Tg +jU +Tg +Tg +Tg +Tg +Lp +Tg +aU +jn +jn +jn +EA +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(135,1,1) = {" +aU +YG +YG +vm +YG +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +pX +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +aU +Tg +Tg +Tg +Tg +Tg +Tg +jU +RN +Tg +aU +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(136,1,1) = {" +aU +YG +YG +vm +vm +YG +YG +DC +DC +DC +DC +YG +Uj +vm +vm +vm +vm +vm +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +Am +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +aU +Cd +vB +vB +Cd +Tg +Tg +Tg +Tg +Tg +aU +re +re +jn +jn +jn +jn +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(137,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +zm +DC +DC +YG +YG +YG +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +re +re +re +re +re +re +re +re +re +re +aU +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(138,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +YG +YG +vm +YG +YG +YG +mH +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +re +re +re +re +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +re +re +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(139,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +YG +vm +vm +vm +vm +pX +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +sb +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +jn +re +re +re +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(140,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +Uj +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +re +re +re +re +re +aU +Ih +xq +Kj +Kj +aU +jn +jn +jn +jn +jn +jn +re +re +re +re +re +sb +jn +jn +jn +re +re +re +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +Vj +Vj +Vj +Vj +"} +(141,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +vm +vm +vm +vm +vm +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +YG +mH +YG +YG +aU +aU +re +re +re +re +re +re +re +re +re +aU +Tg +Tg +Tg +Tg +LB +jn +jn +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +ha +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +fW +dA +dA +dA +aU +Rj +Rj +Lq +Lq +"} +(142,1,1) = {" +aU +YG +YG +YG +vm +YG +YG +DC +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +YG +YG +YG +YG +YG +YG +YG +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +re +re +re +re +re +aU +so +Kj +Tg +so +aU +jn +jn +jn +EA +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +MI +dA +dA +dA +uu +Rj +Lq +Lq +Lq +"} +(143,1,1) = {" +aU +YG +YG +YG +vm +YG +mH +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +so +so +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +fW +dA +dA +dA +aU +Lq +Lq +Lq +Lq +"} +(144,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +Uj +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +Vj +Vj +Vj +Vj +Vj +"} +(145,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +zm +DC +DC +YG +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +re +re +jn +jn +jn +jn +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(146,1,1) = {" +aU +aU +YG +YG +vm +YG +YG +DC +DC +DC +DC +DC +DC +zm +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +DC +YG +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +re +re +re +jn +jn +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(147,1,1) = {" +aU +aU +aU +YG +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +DC +DC +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +re +re +re +re +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(148,1,1) = {" +aU +aU +aU +aU +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +YG +YG +zJ +YG +YG +YG +YG +zJ +YG +YG +DC +DC +YG +mH +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(149,1,1) = {" +aU +aU +aU +aU +aU +aU +YG +YG +YG +YG +YG +YG +YG +vm +vm +vm +vm +vm +vm +vm +vm +vm +vm +zn +DC +DC +zn +vm +vm +vm +vm +YG +YG +mH +mH +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +YG +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +re +re +re +re +re +re +re +re +re +re +re +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +re +re +re +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(150,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +vm +ef +ef +vm +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(151,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +ay +tJ +tJ +ay +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +UG +UG +UG +mw +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +UG +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(152,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +ay +ay +ay +ay +ay +ay +Rx +aU +aU +aU +ay +tJ +tJ +ay +aU +aU +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +Rx +UG +UG +UG +UG +UG +UG +UG +aU +aU +aU +aU +aU +aU +aU +aU +aU +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +ay +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(153,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +UG +ay +ay +tJ +tJ +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +aU +aU +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +Oa +wi +HP +pf +ay +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(154,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +UG +ay +FB +tJ +tJ +FB +ay +UG +UG +UG +mw +UG +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +ay +ay +ay +ay +UG +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +mw +UG +UG +UG +UG +ay +Oa +HP +wi +HP +Br +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(155,1,1) = {" +aU +aU +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +ay +UG +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +Rp +tJ +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +Oa +wi +HP +PK +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(156,1,1) = {" +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +ay +UG +aU +aU +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +bG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +Oa +HP +wi +Vz +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(157,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +aU +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(158,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +bo +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(159,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +mw +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(160,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +mw +UG +UG +ay +UG +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +Rp +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(161,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(162,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +ay +ay +ay +ay +ay +pH +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +mw +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(163,1,1) = {" +aU +aU +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +pf +wi +HP +Oa +ay +UG +UG +UG +ay +ay +ay +ay +ay +Rh +ay +ay +ay +ay +UG +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +ay +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +bG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(164,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +Br +HP +HP +wi +Oa +ay +ay +ay +ay +ay +xk +VJ +cb +Ai +aX +Ic +zj +cv +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(165,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +PK +wi +HP +Oa +ay +UG +UG +UG +ay +fE +xZ +YF +uz +cv +aX +aX +KZ +ay +UG +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(166,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +Vz +HP +wi +Oa +ay +UG +UG +UG +ay +fP +YF +fP +Ai +cv +cv +cv +AH +ay +UG +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(167,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +bo +UG +UG +mw +ay +VG +Jm +ER +uz +cv +DL +kz +zD +ay +UG +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(168,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(169,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +Rp +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +UG +UG +mw +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(170,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +mw +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(171,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +mE +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +mw +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(172,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +Zt +NN +lE +Vl +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +Lh +UG +UG +ay +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(173,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +mw +UG +UG +UG +ay +UG +UG +lE +Vl +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +ay +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(174,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +Ni +UG +lE +Vl +tJ +tJ +tJ +Rp +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +ay +tJ +tJ +ay +ay +ay +ay +ay +bo +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(175,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +lE +Vl +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +ay +Rp +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +pf +wi +HP +Oa +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +Rp +tJ +UG +ay +UG +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(176,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +mw +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ts +by +lE +Vl +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +ay +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +Br +HP +HP +wi +Oa +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(177,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +mE +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +ay +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +PK +wi +HP +Oa +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(178,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +pH +Dj +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +mw +ay +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +Vz +HP +wi +Oa +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(179,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +pH +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +ay +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(180,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +ay +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(181,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +mw +ay +ay +ay +ay +ay +ay +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(182,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +Dj +tJ +Rp +tJ +tJ +UG +ay +ay +ay +ay +Lh +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(183,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(184,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +pH +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(185,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +Dj +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(186,1,1) = {" +aU +aU +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +Lh +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(187,1,1) = {" +aU +aU +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +Rp +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(188,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +Lh +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(189,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +Dj +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +kk +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +mw +UG +ay +UG +tJ +tJ +tJ +tJ +Dj +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(190,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +mw +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(191,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +pH +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +mw +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(192,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +mw +tJ +tJ +tJ +tJ +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(193,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +Dj +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(194,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +UG +UG +ay +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +mw +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +kk +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(195,1,1) = {" +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +ay +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(196,1,1) = {" +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +bG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +ay +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(197,1,1) = {" +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +UG +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +ay +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(198,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +kk +UG +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +ay +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +Rp +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +Rp +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(199,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +ay +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +mw +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +mw +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(200,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +ay +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +mw +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(201,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +Rp +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +Lh +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +mw +UG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(202,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +bG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +kk +UG +tJ +tJ +tJ +tJ +tJ +ay +pf +wi +HP +Oa +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +bG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(203,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +Br +HP +HP +wi +Oa +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(204,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +tJ +ay +PK +wi +HP +Oa +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(205,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +UG +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +Vz +HP +wi +Oa +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(206,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(207,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +mw +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +mw +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(208,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(209,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +pH +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +Lh +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(210,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +Rp +tJ +UG +ay +ay +ay +ay +ay +mw +UG +UG +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(211,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(212,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(213,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +UG +UG +UG +UG +UG +tJ +tJ +tJ +UG +UG +UG +UG +UG +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(214,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +Va +UG +ay +ay +ay +ay +ay +ay +Va +UG +ay +ay +ay +ay +ay +ay +Va +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +ay +ay +mw +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(215,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(216,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +kT +WO +eu +FJ +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(217,1,1) = {" +aU +aU +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +Lh +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +kT +wi +wi +wi +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(218,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +Rp +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +ay +ay +ay +ay +ay +ay +Rx +UG +ay +wi +wi +wi +wi +Br +tJ +tJ +tJ +Rp +tJ +UG +ay +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(219,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +wi +wi +wi +wi +Br +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(220,1,1) = {" +aU +aU +aU +aU +UG +UG +ay +ay +ay +ay +ay +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +kT +wi +wi +wi +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +aU +aU +aU +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +SJ +"} +(221,1,1) = {" +aU +aU +aU +aU +aU +ay +ay +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +kT +WO +hJ +FJ +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +"} +(222,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +UG +UG +UG +UG +mw +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(223,1,1) = {" +aU +aU +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +UG +UG +UG +UG +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +UG +UG +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +Yt +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(224,1,1) = {" +aU +aU +aU +tJ +Gk +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +aW +aU +aU +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(225,1,1) = {" +aU +aU +tJ +tJ +Gk +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(226,1,1) = {" +aU +aU +tJ +tJ +Gk +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(227,1,1) = {" +aU +aU +aU +tJ +Gk +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +aW +aU +aU +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(228,1,1) = {" +aU +aU +aU +aU +aU +aU +UG +UG +UG +mw +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +tJ +tJ +tJ +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +UG +UG +aU +aU +aU +aU +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +UG +UG +UG +UG +tJ +tJ +tJ +UG +UG +tJ +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(229,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +UG +ay +PK +wi +HP +Oa +ay +ay +ay +ay +ay +ay +ay +ay +Va +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +aU +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +ay +ay +ay +ay +ay +ay +Va +UG +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(230,1,1) = {" +aU +aU +aU +aU +aU +ay +ay +ay +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +ay +Vz +HP +wi +Oa +ay +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +Oa +wi +HP +pf +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +UG +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(231,1,1) = {" +aU +aU +aU +aU +UG +UG +UG +ay +ay +ay +ay +ay +UG +UG +tJ +tJ +tJ +tJ +tJ +Br +HP +wi +HP +Oa +ay +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +Oa +HP +wi +HP +Br +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(232,1,1) = {" +aU +aU +aU +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +pf +wi +wi +Oa +ay +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +Oa +wi +HP +PK +ay +tJ +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(233,1,1) = {" +aU +aU +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +bG +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +ay +ay +ay +ay +ay +ay +ay +UG +ay +Oa +HP +wi +Vz +ay +UG +tJ +tJ +Rp +tJ +UG +ay +UG +UG +UG +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(234,1,1) = {" +aU +aU +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +Rp +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(235,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +bo +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +tJ +tJ +UG +ay +mw +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UM +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(236,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +mw +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(237,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +bG +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(238,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(239,1,1) = {" +aU +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +UG +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(240,1,1) = {" +aU +UG +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +ay +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(241,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +UG +tJ +tJ +tJ +tJ +UG +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(242,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(243,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +Rp +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(244,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +tJ +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(245,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +qh +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(246,1,1) = {" +aU +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +Rp +tJ +tJ +UG +UG +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(247,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +Rp +tJ +mw +UG +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(248,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +mw +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(249,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +tJ +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +tJ +UG +UG +ay +UG +aU +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(250,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +tJ +tJ +tJ +tJ +tJ +tJ +UG +UG +UG +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +tJ +tJ +tJ +UG +UG +ay +ay +UG +aU +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(251,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +UG +UG +tJ +tJ +UG +UG +UG +ay +UG +UG +aU +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(252,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +ay +ay +ay +ay +ay +ay +ay +ay +ay +UG +aU +aU +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(253,1,1) = {" +aU +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +UG +aU +aU +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +tJ +aU +SJ +SJ +SJ +SJ +"} +(254,1,1) = {" +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +ay +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +aU +SJ +SJ +SJ +SJ +"} diff --git a/_maps/RandomRooms/backstreetlayout/standard.dmm b/_maps/RandomRooms/backstreetlayout/standard.dmm index 2c190b1aaf05..7f08f542cadd 100644 --- a/_maps/RandomRooms/backstreetlayout/standard.dmm +++ b/_maps/RandomRooms/backstreetlayout/standard.dmm @@ -14,12 +14,28 @@ }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) +"az" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "aJ" = ( /obj/effect/turf_decal/weather/dirt{ dir = 7 }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"aR" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_4" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "bo" = ( /obj/structure/sign/warning{ desc = "A warning sign, something about killer robots."; @@ -42,6 +58,16 @@ name = "Arcade Plush Storage" }, /area/city/backstreets_alley) +"cB" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"dp" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/item/stack/spacecash/c100, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "dR" = ( /obj/structure/fence{ dir = 4 @@ -55,10 +81,51 @@ /obj/effect/landmark/backstreetspawneast, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"em" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_9" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"ez" = ( +/mob/living/simple_animal/hostile/retaliate/ghost, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "eK" = ( /obj/effect/spawner/room/backstreets/connector, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"eL" = ( +/obj/effect/landmark/backstreetspawnwest, +/turf/open/floor/plating, +/area/city/backstreets_room) +"eR" = ( +/obj/effect/landmark/backstreetspawnwest, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"gh" = ( +/obj/machinery/light, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"gk" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_5" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"gF" = ( +/obj/effect/landmark/portal_exit{ + id = "exit" + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_alley) "gI" = ( /obj/effect/spawner/room/backstreets/large_south, /turf/closed/indestructible/reinforced, @@ -67,18 +134,63 @@ /obj/effect/spawner/room/backstreets/medium_east, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"hz" = ( +/mob/living/simple_animal/hostile/retaliate/ghost, +/obj/item/stack/spacecash/c100, +/obj/effect/mob_spawn/human/corpse, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"ii" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_5" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"iq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_4" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "iF" = ( /obj/effect/spawner/room/backstreets/small_north, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"iK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/backstreetspawnwest, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "iW" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) +"ja" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/machinery/light/broken, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "jv" = ( /turf/closed/indestructible/fakedoor{ name = "Malfunctioning Door" }, /area/city/backstreets_alley) +"jw" = ( +/obj/effect/portal/permanent/one_way{ + id = "path_15"; + icon_state = "wooden_tv_broken"; + desc = "An unwavering tv that will never fade."; + name = "broken tv?" + }, +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_alley) "jU" = ( /obj/machinery/door/poddoor/shutters/indestructible{ name = "Malfunctioning Backstreets Shutters" @@ -107,6 +219,15 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_checkpoint) +"lE" = ( +/obj/effect/portal/permanent/one_way{ + id = "exit"; + icon_state = "wooden_tv_broken"; + desc = "An unwavering tv that will never fade."; + name = "broken tv?" + }, +/turf/open/floor/plating, +/area/city/backstreets_room) "lG" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -135,6 +256,16 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"nv" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_11" + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "nE" = ( /obj/item/stack/sheet/mineral/wood, /obj/effect/landmark/backstreetspawneast, @@ -164,6 +295,11 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"pu" = ( +/mob/living/simple_animal/hostile/retaliate/ghost, +/obj/effect/mob_spawn/human/corpse, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "pW" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -171,6 +307,18 @@ /obj/structure/barricade/sandbags, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"pZ" = ( +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"qd" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "qG" = ( /obj/effect/spawner/room/backstreets/small_east, /turf/closed/indestructible/reinforced, @@ -201,6 +349,27 @@ /obj/effect/landmark/backstreetspawnwest, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"si" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_11" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"sG" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/retaliate/ghost, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"th" = ( +/obj/structure/sign/warning/vacuum/external, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"tq" = ( +/turf/open/floor/plating, +/area/city/backstreets_room) "tH" = ( /obj/effect/spawner/room/backstreets/small_south, /turf/closed/indestructible/reinforced, @@ -209,11 +378,52 @@ /obj/effect/spawner/room/backstreets/bossroom, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"tU" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"ub" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_13" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "ux" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/landmark/backstreetspawn, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"uE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/mob_spawn/human/corpse, +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"uX" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"vb" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/portal_exit{ + id = "path_15" + }, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"vi" = ( +/obj/machinery/light/broken{ + dir = 1 + }, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "vz" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -235,6 +445,15 @@ "vE" = ( /turf/closed/indestructible/rock, /area/city/backstreets_alley) +"vL" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_3" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "vN" = ( /obj/effect/spawner/room/backstreets/medium_south, /turf/closed/indestructible/reinforced, @@ -263,6 +482,16 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_checkpoint) +"xp" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_10" + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "xr" = ( /obj/effect/landmark/backstreetspawnwest, /turf/open/floor/plating/dirt/jungle/dark, @@ -273,10 +502,29 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_checkpoint) +"xJ" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_9" + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "yv" = ( /obj/effect/landmark/distortion, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"yK" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"zC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/wood/fancy, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "zD" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -284,6 +532,32 @@ /obj/effect/landmark/backstreetspawn, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"Ag" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"Bi" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_6" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"Bl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"Bt" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/mob/living/simple_animal/hostile/retaliate/ghost, +/turf/open/floor/plating, +/area/city/backstreets_room) "CD" = ( /obj/structure/fence{ dir = 4 @@ -299,6 +573,24 @@ /obj/effect/landmark/backstreetspawn, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"Eu" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_12" + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"EC" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/broken{ + dir = 1 + }, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "EH" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -312,6 +604,14 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_checkpoint) +"Gg" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/wood/fancy, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "Gu" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -319,10 +619,39 @@ /obj/effect/landmark/backstreetspawnwest, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"GL" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_12" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"GO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"Ht" = ( +/obj/effect/mob_spawn/human/corpse, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "HJ" = ( /obj/effect/spawner/room/backstreets/small_east, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"HW" = ( +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"Ib" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_2" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "Ik" = ( /obj/effect/turf_decal/weather/dirt{ dir = 4 @@ -338,10 +667,34 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"Kb" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "Kg" = ( /obj/effect/spawner/room/backstreets/large_north, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"Kh" = ( +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"Kj" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_3" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"Ks" = ( +/obj/item/stack/spacecash/c100, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "KK" = ( /obj/effect/turf_decal/weather/dirt, /obj/effect/turf_decal/weather/dirt{ @@ -349,6 +702,29 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"KL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_2" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"KU" = ( +/obj/machinery/light, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table/wood/fancy, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"Lh" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "LM" = ( /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) @@ -362,6 +738,25 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"MX" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/spider/stickyweb/genetic, +/obj/machinery/light/broken, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"Np" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"NE" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_1" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "Ol" = ( /obj/effect/landmark/backstreetspawnwest, /turf/open/floor/plating/asteroid/basalt, @@ -377,12 +772,40 @@ /obj/effect/landmark/backstreetspawn, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) +"Qb" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_10" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"Qd" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_14" + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "QF" = ( /obj/effect/turf_decal/weather/dirt{ dir = 3 }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"QL" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_8" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "RJ" = ( /obj/effect/spawner/room/backstreets/small_west, /turf/closed/indestructible/reinforced, @@ -391,6 +814,13 @@ /obj/effect/landmark/backstreetspawneast, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) +"RU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/signpost{ + question = "Are you willing to risk it?" + }, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) "Sc" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -404,6 +834,15 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"Sx" = ( +/obj/effect/portal/permanent/one_way{ + id = "path_15"; + icon_state = "wooden_tv_broken"; + desc = "An unwavering tv that will never fade."; + name = "broken tv?" + }, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_alley) "Ta" = ( /obj/effect/turf_decal/weather/dirt{ dir = 10 @@ -440,10 +879,24 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"VM" = ( +/obj/machinery/light/broken, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) +"VN" = ( +/obj/machinery/light/broken, +/mob/living/simple_animal/hostile/retaliate/ghost, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "Wf" = ( /obj/effect/spawner/room/backstreets/medium_west, /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) +"Wv" = ( +/obj/effect/decal/cleanable/cobweb, +/mob/living/simple_animal/hostile/retaliate/ghost, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "WG" = ( /turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_alley) @@ -464,6 +917,13 @@ /obj/effect/spawner/room/backstreets/medium_west, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"XN" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "XV" = ( /obj/effect/turf_decal/weather/dirt{ dir = 1 @@ -477,6 +937,15 @@ /obj/effect/landmark/backstreetspawneast, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_alley) +"ZJ" = ( +/obj/effect/portal/permanent{ + icon_state = "wooden_tv_broken"; + name = "broken tv?"; + desc = "An unwavering tv that will never fade."; + id = "path_7" + }, +/turf/open/floor/plating/rust, +/area/city/backstreets_room) "ZK" = ( /obj/effect/landmark/backstreetspawnwest, /turf/open/floor/plating/asteroid/basalt, @@ -522,9 +991,9 @@ UZ UZ UZ UZ -UZ -UZ -UZ +Yt +Yt +Yt UZ UZ UZ @@ -632,11 +1101,11 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ +Yt +Yt +NE +Yt +Yt UZ UZ UZ @@ -742,13 +1211,13 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +Yt +Yt +Np +Np +Np +Yt +Yt UZ UZ UZ @@ -817,22 +1286,85 @@ UZ "} (4,1,1) = {" UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ +Yt +Yt +Np +Np +Np +Np +Np +GO +Yt UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -862,12 +1394,89 @@ UZ UZ UZ UZ +"} +(5,1,1) = {" +Yt +Yt +Yt +EC +HW +HW +HW +ja +Yt +Yt +Yt UZ +Yt +Yt +Yt +Kh +HW +HW +ez +VM +Yt +Yt +Yt UZ +Yt +Yt +Yt +Ag +pZ +HW +ez +VM +Yt +Yt +Yt UZ +Yt +az +Np +Np +Np +uE +Np +gh +Yt UZ +Yt +Yt +Yt +vi +HW +HW +HW +VM +Yt +Yt +Yt UZ +Yt +Yt +Yt +tU +pZ +HW +HW +VM +Yt +Yt +Yt UZ +Yt +Yt +Yt +Kh +HW +HW +HW +VM +Yt +Yt +Yt UZ UZ UZ @@ -896,784 +1505,89 @@ UZ UZ UZ UZ +"} +(6,1,1) = {" +Yt +Yt +HW +HW +HW +eR +HW +cB +pZ +Yt +Yt UZ +Yt +Yt +yK +HW +eR +HW +Ks +HW +HW +Yt +Yt UZ +Yt +Yt +pZ +pZ +pZ +HW +HW +HW +HW +Yt +Yt UZ +Yt +GO +GO +iK +Np +Np +GO +GO +Yt UZ +Yt +Yt +yK +HW +HW +HW +hz +HW +HW +Yt +Yt UZ +Yt +Yt +pZ +pZ +HW +eR +HW +HW +HW +Yt +Yt UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(5,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(6,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(7,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(8,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(9,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(10,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -"} -(11,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +Yt +Yt +uX +HW +Ks +pu +HW +eR +HW +Yt +Yt UZ UZ UZ @@ -1703,88 +1617,88 @@ UZ UZ UZ "} -(12,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +(7,1,1) = {" +Yt +NE +HW +HW +HW +HW +Ks +HW +pZ +nv +Yt UZ +Yt +ub +HW +HW +HW +Ht +HW +HW +pZ +xJ +Yt UZ +Yt +Eu +pZ +HW +HW +eR +HW +HW +HW +ZJ +Yt UZ +Yt +KL +Np +Np +Np +Np +sG +Kj +Yt UZ +Yt +ZJ +HW +HW +HW +HW +HW +HW +HW +Ib +Yt UZ +Yt +em +HW +HW +HW +HW +HW +HW +HW +aR +Yt UZ +Yt +si +HW +HW +eR +HW +HW +HW +HW +Bi +Yt UZ UZ UZ @@ -1814,88 +1728,88 @@ UZ UZ UZ "} -(13,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +(8,1,1) = {" +Yt +Yt +HW +eR +HW +HW +HW +pZ +pZ +Yt +Yt UZ +Yt +Yt +Kb +HW +HW +HW +HW +cB +pZ +Yt +Yt UZ +Yt +Yt +Kb +HW +HW +HW +HW +HW +HW +Yt +Yt UZ +Yt +GO +GO +Np +Bl +Np +GO +GO +Yt UZ +Yt +Yt +HW +HW +HW +eR +HW +HW +HW +Yt +Yt UZ +Yt +Yt +HW +HW +HW +Ht +HW +HW +HW +Yt +Yt UZ +Yt +Yt +HW +HW +HW +HW +dp +pZ +pZ +Yt +Yt UZ UZ UZ @@ -1925,22 +1839,88 @@ UZ UZ UZ "} -(14,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +(9,1,1) = {" +Yt +Yt +Yt +Lh +HW +HW +HW +ja +Yt +Yt +Yt UZ +Yt +Yt +Yt +Kh +HW +pZ +pZ +ja +Yt +Yt +Yt UZ +Yt +Yt +Yt +Kh +HW +HW +HW +VM +Yt +Yt +Yt UZ +Yt +zC +Np +Bl +Bl +Bl +Np +zC +Yt UZ +Yt +Yt +Yt +Lh +pu +HW +HW +VM +Yt +Yt +Yt UZ +Yt +Yt +Yt +Kh +HW +HW +HW +VM +Yt +Yt +Yt UZ +Yt +Yt +Yt +Lh +HW +pZ +pZ +ja +Yt +Yt +Yt UZ UZ UZ @@ -1969,23 +1949,88 @@ UZ UZ UZ UZ +"} +(10,1,1) = {" UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ +Yt +zC +Np +Bl +vb +Bl +Np +KU +Yt UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -2015,6 +2060,8 @@ UZ UZ UZ UZ +"} +(11,1,1) = {" UZ UZ UZ @@ -2035,8 +2082,6 @@ UZ UZ UZ UZ -"} -(15,1,1) = {" UZ UZ UZ @@ -2053,6 +2098,15 @@ UZ UZ UZ UZ +Yt +Gg +Np +Bl +RU +Bl +iK +zC +Yt UZ UZ UZ @@ -2117,20 +2171,76 @@ UZ UZ UZ UZ +"} +(12,1,1) = {" UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ +Yt +zC +Np +Bl +Bl +Bl +Np +zC +Yt UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -2146,8 +2256,6 @@ UZ UZ UZ UZ -"} -(16,1,1) = {" UZ UZ UZ @@ -2174,11 +2282,77 @@ UZ UZ UZ UZ +"} +(13,1,1) = {" +Yt +Yt +Yt +Kh +HW +HW +HW +VN +Yt +Yt +Yt UZ +Yt +Yt +Yt +Kh +HW +pZ +pZ +MX +Yt +Yt +Yt UZ +Yt +Yt +Yt +XN +HW +HW +HW +VM +Yt +Yt +Yt UZ +Yt +GO +GO +Np +Bl +Np +GO +GO +Yt UZ +Yt +Yt +Yt +XN +HW +HW +HW +VM +Yt +Yt +Yt UZ +Yt +Yt +Yt +Kh +HW +HW +pZ +ja +Yt +Yt +Yt UZ UZ UZ @@ -2219,23 +2393,77 @@ UZ UZ UZ UZ +"} +(14,1,1) = {" Yt Yt +yK +HW +HW +eR +Ks +HW +HW Yt Yt +UZ Yt Yt +Wv +HW +HW +Ks +HW +pZ +pZ Yt Yt -Yt -XD -UZ -UZ -UZ UZ +th +tq +tq +HW +eL +HW +HW +eR +HW +Yt +Yt UZ +Yt +iq +Np +Np +Np +Np +Np +ii +Yt UZ +Yt +Yt +HW +HW +HW +HW +HW +HW +HW +Yt +Yt UZ +Yt +Yt +yK +eR +HW +HW +HW +dp +pZ +Yt +Yt UZ UZ UZ @@ -2257,8 +2485,6 @@ UZ UZ UZ UZ -"} -(17,1,1) = {" UZ UZ UZ @@ -2278,11 +2504,77 @@ UZ UZ UZ UZ +"} +(15,1,1) = {" +Yt +Qd +pZ +HW +Ks +HW +eR +HW +HW +GL +Yt UZ +Yt +Qd +pZ +HW +HW +HW +HW +HW +pZ +xp +Yt UZ +Yt +lE +tq +tq +HW +HW +HW +HW +HW +QL +Yt UZ +Yt +GO +GO +Np +Np +Np +GO +GO +Yt UZ +Yt +QL +HW +HW +eR +HW +Ht +HW +HW +vL +Yt UZ +Yt +Qb +HW +HW +HW +HW +HW +HW +HW +gk +Yt UZ UZ UZ @@ -2323,11 +2615,77 @@ UZ UZ UZ UZ +"} +(16,1,1) = {" +Yt +Yt +cB +pZ +HW +ez +HW +pZ +pZ +Yt +Yt UZ +Yt +Yt +pZ +pZ +eR +HW +HW +HW +HW +Yt +Yt UZ +th +Bt +tq +HW +HW +tq +HW +HW +HW +Yt +Yt UZ +Yt +az +uE +Np +iK +Np +Np +gh +Yt UZ +Yt +Yt +HW +HW +HW +HW +eR +HW +HW +Yt +Yt UZ +Yt +Yt +Kb +Ks +eR +HW +pu +HW +HW +Yt +Yt UZ UZ Yt @@ -2339,7 +2697,7 @@ Yt Yt Yt Yt -Yt +XD UZ UZ UZ @@ -2369,31 +2727,88 @@ UZ UZ UZ "} -(18,1,1) = {" -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +(17,1,1) = {" +Yt +Yt +Yt +tU +pZ +cB +pZ +ja +Yt +Yt +Yt UZ +Yt +Yt +Yt +qd +HW +HW +HW +VM +Yt +Yt +Yt UZ +Yt +Yt +Yt +vi +tq +HW +HW +VM +Yt +Yt +Yt UZ +Yt +Yt +Np +sG +Np +Np +Np +GO +Yt UZ +Yt +Yt +Yt +Lh +HW +HW +HW +VM +Yt +Yt +Yt UZ +Yt +Yt +Yt +vi +HW +HW +HW +VM +Yt +Yt +Yt UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -2422,22 +2837,76 @@ UZ UZ UZ UZ +"} +(18,1,1) = {" UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +ub +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Np +Np +Np +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt +Yt UZ UZ UZ @@ -2509,6 +2978,9 @@ UZ UZ UZ UZ +Yt +Yt +Yt UZ UZ UZ @@ -2516,14 +2988,11 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ -UZ +Yt +Yt +Bi +Yt +Yt UZ UZ UZ @@ -2631,9 +3100,9 @@ UZ UZ UZ UZ -UZ -UZ -UZ +Yt +Yt +Yt UZ UZ UZ @@ -3130,7 +3599,7 @@ Xj ZK Xj Xj -Xj +Sx aq Uc Uc @@ -5315,7 +5784,7 @@ Xj Xj yv Xj -Xj +Sx iW UZ UZ @@ -6972,11 +7441,11 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -iF +UZ +UZ +UZ +UZ +iW Xj Xj Xj @@ -7083,11 +7552,11 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt +UZ +UZ +UZ +UZ +iW Xj Xj Xj @@ -7194,11 +7663,11 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt +UZ +UZ +UZ +UZ +iW Xj Xj Xj @@ -7305,11 +7774,11 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt +UZ +UZ +UZ +UZ +iW Xj Xj Xj @@ -7416,11 +7885,11 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt +UZ +UZ +UZ +UZ +iW ZK Xj Xj @@ -7527,11 +7996,11 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt +UZ +UZ +UZ +UZ +iW Xj Xj Xj @@ -7638,11 +8107,11 @@ UZ UZ UZ UZ -Yt -Yt -Yt -Yt -Yt +UZ +UZ +UZ +UZ +iW Xj Xj Xj @@ -7971,11 +8440,11 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -iW +Yt +Yt +Yt +Yt +iF Xj Xj Xj @@ -8082,11 +8551,11 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -iW +Yt +Yt +Yt +Yt +Yt Xj Xj Xj @@ -8155,7 +8624,7 @@ UZ UZ UZ iW -LM +jw LM Yt Yt @@ -8193,11 +8662,11 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -iW +Yt +Yt +Yt +Yt +Yt Xj Xj Xj @@ -8304,11 +8773,11 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -iW +Yt +Yt +Yt +Yt +Yt Xj Xj Xj @@ -8415,11 +8884,11 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -iW +Yt +Yt +Yt +Yt +Yt Xj Xj Xj @@ -8526,11 +8995,11 @@ UZ UZ UZ UZ -UZ -UZ -UZ -UZ -iW +Yt +Yt +Yt +Yt +Yt Xj Xj Xj @@ -8637,11 +9106,11 @@ iW iW iW iW -iW -iW -iW -iW -iW +Yt +Yt +Yt +Yt +Yt XV Xj QF @@ -8657,7 +9126,7 @@ iW iW iW iW -Xj +Sx Xj yv Xj @@ -16240,7 +16709,7 @@ WG WG WG WG -WG +gF WG WG "} @@ -20954,7 +21423,7 @@ Xj Xj yv Xj -Xj +Sx iW XV Xj @@ -25942,7 +26411,7 @@ UZ iW Xj Xj -Xj +Sx Xj Xj iW diff --git a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm new file mode 100644 index 000000000000..ce16fb306c5d --- /dev/null +++ b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm @@ -0,0 +1,2209 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ai" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 10 + }, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"ao" = ( +/obj/machinery/smartfridge/extract/preloaded, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"at" = ( +/turf/open/floor/plating/asteroid/snow/airless, +/area/city/backstreets_room) +"aY" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"bk" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"bl" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"bw" = ( +/obj/effect/turf_decal/siding/purple, +/obj/item/trash/sosjerky, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"bA" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/table/wood/fancy/green, +/obj/structure/displaycase/forsale, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"bJ" = ( +/obj/item/slimepotion/slime/docility, +/obj/item/slimepotion/slime/docility, +/obj/item/slimepotion/slime/docility, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"ci" = ( +/obj/structure/chair/office, +/obj/machinery/light{ + dir = 1; + color = "#32a852" + }, +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"co" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/semki, +/obj/machinery/light/broken{ + dir = 4 + }, +/obj/structure/disposalpipe/broken{ + dir = 4 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"cQ" = ( +/obj/item/trash/cheesie, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"ee" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"eq" = ( +/obj/structure/table/wood/fancy/green, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 8 + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 8 + }, +/obj/item/food/donut/jelly/slimejelly/apple, +/obj/item/food/donut/jelly/slimejelly/apple, +/obj/item/food/donut/jelly/slimejelly/apple, +/obj/item/food/donut/jelly/slimejelly/apple, +/obj/item/food/donut/jelly/slimejelly/apple, +/obj/item/food/donut/jelly/slimejelly/caramel, +/obj/item/food/donut/jelly/slimejelly/caramel, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"fj" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/grille/broken{ + color = "#42f545" + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"fn" = ( +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) +"fo" = ( +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400" + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"fz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/carbon/human/species/monkey, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"fI" = ( +/obj/machinery/camera/emp_proof{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/snow/airless, +/area/city/backstreets_room) +"fQ" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 8 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"gF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/broken{ + dir = 8 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"gS" = ( +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/item/trash/sosjerky, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"gW" = ( +/obj/structure/sign/departments/cargo, +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) +"gY" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"hk" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"hl" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/obj/structure/fluff/broken_flooring{ + color = "#42f545" + }, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"hC" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/table/reinforced, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"hK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 1; + color = "#32a852" + }, +/obj/effect/landmark/cratespawn/corpo, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"il" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 1; + color = "#32a852" + }, +/obj/effect/landmark/cratespawn/corpo, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"im" = ( +/obj/structure/bed/abductor, +/obj/item/bedsheet/k_corporation, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"ir" = ( +/obj/effect/turf_decal/siding/green/corner{ + dir = 4; + color = "#006400" + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"iE" = ( +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"iP" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"jv" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/indestructible/fakeglass{ + color = "#42f545" + }, +/area/city/backstreets_room) +"jy" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"jQ" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"jY" = ( +/obj/item/slimecross/industrial/grey, +/obj/item/slimecross/industrial/grey, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"kD" = ( +/mob/living/simple_animal/slime/pet{ + color = "#32a852" + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 8 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"kG" = ( +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/item/trash/semki, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"kK" = ( +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"kL" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/item/trash/energybar, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"kP" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"lq" = ( +/obj/effect/turf_decal/siding/purple, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 1 + }, +/obj/structure/disposalpipe/broken{ + dir = 8 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"mr" = ( +/obj/effect/turf_decal{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"mt" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/semki, +/obj/item/trash/cheesie, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"mD" = ( +/obj/item/slimepotion/speed, +/obj/item/slimepotion/speed, +/obj/item/slimepotion/speed, +/obj/item/slimepotion/slime_reviver, +/obj/item/slimepotion/slime_reviver, +/obj/item/slimepotion/slime_reviver, +/obj/item/slimepotion/transference, +/mob/living/simple_animal/hostile/illusion/escape{ + maxHealth = 500; + health = 500 + }, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"mE" = ( +/obj/machinery/light{ + color = "#32a852" + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 6 + }, +/obj/item/trash/sosjerky, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"nc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/gibspawner/human/bodypartless, +/obj/item/trash/semki, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"nd" = ( +/mob/living/simple_animal/slime/pet{ + color = "#32a852" + }, +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/semki, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"np" = ( +/obj/machinery/processor/slime, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"nt" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400" + }, +/obj/item/trash/energybar, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"ol" = ( +/obj/machinery/light{ + dir = 1; + color = "#32a852" + }, +/mob/living/simple_animal/hostile/ordeal/steel_dusk, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"oA" = ( +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"oC" = ( +/obj/structure/chair/sofa/right{ + dir = 1 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"oN" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"oQ" = ( +/obj/structure/table/wood/fancy/green, +/obj/structure/table/wood/fancy/green, +/obj/structure/table/wood/fancy/green, +/obj/structure/table/wood/fancy/green, +/obj/structure/displaycase/forsale, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"oX" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"pC" = ( +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 8 + }, +/obj/item/trash/cheesie, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"pY" = ( +/obj/machinery/door/airlock/glass_large{ + resistance_flags = 64 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"qi" = ( +/obj/item/trash/sosjerky, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"qj" = ( +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 1 + }, +/obj/machinery/light{ + color = "#32a852" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"qq" = ( +/obj/machinery/monkey_recycler, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"rU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/morph, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"sb" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 8 + }, +/obj/structure/plaque/static_plaque{ + pixel_x = 32 + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"su" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/spider/stickyweb/genetic, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"sF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/cratespawn/corpo, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"sH" = ( +/obj/effect/turf_decal/siding/purple, +/mob/living/simple_animal/slime/pet{ + color = "#32a852" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"sY" = ( +/obj/structure/plaque/static_plaque{ + pixel_x = 32 + }, +/mob/living/simple_animal/slime/pet{ + color = "#32a852" + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"to" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/sosjerky, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"tu" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"tG" = ( +/obj/effect/turf_decal/siding/green/corner{ + color = "#006400"; + dir = 3 + }, +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"uk" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 8 + }, +/obj/item/trash/sosjerky, +/obj/machinery/light/broken{ + dir = 8 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"un" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"us" = ( +/turf/closed/mineral/ash_rock, +/area/city/backstreets_room) +"vn" = ( +/obj/structure/table/wood/fancy/green, +/obj/item/toy/plush/slimeplushie, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"vH" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 12 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"wb" = ( +/obj/structure/closet/wardrobe/science_white, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"wl" = ( +/obj/machinery/camera/emp_proof{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/table/wood/fancy/green, +/obj/structure/displaycase/forsale, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"wz" = ( +/obj/machinery/door/airlock/public{ + resistance_flags = 64 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"wF" = ( +/obj/machinery/light{ + color = "#32a852" + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/structure/closet/crate/large, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"wU" = ( +/obj/structure/spider/stickyweb/genetic, +/obj/structure/grille/broken{ + color = "#42f545" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"xa" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, +/obj/item/trash/semki, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"xg" = ( +/obj/machinery/processor/slime, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"xh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"xM" = ( +/obj/structure/sign/warning/nosmoking/circle, +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) +"xN" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"xQ" = ( +/obj/machinery/light{ + color = "#32a852" + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"yd" = ( +/obj/machinery/camera/emp_proof, +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/item/trash/semki, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"yk" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/bot, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"yC" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 32 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"yG" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 32 + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/machinery/light/broken{ + dir = 4 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"yH" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400" + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"zu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"zL" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 12 + }, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"zP" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/disposalpipe/broken{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow/airless, +/area/city/backstreets_room) +"zU" = ( +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/mineral/ash_rock, +/area/city/backstreets_room) +"Ah" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/sosjerky, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"AF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/slime/random, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"AI" = ( +/obj/structure/grille/broken{ + color = "#42f545" + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"AN" = ( +/obj/machinery/door/airlock/public{ + resistance_flags = 64 + }, +/obj/effect/turf_decal/siding/green/end{ + dir = 1; + color = "#006400" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"AY" = ( +/obj/effect/turf_decal{ + dir = 1 + }, +/obj/effect/turf_decal, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"AZ" = ( +/obj/machinery/door/airlock/centcom{ + desc = "A bit too sturdy..."; + max_integrity = 10000; + name = "Strange Airlock"; + normal_integrity = 100000; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"Ba" = ( +/obj/machinery/door/airlock/glass_large{ + resistance_flags = 64; + name = "slime office" + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Bk" = ( +/turf/closed/indestructible/fakeglass{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Bz" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"BJ" = ( +/obj/machinery/light{ + color = "#32a852" + }, +/obj/structure/table/reinforced, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/syringes, +/obj/item/storage/box/syringes, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"BW" = ( +/obj/machinery/light{ + color = "#32a852" + }, +/obj/structure/table/reinforced, +/obj/item/storage/bag/chemistry, +/obj/machinery/reagentgrinder, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Cc" = ( +/obj/structure/fluff/broken_flooring{ + color = "#42f545" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Cy" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/bot, +/obj/effect/gibspawner/human/bodypartless, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"CE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/mineral/ash_rock, +/area/city/backstreets_room) +"CF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"CH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/gibspawner/xeno/bodypartless, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"CK" = ( +/obj/machinery/camera/emp_proof{ + dir = 6 + }, +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/item/trash/semki, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"CT" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/carbon/human/species/monkey, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Dd" = ( +/obj/effect/turf_decal/siding/purple, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Dj" = ( +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"DN" = ( +/obj/machinery/smartfridge/extract/preloaded, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Ed" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 9 + }, +/obj/item/kirbyplants/random, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Ek" = ( +/obj/item/kirbyplants/random, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"EK" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ooze/gelatinous, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"EO" = ( +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/item/trash/cheesie, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"EQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"EV" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 10 + }, +/obj/structure/fluff/broken_flooring{ + color = "#42f545" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Fi" = ( +/obj/structure/sign/departments/science, +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Fr" = ( +/obj/structure/spider/stickyweb/genetic, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Fw" = ( +/obj/structure/sign/departments/xenobio, +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) +"FI" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"FO" = ( +/obj/machinery/door/airlock/public{ + resistance_flags = 64 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Gv" = ( +/obj/structure/plaque/static_plaque{ + pixel_x = -32 + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 8 + }, +/obj/structure/fluff/broken_flooring{ + color = "#42f545" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"GZ" = ( +/obj/machinery/door/airlock/public{ + resistance_flags = 64 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"HC" = ( +/obj/structure/closet/wardrobe/green, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"HE" = ( +/obj/effect/turf_decal{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"HV" = ( +/obj/structure/table/wood/fancy/green, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Ik" = ( +/obj/effect/turf_decal/siding/purple, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Jl" = ( +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Ku" = ( +/obj/machinery/camera/emp_proof{ + dir = 8 + }, +/obj/structure/closet/crate/large, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_simple, +/obj/item/stack/sheet/silk/steel_advanced, +/obj/item/stack/sheet/silk/steel_advanced, +/obj/item/stack/sheet/silk/steel_advanced, +/obj/item/stack/sheet/silk/steel_advanced, +/obj/item/stack/sheet/silk/steel_advanced, +/obj/item/stack/sheet/silk/steel_advanced, +/obj/item/stack/sheet/silk/steel_elegant, +/obj/item/stack/sheet/silk/steel_elegant, +/obj/item/stack/sheet/silk/steel_elegant, +/obj/item/stack/sheet/silk/steel_elegant, +/obj/item/stack/sheet/silk/steel_masterpiece, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"KD" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/structure/closet/crate/large, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"KJ" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Lg" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 32 + }, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 5 + }, +/obj/machinery/light/broken{ + dir = 4 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Lm" = ( +/obj/machinery/processor/slime, +/turf/open/floor/plating/asteroid/snow/airless, +/area/city/backstreets_room) +"LR" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/bot, +/mob/living/simple_animal/slime/random, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"MD" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/semki, +/obj/item/trash/sosjerky, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"MF" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/item/trash/energybar, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"MP" = ( +/obj/structure/sign/warning/coldtemp, +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Nx" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/bot, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Ny" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/item/trash/cheesie, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"NF" = ( +/obj/structure/closet/crate/large, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c200, +/obj/item/stack/spacecash/c200, +/obj/item/stack/spacecash/c200, +/obj/structure/spider/stickyweb/genetic, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"NN" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/fluff/broken_flooring{ + color = "#42f545" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Ol" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Om" = ( +/obj/structure/closet/wardrobe/genetics_white, +/obj/structure/fluff/broken_flooring{ + color = "#42f545" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Pa" = ( +/obj/machinery/camera/emp_proof{ + dir = 6 + }, +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Pb" = ( +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Ps" = ( +/obj/machinery/camera/emp_proof{ + dir = 4 + }, +/obj/machinery/door/window, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 10 + }, +/obj/structure/plaque/static_plaque{ + pixel_x = -32 + }, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Px" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/gibspawner/human/bodypartless, +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/bot, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"PI" = ( +/obj/structure/table/wood/fancy/green, +/obj/item/key/displaycase, +/obj/item/key/displaycase, +/obj/effect/landmark/cratespawn/corpo, +/obj/effect/landmark/cratespawn/corpo, +/obj/item/documents, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"PK" = ( +/obj/machinery/monkey_recycler, +/obj/item/trash/energybar, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"PL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + color = "#32a852"; + dir = 8 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"PV" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/structure/closet/crate/large, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c50, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Qa" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"QZ" = ( +/obj/effect/turf_decal{ + dir = 1 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Rk" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/sosjerky, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Rw" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 9 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Ry" = ( +/mob/living/simple_animal/slime/pet{ + color = "#32a852" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"RI" = ( +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"RX" = ( +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"RY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/trash/semki, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Sn" = ( +/obj/structure/plaque/static_plaque{ + pixel_x = -32 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"So" = ( +/obj/machinery/camera/emp_proof{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 6 + }, +/obj/structure/closet/crate/large, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/item/stack/spacecash/c100, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"SB" = ( +/obj/effect/turf_decal/siding/green/end{ + dir = 4; + color = "#006400" + }, +/obj/item/kirbyplants/random, +/obj/structure/plaque/static_plaque{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"SM" = ( +/obj/structure/table/wood/fancy/green, +/obj/item/clothing/mask/animal/frog/cursed, +/obj/item/clothing/under/color/darkgreen, +/obj/item/clothing/suit/armor/ego_gear/city/kcorp_sci{ + name = "slime office scientist uniform"; + desc = "A white labcoat with slime offices signature green. Appears to be specifically designed to not protect the wearer." + }, +/obj/item/clothing/shoes/cowboy/lizard, +/obj/item/storage/backpack/satchel/vir, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Tb" = ( +/obj/structure/table/wood/fancy/green, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/item/food/donut/jelly/slimejelly/blumpkin, +/obj/item/food/donut/jelly/slimejelly/blumpkin, +/obj/item/food/donut/jelly/slimejelly/trumpet, +/obj/item/food/donut/jelly/slimejelly/trumpet, +/obj/item/food/donut/jelly/slimejelly/bungo, +/obj/item/food/donut/jelly/slimejelly/bungo, +/obj/item/trash/semki, +/obj/item/trash/sosjerky, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Th" = ( +/obj/machinery/smartfridge/extract, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"Tj" = ( +/obj/machinery/camera/emp_proof, +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Tn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Tp" = ( +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"TP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/spider/stickyweb/genetic, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Um" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Uq" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/item/trash/semki, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"UL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/camera/emp_proof{ + dir = 8 + }, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Vh" = ( +/obj/machinery/light/broken{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow/airless, +/area/city/backstreets_room) +"Vu" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"VF" = ( +/obj/structure/chair/comfy/teal, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Wg" = ( +/obj/structure/disposalpipe/broken{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow/airless, +/area/city/backstreets_room) +"Wv" = ( +/obj/item/slimecross/industrial/purple, +/obj/item/slimecross/industrial/purple, +/obj/item/trash/energybar, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"WC" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Xw" = ( +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"XA" = ( +/obj/effect/turf_decal{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/broken{ + dir = 1 + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"XI" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/cratespawn/corpo, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"YZ" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/effect/turf_decal/siding/green/corner{ + dir = 4; + color = "#006400" + }, +/obj/item/trash/energybar, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Zx" = ( +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 + }, +/obj/item/trash/cheesie, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"ZE" = ( +/obj/effect/turf_decal/siding/green{ + dir = 1; + color = "#006400" + }, +/turf/open/floor/plating{ + color = "#42f545" + }, +/area/city/backstreets_room) +"ZV" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) + +(1,1,1) = {" +us +us +us +us +us +fn +fn +fn +fn +xM +fn +fn +fn +fn +fn +fn +fn +fn +fn +fn +"} +(2,1,1) = {" +us +hK +ZV +XI +Bk +wl +Sn +RX +AN +ir +lq +Bk +PL +rU +wz +AY +wz +gF +TP +fn +"} +(3,1,1) = {" +fn +ZV +Px +AF +Bk +PV +Fr +xh +Fw +EO +sH +Bk +zu +CH +Bk +Dd +AI +TP +EK +fn +"} +(4,1,1) = {" +fn +ZV +ZV +ZV +Bk +hC +CF +Om +us +yd +bw +Bk +AI +Bk +Bk +Ik +Bk +Bk +Bk +fn +"} +(5,1,1) = {" +fn +wz +Bk +Bk +Bk +xN +VF +qj +us +Lg +sb +hk +YZ +Vu +gY +tu +ee +Vu +wF +fn +"} +(6,1,1) = {" +fn +HE +Vu +MD +Vu +Bz +iE +PK +fn +fn +fn +fn +Pa +Rk +Pb +yG +mt +Qa +kP +fn +"} +(7,1,1) = {" +us +hl +kL +iP +iP +Ah +iE +xg +fn +Th +bJ +AZ +kK +iE +CE +fn +fn +FO +us +us +"} +(8,1,1) = {" +us +jv +jv +jv +jv +aY +Pb +DN +fn +su +mD +gW +gS +iE +fj +Ed +Ps +Pb +Tp +us +"} +(9,1,1) = {" +us +EQ +LR +ZV +jv +xN +Ry +DN +fn +NF +Ku +fn +nd +iE +wU +oA +eq +ai +oC +Fi +"} +(10,1,1) = {" +fn +sF +Nx +fz +pY +QZ +RY +BJ +fn +us +us +us +kK +iE +us +ci +HV +vH +qi +Ba +"} +(11,1,1) = {" +fn +CT +nc +TP +ZV +mr +Pb +BW +fn +im +HC +us +zU +jQ +fn +Ol +vn +zL +Pb +iE +"} +(12,1,1) = {" +fn +Tn +TP +yk +jv +aY +Wv +ao +fn +ol +Ek +AI +Cc +KJ +fn +tG +Tb +oN +Tp +Fi +"} +(13,1,1) = {" +us +jv +jv +jv +jv +aY +jY +DN +fn +Jl +PI +AI +CF +xQ +us +SB +Bk +Um +oC +fn +"} +(14,1,1) = {" +us +jy +ee +un +gY +Zx +xh +np +fn +Jl +SM +fn +ZE +nt +us +fn +fn +FO +fn +fn +"} +(15,1,1) = {" +us +XA +MF +Uq +oX +WC +iE +qq +us +GZ +fn +fn +CK +pC +FI +uk +fQ +kD +EV +fn +"} +(16,1,1) = {" +us +wz +jv +AI +AI +NN +VF +qj +us +Rw +FI +Gv +fo +sY +bl +Xw +Ny +bk +mE +us +"} +(17,1,1) = {" +fn +TP +Cy +ZV +jv +xa +to +wb +us +Tj +cQ +iE +KJ +fn +fn +MP +FO +fn +us +us +"} +(18,1,1) = {" +fn +TP +AF +ZV +jv +KD +Pb +RI +Fw +kG +Dj +xh +yH +AI +at +Wg +at +at +fI +us +"} +(19,1,1) = {" +fn +il +Nx +UL +jv +bA +yC +xh +AN +co +bl +oQ +So +Bk +zP +Vh +at +Vh +Lm +us +"} +(20,1,1) = {" +fn +fn +us +us +us +fn +fn +fn +fn +xM +fn +fn +fn +fn +fn +fn +us +us +us +us +"} diff --git a/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm b/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm new file mode 100644 index 000000000000..f5a505753c91 --- /dev/null +++ b/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm @@ -0,0 +1,375 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"c" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bed/dogbed/ian, +/turf/open/floor/wood, +/area/city/backstreets_room) +"d" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"e" = ( +/turf/closed/indestructible/rock, +/area/city/backstreets_room) +"f" = ( +/mob/living/simple_animal/hostile/humanoid/rat/zippy, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"j" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/city/backstreets_room) +"m" = ( +/mob/living/simple_animal/hostile/humanoid/rat, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"n" = ( +/obj/structure/table/wood, +/obj/item/fishing_rod, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"o" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/humanoid/rat/hammer, +/turf/open/floor/wood, +/area/city/backstreets_room) +"p" = ( +/obj/structure/bed/dogbed/ian, +/mob/living/simple_animal/pet/cat/jerry, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"q" = ( +/obj/machinery/griddle, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"t" = ( +/obj/structure/bed/maint, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"v" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/stack/sheet/animalhide/corgi, +/turf/open/floor/wood, +/area/city/backstreets_room) +"w" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/food/meat/slab/bear, +/turf/open/floor/wood, +/area/city/backstreets_room) +"y" = ( +/obj/item/food/fish/fresh_water/ratfish, +/obj/structure/bed/maint, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"z" = ( +/mob/living/simple_animal/hostile/humanoid/rat/pipe, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"A" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"D" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/food/meat/rawbacon, +/obj/item/food/meat/rawbacon, +/obj/item/food/meat/rawbacon, +/obj/structure/table/wood, +/obj/item/kitchen/knife, +/turf/open/floor/wood, +/area/city/backstreets_room) +"G" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/broken{ + dir = 8 + }, +/obj/item/food/burger/corgi, +/turf/open/floor/wood, +/area/city/backstreets_room) +"K" = ( +/obj/item/food/fish/fresh_water/ratfish, +/turf/open/floor/wood, +/area/city/backstreets_room) +"L" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"N" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/bed, +/obj/item/bedsheet/ian, +/turf/open/floor/wood, +/area/city/backstreets_room) +"O" = ( +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) +"Q" = ( +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) +"R" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"S" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"U" = ( +/mob/living/simple_animal/hostile/humanoid/rat/hammer, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) +"W" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"X" = ( +/obj/item/food/fish/fresh_water/ratfish, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Z" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/wood, +/area/city/backstreets_room) + +(1,1,1) = {" +a +a +a +a +a +a +Q +Q +Q +e +e +e +a +a +a +"} +(2,1,1) = {" +a +W +y +n +d +a +Q +Q +Q +Q +Q +Q +a +p +a +"} +(3,1,1) = {" +a +K +S +z +X +A +Q +Q +Q +O +Q +Q +A +f +a +"} +(4,1,1) = {" +a +W +W +X +K +a +a +a +a +a +a +Q +a +t +a +"} +(5,1,1) = {" +a +a +a +a +a +a +q +W +G +L +a +Q +a +a +a +"} +(6,1,1) = {" +Q +Q +a +W +w +a +D +v +o +S +a +Q +Q +Q +Q +"} +(7,1,1) = {" +Q +U +a +m +R +a +c +S +a +A +a +Q +Q +Q +Q +"} +(8,1,1) = {" +Q +Q +A +W +W +a +j +N +a +Q +Q +Q +O +Q +Q +"} +(9,1,1) = {" +e +Q +a +t +j +a +a +a +a +Q +Q +Q +Q +e +e +"} +(10,1,1) = {" +e +Q +a +a +a +a +Q +Q +Q +Q +Q +a +A +a +a +"} +(11,1,1) = {" +e +Q +Q +Q +Q +Q +O +Q +Q +Q +Q +a +W +t +a +"} +(12,1,1) = {" +e +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +a +Z +j +a +"} +(13,1,1) = {" +e +e +e +e +e +e +Q +Q +Q +e +e +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/connector/fort_knox.dmm b/_maps/RandomRooms/backstreets/connector/fort_knox.dmm index b78886101a76..cd339ccd54c1 100644 --- a/_maps/RandomRooms/backstreets/connector/fort_knox.dmm +++ b/_maps/RandomRooms/backstreets/connector/fort_knox.dmm @@ -5,8 +5,8 @@ "c" = ( /obj/structure/railing{ dir = 10; - name = "invincible railing"; - max_integrity = 1e+007 + max_integrity = 1e+007; + name = "invincible railing" }, /mob/living/simple_animal/hostile/ordeal/green_bot_big{ name = "gun bot" @@ -46,8 +46,8 @@ "h" = ( /obj/structure/railing{ dir = 9; - name = "invincible railing"; - max_integrity = 1e+007 + max_integrity = 1e+007; + name = "invincible railing" }, /mob/living/simple_animal/hostile/ordeal/green_bot_big{ name = "gun bot" @@ -69,10 +69,10 @@ /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) "j" = ( +/obj/structure/lootcrate/money, /obj/structure/railing{ dir = 5 }, -/obj/item/raw_anomaly_core/flux, /turf/open/floor/mineral/plastitanium/red, /area/city/backstreets_room) "k" = ( @@ -116,22 +116,22 @@ "r" = ( /obj/structure/railing{ dir = 8; - name = "invincible railing"; - max_integrity = 1e+007 + max_integrity = 1e+007; + name = "invincible railing" }, /obj/structure/railing{ dir = 1; - name = "invincible railing"; - max_integrity = 1e+007 + max_integrity = 1e+007; + name = "invincible railing" }, /obj/structure/railing{ dir = 4; - name = "invincible railing"; - max_integrity = 1e+007 + max_integrity = 1e+007; + name = "invincible railing" }, /obj/structure/railing{ - name = "invincible railing"; - max_integrity = 1e+007 + max_integrity = 1e+007; + name = "invincible railing" }, /mob/living/simple_animal/hostile/ordeal/green_bot_big{ name = "gun bot" @@ -220,8 +220,8 @@ "H" = ( /obj/structure/railing{ dir = 5; - name = "invincible railing"; - max_integrity = 1e+007 + max_integrity = 1e+007; + name = "invincible railing" }, /mob/living/simple_animal/hostile/ordeal/green_bot_big{ name = "gun bot" @@ -274,10 +274,10 @@ /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) "O" = ( +/obj/structure/lootcrate/money, /obj/structure/railing{ dir = 8 }, -/obj/item/raw_anomaly_core/pyro, /turf/open/floor/mineral/plastitanium/red, /area/city/backstreets_room) "Q" = ( @@ -321,8 +321,8 @@ "Z" = ( /obj/structure/railing{ dir = 6; - name = "invincible railing"; - max_integrity = 1e+007 + max_integrity = 1e+007; + name = "invincible railing" }, /mob/living/simple_animal/hostile/ordeal/green_bot_big{ name = "gun bot" diff --git a/_maps/RandomRooms/backstreets/connector/toughshit.dmm b/_maps/RandomRooms/backstreets/connector/toughshit.dmm new file mode 100644 index 000000000000..bc6fe367dbed --- /dev/null +++ b/_maps/RandomRooms/backstreets/connector/toughshit.dmm @@ -0,0 +1,239 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"N" = ( +/obj/item/stack/spacecash/c100, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) +"Q" = ( +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) +"S" = ( +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) +"W" = ( +/turf/open/chasm, +/area/city/backstreets_room) + +(1,1,1) = {" +a +a +a +a +a +a +Q +Q +Q +Q +a +a +a +a +a +"} +(2,1,1) = {" +a +W +W +W +W +S +Q +Q +Q +Q +S +W +W +W +a +"} +(3,1,1) = {" +a +W +W +W +W +S +S +Q +N +Q +S +W +W +W +a +"} +(4,1,1) = {" +a +W +W +W +W +W +S +Q +Q +Q +S +W +W +W +a +"} +(5,1,1) = {" +a +S +S +S +S +W +S +Q +Q +S +S +S +S +S +a +"} +(6,1,1) = {" +Q +Q +Q +Q +S +S +S +Q +Q +S +Q +Q +Q +Q +Q +"} +(7,1,1) = {" +Q +Q +Q +N +Q +Q +S +S +S +S +Q +Q +N +Q +Q +"} +(8,1,1) = {" +Q +Q +S +S +S +S +W +S +Q +S +Q +Q +Q +Q +Q +"} +(9,1,1) = {" +a +S +S +W +W +S +S +S +Q +S +S +S +Q +Q +Q +"} +(10,1,1) = {" +a +W +W +W +W +S +Q +Q +Q +S +W +S +S +S +a +"} +(11,1,1) = {" +a +W +W +W +W +S +Q +N +Q +S +W +W +W +W +a +"} +(12,1,1) = {" +a +W +W +W +W +S +Q +Q +Q +S +W +W +W +W +a +"} +(13,1,1) = {" +a +a +a +a +a +a +Q +Q +Q +a +a +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/connector/water_ca.dmm b/_maps/RandomRooms/backstreets/connector/water_ca.dmm new file mode 100644 index 000000000000..c6b5677d8f46 --- /dev/null +++ b/_maps/RandomRooms/backstreets/connector/water_ca.dmm @@ -0,0 +1,241 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"Q" = ( +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"S" = ( +/turf/open/water/deep/freshwater, +/area/city/backstreets_room) +"W" = ( +/obj/effect/light_emitter{ + light_power = 4; + light_range = 25; + set_cap = 3; + set_luminosity = 24 + }, +/turf/open/water/deep/freshwater, +/area/city/backstreets_room) + +(1,1,1) = {" +a +a +a +a +a +a +Q +Q +Q +a +a +a +a +a +a +"} +(2,1,1) = {" +a +W +S +S +S +Q +Q +Q +Q +Q +S +S +S +W +a +"} +(3,1,1) = {" +a +S +S +S +S +S +Q +Q +Q +S +S +S +S +S +a +"} +(4,1,1) = {" +a +S +S +S +S +S +S +S +S +S +S +S +S +Q +a +"} +(5,1,1) = {" +a +Q +S +S +S +S +S +S +S +S +S +S +S +Q +a +"} +(6,1,1) = {" +Q +Q +S +S +S +S +S +S +S +S +S +S +Q +Q +Q +"} +(7,1,1) = {" +Q +Q +Q +S +S +S +S +S +S +S +S +S +Q +Q +Q +"} +(8,1,1) = {" +Q +Q +Q +S +S +S +S +S +S +S +S +S +S +Q +Q +"} +(9,1,1) = {" +a +Q +S +S +S +S +S +S +S +S +S +S +S +S +a +"} +(10,1,1) = {" +a +S +S +S +S +S +S +S +S +S +S +S +S +S +a +"} +(11,1,1) = {" +a +S +S +S +S +S +Q +Q +Q +Q +Q +S +S +S +a +"} +(12,1,1) = {" +a +W +S +S +S +Q +Q +Q +Q +Q +Q +Q +S +W +a +"} +(13,1,1) = {" +a +a +a +a +a +a +Q +Q +Q +a +a +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm b/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm new file mode 100644 index 000000000000..6534af04c76a --- /dev/null +++ b/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm @@ -0,0 +1,366 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/revival, +/turf/open/floor/wood, +/area/city/backstreets_room) +"e" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"g" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/humanoid/rat/zippy, +/turf/open/floor/wood, +/area/city/backstreets_room) +"h" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/wood, +/area/city/backstreets_room) +"i" = ( +/obj/machinery/dna_scannernew, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"j" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/humanoid/rat/pipe, +/turf/open/floor/wood, +/area/city/backstreets_room) +"m" = ( +/obj/structure/table/wood, +/obj/item/dnainjector/glow, +/obj/item/dnainjector/lasereyesmut{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"n" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"o" = ( +/obj/item/kirbyplants/random, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"q" = ( +/obj/structure/closet/cabinet, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"r" = ( +/obj/structure/dresser, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"s" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/humanoid/rat/knife, +/turf/open/floor/wood, +/area/city/backstreets_room) +"w" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/donk, +/area/city/backstreets_room) +"x" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/regular, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"y" = ( +/obj/machinery/computer/cloning, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"z" = ( +/obj/structure/chair/sofa/corp/left, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/donk, +/area/city/backstreets_room) +"B" = ( +/obj/structure/table/wood, +/obj/item/candle, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"C" = ( +/obj/structure/chair/comfy/black{ + dir = 8 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"D" = ( +/obj/machinery/griddle, +/turf/open/floor/wood, +/area/city/backstreets_room) +"E" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"F" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/city/backstreets_room) +"G" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"H" = ( +/obj/structure/bed/pod, +/obj/item/bedsheet/ce, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"I" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/carpet/donk, +/area/city/backstreets_room) +"J" = ( +/mob/living/simple_animal/hostile/humanoid/rat/hammer, +/turf/open/floor/wood, +/area/city/backstreets_room) +"K" = ( +/obj/machinery/door/airlock/centcom{ + desc = "A bit too sturdy..."; + max_integrity = 10000; + name = "Strange Airlock"; + normal_integrity = 100000; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/shuttle{ + name = "floor" + }, +/area/city/backstreets_room) +"L" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"M" = ( +/obj/structure/table/wood, +/obj/item/candle{ + pixel_y = 9 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/spacecash/c100, +/turf/open/floor/wood, +/area/city/backstreets_room) +"N" = ( +/obj/structure/table/wood, +/obj/item/phone, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"O" = ( +/obj/structure/chair/sofa/corp/right, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/donk, +/area/city/backstreets_room) +"Q" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"R" = ( +/obj/structure/chair/sofa/corp, +/turf/open/floor/carpet/donk, +/area/city/backstreets_room) +"S" = ( +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"U" = ( +/obj/structure/bed/maint, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"V" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/donk, +/area/city/backstreets_room) +"X" = ( +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/structure/sink{ + pixel_y = 19 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"Y" = ( +/turf/open/floor/carpet/donk, +/area/city/backstreets_room) +"Z" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) + +(1,1,1) = {" +L +L +L +L +L +L +L +L +"} +(2,1,1) = {" +L +a +Z +Q +L +x +Z +L +"} +(3,1,1) = {" +L +y +Z +B +L +q +g +n +"} +(4,1,1) = {" +L +i +Z +C +L +F +U +L +"} +(5,1,1) = {" +L +m +Z +L +L +L +L +L +"} +(6,1,1) = {" +L +L +K +L +D +S +M +L +"} +(7,1,1) = {" +L +E +Z +n +Z +s +e +L +"} +(8,1,1) = {" +L +o +h +L +r +G +H +L +"} +(9,1,1) = {" +L +G +Z +L +L +L +L +L +"} +(10,1,1) = {" +L +Z +Z +Z +N +L +X +L +"} +(11,1,1) = {" +L +o +Z +J +Z +L +n +L +"} +(12,1,1) = {" +L +L +n +L +V +V +Y +L +"} +(13,1,1) = {" +L +x +G +L +O +V +I +L +"} +(14,1,1) = {" +L +q +j +L +R +Y +V +n +"} +(15,1,1) = {" +L +F +U +L +z +V +w +L +"} +(16,1,1) = {" +L +L +L +L +L +L +L +L +"} diff --git a/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm b/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm new file mode 100644 index 000000000000..1c28a119be90 --- /dev/null +++ b/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm @@ -0,0 +1,416 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"gl" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"gJ" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e" + }, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"hY" = ( +/obj/structure/chair/pew/left{ + dir = 4 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"iN" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#694720"; + dir = 1 + }, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"mX" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"nG" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e"; + dir = 5 + }, +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = -6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"ql" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"rJ" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"tk" = ( +/obj/structure/table/wood, +/obj/item/food/sashimi, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 7; + pixel_y = 8 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"tH" = ( +/obj/structure/window/paperframe, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"uK" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e"; + dir = 10 + }, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"vm" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e"; + dir = 9 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"zI" = ( +/obj/structure/lootcrate/syndicate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"BV" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/light_emitter{ + light_power = 4; + light_range = 25; + set_cap = 3; + set_luminosity = 24 + }, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"Cw" = ( +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"Da" = ( +/obj/structure/chair/pew/right{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Dl" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e"; + dir = 1 + }, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"Gp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/lootcrate/money, +/turf/open/floor/wood, +/area/city/backstreets_room) +"HL" = ( +/obj/structure/lootcrate/syndicate, +/turf/open/floor/wood, +/area/city/backstreets_room) +"IF" = ( +/mob/living/simple_animal/hostile/humanoid/rat/knife, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"IT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"Jj" = ( +/obj/structure/mineral_door/paperframe, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Jl" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e" + }, +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"KE" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e"; + dir = 6 + }, +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"Lf" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#694720"; + dir = 1 + }, +/mob/living/simple_animal/hostile/humanoid/rat/pipe, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"On" = ( +/obj/structure/mineral_door/paperframe, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Pg" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e"; + dir = 8 + }, +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"PO" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e"; + dir = 1 + }, +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"Qu" = ( +/obj/structure/window/paperframe, +/turf/open/floor/wood, +/area/city/backstreets_room) +"QS" = ( +/obj/structure/table/wood, +/obj/item/food/sashimi, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Ry" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"RL" = ( +/obj/effect/turf_decal/siding/wood, +/mob/living/simple_animal/hostile/humanoid/rat/pipe, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"Th" = ( +/mob/living/simple_animal/hostile/humanoid/rat/zippy, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Ti" = ( +/turf/closed/indestructible/wood, +/area/city/backstreets_room) +"Ts" = ( +/mob/living/simple_animal/hostile/humanoid/rat/hammer, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"Wt" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Xb" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"XH" = ( +/obj/effect/turf_decal/siding/wood{ + color = "#2e1f0e"; + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"XV" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) +"XY" = ( +/obj/structure/chair/pew/right{ + dir = 8 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Yn" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/mob/living/simple_animal/hostile/humanoid/rat/hammer, +/turf/open/floor/plating/beach/sand, +/area/city/backstreets_room) + +(1,1,1) = {" +Ti +Ti +Ti +Ti +Ti +Ti +Ti +gl +"} +(2,1,1) = {" +Ti +tk +Wt +Wt +Wt +Wt +mX +On +"} +(3,1,1) = {" +Ti +Xb +Wt +Da +hY +Wt +Wt +On +"} +(4,1,1) = {" +Ti +Qu +Jj +tH +tH +Jj +tH +gl +"} +(5,1,1) = {" +Ti +HL +Wt +mX +Wt +Wt +Th +gl +"} +(6,1,1) = {" +Ti +Wt +vm +Ry +Pg +uK +HL +gl +"} +(7,1,1) = {" +Ti +Gp +PO +IF +Cw +Jl +Wt +gl +"} +(8,1,1) = {" +Ti +zI +iN +Cw +XV +RL +Wt +gl +"} +(9,1,1) = {" +Ti +Wt +Lf +Yn +Cw +BV +Wt +gl +"} +(10,1,1) = {" +Ti +mX +Dl +rJ +Ts +gJ +HL +gl +"} +(11,1,1) = {" +Ti +Wt +nG +IT +XH +KE +Wt +gl +"} +(12,1,1) = {" +Ti +zI +Wt +Wt +mX +Wt +Th +gl +"} +(13,1,1) = {" +Ti +tH +Jj +tH +Qu +Jj +tH +gl +"} +(14,1,1) = {" +Ti +QS +Wt +ql +XY +Wt +Wt +On +"} +(15,1,1) = {" +Ti +Xb +Wt +mX +mX +mX +mX +On +"} +(16,1,1) = {" +Ti +Ti +Ti +Ti +Ti +Ti +Ti +gl +"} diff --git a/_maps/RandomRooms/backstreets/large_north/electric_room.dmm b/_maps/RandomRooms/backstreets/large_north/electric_room.dmm index f05795163423..06130a32fc0d 100644 --- a/_maps/RandomRooms/backstreets/large_north/electric_room.dmm +++ b/_maps/RandomRooms/backstreets/large_north/electric_room.dmm @@ -78,7 +78,6 @@ /area/city/backstreets_room) "hz" = ( /obj/structure/closet/crate/large, -/obj/item/gun/ego_gun/pistol/kcorp/nade, /obj/item/ego_weapon/shield/kcorp, /turf/open/floor/facility/dark, /area/city/backstreets_room) diff --git a/_maps/RandomRooms/backstreets/medium_north/lab_ln.dmm b/_maps/RandomRooms/backstreets/large_north/lab_ln.dmm similarity index 100% rename from _maps/RandomRooms/backstreets/medium_north/lab_ln.dmm rename to _maps/RandomRooms/backstreets/large_north/lab_ln.dmm diff --git a/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm b/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm new file mode 100644 index 000000000000..fbef14fe7f26 --- /dev/null +++ b/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm @@ -0,0 +1,257 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"c" = ( +/obj/structure/rack, +/obj/item/ego_weapon/shield/lccb, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"e" = ( +/obj/structure/rack, +/obj/item/ego_weapon/city/lccb_bat, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"i" = ( +/mob/living/simple_animal/hostile/ordeal/sin_wrath, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"j" = ( +/obj/structure/table, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"k" = ( +/mob/living/simple_animal/hostile/ordeal/sin_lust, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"p" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"t" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/effect/gibspawner/generic, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"u" = ( +/obj/machinery/door/airlock{ + name = "lab entrance" + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"A" = ( +/obj/item/shard, +/obj/structure/grille/broken, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"E" = ( +/obj/structure/table_frame, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"I" = ( +/obj/structure/table, +/obj/item/ego_weapon/ranged/city/limbuspistol, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"J" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/ego_gear/limbus_labs, +/obj/item/clothing/head/beret/sec/lccb, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"L" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"M" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) +"O" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gloom, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Q" = ( +/obj/structure/window/fulltile, +/obj/structure/grille, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"U" = ( +/obj/structure/rack, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"V" = ( +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) +"X" = ( +/obj/machinery/door/airlock{ + name = "lab security" + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Y" = ( +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Z" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) + +(1,1,1) = {" +L +L +L +L +L +L +L +L +"} +(2,1,1) = {" +L +Y +Y +Q +Y +Y +c +L +"} +(3,1,1) = {" +L +Y +k +Q +Z +Y +J +L +"} +(4,1,1) = {" +L +L +L +L +Y +Y +U +L +"} +(5,1,1) = {" +L +Y +Y +Q +Y +O +Y +L +"} +(6,1,1) = {" +L +i +Y +Q +O +Y +Y +L +"} +(7,1,1) = {" +L +L +L +L +Y +Y +e +L +"} +(8,1,1) = {" +L +Y +Y +A +Y +Z +J +L +"} +(9,1,1) = {" +L +Y +O +Q +Y +Y +U +L +"} +(10,1,1) = {" +L +L +L +L +L +u +L +L +"} +(11,1,1) = {" +L +Z +Y +p +Q +V +V +V +"} +(12,1,1) = {" +L +t +Y +E +A +V +V +V +"} +(13,1,1) = {" +L +Y +Z +j +Q +V +M +V +"} +(14,1,1) = {" +L +Y +Z +Y +X +V +V +V +"} +(15,1,1) = {" +L +j +j +I +Q +V +V +V +"} +(16,1,1) = {" +L +L +L +L +L +L +L +L +"} diff --git a/_maps/RandomRooms/backstreets/large_south/bongy.dmm b/_maps/RandomRooms/backstreets/large_south/bongy.dmm new file mode 100644 index 000000000000..aed2ccf94d41 --- /dev/null +++ b/_maps/RandomRooms/backstreets/large_south/bongy.dmm @@ -0,0 +1,562 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/chair/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"b" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/bongy_hostile, +/turf/open/floor/wood, +/area/city/backstreets_room) +"c" = ( +/obj/structure/table/wood, +/obj/item/food/fries{ + pixel_x = -6 + }, +/obj/item/food/fried_chicken{ + pixel_x = 6 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"d" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"e" = ( +/turf/open/floor/facility, +/area/city/backstreets_room) +"f" = ( +/obj/structure/table/wood, +/obj/item/food/burger/chicken{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/food/burger/chicken{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"g" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"h" = ( +/obj/machinery/griddle, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"i" = ( +/obj/machinery/deepfryer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"j" = ( +/obj/machinery/vending/cola, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"k" = ( +/obj/effect/decal/cleanable/food/flour, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility, +/area/city/backstreets_room) +"l" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"m" = ( +/obj/structure/table, +/obj/item/reagent_containers/glass/bowl, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"n" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/city/backstreets_room) +"o" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"p" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"q" = ( +/obj/effect/landmark/cratespawn, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"r" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"s" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"t" = ( +/mob/living/simple_animal/hostile/distortion/papa_bongy, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/facility, +/area/city/backstreets_room) +"u" = ( +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"v" = ( +/obj/machinery/deepfryer, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"w" = ( +/obj/structure/table/wood, +/obj/item/food/fried_chicken{ + pixel_x = 6 + }, +/obj/item/food/fries{ + pixel_x = -4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_x = -2; + pixel_y = 11 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"x" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility, +/area/city/backstreets_room) +"y" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/facility, +/area/city/backstreets_room) +"z" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"A" = ( +/obj/structure/table, +/obj/item/food/patty/chicken{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/food/patty/chicken{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/food/patty/chicken{ + pixel_x = 3; + pixel_y = -7 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"B" = ( +/obj/machinery/processor, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"C" = ( +/obj/structure/table, +/obj/item/food/fried_chicken{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/food/burger/chicken{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/food/fried_chicken{ + pixel_x = 1; + pixel_y = -7 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"D" = ( +/obj/structure/table/wood, +/obj/item/food/fries{ + pixel_x = -5 + }, +/obj/item/food/burger/chicken{ + pixel_x = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"E" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"G" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/facility, +/area/city/backstreets_room) +"H" = ( +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"I" = ( +/obj/structure/table, +/obj/item/food/patty/chicken{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/food/patty/chicken{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/food/patty/chicken{ + pixel_x = -4; + pixel_y = -4 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"J" = ( +/obj/structure/table, +/obj/item/food/bun{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/food/bun{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/food/bun, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"K" = ( +/obj/structure/table, +/obj/item/food/raw_patty/chicken, +/obj/item/food/raw_patty/chicken{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/food/raw_patty/chicken{ + pixel_x = 7; + pixel_y = 5 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"L" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"M" = ( +/obj/structure/chair/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"N" = ( +/obj/effect/decal/cleanable/blood/gibs/down, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/facility, +/area/city/backstreets_room) +"O" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"P" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Q" = ( +/obj/effect/landmark/cratespawn, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"R" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"S" = ( +/obj/structure/table, +/obj/item/food/patty/chicken{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/food/patty/chicken{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/food/patty/chicken{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/food/patty/chicken{ + pixel_x = -4; + pixel_y = -4 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"T" = ( +/obj/structure/table, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"U" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 + }, +/turf/open/floor/facility, +/area/city/backstreets_room) +"V" = ( +/obj/structure/table, +/obj/item/food/meat/slab/chicken{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/food/meat/slab/chicken{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/food/meat/slab/chicken{ + pixel_x = -4; + pixel_y = 1 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"W" = ( +/obj/structure/table, +/obj/item/food/meat/slab/chicken{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/food/meat/slab/chicken{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/food/meat/slab/chicken{ + pixel_x = 4; + pixel_y = 2 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"X" = ( +/obj/structure/table, +/obj/item/food/fried_chicken{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/food/fried_chicken{ + pixel_x = -2 + }, +/obj/item/food/fried_chicken{ + pixel_x = 6 + }, +/obj/item/food/fries{ + pixel_x = -3; + pixel_y = 2 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"Z" = ( +/obj/structure/table, +/obj/item/food/meat/slab/chicken{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/food/meat/slab/chicken{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/food/meat/slab/chicken{ + pixel_x = -4; + pixel_y = 1 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) + +(1,1,1) = {" +L +L +L +L +L +L +L +L +"} +(2,1,1) = {" +n +a +D +z +r +r +R +L +"} +(3,1,1) = {" +n +a +w +z +r +b +f +L +"} +(4,1,1) = {" +g +O +O +O +r +O +P +L +"} +(5,1,1) = {" +n +r +b +O +r +O +O +L +"} +(6,1,1) = {" +n +M +c +z +O +O +j +L +"} +(7,1,1) = {" +L +L +L +L +g +L +L +L +"} +(8,1,1) = {" +L +h +d +u +H +C +X +L +"} +(9,1,1) = {" +L +i +G +x +e +x +d +L +"} +(10,1,1) = {" +L +v +N +A +I +x +q +L +"} +(11,1,1) = {" +L +v +y +S +J +e +Q +L +"} +(12,1,1) = {" +L +v +y +T +E +k +l +L +"} +(13,1,1) = {" +L +V +y +B +K +x +o +L +"} +(14,1,1) = {" +L +Z +U +t +e +k +m +L +"} +(15,1,1) = {" +L +W +Q +p +p +Q +s +L +"} +(16,1,1) = {" +L +L +L +L +L +L +L +L +"} diff --git a/_maps/RandomRooms/backstreets/medium_east/prosthetics_me.dmm b/_maps/RandomRooms/backstreets/medium_east/prosthetics_me.dmm new file mode 100644 index 000000000000..3c605e6cc1e2 --- /dev/null +++ b/_maps/RandomRooms/backstreets/medium_east/prosthetics_me.dmm @@ -0,0 +1,186 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"e" = ( +/obj/structure/rack, +/obj/item/organ/eyes/robotic/thermals, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"g" = ( +/obj/structure/table/glass, +/obj/item/storage/firstaid/ancient, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"i" = ( +/obj/structure/table/glass, +/obj/item/kitchen/knife/shiv, +/obj/item/crowbar/large{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/wirecutters, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"s" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"x" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"y" = ( +/obj/structure/bed/maint, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"B" = ( +/obj/structure/rack, +/obj/item/organ/stomach/cybernetic/tier2, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"E" = ( +/obj/structure/lootcrate/money, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"F" = ( +/obj/structure/rack, +/obj/item/stack/spacecash/c100, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"G" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"H" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"K" = ( +/obj/structure/rack, +/obj/item/stack/spacecash/c100, +/obj/item/organ/cyberimp/chest/reviver, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"N" = ( +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"O" = ( +/obj/structure/rack, +/obj/item/organ/cyberimp/arm/medibeam, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"P" = ( +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) +"Q" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"V" = ( +/obj/structure/rack, +/obj/item/organ/lungs/cybernetic/tier3, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"W" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"Y" = ( +/obj/machinery/door/airlock/centcom{ + desc = "A bit too sturdy..."; + max_integrity = 10000; + name = "Prosthetics Storage"; + normal_integrity = 100000; + req_access_txt = "189" + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) + +(1,1,1) = {" +x +x +H +x +x +x +x +x +x +x +"} +(2,1,1) = {" +x +a +s +Q +a +P +E +G +e +x +"} +(3,1,1) = {" +x +s +s +s +s +Y +N +G +O +x +"} +(4,1,1) = {" +x +W +s +s +s +P +K +N +V +x +"} +(5,1,1) = {" +x +g +y +i +s +P +B +N +F +x +"} +(6,1,1) = {" +x +x +x +x +x +x +x +x +x +x +"} diff --git a/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm b/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm new file mode 100644 index 000000000000..13c964a01667 --- /dev/null +++ b/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm @@ -0,0 +1,168 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/tresmetal/green, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"b" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"c" = ( +/obj/structure/forge, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"i" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/forginghammer, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"l" = ( +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"p" = ( +/obj/structure/rack, +/obj/item/tresmetal, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"s" = ( +/obj/structure/lootcrate/tres, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"t" = ( +/obj/structure/lootcrate/tres, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"v" = ( +/obj/structure/table/anvil, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"x" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"D" = ( +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/humanoid/rat/hammer, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"H" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"N" = ( +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"P" = ( +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) +"V" = ( +/obj/structure/rack, +/obj/item/tresmetal, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"X" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Y" = ( +/obj/machinery/door/airlock/centcom{ + desc = "A bit too sturdy..."; + max_integrity = 10000; + name = "Strange Airlock"; + normal_integrity = 100000; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/shuttle{ + name = "floor" + }, +/area/city/backstreets_room) + +(1,1,1) = {" +x +x +x +x +x +x +x +H +H +x +"} +(2,1,1) = {" +x +a +l +t +t +P +p +l +l +x +"} +(3,1,1) = {" +x +i +X +l +l +Y +l +X +N +x +"} +(4,1,1) = {" +x +c +l +X +s +P +V +D +t +x +"} +(5,1,1) = {" +x +v +l +s +s +P +b +l +t +x +"} +(6,1,1) = {" +x +x +x +x +x +x +x +x +x +x +"} diff --git a/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm b/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm new file mode 100644 index 000000000000..9cea27c99000 --- /dev/null +++ b/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm @@ -0,0 +1,195 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/item/chair/plastic, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"e" = ( +/obj/structure/filingcabinet{ + pixel_x = -10 + }, +/obj/structure/filingcabinet{ + pixel_x = 10 + }, +/obj/structure/filingcabinet, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"f" = ( +/mob/living/simple_animal/hostile/rat, +/obj/structure/table/wood, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"n" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"o" = ( +/mob/living/simple_animal/hostile/humanoid/rat/zippy, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"t" = ( +/obj/item/ego_weapon/city/zweihander, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"u" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"v" = ( +/obj/effect/decal/cleanable/blood/gibs/down, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"w" = ( +/obj/item/clothing/suit/armor/ego_gear/city/zweiwest, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"x" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"A" = ( +/obj/structure/table/wood, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"B" = ( +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"G" = ( +/mob/living/simple_animal/hostile/rat, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"H" = ( +/obj/machinery/door/airlock/command, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"J" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/coffee, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"K" = ( +/obj/machinery/light/dim{ + dir = 8 + }, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"N" = ( +/mob/living/simple_animal/hostile/humanoid/rat, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"P" = ( +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"Q" = ( +/obj/structure/rack, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"R" = ( +/mob/living/simple_animal/hostile/humanoid/rat/pipe, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"S" = ( +/obj/structure/lootcrate/zwei, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"T" = ( +/obj/machinery/light/dim, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"U" = ( +/mob/living/simple_animal/hostile/humanoid/rat/knife, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"V" = ( +/obj/effect/decal/cleanable/blood/gibs/torso, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"W" = ( +/obj/machinery/light/dim{ + dir = 1 + }, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"Y" = ( +/obj/structure/chair/comfy, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) +"Z" = ( +/mob/living/simple_animal/hostile/humanoid/rat, +/obj/item/chair/plastic, +/turf/open/floor/carpet/blue, +/area/city/backstreets_room) + +(1,1,1) = {" +x +x +x +x +x +x +x +H +H +x +"} +(2,1,1) = {" +x +e +w +U +A +B +Z +P +P +x +"} +(3,1,1) = {" +T +Q +v +Y +A +G +V +a +J +W +"} +(4,1,1) = {" +x +S +P +P +A +n +t +B +f +x +"} +(5,1,1) = {" +x +S +o +P +a +N +P +R +u +x +"} +(6,1,1) = {" +x +x +x +K +x +x +K +x +x +x +"} diff --git a/_maps/RandomRooms/backstreets/medium_north/casino_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/casino_mn.dmm new file mode 100644 index 000000000000..53616466fe76 --- /dev/null +++ b/_maps/RandomRooms/backstreets/medium_north/casino_mn.dmm @@ -0,0 +1,209 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"c" = ( +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"d" = ( +/obj/structure/rack, +/obj/item/stack/spacecash/c100, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"j" = ( +/obj/structure/rack, +/obj/item/stack/spacecash/c10, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"k" = ( +/obj/machinery/door/airlock/centcom{ + desc = "A bit too sturdy..."; + max_integrity = 10000; + name = "Strange Airlock"; + normal_integrity = 100000; + req_access_txt = "19" + }, +/turf/open/floor/plating, +/area/city/backstreets_room) +"p" = ( +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"s" = ( +/obj/structure/lootcrate/money, +/obj/machinery/light/dim{ + dir = 4 + }, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"t" = ( +/obj/item/stack/spacecash/c10, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"u" = ( +/obj/machinery/computer/slot_machine, +/obj/machinery/light/dim{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"x" = ( +/obj/machinery/roulette, +/obj/machinery/light/dim{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"z" = ( +/obj/structure/rack, +/obj/machinery/light/dim{ + dir = 8; + pixel_x = null; + pixel_y = null + }, +/obj/item/stack/spacecash/c100, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"A" = ( +/obj/structure/chair/stool, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"B" = ( +/obj/machinery/computer/slot_machine, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"G" = ( +/obj/structure/rack, +/obj/item/stack/spacecash/c1000, +/obj/machinery/light/dim{ + dir = 4 + }, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"I" = ( +/obj/structure/rack, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"K" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"M" = ( +/obj/structure/rack, +/obj/item/stack/spacecash/c1000, +/obj/machinery/light/dim{ + dir = 8; + pixel_x = null; + pixel_y = null + }, +/turf/open/floor/mineral/gold, +/area/city/backstreets_room) +"Q" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"R" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/bottle/champagne{ + pixel_x = 7 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_y = 7 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/machinery/light/dim, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"S" = ( +/obj/structure/table, +/obj/item/food/burger/chicken{ + pixel_x = -7 + }, +/obj/item/food/fries{ + pixel_x = 3 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) + +(1,1,1) = {" +Q +Q +Q +Q +Q +Q +"} +(2,1,1) = {" +Q +u +A +p +p +a +"} +(3,1,1) = {" +Q +B +A +p +S +Q +"} +(4,1,1) = {" +Q +x +A +p +R +Q +"} +(5,1,1) = {" +Q +Q +Q +k +Q +Q +"} +(6,1,1) = {" +Q +M +c +t +z +Q +"} +(7,1,1) = {" +Q +I +t +c +K +Q +"} +(8,1,1) = {" +Q +j +t +c +d +Q +"} +(9,1,1) = {" +Q +G +c +t +s +Q +"} +(10,1,1) = {" +Q +Q +Q +Q +Q +Q +"} diff --git a/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm new file mode 100644 index 000000000000..d7f52f5a0dcc --- /dev/null +++ b/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm @@ -0,0 +1,120 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/floor/facility/halls, +/area/city/backstreets_room) +"j" = ( +/obj/structure/lattice/catwalk, +/obj/item/fishing_rod/gold, +/turf/open/water/deep/polluted, +/area/city/backstreets_room) +"u" = ( +/obj/structure/lattice/catwalk, +/obj/item/fishing_net/hicap, +/turf/open/water/deep/polluted, +/area/city/backstreets_room) +"x" = ( +/turf/open/water/deep/polluted, +/area/city/backstreets_room) +"z" = ( +/obj/structure/lattice/catwalk, +/mob/living/simple_animal/hostile/shrimp, +/turf/open/water/deep/polluted, +/area/city/backstreets_room) +"B" = ( +/obj/structure/lattice/catwalk, +/turf/open/water/deep/polluted, +/area/city/backstreets_room) +"I" = ( +/obj/structure/lattice/catwalk, +/obj/structure/lootcrate/money, +/turf/open/water/deep/polluted, +/area/city/backstreets_room) +"P" = ( +/obj/structure/lattice/catwalk, +/obj/item/fishing_net/steel, +/turf/open/water/deep/polluted, +/area/city/backstreets_room) +"Q" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) + +(1,1,1) = {" +Q +Q +Q +Q +Q +Q +"} +(2,1,1) = {" +Q +B +z +I +I +Q +"} +(3,1,1) = {" +Q +j +x +x +x +Q +"} +(4,1,1) = {" +Q +B +B +B +P +Q +"} +(5,1,1) = {" +Q +x +x +x +B +Q +"} +(6,1,1) = {" +Q +x +x +x +B +Q +"} +(7,1,1) = {" +Q +z +u +B +B +Q +"} +(8,1,1) = {" +Q +B +x +x +x +Q +"} +(9,1,1) = {" +Q +B +B +B +B +a +"} +(10,1,1) = {" +Q +Q +Q +Q +Q +Q +"} diff --git a/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm b/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm new file mode 100644 index 000000000000..8d12790a14d8 --- /dev/null +++ b/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm @@ -0,0 +1,267 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"b" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/machinery/light/floor, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"c" = ( +/obj/item/stack/spacecash/c50{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/stack/spacecash/c50{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/stack/spacecash/c50{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"d" = ( +/obj/structure/railing/corner, +/obj/machinery/light/floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"k" = ( +/obj/item/stack/spacecash/c50{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/stack/spacecash/c50{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/item/stack/spacecash/c50{ + pixel_x = -4; + pixel_y = -4 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"l" = ( +/obj/structure/railing, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"m" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/machinery/light/floor, +/obj/item/ego_weapon/city/rats/knife, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"o" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 5 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"q" = ( +/obj/structure/rack, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"r" = ( +/obj/structure/punching_bag, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"s" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/machinery/light/floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"t" = ( +/mob/living/simple_animal/hostile/senior_shrimp, +/obj/item/stack/spacecash/c50{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/stack/spacecash/c50{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/stack/spacecash/c50{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"x" = ( +/mob/living/simple_animal/hostile/senior_shrimp, +/obj/item/stack/spacecash/c50{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/item/stack/spacecash/c50{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"z" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"B" = ( +/obj/structure/punching_bag, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"C" = ( +/obj/structure/closet/boxinggloves, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"D" = ( +/obj/structure/closet/boxinggloves, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"F" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"G" = ( +/mob/living/simple_animal/hostile/shrimp, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"H" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"K" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"O" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/decal/cleanable/blood/gibs/core, +/obj/effect/decal/cleanable/blood/gibs/torso{ + pixel_y = -12 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Q" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"T" = ( +/mob/living/simple_animal/hostile/shrimp, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Y" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Z" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) + +(1,1,1) = {" +Q +Q +Q +Q +Q +Q +"} +(2,1,1) = {" +Q +B +B +B +r +Q +"} +(3,1,1) = {" +Q +G +F +T +F +a +"} +(4,1,1) = {" +Q +d +z +K +b +Q +"} +(5,1,1) = {" +Q +l +x +k +H +Q +"} +(6,1,1) = {" +Q +l +c +t +H +Q +"} +(7,1,1) = {" +Q +s +Y +Z +m +Q +"} +(8,1,1) = {" +Q +F +o +O +F +a +"} +(9,1,1) = {" +Q +C +D +q +q +Q +"} +(10,1,1) = {" +Q +Q +Q +Q +Q +Q +"} diff --git a/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm b/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm new file mode 100644 index 000000000000..f43ebcd9545c --- /dev/null +++ b/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm @@ -0,0 +1,288 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/showcase/machinery/cloning_pod, +/obj/structure/window/reinforced/spawner/east, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"c" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 6 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"g" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"k" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/lootcrate/seven, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"l" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/showcase/machinery/cloning_pod, +/obj/structure/window/reinforced/spawner/west, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"n" = ( +/mob/living/simple_animal/hostile/ooze/gelatinous{ + maxHealth = 750; + health = 750 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"s" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"u" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) +"x" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 10 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"y" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"z" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 9 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"C" = ( +/obj/structure/mineral_door/uranium, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"E" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/siding/green{ + color = "#006400"; + dir = 5 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"J" = ( +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) +"L" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"M" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/showcase/horrific_experiment, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/window/reinforced/spawner, +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"O" = ( +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"P" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/xenoblood/xsplatter, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Q" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"U" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/barricade/slime{ + color = "#32a852" + }, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"V" = ( +/mob/living/simple_animal/hostile/ooze/gelatinous{ + maxHealth = 750; + health = 750 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"W" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/structure/lootcrate/seven, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) +"Y" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/industrial_lift, +/obj/effect/decal/cleanable/xenoblood/xsplatter, +/turf/open/floor/plasteel/shuttle{ + color = "#42f545" + }, +/area/city/backstreets_room) + +(1,1,1) = {" +J +J +J +J +J +J +"} +(2,1,1) = {" +J +a +V +M +k +u +"} +(3,1,1) = {" +J +P +O +g +U +u +"} +(4,1,1) = {" +J +s +L +O +U +u +"} +(5,1,1) = {" +J +Q +z +x +Y +C +"} +(6,1,1) = {" +J +Q +E +c +Q +C +"} +(7,1,1) = {" +J +s +n +L +s +u +"} +(8,1,1) = {" +J +U +y +g +k +u +"} +(9,1,1) = {" +J +W +l +s +s +u +"} +(10,1,1) = {" +J +J +J +J +J +J +"} diff --git a/_maps/RandomRooms/backstreets/pointofinterest/lcorp.dmm b/_maps/RandomRooms/backstreets/pointofinterest/lcorp.dmm new file mode 100644 index 000000000000..a4588bd673f0 --- /dev/null +++ b/_maps/RandomRooms/backstreets/pointofinterest/lcorp.dmm @@ -0,0 +1,1737 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"af" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/carpet/orange, +/area/city/backstreets_room) +"aC" = ( +/obj/structure/sign/departments/command{ + pixel_x = 32 + }, +/obj/item/kirbyplants{ + icon_state = "plant-18" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"aD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"bs" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"ck" = ( +/obj/machinery/vending/medical{ + req_access = list() + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"cm" = ( +/obj/effect/turf_decal/siding/yellow/corner, +/obj/structure/table/wood/fancy/blue, +/obj/structure/railing/corner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"cr" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"di" = ( +/obj/structure/chair/office, +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"eb" = ( +/mob/living/simple_animal/hostile/ordeal/sin_wrath, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"ei" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/machinery/microwave{ + pixel_y = 7 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"el" = ( +/obj/structure/table/wood/fancy/blue, +/obj/item/statuebust{ + pixel_y = 12 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"eN" = ( +/obj/effect/turf_decal/siding/yellow, +/turf/open/floor/wood, +/area/city/backstreets_room) +"fq" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"gS" = ( +/obj/structure/table/glass, +/obj/effect/decal/cleanable/dirt, +/obj/item/folder/syndicate/red, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"gY" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gloom, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"ho" = ( +/turf/open/floor/plasteel/stairs/medium, +/area/city/backstreets_room) +"hF" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"hO" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"hP" = ( +/obj/structure/chair/comfy/teal, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"hQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"jz" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/champagne{ + pixel_y = 17 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = -7 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = 7 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"jL" = ( +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"kc" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"kn" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"kx" = ( +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"kz" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/turf/open/floor/plating/grass, +/area/city/backstreets_room) +"kX" = ( +/obj/structure/table/wood/fancy/blue, +/obj/structure/sign/ordealmonitor{ + pixel_x = 32 + }, +/obj/item/clothing/accessory/armband/lobotomy/command, +/obj/item/clothing/accessory/armband/lobotomy/command, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"lq" = ( +/mob/living/simple_animal/hostile/ordeal/sin_lust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"mq" = ( +/obj/item/ego_weapon/fragment, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"mO" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/obj/machinery/griddle, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"nK" = ( +/obj/machinery/door/airlock/centcom{ + desc = "A bit too sturdy..."; + max_integrity = 10000; + name = "Strange Airlock"; + normal_integrity = 100000; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/shuttle{ + name = "floor" + }, +/area/city/backstreets_room) +"oK" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"pW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"pY" = ( +/obj/structure/table/glass, +/obj/item/kitchen/knife, +/obj/item/crowbar, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"qw" = ( +/obj/structure/fluff/hedge, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"qK" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/obj/machinery/vending/dinnerware, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"qS" = ( +/obj/structure/bodycontainer/extraction{ + dir = 8 + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"qX" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/ego_gear/teth/beak, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblack, +/area/city/backstreets_room) +"rA" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 10 + }, +/obj/structure/lootcrate/money, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"sx" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/kirbyplants{ + icon_state = "plant-11"; + pixel_y = 13 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"sU" = ( +/obj/structure/flora/tree/jungle, +/turf/open/floor/plating/grass, +/area/city/backstreets_room) +"te" = ( +/obj/structure/chair/comfy/teal{ + dir = 1 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"tY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblack, +/area/city/backstreets_room) +"uo" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Safety Department" + }, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"ux" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/lootcrate/money, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"uN" = ( +/obj/structure/sign/departments/command{ + pixel_x = -32 + }, +/obj/item/kirbyplants{ + icon_state = "plant-18" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"vV" = ( +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"wu" = ( +/mob/living/simple_animal/hostile/ordeal/sin_lust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"xr" = ( +/obj/item/clothing/suit/armor/ego_gear/teth/fragment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"xE" = ( +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"xH" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/orange, +/area/city/backstreets_room) +"xI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"yh" = ( +/obj/effect/turf_decal/siding/blue, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"yE" = ( +/obj/structure/rack, +/obj/item/ego_weapon/fragment, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"yM" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gloom, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/orange, +/area/city/backstreets_room) +"yU" = ( +/obj/structure/table/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"zL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/down, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"zT" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/obj/structure/table/reinforced, +/obj/item/food/meat/slab, +/obj/item/food/meat/slab, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/city/backstreets_room) +"Al" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"Ap" = ( +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) +"AI" = ( +/obj/structure/chair/comfy/teal{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"AN" = ( +/mob/living/simple_animal/hostile/ordeal/sin_lust, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"AX" = ( +/obj/structure/sign/departments/safety, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"AY" = ( +/obj/structure/lootcrate/money, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"Bn" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 10 + }, +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/turf/open/floor/wood, +/area/city/backstreets_room) +"BE" = ( +/obj/structure/table/wood/fancy/blue, +/obj/structure/sign/ordealmonitor{ + pixel_x = -32 + }, +/obj/item/flashlight/lamp/green{ + pixel_x = -5; + pixel_y = 10 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"Dd" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Dm" = ( +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/railing, +/turf/open/floor/plating/grass, +/area/city/backstreets_room) +"Ds" = ( +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/obj/structure/table/wood/fancy/blue, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"Dz" = ( +/obj/machinery/door/airlock/highsecurity, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"DA" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"DN" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/railing, +/turf/open/floor/plating/grass, +/area/city/backstreets_room) +"DQ" = ( +/obj/effect/turf_decal/siding/blue, +/obj/structure/lootcrate/money, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"Em" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"Ew" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Fs" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"Gp" = ( +/obj/item/modular_computer/laptop/preset/civilian, +/obj/structure/table/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"Hj" = ( +/obj/structure/table/glass, +/obj/item/storage/box/handcuffs, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"HX" = ( +/obj/machinery/modular_computer/console, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"If" = ( +/obj/structure/table/wood/fancy/green, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/green, +/area/city/backstreets_room) +"IL" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"Jo" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/fluff/arc/angela{ + pixel_y = 11 + }, +/obj/structure/railing, +/turf/open/floor/plating/grass, +/area/city/backstreets_room) +"KJ" = ( +/turf/open/floor/carpet/royalblack, +/area/city/backstreets_room) +"KK" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Central Command Department" + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"KV" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"Lv" = ( +/obj/machinery/computer/operating, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"Lw" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"LN" = ( +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Mi" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/orange, +/area/city/backstreets_room) +"Nq" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"Ny" = ( +/obj/structure/sign/departments/command{ + pixel_x = -32 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"NC" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"NG" = ( +/obj/structure/rack, +/obj/item/ego_weapon/ranged/pistol/beakmagnum, +/turf/open/floor/carpet/royalblack, +/area/city/backstreets_room) +"NM" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"NX" = ( +/obj/structure/chair/comfy/beige{ + dir = 4 + }, +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/orange, +/area/city/backstreets_room) +"NY" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 10 + }, +/obj/structure/railing{ + dir = 10 + }, +/obj/structure/table/wood/fancy/blue, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"Oa" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/obj/structure/table/wood/fancy/blue, +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"Oh" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/gibs/down, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Oj" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gloom, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"OW" = ( +/mob/living/simple_animal/hostile/ordeal/sin_wrath, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Pd" = ( +/obj/structure/lootcrate/money, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Pv" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/effect/gibspawner/generic/silent, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"PM" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"Qc" = ( +/obj/structure/table/wood, +/obj/item/clothing/accessory/armband/lobotomy/training, +/obj/item/clothing/accessory/armband/lobotomy/training, +/turf/open/floor/carpet/orange, +/area/city/backstreets_room) +"QB" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/turf/open/floor/wood, +/area/city/backstreets_room) +"QI" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/wood, +/area/city/backstreets_room) +"QS" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Rf" = ( +/obj/structure/lootcrate/money, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Rt" = ( +/obj/structure/sign/departments/training, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"RD" = ( +/obj/structure/rack, +/obj/item/melee/classic_baton, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Sd" = ( +/turf/open/floor/plating/grass, +/area/city/backstreets_room) +"Tc" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"Tw" = ( +/mob/living/simple_animal/hostile/ordeal/sin_wrath, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Ud" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Uf" = ( +/obj/item/clipboard, +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Ul" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"Un" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Uo" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblack, +/area/city/backstreets_room) +"Us" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gloom, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"UP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/stairs/medium, +/area/city/backstreets_room) +"UT" = ( +/obj/structure/fluff/hedge, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"Vb" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/structure/table/wood/fancy/blue, +/obj/structure/railing, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"VB" = ( +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"VK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"VV" = ( +/obj/structure/table/wood/fancy/blue, +/obj/item/statuebust{ + pixel_y = 12 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"We" = ( +/obj/item/ego_weapon/ranged/beak, +/turf/open/floor/carpet/royalblack, +/area/city/backstreets_room) +"Wk" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/grass, +/area/city/backstreets_room) +"Wt" = ( +/obj/structure/table/optable, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"Xl" = ( +/obj/structure/rack, +/turf/open/floor/carpet/royalblack, +/area/city/backstreets_room) +"Ym" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Control Department" + }, +/turf/open/floor/plasteel, +/area/city/backstreets_room) +"Za" = ( +/obj/structure/table/glass, +/obj/item/clothing/accessory/armband/lobotomy, +/obj/item/clothing/accessory/armband/lobotomy, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) +"Zu" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"ZC" = ( +/obj/structure/sign/departments/command{ + pixel_x = 32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/carpet/royalblue, +/area/city/backstreets_room) +"ZG" = ( +/obj/structure/fluff/fokoff_sign, +/turf/open/floor/plating/grass, +/area/city/backstreets_room) +"ZM" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 9 + }, +/obj/structure/lootcrate/money, +/turf/open/floor/carpet/cyan, +/area/city/backstreets_room) +"ZP" = ( +/turf/open/floor/carpet/orange, +/area/city/backstreets_room) +"ZW" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) + +(1,1,1) = {" +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Wk +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +"} +(2,1,1) = {" +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +sU +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Wk +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +"} +(3,1,1) = {" +Sd +kz +Sd +Sd +Wk +Sd +Sd +Sd +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +kz +Sd +Sd +Sd +Sd +Sd +"} +(4,1,1) = {" +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +ZW +ck +AY +Dd +If +AX +Nq +Nq +Nq +VB +Nq +Nq +Nq +Nq +KV +ZW +Sd +Sd +Sd +Sd +sU +Sd +"} +(5,1,1) = {" +Sd +Sd +Sd +Sd +Sd +kz +Wk +Sd +ZW +pY +kc +Em +Dd +uo +Nq +Nq +Nq +Nq +Nq +Nq +Nq +Nq +Nq +ZW +Sd +Sd +Wk +Sd +Sd +Sd +"} +(6,1,1) = {" +Sd +Wk +Sd +Sd +Sd +Sd +Sd +Sd +ZW +Wt +xE +Dd +Dd +AX +Nq +VB +ZW +ZW +ZW +ZW +ZW +Tc +Nq +ZW +Sd +Sd +Sd +kz +Sd +Sd +"} +(7,1,1) = {" +Sd +Sd +ZW +ZW +ZW +ZW +ZW +ZW +ZW +Lv +kc +gY +qS +ZW +Nq +zL +ZW +Ul +Ul +Ul +ZW +Nq +Nq +ZW +Sd +Sd +Sd +Sd +Sd +Sd +"} +(8,1,1) = {" +Sd +Sd +ZW +ZM +sx +rA +Uf +jz +ZW +ZW +ZW +ZW +ZW +ZW +VB +Nq +ZW +hO +QS +Ul +ZW +VB +wu +ZW +Sd +Sd +Sd +Sd +Wk +Sd +"} +(9,1,1) = {" +Sd +Sd +ZW +di +gS +yh +Ud +Pd +QI +ZW +Tw +Ul +Ul +ZW +Tc +VB +ZW +LN +Ul +eb +ZW +Nq +Nq +ZW +kz +Sd +sU +Sd +Sd +Sd +"} +(10,1,1) = {" +Sd +Sd +ZW +PM +Gp +DQ +Ud +Ud +Pd +ZW +LN +Ul +Rf +ZW +Nq +Nq +ZW +Ul +Ul +Ul +ZW +aD +Nq +ZW +Sd +Sd +Sd +Sd +Sd +Sd +"} +(11,1,1) = {" +Sd +Sd +ZW +IL +NC +Zu +Pd +bs +Ud +ZW +Ul +Ul +LN +ZW +Nq +Nq +ZW +Ul +Ul +LN +Dz +Nq +Nq +ZW +Sd +Sd +Sd +Sd +Sd +Sd +"} +(12,1,1) = {" +kz +ZW +ZW +ZW +Ap +Ap +Ap +nK +ZW +ZW +Ul +Ul +eb +ZW +VB +Nq +ZW +ZW +ZW +ZW +ZW +ZW +KK +ZW +ZW +ZW +ZW +ZW +Sd +Sd +"} +(13,1,1) = {" +Sd +ZW +hQ +hQ +hQ +vV +hF +hQ +hQ +ZW +Ul +Ul +Ul +Dz +Nq +Nq +ZW +ZW +VV +xI +UP +uN +xI +Ny +BE +AI +UT +ZW +Sd +Sd +"} +(14,1,1) = {" +Sd +ZW +ux +VK +Us +jL +jL +VK +hQ +ZW +ZW +ZW +ZW +ZW +Nq +VB +ZW +ZW +xI +pW +UP +Ew +Ew +Ew +Ew +Bn +xI +ZW +ZG +Sd +"} +(15,1,1) = {" +Sd +ZW +hQ +VK +Hj +Fs +hQ +lq +vV +ZW +Nq +Nq +wu +VB +Nq +Nq +ZW +DN +kx +Ds +NY +Ud +QB +Ud +Ud +eN +xI +ZW +Sd +Sd +"} +(16,1,1) = {" +Sd +ZW +hQ +VK +HX +vV +hQ +VK +vV +Ym +VB +Nq +Nq +Nq +Nq +Tc +ZW +Jo +xI +hP +Vb +Ud +Ud +Ud +fq +DA +xI +KK +Sd +Sd +"} +(17,1,1) = {" +Sd +ZW +hQ +OW +yU +Za +vV +VK +hQ +ZW +Lw +VB +Nq +Nq +VB +Nq +ZW +Dm +kx +cm +Oa +bs +bs +Ud +Ud +eN +xI +ZW +Sd +Sd +"} +(18,1,1) = {" +Sd +ZW +hQ +VK +VK +VK +VK +VK +Oj +ZW +ZW +ZW +ZW +ZW +Nq +Nq +ZW +ZW +kx +kx +UP +oK +oK +Oh +oK +NM +xI +ZW +Sd +Sd +"} +(19,1,1) = {" +Sd +ZW +Fs +hQ +vV +ux +hQ +Pv +hQ +ZW +LN +Ul +Ul +Dz +VB +Nq +ZW +ZW +el +kx +ho +aC +kx +ZC +kX +te +qw +ZW +Sd +Sd +"} +(20,1,1) = {" +Sd +ZW +ZW +ZW +Ap +Ap +Ap +nK +ZW +ZW +AN +Ul +Ul +ZW +Nq +VB +ZW +ZW +ZW +ZW +ZW +ZW +KK +ZW +ZW +ZW +ZW +ZW +Sd +Sd +"} +(21,1,1) = {" +Sd +Sd +ZW +qX +tY +KJ +mq +VK +Un +ZW +Ul +Ul +eb +ZW +Nq +VB +ZW +Ul +Ul +LN +Dz +Nq +VB +ZW +Sd +Sd +Sd +Sd +Sd +Wk +"} +(22,1,1) = {" +Sd +Sd +ZW +Uo +tY +NG +VK +VK +RD +ZW +LN +Ul +Rf +ZW +Nq +Nq +ZW +Rf +Ul +QS +ZW +Nq +VB +ZW +Sd +Sd +Sd +Sd +Sd +Sd +"} +(23,1,1) = {" +Sd +Sd +ZW +Xl +We +Uo +jL +jL +yE +ZW +Ul +Ul +LN +ZW +Lw +Nq +ZW +LN +Ul +Ul +ZW +Nq +Nq +ZW +Sd +Wk +Sd +Sd +kz +Sd +"} +(24,1,1) = {" +Sd +Sd +ZW +Xl +KJ +KJ +xr +VK +ZW +ZW +ZW +ZW +ZW +ZW +Nq +aD +ZW +Ul +eb +LN +ZW +wu +Nq +ZW +Sd +Sd +Sd +Sd +sU +Sd +"} +(25,1,1) = {" +Sd +Sd +ZW +ZW +ZW +ZW +ZW +ZW +ZW +mO +cr +ZP +af +Rt +Nq +Nq +ZW +Ul +Ul +LN +ZW +Nq +Nq +ZW +Sd +Sd +Sd +Sd +Sd +Sd +"} +(26,1,1) = {" +Sd +Sd +kz +Sd +Wk +Sd +Sd +Sd +ZW +zT +cr +yM +xH +uo +Nq +Nq +ZW +ZW +ZW +ZW +ZW +Nq +Al +ZW +Sd +Sd +Wk +Sd +Sd +Sd +"} +(27,1,1) = {" +Sd +Sd +Sd +Sd +Sd +Sd +sU +Sd +ZW +ei +kn +xH +NX +Rt +Nq +Nq +VB +VB +Nq +Nq +Nq +Tc +Nq +ZW +Sd +Sd +Sd +Sd +Sd +Sd +"} +(28,1,1) = {" +Sd +Sd +Sd +kz +Sd +Sd +kz +Sd +ZW +qK +cr +Mi +Qc +ZW +Nq +Nq +Nq +Nq +Nq +Nq +VB +Nq +VB +ZW +Sd +Sd +Sd +Sd +Sd +Wk +"} +(29,1,1) = {" +Sd +Wk +Sd +Sd +Sd +Sd +Wk +Sd +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +Sd +Sd +kz +Sd +Sd +Sd +"} +(30,1,1) = {" +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +Sd +"} diff --git a/_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm b/_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm index 2d7b2886a0f9..646b684ff583 100644 --- a/_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm +++ b/_maps/RandomRooms/backstreets/pointofinterest/love_train.dmm @@ -252,6 +252,7 @@ /obj/item/stack/spacecash/c200, /obj/item/stack/spacecash/c200, /obj/item/stack/spacecash/c200, +/obj/item/attribute_increase/fixer, /turf/open/floor/engine, /area/city/backstreets_room) "AX" = ( @@ -463,6 +464,7 @@ /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c100, +/obj/item/attribute_increase/fixer, /turf/open/floor/engine, /area/city/backstreets_room) "Tw" = ( @@ -1144,9 +1146,9 @@ BV mA Hb dX -zZ -Is -Is +kM +dX +dX zZ zZ zZ @@ -1176,8 +1178,8 @@ Dd mA mA dX -kM -dX +Dz +ag dX ZW zZ @@ -1208,8 +1210,8 @@ Dd mA Lw dX -Dz -ag +gX +Hc dX Is Is @@ -1240,8 +1242,8 @@ Lw Lw MA dX -gX -Hc +Tf +AQ dX zZ Bb @@ -1272,8 +1274,8 @@ MA MA MA dX -Tf -AQ +dX +dX dX zZ MA @@ -1304,10 +1306,10 @@ MA MA MA dX -dX -dX -dX -MA +zZ +zZ +zZ +zZ MA zZ zZ @@ -1337,7 +1339,7 @@ MA MA dX zZ -zZ +MA MA MA MA @@ -1369,7 +1371,7 @@ MA MA dX zZ -zZ +MA MA MA zZ diff --git a/_maps/RandomRooms/backstreets/pointofinterest/n_corp.dmm b/_maps/RandomRooms/backstreets/pointofinterest/n_corp.dmm new file mode 100644 index 000000000000..c541e84f1b12 --- /dev/null +++ b/_maps/RandomRooms/backstreets/pointofinterest/n_corp.dmm @@ -0,0 +1,1587 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ao" = ( +/obj/structure/bonfire/prelit, +/obj/item/organ/cyberimp/arm/mantis/l{ + pixel_x = -6; + pixel_y = -7 + }, +/obj/item/bodypart/l_arm/robot, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"bt" = ( +/obj/structure/table/wood, +/obj/item/documents/syndicate, +/turf/open/floor/wood, +/area/city/backstreets_room) +"cf" = ( +/obj/item/ego_weapon/city/ncorp_mark/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"ck" = ( +/obj/effect/gibspawner/robot, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"cA" = ( +/obj/structure/table/wood, +/obj/effect/gibspawner/robot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"cB" = ( +/obj/item/ego_weapon/city/ncorp_mark/white, +/turf/open/floor/wood, +/area/city/backstreets_room) +"dq" = ( +/obj/item/bodypart/l_leg/robot{ + pixel_x = -6; + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"ez" = ( +/obj/structure/lootcrate/money, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"eP" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"eU" = ( +/obj/item/chair/wood, +/obj/item/bodypart/l_arm/robot{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/item/organ/cyberimp/arm/chainsword, +/turf/open/floor/wood, +/area/city/backstreets_room) +"ff" = ( +/obj/item/chair/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"gw" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/city/backstreets_room) +"gX" = ( +/obj/item/ego_weapon/city/ncorp_mark/black, +/turf/open/floor/wood, +/area/city/backstreets_room) +"hB" = ( +/turf/closed/indestructible/wood, +/area/city/backstreets_room) +"hN" = ( +/mob/living/simple_animal/hostile/ordeal/snake_corrosion, +/turf/open/floor/plating/sandy_dirt, +/area/city/backstreets_room) +"hV" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"iP" = ( +/obj/structure/sign/warning, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"jr" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/suit/charcoal, +/turf/open/floor/wood, +/area/city/backstreets_room) +"jt" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/wood, +/area/city/backstreets_room) +"jC" = ( +/obj/effect/gibspawner/robot, +/obj/item/organ/brain, +/turf/open/floor/wood, +/area/city/backstreets_room) +"km" = ( +/obj/effect/gibspawner/robot, +/obj/structure/table_frame/wood, +/obj/item/bodypart/head/robot{ + pixel_x = 8; + pixel_y = -9 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"kQ" = ( +/obj/effect/gibspawner/robot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"lC" = ( +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/turf/open/floor/wood, +/area/city/backstreets_room) +"lK" = ( +/obj/structure/mineral_door/wood, +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/city/backstreets_room) +"mt" = ( +/obj/structure/table/glass, +/obj/item/organ/cyberimp/arm/mantis/black, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"mC" = ( +/obj/structure/table/glass, +/obj/item/organ/cyberimp/arm/surgery, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"ni" = ( +/obj/structure/table/glass, +/obj/item/organ/cyberimp/brain/anti_drop, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"nq" = ( +/obj/item/shard, +/turf/open/floor/wood, +/area/city/backstreets_room) +"nL" = ( +/obj/structure/table/wood, +/obj/item/food/salad/eggbowl, +/turf/open/floor/wood, +/area/city/backstreets_room) +"oo" = ( +/obj/item/bodypart/r_leg/robot, +/turf/open/floor/wood, +/area/city/backstreets_room) +"pP" = ( +/obj/structure/closet/cabinet, +/obj/item/kitchen/fork, +/obj/item/kitchen/knife, +/obj/item/kitchen/spoon, +/turf/open/floor/wood, +/area/city/backstreets_room) +"qe" = ( +/obj/item/kitchen/knife, +/turf/open/floor/wood, +/area/city/backstreets_room) +"qy" = ( +/obj/item/toy/gun, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"rv" = ( +/obj/item/shard, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"rV" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"sg" = ( +/obj/structure/bonfire/prelit, +/obj/item/organ/tongue/robot{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/bodypart/r_leg/robot, +/obj/effect/gibspawner/robot, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"sO" = ( +/obj/effect/gibspawner/robot, +/turf/open/floor/plating/sandy_dirt, +/area/city/backstreets_room) +"tB" = ( +/obj/effect/gibspawner/robot, +/obj/structure/table_frame/wood, +/obj/item/bodypart/head/robot{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/bodypart/l_leg/robot{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/organ/cyberimp/arm/zippy, +/turf/open/floor/wood, +/area/city/backstreets_room) +"ua" = ( +/obj/structure/chair/wood, +/obj/item/bodypart/l_leg/robot{ + pixel_x = -6; + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"uB" = ( +/obj/structure/bonfire/prelit, +/obj/item/organ/eyes/robotic{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/bodypart/head/robot, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"uX" = ( +/obj/structure/dresser, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"vi" = ( +/obj/effect/gibspawner/robot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"vo" = ( +/obj/item/circuitboard/computer/operating, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"vV" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"wf" = ( +/obj/structure/headpike, +/obj/item/bodypart/head/robot, +/turf/open/floor/plating/sandy_dirt, +/area/city/backstreets_room) +"wu" = ( +/mob/living/simple_animal/hostile/ordeal/snake_corrosion, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"xm" = ( +/obj/structure/bed, +/obj/item/stack/sheet/cotton/cloth, +/turf/open/floor/wood, +/area/city/backstreets_room) +"yQ" = ( +/mob/living/simple_animal/hostile/ordeal/dog_corrosion, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"zK" = ( +/obj/effect/gibspawner/robot, +/obj/item/ego_weapon/city/ncorp_mark/black, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"zZ" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"As" = ( +/obj/effect/gibspawner/robot, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Bh" = ( +/obj/structure/frame/computer{ + anchored = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"Bs" = ( +/obj/effect/spawner/structure/window, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/wood, +/area/city/backstreets_room) +"BJ" = ( +/turf/open/floor/plating/sandy_dirt, +/area/city/backstreets_room) +"BU" = ( +/obj/structure/table/wood, +/obj/item/documents/ncorporation, +/turf/open/floor/wood, +/area/city/backstreets_room) +"DM" = ( +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"Es" = ( +/obj/structure/bonfire/prelit, +/obj/item/bodypart/l_arm/robot{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/item/bodypart/l_leg/robot{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/effect/gibspawner/robot, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Ev" = ( +/obj/structure/closet/crate/pcorp, +/obj/item/trash/can/food/pcorp_burger, +/obj/item/trash/can/food/pcorp, +/obj/item/trash/can/food/pcorp, +/obj/item/trash/can/food/pcorp, +/obj/item/trash/can/food/pcorp_burger, +/obj/item/trash/can/food/pcorp_burger, +/obj/item/trash/can/food/pcorp_burger, +/turf/open/floor/plating/sandy_dirt, +/area/city/backstreets_room) +"Fb" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/grille/broken, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Fy" = ( +/obj/item/bodypart/r_leg/robot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"FF" = ( +/obj/item/chair/wood, +/obj/effect/gibspawner/robot, +/turf/open/floor/wood, +/area/city/backstreets_room) +"FU" = ( +/obj/item/bodypart/l_arm/robot{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/item/ego_weapon/city/ncorp_mark/pale, +/turf/open/floor/wood, +/area/city/backstreets_room) +"GK" = ( +/obj/structure/bed, +/obj/item/bedsheet/dorms, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"GM" = ( +/obj/structure/bonfire/prelit, +/turf/open/floor/plating/sandy_dirt, +/area/city/backstreets_room) +"Hb" = ( +/obj/structure/lootcrate/n_corp, +/turf/open/floor/plating/sandy_dirt, +/area/city/backstreets_room) +"Ho" = ( +/obj/item/chair/wood, +/obj/item/bodypart/l_arm/robot{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/item/bodypart/l_leg/robot{ + pixel_x = -6; + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"HH" = ( +/obj/item/shard, +/obj/effect/decal/cleanable/glass, +/obj/structure/grille/broken, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Id" = ( +/obj/item/bodypart/head/robot, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Ir" = ( +/obj/structure/table_frame/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"IM" = ( +/obj/machinery/griddle, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"IN" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"IR" = ( +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/structure/table/glass, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"IZ" = ( +/obj/structure/cloth_pile, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Jm" = ( +/mob/living/simple_animal/hostile/ordeal/snake_corrosion/strong, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Jo" = ( +/obj/structure/table/wood, +/obj/item/bodypart/head/robot, +/obj/item/extra_arm/double, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Jx" = ( +/obj/item/chair/wood, +/turf/open/floor/wood, +/area/city/backstreets_room) +"JJ" = ( +/obj/structure/table/glass, +/obj/item/extra_arm, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"JN" = ( +/obj/structure/closet/cabinet, +/obj/item/stack/spacecash/c100, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"JV" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/suit/charcoal, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Kl" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/suit/charcoal, +/obj/item/stack/spacecash/c1000, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Kq" = ( +/obj/item/organ/brain, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Kz" = ( +/obj/structure/closet/crate/wooden{ + name = "toy chest" + }, +/obj/item/toy/crayon, +/obj/item/toy/crayon/orange, +/obj/item/toy/crayon/purple, +/obj/item/toy/figure/borg, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"KC" = ( +/obj/item/chair/wood, +/obj/item/bodypart/l_arm/robot{ + pixel_x = 2; + pixel_y = -5 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"KW" = ( +/obj/effect/gibspawner/robot, +/obj/item/bodypart/r_leg/robot, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Lh" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Lm" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/wood, +/area/city/backstreets_room) +"LA" = ( +/obj/effect/gibspawner/robot, +/obj/item/organ/eyes/robotic{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/organ/cyberimp/arm/chainsword, +/turf/open/floor/wood, +/area/city/backstreets_room) +"LV" = ( +/obj/item/organ/cyberimp/arm/chainsword, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"LZ" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Me" = ( +/obj/item/bodypart/l_arm/robot{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Mf" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"MI" = ( +/obj/structure/table_frame, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"NI" = ( +/obj/item/chair/wood, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"NJ" = ( +/obj/effect/gibspawner/scrap_metal, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Po" = ( +/obj/item/ego_weapon/city/ncorp_mark, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"Pt" = ( +/obj/item/kitchen/spoon, +/turf/open/floor/wood, +/area/city/backstreets_room) +"PK" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) +"PO" = ( +/obj/item/ego_weapon/city/ncorp_mark, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Qm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ego_weapon/city/ncorp_mark/black, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Qp" = ( +/obj/structure/closet/cabinet, +/obj/item/kitchen/fork, +/obj/item/kitchen/knife, +/obj/item/kitchen/spoon, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"RC" = ( +/obj/item/bodypart/head/robot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"TF" = ( +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) +"Ul" = ( +/obj/item/bodypart/head/robot{ + pixel_x = 3; + pixel_y = 2 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Ut" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"UR" = ( +/obj/item/kitchen/fork, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"WM" = ( +/obj/item/stack/sheet/cotton/cloth, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Xg" = ( +/obj/structure/bed, +/obj/item/bedsheet/cosmos, +/obj/effect/gibspawner/robot, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Xp" = ( +/obj/item/stack/spacecash/c500, +/obj/structure/table/glass, +/turf/open/floor/facility/white, +/area/city/backstreets_room) +"Yp" = ( +/obj/machinery/door/airlock/centcom{ + desc = "A bit too sturdy..."; + max_integrity = 10000; + name = "Strange Airlock"; + normal_integrity = 100000; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/shuttle{ + name = "floor" + }, +/area/city/backstreets_room) +"YI" = ( +/obj/machinery/griddle, +/turf/open/floor/wood, +/area/city/backstreets_room) +"Zr" = ( +/obj/effect/gibspawner/robot, +/obj/item/bodypart/head/robot{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/bodypart/r_leg/robot, +/turf/open/floor/wood, +/area/city/backstreets_room) +"ZW" = ( +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_room) + +(1,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +"} +(2,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +zZ +"} +(3,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +zZ +"} +(4,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +BJ +BJ +hB +hB +hB +hB +hB +ZW +ZW +hB +hB +hB +hB +hB +BJ +hB +hB +hB +hB +hB +BJ +BJ +BJ +zZ +"} +(5,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +BJ +BJ +hB +nL +YI +pP +Fb +rv +ZW +TF +Lm +Lm +Lm +hB +BJ +hB +nL +IM +Qp +Fb +ZW +ZW +BJ +zZ +"} +(6,1,1) = {" +zZ +zZ +zZ +zZ +zZ +zZ +BJ +BJ +hB +vi +PO +nq +Fb +ZW +ZW +TF +As +rV +Lm +hB +BJ +hB +eP +vi +Qm +Fb +ZW +ZW +BJ +zZ +"} +(7,1,1) = {" +zZ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +hB +IZ +ff +rV +hV +ZW +wu +Yp +eP +rV +ez +hB +BJ +hB +gX +eP +eP +hV +ck +ZW +BJ +zZ +"} +(8,1,1) = {" +zZ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +hB +eP +rV +zK +jt +ZW +ZW +TF +eP +Lm +ez +hB +BJ +hB +rV +LV +nq +Lh +ZW +yQ +BJ +zZ +"} +(9,1,1) = {" +hB +hB +hB +hB +hB +hB +hB +BJ +hB +xm +gw +Kl +jt +ZW +ZW +TF +Lm +Lm +Lm +hB +BJ +hB +WM +uX +jr +jt +ZW +NI +BJ +zZ +"} +(10,1,1) = {" +hB +GK +uX +hB +lC +gw +hB +BJ +hB +hB +hB +hB +hB +ZW +ZW +hB +hB +hB +hB +hB +BJ +hB +hB +hB +hB +hB +ZW +ZW +BJ +zZ +"} +(11,1,1) = {" +hB +eP +rV +hB +rV +rV +hB +BJ +Hb +BJ +Hb +Hb +BJ +ZW +ZW +Hb +BJ +BJ +Hb +Hb +BJ +BJ +BJ +Ev +BJ +BJ +ZW +ZW +zZ +zZ +"} +(12,1,1) = {" +hB +hB +hV +hB +hB +hV +hB +BJ +BJ +BJ +BJ +BJ +BJ +ZW +ck +BJ +BJ +wf +BJ +BJ +wf +BJ +BJ +BJ +BJ +BJ +ZW +ZW +zZ +ZW +"} +(13,1,1) = {" +hB +Jx +rV +Jm +ff +Id +hB +wf +GM +wf +GM +wf +GM +ZW +ZW +BJ +BJ +ZW +ZW +ZW +ZW +ZW +ZW +wf +hN +BJ +ZW +ZW +iP +ck +"} +(14,1,1) = {" +hB +jC +rV +BU +rV +jC +hB +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +wu +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ck +ZW +ZW +ZW +iP +ZW +"} +(15,1,1) = {" +hB +Fy +ua +Jo +rV +rV +PK +ZW +ZW +ZW +ZW +ZW +ZW +NJ +ZW +ZW +ZW +ZW +ZW +Es +uB +ZW +ZW +ZW +ZW +ZW +ZW +ZW +PK +Po +"} +(16,1,1) = {" +hB +eP +ff +cA +rV +ff +PK +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ck +ZW +ao +sg +ZW +ZW +ZW +ZW +ZW +ZW +ZW +PK +ZW +"} +(17,1,1) = {" +hB +RC +rV +bt +IN +Me +hB +ZW +ZW +ZW +ZW +ck +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +ZW +iP +ZW +"} +(18,1,1) = {" +hB +rV +Kq +Mf +eP +rV +hB +wf +GM +wf +GM +wf +GM +ZW +ZW +BJ +BJ +yQ +ZW +ZW +ZW +ZW +wu +wf +BJ +BJ +ZW +ZW +iP +ZW +"} +(19,1,1) = {" +hB +hV +hB +hB +hB +hV +hB +BJ +BJ +BJ +BJ +BJ +BJ +ZW +ZW +BJ +BJ +wf +BJ +BJ +wf +BJ +sO +BJ +BJ +BJ +ZW +ZW +zZ +ck +"} +(20,1,1) = {" +hB +RC +qy +hB +rV +rV +hB +BJ +BJ +Hb +BJ +Hb +BJ +ZW +ZW +BJ +Hb +Hb +Hb +BJ +BJ +BJ +BJ +BJ +BJ +BJ +ZW +ZW +zZ +zZ +"} +(21,1,1) = {" +hB +Xg +Kz +hB +GK +uX +hB +BJ +hB +hB +hB +hB +hB +wu +ZW +hB +hB +hB +hB +hB +BJ +zZ +zZ +zZ +zZ +zZ +ZW +yQ +BJ +zZ +"} +(22,1,1) = {" +hB +hB +hB +hB +hB +hB +hB +BJ +hB +Ir +IM +JN +jt +ZW +ZW +Bs +km +oo +eU +hB +BJ +zZ +mC +mt +ni +Ut +ZW +ZW +BJ +zZ +"} +(23,1,1) = {" +zZ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +hB +rV +UR +FF +jt +ZW +ZW +jt +Ho +LA +Zr +hB +BJ +zZ +DM +vo +kQ +Ut +ZW +ZW +BJ +zZ +"} +(24,1,1) = {" +zZ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +hB +cB +qe +eP +hV +ZW +ZW +lK +KW +As +FU +hB +BJ +zZ +Bh +vV +DM +hV +ZW +ZW +BJ +zZ +"} +(25,1,1) = {" +zZ +zZ +zZ +zZ +zZ +zZ +BJ +BJ +hB +Pt +vi +cf +HH +ZW +ZW +Bs +Ul +KW +tB +hB +BJ +zZ +MI +kQ +JJ +Ut +ZW +ZW +BJ +zZ +"} +(26,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +BJ +BJ +hB +LZ +uX +JV +jt +ZW +ZW +jt +KC +dq +oo +hB +BJ +zZ +IR +DM +Xp +Ut +ZW +ZW +BJ +zZ +"} +(27,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +BJ +BJ +hB +hB +hB +hB +hB +ZW +ZW +hB +hB +hB +hB +hB +BJ +zZ +zZ +zZ +zZ +zZ +BJ +BJ +BJ +zZ +"} +(28,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +zZ +"} +(29,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +BJ +zZ +"} +(30,1,1) = {" +ZW +ZW +ZW +ZW +ZW +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +zZ +"} diff --git a/_maps/RandomRooms/backstreets/small_east/binah.dmm b/_maps/RandomRooms/backstreets/small_east/binah.dmm new file mode 100644 index 000000000000..856748e3d76b --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_east/binah.dmm @@ -0,0 +1,70 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"k" = ( +/obj/item/toy/plush/binah, +/obj/structure/table/bronze, +/obj/item/reagent_containers/food/drinks/mug/tea{ + pixel_x = -9; + pixel_y = -2 + }, +/turf/open/floor/plating/dirt, +/area/city/backstreets_room) +"n" = ( +/obj/structure/bonfire/prelit, +/turf/open/floor/plating/dirt, +/area/city/backstreets_room) +"J" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/plating/dirt, +/area/city/backstreets_room) +"X" = ( +/turf/open/floor/plating/dirt, +/area/city/backstreets_room) + +(1,1,1) = {" +a +X +X +X +X +X +a +"} +(2,1,1) = {" +a +X +X +J +X +J +a +"} +(3,1,1) = {" +a +J +X +k +X +X +a +"} +(4,1,1) = {" +a +n +J +X +J +n +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/small_east/cigarettes_se.dmm b/_maps/RandomRooms/backstreets/small_east/cigarettes_se.dmm new file mode 100644 index 000000000000..cf7e8474778f --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_east/cigarettes_se.dmm @@ -0,0 +1,207 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"e" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/robust, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"g" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/chair/plastic, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"k" = ( +/obj/structure/table/wood, +/obj/item/ego_weapon/shield/sangria, +/obj/item/clothing/under/limbus/prison, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"v" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -4 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"w" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -7; + pixel_y = 11 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"x" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -1; + pixel_y = 10 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"y" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"F" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"J" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"K" = ( +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"N" = ( +/obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -7; + pixel_y = 11 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/item/clothing/mask/cigarette/robust, +/obj/item/clothing/mask/cigarette/robust, +/obj/item/storage/fancy/cigarettes/cigpack_robust{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Q" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/plastic{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"X" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) + +(1,1,1) = {" +a +a +a +a +a +X +a +"} +(2,1,1) = {" +a +v +w +F +N +X +a +"} +(3,1,1) = {" +a +k +K +g +X +K +a +"} +(4,1,1) = {" +a +y +J +e +x +Q +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm b/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm new file mode 100644 index 000000000000..1bdfac75f1a1 --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm @@ -0,0 +1,114 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"d" = ( +/obj/structure/rack, +/obj/item/clothing/suit/armor/ego_gear/limbus_labs, +/obj/item/clothing/head/beret/sec/lccb, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"g" = ( +/obj/structure/window/fulltile, +/obj/structure/grille, +/obj/effect/decal/cleanable/blood/splatter/over_window, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"h" = ( +/obj/structure/window/fulltile, +/obj/structure/grille, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"k" = ( +/obj/structure/rack, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"x" = ( +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"C" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 6 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"J" = ( +/mob/living/simple_animal/hostile/ordeal/sin_gluttony, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"N" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Q" = ( +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"S" = ( +/obj/item/shard, +/obj/structure/grille/broken, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"X" = ( +/obj/machinery/door/airlock{ + name = "lab entrance" + }, +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"Y" = ( +/obj/structure/rack, +/obj/item/ego_weapon/ranged/city/limbuspistol, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) + +(1,1,1) = {" +a +a +a +a +X +a +a +"} +(2,1,1) = {" +a +J +x +g +N +k +a +"} +(3,1,1) = {" +a +x +Q +S +C +Y +a +"} +(4,1,1) = {" +a +x +J +h +x +d +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/small_east/limbus_seb.dmm b/_maps/RandomRooms/backstreets/small_east/limbus_seb.dmm new file mode 100644 index 000000000000..541a3de40e5b --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_east/limbus_seb.dmm @@ -0,0 +1,104 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"d" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"f" = ( +/obj/effect/mob_spawn/human/doctor, +/obj/effect/gibspawner/generic/silent, +/obj/structure/chair/comfy/black, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"q" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"r" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"w" = ( +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"x" = ( +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) +"J" = ( +/obj/structure/table/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"N" = ( +/obj/machinery/door/airlock/centcom{ + desc = "A bit too sturdy..."; + max_integrity = 10000; + name = "Strange Airlock"; + normal_integrity = 100000; + req_access_txt = "19" + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"U" = ( +/obj/structure/table/wood, +/obj/item/ego_weapon/ranged/city/limbusmagnum, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"X" = ( +/obj/machinery/door/airlock{ + name = "lab entrance" + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) + +(1,1,1) = {" +a +a +a +a +a +X +a +"} +(2,1,1) = {" +a +d +d +w +N +d +a +"} +(3,1,1) = {" +a +f +U +q +x +w +a +"} +(4,1,1) = {" +a +w +J +d +x +r +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm b/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm new file mode 100644 index 000000000000..000fd32e5e99 --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm @@ -0,0 +1,135 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"e" = ( +/obj/effect/decal/cleanable/blood/gibs/core, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"h" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/soda_cans/oceanwave/ultimate{ + pixel_x = 6 + }, +/obj/item/reagent_containers/food/drinks/soda_cans/wellcheers_purple{ + pixel_x = -6 + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"i" = ( +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"m" = ( +/obj/machinery/chem_master{ + is_operational = 0; + name = "Broken Soda Development Device" + }, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"v" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/blood/splatter/over_window, +/obj/item/stack/spacecash/c100, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"x" = ( +/obj/structure/rack, +/obj/item/storage/firstaid/regular, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"B" = ( +/obj/item/clothing/suit/toggle/labcoat/chemist, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"J" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/glass/bottle, +/obj/item/reagent_containers/dropper, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"M" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"N" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"P" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/shrimp_soldier, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"R" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/footprints, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"S" = ( +/obj/structure/table/reinforced, +/obj/structure/microscope, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"U" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/vending/medical, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) +"X" = ( +/obj/machinery/door/airlock, +/turf/open/floor/facility/dark, +/area/city/backstreets_room) + +(1,1,1) = {" +a +a +a +a +a +X +a +"} +(2,1,1) = {" +a +v +N +B +N +M +a +"} +(3,1,1) = {" +a +m +R +i +P +e +a +"} +(4,1,1) = {" +a +S +J +h +x +U +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/small_east/ukulele.dmm b/_maps/RandomRooms/backstreets/small_east/ukulele.dmm new file mode 100644 index 000000000000..32e00fe29df5 --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_east/ukulele.dmm @@ -0,0 +1,66 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) +"J" = ( +/obj/item/food/meat/slab{ + desc = "Quality Saturnian Bison Meat."; + name = "bison steak" + }, +/obj/item/instrument/guitar{ + desc = "...and his music was electric."; + name = "ukulele"; + pixel_x = -2; + pixel_y = 5 + }, +/turf/open/floor/grass/fairy, +/area/city/backstreets_room) +"X" = ( +/turf/open/floor/grass/fairy, +/area/city/backstreets_room) + +(1,1,1) = {" +a +X +X +X +X +X +a +"} +(2,1,1) = {" +a +X +X +X +X +X +a +"} +(3,1,1) = {" +a +X +X +X +X +X +a +"} +(4,1,1) = {" +a +X +J +X +X +X +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +"} diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm index 6908c2a5d8b7..4cea0e21b0ab 100644 --- a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm +++ b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm @@ -1,103 +1,104 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) -"f" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, +/obj/structure/closet/cabinet, +/obj/item/clothing/suit/hooded/chaplain_hoodie/leader, +/obj/item/clothing/head/helmet/plate/crusader, +/obj/structure/spider/stickyweb, /turf/open/floor/wood, /area/city/backstreets_room) -"g" = ( +"j" = ( +/obj/structure/spider/stickyweb, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, /turf/open/floor/wood, /area/city/backstreets_room) -"j" = ( -/obj/item/bedsheet/chaplain, -/obj/structure/bed{ - dir = 3 - }, +"t" = ( /obj/structure/spider/stickyweb, -/obj/effect/landmark/cratespawn, -/obj/effect/landmark/cratespawn, /turf/open/floor/wood, /area/city/backstreets_room) -"m" = ( +"K" = ( /obj/structure/table/wood, /obj/item/food/cake/holy_cake, /turf/open/floor/wood, /area/city/backstreets_room) -"p" = ( -/obj/structure/spider/stickyweb, -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, -/turf/open/floor/wood, -/area/city/backstreets_room) -"w" = ( +"M" = ( /obj/structure/dresser, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/structure/spider/stickyweb, /obj/effect/landmark/cratespawn, /turf/open/floor/wood, /area/city/backstreets_room) -"F" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/suit/hooded/chaplain_hoodie/leader, -/obj/item/clothing/head/helmet/plate/crusader, +"N" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/wood, +/area/city/backstreets_room) +"O" = ( +/obj/item/bedsheet/chaplain, +/obj/structure/bed{ + dir = 3 + }, /obj/structure/spider/stickyweb, +/obj/effect/landmark/cratespawn, /turf/open/floor/wood, /area/city/backstreets_room) -"H" = ( +"P" = ( /obj/structure/barricade/wooden/crude, /obj/structure/barricade/wooden, /turf/open/floor/wood, /area/city/backstreets_room) -"Z" = ( -/obj/machinery/light/warm{ - dir = 4 - }, +"R" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"U" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) (1,1,1) = {" -a -a -a -Z -a -a -a +U +U +U +U +U "} (2,1,1) = {" +U a -F -p -g -g -g -H +t +K +U "} (3,1,1) = {" -a -w -g -g -g -m -f +U +M +R +R +P "} (4,1,1) = {" -a -j -p -g -g -g -f +U +t +R +R +N "} (5,1,1) = {" -a -a -a -a -a -a -a +U +t +R +R +N +"} +(6,1,1) = {" +U +O +j +R +U +"} +(7,1,1) = {" +U +U +U +U +U "} diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm new file mode 100644 index 000000000000..6f87fc4807dd --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm @@ -0,0 +1,116 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"c" = ( +/mob/living/simple_animal/hostile/sweeper, +/turf/open/floor/wood, +/area/city/backstreets_room) +"j" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/open/floor/wood, +/area/city/backstreets_room) +"t" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/wood, +/area/city/backstreets_room) +"w" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/turf/open/floor/wood, +/area/city/backstreets_room) +"A" = ( +/obj/item/bedsheet/grey, +/obj/structure/bed, +/turf/open/floor/wood, +/area/city/backstreets_room) +"K" = ( +/obj/structure/table, +/obj/item/reagent_containers/pill/salicylic, +/turf/open/floor/wood, +/area/city/backstreets_room) +"M" = ( +/obj/item/bedsheet/clown, +/obj/structure/bed/maint, +/obj/item/bikehorn, +/turf/open/floor/wood, +/area/city/backstreets_room) +"N" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/wood, +/area/city/backstreets_room) +"O" = ( +/obj/structure/table, +/obj/item/flashlight/lamp/green{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/paper, +/obj/item/pen, +/obj/item/reagent_containers/hypospray/medipen/stimpack, +/turf/open/floor/wood, +/area/city/backstreets_room) +"P" = ( +/obj/structure/barricade/wooden/crude, +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/city/backstreets_room) +"R" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"T" = ( +/mob/living/simple_animal/hostile/ordeal/indigo_dawn, +/turf/open/floor/wood, +/area/city/backstreets_room) +"U" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) + +(1,1,1) = {" +U +U +U +U +U +"} +(2,1,1) = {" +U +t +M +K +U +"} +(3,1,1) = {" +U +R +c +w +P +"} +(4,1,1) = {" +U +U +U +U +U +"} +(5,1,1) = {" +U +t +T +R +N +"} +(6,1,1) = {" +U +O +j +A +U +"} +(7,1,1) = {" +U +U +U +U +U +"} diff --git a/_maps/RandomRooms/backstreets/small_north/bird_box.dmm b/_maps/RandomRooms/backstreets/small_north/bird_box.dmm index 0aa1c745d392..6d6515b9c30c 100644 --- a/_maps/RandomRooms/backstreets/small_north/bird_box.dmm +++ b/_maps/RandomRooms/backstreets/small_north/bird_box.dmm @@ -14,7 +14,6 @@ /turf/open/floor/plasteel/cult, /area/city/backstreets_room) "U" = ( -/mob/living/simple_animal/hostile/ordeal/bigBirdEye, /obj/effect/landmark/cratespawn, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) @@ -28,7 +27,7 @@ P "} (2,1,1) = {" P -U +a a R P diff --git a/_maps/RandomRooms/backstreets/small_north/grey_partizan.dmm b/_maps/RandomRooms/backstreets/small_north/grey_partizan.dmm deleted file mode 100644 index deefd3cd9410..000000000000 --- a/_maps/RandomRooms/backstreets/small_north/grey_partizan.dmm +++ /dev/null @@ -1,97 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"j" = ( -/obj/structure/table/greyscale, -/obj/item/reagent_containers/food/drinks/coffee, -/turf/open/floor/wood, -/area/city/backstreets_room) -"k" = ( -/turf/closed/indestructible/rock, -/area/space) -"q" = ( -/obj/structure/table/greyscale, -/obj/item/stack/spacecash/c1000, -/turf/open/floor/wood, -/area/city/backstreets_room) -"u" = ( -/turf/closed/indestructible/fakeglass, -/area/city/backstreets_room) -"C" = ( -/obj/item/clothing/suit/armor/ego_gear/limbus/ego/minos, -/obj/structure/table/greyscale, -/obj/item/ego_weapon/ranged/pistol/kcorp/nade, -/turf/open/floor/wood, -/area/city/backstreets_room) -"M" = ( -/obj/item/ego_weapon/city/seven/vet, -/obj/structure/table/greyscale, -/turf/open/floor/wood, -/area/city/backstreets_room) -"P" = ( -/obj/structure/mineral_door/wood, -/turf/open/floor/wood, -/area/city/backstreets_room) -"R" = ( -/obj/structure/table/greyscale, -/obj/structure/plaque/static_plaque{ - desc = "The Gray Partizan."; - pixel_y = 32 - }, -/obj/item/clothing/suit/armor/ego_gear/limbus/ego/minos, -/turf/open/floor/wood, -/area/city/backstreets_room) -"U" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) -"W" = ( -/turf/open/floor/wood, -/area/city/backstreets_room) - -(1,1,1) = {" -k -k -U -U -U -"} -(2,1,1) = {" -U -U -U -j -U -"} -(3,1,1) = {" -U -M -u -W -P -"} -(4,1,1) = {" -U -R -u -W -U -"} -(5,1,1) = {" -U -C -u -W -U -"} -(6,1,1) = {" -U -U -U -q -U -"} -(7,1,1) = {" -k -k -U -U -U -"} diff --git a/_maps/RandomRooms/backstreets/small_north/wellcheers_interrogation.dmm b/_maps/RandomRooms/backstreets/small_north/wellcheers_interrogation.dmm new file mode 100644 index 000000000000..6befdee191e9 --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_north/wellcheers_interrogation.dmm @@ -0,0 +1,120 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"j" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"p" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/soda_cans/wellcheers_purple{ + pixel_x = -6 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 6 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"q" = ( +/obj/effect/decal/cleanable/blood/footprints, +/obj/effect/decal/cleanable/blood/footprints{ + dir = 8; + pixel_y = 19 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"v" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/ego_weapon/ranged/shrimp/assault, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"z" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/item/restraints/handcuffs, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/footprints, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"B" = ( +/obj/effect/landmark/cratespawn, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"M" = ( +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"P" = ( +/obj/effect/decal/cleanable/blood/footprints, +/obj/machinery/door/airlock/wood, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"R" = ( +/obj/effect/decal/cleanable/blood/footprints{ + dir = 8; + pixel_x = -10; + pixel_y = 11 + }, +/turf/open/floor/plasteel/dark, +/area/city/backstreets_room) +"U" = ( +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) + +(1,1,1) = {" +U +U +U +U +U +"} +(2,1,1) = {" +U +a +M +q +P +"} +(3,1,1) = {" +U +M +z +R +U +"} +(4,1,1) = {" +U +v +p +M +U +"} +(5,1,1) = {" +U +M +j +M +U +"} +(6,1,1) = {" +U +B +M +M +U +"} +(7,1,1) = {" +U +U +U +U +U +"} diff --git a/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm b/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm new file mode 100644 index 000000000000..ce8118afd9bd --- /dev/null +++ b/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm @@ -0,0 +1,77 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"n" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/plating, +/area/city/backstreets_room) +"v" = ( +/obj/structure/lootcrate/money, +/turf/open/floor/wood, +/area/city/backstreets_room) +"x" = ( +/turf/open/floor/wood, +/area/city/backstreets_room) +"J" = ( +/mob/living/simple_animal/hostile/runawaybird, +/turf/open/floor/wood, +/area/city/backstreets_room) +"N" = ( +/obj/effect/gibspawner/human/bodypartless, +/turf/open/floor/wood, +/area/city/backstreets_room) +"P" = ( +/obj/effect/landmark/cratespawn, +/turf/open/floor/wood, +/area/city/backstreets_room) +"S" = ( +/obj/structure/jbird_noose, +/turf/open/floor/wood, +/area/city/backstreets_room) +"X" = ( +/turf/closed/indestructible/wood, +/area/city/backstreets_room) + +(1,1,1) = {" +X +X +X +X +X +X +X +"} +(2,1,1) = {" +X +v +x +J +N +P +X +"} +(3,1,1) = {" +X +S +N +x +x +J +X +"} +(4,1,1) = {" +X +x +J +x +x +x +X +"} +(5,1,1) = {" +X +X +X +n +X +X +X +"} diff --git a/_maps/RandomRooms/rcorp/caves/caves.dmm b/_maps/RandomRooms/rcorp/caves/caves.dmm index 36e99874bc41..2576acc311a2 100644 --- a/_maps/RandomRooms/rcorp/caves/caves.dmm +++ b/_maps/RandomRooms/rcorp/caves/caves.dmm @@ -2,6 +2,10 @@ "a" = ( /turf/closed/indestructible/rock, /area/city/outskirts) +"g" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "i" = ( /turf/open/floor/plating/asteroid, /area/city/outskirts) @@ -993,12 +997,12 @@ a a a a -a -a -a -a -a -a +g +g +g +g +g +g a a a @@ -1113,20 +1117,20 @@ a a a a -a -a -a -a -a +g +g +g +g +g i i i i -a -a -a -a -a +g +g +g +g +g a a a @@ -1236,8 +1240,8 @@ a a a a -a -a +g +g i i i @@ -1250,7 +1254,7 @@ i i i i -a +g a a a @@ -1320,6 +1324,17 @@ a a a a +g +g +g +g +g +g +g +g +g +g +g a a a @@ -1349,18 +1364,7 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a +g i i i @@ -1374,8 +1378,8 @@ i i i i -a -a +g +g a a a @@ -1440,11 +1444,11 @@ a a a a -a -a -a -a -a +g +g +g +g +g i i i @@ -1454,6 +1458,9 @@ i i i i +g +g +g a a a @@ -1481,10 +1488,7 @@ a a a a -a -a -a -a +g i i i @@ -1499,7 +1503,7 @@ i i i i -a +g a a a @@ -1562,9 +1566,9 @@ a a a a -a -a -a +g +g +g i i i @@ -1580,6 +1584,9 @@ i i i i +g +g +g a a a @@ -1604,11 +1611,8 @@ a a a a -a -a -a -a -a +g +g i i i @@ -1623,7 +1627,7 @@ i i i i -a +g a a a @@ -1685,8 +1689,8 @@ a a a a -a -a +g +g i i i @@ -1706,6 +1710,8 @@ i i i i +g +g a a a @@ -1729,9 +1735,7 @@ a a a a -a -a -a +g i i i @@ -1747,9 +1751,9 @@ i i i i -a -a -a +g +g +g a a a @@ -1806,10 +1810,10 @@ a a a a -a -a -a -a +g +g +g +g i i i @@ -1831,6 +1835,8 @@ i i i i +g +g a a a @@ -1851,11 +1857,9 @@ a a a a -a -a -a -a -a +g +g +g i i i @@ -1873,8 +1877,8 @@ i i i i -a -a +g +g a a "} @@ -1928,9 +1932,9 @@ a a a a -a -a -a +g +g +g i i i @@ -1956,6 +1960,8 @@ i i i i +g +g a a a @@ -1973,11 +1979,9 @@ a a a a -a -a -a -a -a +g +g +g i i i @@ -1987,8 +1991,8 @@ i i i i -a -a +g +g i i i @@ -1998,7 +2002,7 @@ i i i i -a +g a a "} @@ -2050,9 +2054,9 @@ a a a a -a -a -a +g +g +g i i i @@ -2081,6 +2085,9 @@ i i i i +g +g +g a a a @@ -2096,10 +2103,7 @@ a a a a -a -a -a -a +g i i i @@ -2110,10 +2114,10 @@ i i i i +g a a -a -a +g i i i @@ -2122,8 +2126,8 @@ i i i i -a -a +g +g a "} (18,1,1) = {" @@ -2172,9 +2176,9 @@ a a a a -a -a -a +g +g +g i i i @@ -2207,6 +2211,8 @@ i i i i +g +g a a a @@ -2220,10 +2226,8 @@ a a a a -a -a -a -a +g +g i i i @@ -2234,11 +2238,11 @@ i i i i +g a a -a -a -a +g +g i i i @@ -2247,8 +2251,8 @@ i i i i -a -a +g +g "} (19,1,1) = {" a @@ -2290,13 +2294,13 @@ a a a a -a -a -a -a -a -a -a +g +g +g +g +g +g +g i i i @@ -2332,6 +2336,8 @@ i i i i +g +g a a a @@ -2344,9 +2350,7 @@ a a a a -a -a -a +g i i i @@ -2357,12 +2361,12 @@ i i i i +g a a a a -a -a +g i i i @@ -2372,7 +2376,7 @@ i i i i -a +g "} (20,1,1) = {" a @@ -2413,8 +2417,8 @@ a a a a -a -a +g +g i i i @@ -2438,13 +2442,13 @@ i i i i -a -a -a -a -a -a -a +g +g +g +g +g +g +g i i i @@ -2457,6 +2461,8 @@ i i i i +g +g a a a @@ -2464,13 +2470,11 @@ a a a a -a -a -a -a -a -a -a +g +g +g +g +g i i i @@ -2481,14 +2485,14 @@ i i i i +g a a a a -a -a -a -a +g +g +g i i i @@ -2536,8 +2540,8 @@ a a a a -a -a +g +g i i i @@ -2559,22 +2563,22 @@ i i i i +g +g +g a a a a -a -a -a -a -a +g +g i i i i i i -a +g i i i @@ -2582,15 +2586,15 @@ i i i i +g +g a a a a a -a -a -a -a +g +g i i i @@ -2605,15 +2609,15 @@ i i i i +g a a a a -a -a -a -a -a +g +g +g +g i i i @@ -2659,8 +2663,8 @@ a a a a -a -a +g +g i i i @@ -2680,16 +2684,16 @@ i i i i +g +g +g a a a a a a -a -a -a -a +g i i i @@ -2697,8 +2701,8 @@ i i i i -a -a +g +g i i i @@ -2707,13 +2711,13 @@ i i i i +g a a a a a -a -a +g i i i @@ -2728,17 +2732,17 @@ i i i i +g a a a -a -a -a -a +g +g +g i -a -a -a +g +g +g i i i @@ -2782,8 +2786,8 @@ a a a a -a -a +g +g i i i @@ -2802,6 +2806,8 @@ i i i i +g +g a a a @@ -2810,9 +2816,7 @@ a a a a -a -a -a +g i i i @@ -2820,10 +2824,10 @@ i i i i +g a a -a -a +g i i i @@ -2831,13 +2835,13 @@ i i i i +g +g a a a -a -a -a -a +g +g i i i @@ -2852,11 +2856,11 @@ i i i i +g a a -a -a -a +g +g i i i @@ -2906,7 +2910,7 @@ a a a a -a +g i i i @@ -2925,6 +2929,7 @@ i i i i +g a a a @@ -2934,21 +2939,20 @@ a a a a -a -a -a +g +g i i i i i i +g a a a a -a -a +g i i i @@ -2956,11 +2960,11 @@ i i i i +g a a -a -a -a +g +g i i i @@ -2975,11 +2979,11 @@ i i i i +g a a a -a -a +g i i i @@ -3030,7 +3034,7 @@ a a a a -a +g i i i @@ -3048,6 +3052,7 @@ i i i i +g a a a @@ -3057,8 +3062,7 @@ a a a a -a -a +g i i i @@ -3066,24 +3070,24 @@ i i i i +g a a a -a -a -a -a -a -a +g +g +g +g +g i i i i i +g +g a -a -a -a +g i i i @@ -3099,11 +3103,11 @@ i i i i +g a a a -a -a +g i i i @@ -3116,7 +3120,7 @@ i i i i -a +g "} (26,1,1) = {" a @@ -3154,7 +3158,7 @@ a a a a -a +g i i i @@ -3171,6 +3175,7 @@ i i i i +g a a a @@ -3181,19 +3186,18 @@ a a a a -a -a +g i i i i i i +g a a -a -a -a +g +g i i i @@ -3205,9 +3209,9 @@ i i i i -a -a -a +g +g +g i i i @@ -3222,13 +3226,13 @@ i i i i +g a a a a -a -a -a +g +g i i i @@ -3238,8 +3242,8 @@ i i i i -a -a +g +g a "} (27,1,1) = {" @@ -3278,7 +3282,7 @@ a a a a -a +g i i i @@ -3293,6 +3297,8 @@ i i i i +g +g a a a @@ -3303,9 +3309,7 @@ a a a a -a -a -a +g i i i @@ -3313,9 +3317,9 @@ i i i i -a -a -a +g +g +g i i i @@ -3345,15 +3349,15 @@ i i i i +g a a a a a a -a -a -a +g +g i i i @@ -3361,7 +3365,7 @@ i i i i -a +g a a a @@ -3401,8 +3405,8 @@ a a a a -a -a +g +g i i i @@ -3416,6 +3420,7 @@ i i i i +g a a a @@ -3428,8 +3433,7 @@ a a a a -a -a +g i i i @@ -3437,7 +3441,7 @@ i i i i -a +g i i i @@ -3468,6 +3472,7 @@ G i i i +g a a a @@ -3476,15 +3481,14 @@ a a a a -a -a -a +g +g i i i i i -a +g a a a @@ -3525,7 +3529,7 @@ a a a a -a +g i i i @@ -3538,6 +3542,8 @@ i i i i +g +g a a a @@ -3550,9 +3556,7 @@ a a a a -a -a -a +g i i i @@ -3591,6 +3595,7 @@ i i i i +g a a a @@ -3601,13 +3606,12 @@ a a a a -a -a -a -a +g +g +g i i -a +g a a a @@ -3649,7 +3653,7 @@ a a a a -a +g i i i @@ -3660,6 +3664,8 @@ i i i i +g +g a a a @@ -3674,9 +3680,7 @@ a a a a -a -a -a +g i i i @@ -3693,8 +3697,8 @@ i i i i -a -a +g +g i i i @@ -3714,6 +3718,7 @@ i H i i +g a a a @@ -3727,11 +3732,10 @@ a a a a -a -a -a +g +g i -a +g a a a @@ -3772,8 +3776,8 @@ a a a a -a -a +g +g i i i @@ -3783,6 +3787,7 @@ i i i i +g a a a @@ -3798,8 +3803,7 @@ a a a a -a -a +g i i i @@ -3816,12 +3820,12 @@ i i i i -a -a -a -a -a -a +g +g +g +g +g +g i i i @@ -3837,6 +3841,7 @@ i i i i +g a a a @@ -3851,11 +3856,10 @@ a a a a -a -a -a +g +g i -a +g a a a @@ -3895,8 +3899,8 @@ a a a a -a -a +g +g i i i @@ -3907,6 +3911,7 @@ i i i i +g a a a @@ -3921,8 +3926,7 @@ a a a a -a -a +g i i i @@ -3938,19 +3942,19 @@ i i i i +g +g +g a a a a -a -a -a -a -a -a -a -a -a +g +g +g +g +g +g i i i @@ -3960,6 +3964,7 @@ i i i i +g a a a @@ -3974,12 +3979,11 @@ a a a a -a -a -a +g +g i i -a +g a a a @@ -4019,7 +4023,7 @@ a a a a -a +g i i i @@ -4032,6 +4036,8 @@ i i i i +g +g a a a @@ -4042,10 +4048,8 @@ a a a a -a -a -a -a +g +g i i i @@ -4060,19 +4064,19 @@ i i i i +g +g +g a a a a a -a -a -a -a -a -a -a -a +g +g +g +g +g i i i @@ -4083,6 +4087,7 @@ i i i i +g a a a @@ -4096,15 +4101,14 @@ a a a a -a -a -a -a +g +g +g i i i i -a +g a a a @@ -4141,9 +4145,9 @@ a a a a -a -a -a +g +g +g i i i @@ -4158,16 +4162,16 @@ i i i i -a -a -a -a -a -a -a -a -a -a +g +g +g +g +g +g +g +g +g +g i i i @@ -4181,18 +4185,18 @@ i i i i +g +g +g +g a a a a a a -a -a -a -a -a -a +g +g i i i @@ -4206,6 +4210,7 @@ i i i i +g a a a @@ -4220,15 +4225,14 @@ a a a a -a -a +g i i i i i i -a +g a a a @@ -4263,9 +4267,9 @@ a a a a -a -a -a +g +g +g i i i @@ -4304,6 +4308,8 @@ i i i i +g +g a a a @@ -4311,11 +4317,9 @@ a a a a -a -a -a -a -a +g +g +g i i i @@ -4329,6 +4333,7 @@ i i i i +g a a a @@ -4343,9 +4348,8 @@ a a a a -a -a -a +g +g i i i @@ -4353,7 +4357,7 @@ i i i i -a +g a a a @@ -4386,8 +4390,8 @@ a a a a -a -a +g +g i i i @@ -4428,6 +4432,7 @@ i i i i +g a a a @@ -4435,9 +4440,8 @@ a a a a -a -a -a +g +g i i i @@ -4452,6 +4456,7 @@ i i i i +g a a a @@ -4467,8 +4472,7 @@ a a a a -a -a +g i i i @@ -4477,7 +4481,7 @@ i i i i -a +g a a a @@ -4509,8 +4513,8 @@ a a a a -a -a +g +g i i i @@ -4550,17 +4554,17 @@ i i i i +g +g +g a a a a a a -a -a -a -a -a +g +g i i i @@ -4575,6 +4579,7 @@ i i i i +g a a a @@ -4591,8 +4596,7 @@ a a a a -a -a +g i i i @@ -4600,7 +4604,7 @@ i i i i -a +g a a a @@ -4632,8 +4636,8 @@ a a a a -a -a +g +g i i i @@ -4673,6 +4677,8 @@ i i i i +g +g a a a @@ -4681,9 +4687,7 @@ a a a a -a -a -a +g i i i @@ -4699,6 +4703,7 @@ i i i i +g a a a @@ -4714,9 +4719,8 @@ a a a a -a -a -a +g +g i i i @@ -4724,7 +4728,7 @@ i i i i -a +g a a a @@ -4756,7 +4760,7 @@ a a a a -a +g i i i @@ -4796,6 +4800,8 @@ i i i i +g +g a a a @@ -4805,9 +4811,7 @@ a a a a -a -a -a +g i i i @@ -4822,6 +4826,7 @@ i i i i +g a a a @@ -4834,20 +4839,19 @@ a a a a -a -a -a -a -a -a +g +g +g +g +g i i i i i i -a -a +g +g a a a @@ -4880,7 +4884,7 @@ a a a a -a +g i i i @@ -4919,6 +4923,8 @@ i i i i +g +g a a a @@ -4929,9 +4935,7 @@ a a a a -a -a -a +g i i i @@ -4945,6 +4949,7 @@ i i i i +g a a a @@ -4956,10 +4961,9 @@ a a a a -a -a -a -a +g +g +g i i i @@ -4969,7 +4973,7 @@ i i i i -a +g a a a @@ -5003,8 +5007,8 @@ a a a a -a -a +g +g i i i @@ -5041,6 +5045,9 @@ i i i i +g +g +g a a a @@ -5052,10 +5059,7 @@ a a a a -a -a -a -a +g i i i @@ -5068,20 +5072,20 @@ i i i i +g a +g +g +g +g +g +g +g a a a -a -a -a -a -a -a -a -a -a -a +g +g i i i @@ -5092,7 +5096,7 @@ i i i i -a +g a a a @@ -5127,7 +5131,7 @@ a a a a -a +g i i i @@ -5163,6 +5167,9 @@ i i i i +g +g +g a a a @@ -5175,11 +5182,8 @@ a a a a -a -a -a -a -a +g +g i i i @@ -5191,20 +5195,20 @@ i i i i +g a a -a -a +g i i i i i -a -a -a -a -a +g +g +g +g +g i i i @@ -5215,7 +5219,7 @@ i i i i -a +g a a a @@ -5250,8 +5254,8 @@ a a a a -a -a +g +g i i i @@ -5284,6 +5288,10 @@ i i i i +g +g +g +g a a a @@ -5298,11 +5306,7 @@ a a a a -a -a -a -a -a +g i i i @@ -5314,11 +5318,11 @@ i i i i +g a a -a -a -a +g +g i i i @@ -5339,7 +5343,7 @@ i i i i -a +g a a a @@ -5374,7 +5378,7 @@ a a a a -a +g i i i @@ -5406,6 +5410,9 @@ i i i i +g +g +g a a a @@ -5423,10 +5430,7 @@ a a a a -a -a -a -a +g i i i @@ -5437,11 +5441,11 @@ i i i i +g a -a -a -a -a +g +g +g i i i @@ -5457,12 +5461,12 @@ i i i i -a -a -a -a -a -a +g +g +g +g +g +g a a a @@ -5498,7 +5502,7 @@ a a a a -a +g i i i @@ -5519,6 +5523,18 @@ i i i i +g +g +g +g +g +g +g +g +g +g +g +g a a a @@ -5538,19 +5554,7 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a +g i i i @@ -5560,10 +5564,10 @@ i i i i -a -a -a -a +g +g +g +g i i i @@ -5578,9 +5582,9 @@ i i i i -a -a -a +g +g +g a a a @@ -5622,7 +5626,7 @@ a a a a -a +g i i i @@ -5642,6 +5646,8 @@ i i i i +g +g a a a @@ -5672,9 +5678,7 @@ a a a a -a -a -a +g i i i @@ -5684,8 +5688,8 @@ i i i i -a -a +g +g i i i @@ -5699,9 +5703,9 @@ i i i i -a -a -a +g +g +g a a a @@ -5746,7 +5750,7 @@ a a a a -a +g i i i @@ -5765,6 +5769,8 @@ i i i i +g +g a a a @@ -5796,9 +5802,7 @@ a a a a -a -a -a +g i i i @@ -5807,9 +5811,9 @@ i i i i -a -a -a +g +g +g i i i @@ -5822,7 +5826,7 @@ i i i i -a +g a a a @@ -5869,8 +5873,8 @@ a a a a -a -a +g +g i i i @@ -5889,6 +5893,7 @@ i i i i +g a a a @@ -5920,9 +5925,8 @@ a a a a -a -a -a +g +g i i i @@ -5931,8 +5935,8 @@ i i i i -a -a +g +g i i i @@ -5944,8 +5948,8 @@ i i i i -a -a +g +g a a a @@ -5993,7 +5997,7 @@ a a a a -a +g i i i @@ -6012,6 +6016,8 @@ i i i i +g +g a a a @@ -6043,9 +6049,7 @@ a a a a -a -a -a +g i i i @@ -6055,8 +6059,8 @@ i i i i -a -a +g +g i i i @@ -6065,9 +6069,9 @@ i i i i -a -a -a +g +g +g a a a diff --git a/_maps/RandomRooms/rcorp/caves/choke.dmm b/_maps/RandomRooms/rcorp/caves/choke.dmm index a9782cdf49a6..17273ddb0f32 100644 --- a/_maps/RandomRooms/rcorp/caves/choke.dmm +++ b/_maps/RandomRooms/rcorp/caves/choke.dmm @@ -9,6 +9,10 @@ /obj/effect/landmark/abnospawn/easycombat, /turf/open/floor/plating/asteroid, /area/city/outskirts) +"r" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "G" = ( /obj/effect/landmark/abnospawn/easysupport, /turf/open/floor/plating/asteroid, @@ -962,6 +966,22 @@ a a a a +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r a a a @@ -978,26 +998,10 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +r +r +r +r a a a @@ -1084,8 +1088,8 @@ a a a a -a -a +r +r i i i @@ -1102,6 +1106,10 @@ i i i i +r +r +r +r a a a @@ -1113,19 +1121,15 @@ a a a a -a -a -a -a -a +r i i i i -a -a -a -a +r +r +r +r a a a @@ -1206,8 +1210,8 @@ a a a a -a -a +r +r i i i @@ -1230,17 +1234,17 @@ i i i i +r +r a a a a a a -a -a -a -a -a +r +r +r i i i @@ -1250,7 +1254,7 @@ i i i i -a +r a a a @@ -1329,7 +1333,7 @@ a a a a -a +r i i i @@ -1356,12 +1360,12 @@ i i i i -a -a -a -a -a -a +r +r +r +r +r +r i i i @@ -1374,7 +1378,7 @@ i i i i -a +r a a a @@ -1452,7 +1456,7 @@ a a a a -a +r i i i @@ -1490,7 +1494,7 @@ i i i i -a +r i i i @@ -1499,7 +1503,7 @@ i i i i -a +r a a a @@ -1576,7 +1580,7 @@ a a a a -a +r i i i @@ -1614,7 +1618,7 @@ i i i i -a +r i i i @@ -1623,7 +1627,7 @@ i i i i -a +r a a a @@ -1699,7 +1703,7 @@ a a a a -a +r i i i @@ -1737,9 +1741,9 @@ i i i i +r a -a -a +r i i i @@ -1747,8 +1751,8 @@ i i i i -a -a +r +r a a a @@ -1824,7 +1828,7 @@ a a a a -a +r i i i @@ -1837,14 +1841,14 @@ i i i i -a -a -a +r +r +r i i i -a -a +r +r i i i @@ -1861,9 +1865,9 @@ i i i i +r a -a -a +r i i i @@ -1873,7 +1877,7 @@ i i i i -a +r a a a @@ -1948,7 +1952,7 @@ a a a a -a +r i i i @@ -1957,21 +1961,21 @@ i i i i +r +r +r +r a a a +r +r +r a a -a -a -a -a -a -a -a -a -a -a +r +r +r i i i @@ -1980,15 +1984,15 @@ i i i i +r +r +r +r +r a a a -a -a -a -a -a -a +r i i i @@ -1998,7 +2002,7 @@ i i i i -a +r a a "} @@ -2073,10 +2077,14 @@ a a a a -a +r i i i +r +r +r +r a a a @@ -2092,6 +2100,14 @@ a a a a +r +r +r +r +r +r +r +r a a a @@ -2101,19 +2117,7 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a +r i i i @@ -2122,7 +2126,7 @@ i i i i -a +r a a "} @@ -2196,9 +2200,11 @@ a a a a -a -a +r +r i +r +r a a a @@ -2236,9 +2242,7 @@ a a a a -a -a -a +r i i i @@ -2247,7 +2251,7 @@ i i i i -a +r a "} (19,1,1) = {" @@ -2319,11 +2323,14 @@ a a a a -a +r i i i i +r +r +r a a a @@ -2359,10 +2366,7 @@ a a a a -a -a -a -a +r i i i @@ -2372,7 +2376,7 @@ i i i i -a +r "} (20,1,1) = {" a @@ -2441,8 +2445,8 @@ a a a a -a -a +r +r i i i @@ -2451,6 +2455,7 @@ i i i i +r a a a @@ -2486,9 +2491,8 @@ a a a a -a -a -a +r +r i i i @@ -2564,7 +2568,7 @@ a a a a -a +r i i i @@ -2574,6 +2578,7 @@ i i i i +r a a a @@ -2612,8 +2617,7 @@ a a a a -a -a +r i i i @@ -2686,8 +2690,8 @@ a a a a -a -a +r +r i i i @@ -2697,6 +2701,7 @@ i i i i +r a a a @@ -2737,8 +2742,7 @@ a a a a -a -a +r i i i @@ -2809,7 +2813,7 @@ a a a a -a +r i i i @@ -2821,6 +2825,7 @@ i i i i +r a a a @@ -2861,8 +2866,7 @@ a a a a -a -a +r i i i @@ -2927,13 +2931,13 @@ a a a a -a -a -a -a -a -a -a +r +r +r +r +r +r +r i i i @@ -2944,6 +2948,7 @@ i i i i +r a a a @@ -2986,8 +2991,7 @@ a a a a -a -a +r i i i @@ -3049,8 +3053,8 @@ a a a a -a -a +r +r i i i @@ -3068,6 +3072,7 @@ i i i i +r a a a @@ -3111,12 +3116,11 @@ a a a a -a -a -a -a +r +r +r i -a +r "} (26,1,1) = {" a @@ -3169,10 +3173,10 @@ a a a a -a -a -a -a +r +r +r +r i i i @@ -3192,6 +3196,7 @@ i i a a +r a a a @@ -3238,8 +3243,7 @@ a a a a -a -a +r a "} (27,1,1) = {" @@ -3291,8 +3295,8 @@ a a a a -a -a +r +r i i i @@ -3316,7 +3320,7 @@ a a a a -a +r a a a @@ -3414,7 +3418,7 @@ a a a a -a +r i i i @@ -3440,7 +3444,7 @@ a a a a -a +r a a a @@ -3537,7 +3541,7 @@ a a a a -a +r i i i @@ -3564,7 +3568,7 @@ a a a a -a +r a a a @@ -3660,7 +3664,7 @@ a a a a -a +r i i i @@ -3688,7 +3692,7 @@ a a a a -a +r a a a @@ -3783,7 +3787,7 @@ a a a a -a +r i i i @@ -3812,7 +3816,7 @@ a a a a -a +r a a a @@ -3906,7 +3910,7 @@ a a a a -a +r i i i @@ -3936,7 +3940,7 @@ a a a a -a +r a a a @@ -4030,7 +4034,7 @@ a a a a -a +r i i i @@ -4060,7 +4064,7 @@ a a a a -a +r a a a @@ -4153,7 +4157,7 @@ a a a a -a +r i i a @@ -4184,8 +4188,8 @@ a a a a -a -a +r +r a a a @@ -4268,15 +4272,15 @@ a a a a -a -a -a -a -a -a -a -a -a +r +r +r +r +r +r +r +r +r i i a @@ -4310,7 +4314,7 @@ i i i i -a +r a a a @@ -4389,9 +4393,9 @@ a a a a -a -a -a +r +r +r i i i @@ -4435,8 +4439,8 @@ a a a i -a -a +r +r a a a @@ -4511,8 +4515,8 @@ a a a a -a -a +r +r i i i @@ -4561,8 +4565,8 @@ a a i i -a -a +r +r a a a @@ -4634,7 +4638,7 @@ a a a a -a +r i i i @@ -4687,7 +4691,7 @@ i i i i -a +r a a a @@ -4757,7 +4761,7 @@ a a a a -a +r i i i @@ -4811,8 +4815,8 @@ i i i i -a -a +r +r a a a @@ -4881,7 +4885,7 @@ a a a a -a +r i i i @@ -4937,7 +4941,7 @@ i i i i -a +r a a a @@ -5004,7 +5008,7 @@ a a a a -a +r i i i @@ -5061,7 +5065,7 @@ i i i i -a +r a a a @@ -5127,7 +5131,7 @@ a a a a -a +r i i i @@ -5186,7 +5190,7 @@ i i i i -a +r a a a @@ -5251,7 +5255,7 @@ a a a a -a +r i i i @@ -5310,16 +5314,16 @@ i i i i +r a a a a a -a -a -a -a -a +r +r +r +r a a a @@ -5374,7 +5378,7 @@ a a a a -a +r i i i @@ -5434,18 +5438,18 @@ i i i i +r a a a a -a -a +r i i i i -a -a +r +r a a a @@ -5498,7 +5502,7 @@ a a a a -a +r i i i @@ -5559,10 +5563,10 @@ i i i i +r a -a -a -a +r +r i i i @@ -5570,7 +5574,7 @@ i i i i -a +r a a a @@ -5622,7 +5626,7 @@ a a a a -a +r i i i @@ -5683,9 +5687,9 @@ i i i i +r a -a -a +r i i i @@ -5695,7 +5699,7 @@ i i i i -a +r a a a @@ -5746,7 +5750,7 @@ a a a a -a +r i i i @@ -5808,8 +5812,8 @@ i i i a -a -a +r +r i i i @@ -5819,7 +5823,7 @@ i i i i -a +r a a a @@ -5870,7 +5874,7 @@ a a a a -a +r i i i @@ -5942,7 +5946,7 @@ i i i i -a +r a a a @@ -5993,7 +5997,7 @@ a a a a -a +r i i i @@ -6065,7 +6069,7 @@ i i i i -a +r a a a diff --git a/_maps/RandomRooms/rcorp/caves/elevator.dmm b/_maps/RandomRooms/rcorp/caves/elevator.dmm index b6e969bbe3c4..9c8a3eb813ef 100644 --- a/_maps/RandomRooms/rcorp/caves/elevator.dmm +++ b/_maps/RandomRooms/rcorp/caves/elevator.dmm @@ -114,6 +114,10 @@ }, /turf/closed/indestructible/reinforced, /area/city/outskirts) +"iW" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/reinforced, +/area/city/outskirts) "ju" = ( /obj/effect/turf_decal/siding/purple{ dir = 9 @@ -170,6 +174,9 @@ }, /turf/open/floor/carpet/purple, /area/city/outskirts) +"po" = ( +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/outskirts) "px" = ( /obj/effect/turf_decal/siding/purple, /obj/item/toy/plush/yesod, @@ -196,6 +203,10 @@ /obj/effect/landmark/abnospawn/easysupport, /turf/open/floor/carpet/purple, /area/city/outskirts) +"sU" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/outskirts) "tl" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -209,6 +220,10 @@ /obj/effect/landmark/abnospawn/easysupport, /turf/open/floor/carpet, /area/city/outskirts) +"uM" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/ashplanet/ash, +/area/city/outskirts) "ve" = ( /obj/effect/landmark/abnospawn/easysupport, /turf/open/floor/plasteel/dark, @@ -236,10 +251,22 @@ }, /turf/closed/indestructible/reinforced, /area/city/outskirts) +"xW" = ( +/obj/effect/landmark/nobasic_incorp_move, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/reinforced, +/area/city/outskirts) "yy" = ( /obj/effect/turf_decal/siding/purple, /turf/open/floor/carpet/purple, /area/city/outskirts) +"yC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/ash, +/area/city/outskirts) +"yK" = ( +/turf/open/floor/plating/ashplanet/ash, +/area/city/outskirts) "zb" = ( /obj/effect/turf_decal/siding/purple, /obj/structure/chair/comfy/black{ @@ -253,6 +280,11 @@ }, /turf/open/floor/carpet, /area/city/outskirts) +"zQ" = ( +/obj/structure/flora/rock/pile, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/ash, +/area/city/outskirts) "Ar" = ( /obj/docking_port/stationary{ dwidth = 3; @@ -313,6 +345,14 @@ }, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"Ij" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/indestructible/rock, +/area/city/outskirts) +"Ir" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/ashplanet/ash, +/area/city/outskirts) "IR" = ( /obj/structure/closet/crate, /obj/item/storage/belt/ego, @@ -335,6 +375,10 @@ /obj/item/storage/belt/ego, /turf/open/floor/carpet, /area/city/outskirts) +"Kt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/dark, +/area/city/outskirts) "Ky" = ( /obj/machinery/light, /turf/open/floor/plasteel/dark, @@ -348,11 +392,20 @@ }, /turf/closed/indestructible/reinforced, /area/city/outskirts) +"Lt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/indestructible/rock, +/area/city/outskirts) "LT" = ( /obj/effect/turf_decal/siding/red, /obj/effect/landmark/abnospawn/easytank, /turf/open/floor/carpet, /area/city/outskirts) +"Ny" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/ashplanet/wateryrock, +/area/city/outskirts) "NI" = ( /turf/open/floor/plasteel/dark, /area/city/outskirts) @@ -497,11 +550,18 @@ height = 5; id = "epsilon_control"; name = "2F - Control"; - roundstart_template = null; width = 6 }, /turf/open/floor/plasteel/elevatorshaft, /area/city/outskirts) +"WF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/closed/indestructible/reinforced, +/area/city/outskirts) +"WN" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "Xa" = ( /obj/effect/turf_decal/siding/red/corner, /obj/effect/turf_decal/siding/red/corner{ @@ -525,6 +585,11 @@ }, /turf/open/floor/plasteel/elevatorshaft, /area/city/outskirts) +"YW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/ashplanet/ash, +/area/city/outskirts) "Zr" = ( /obj/effect/turf_decal/siding/red{ dir = 8 @@ -962,70 +1027,70 @@ OY OY OY OY -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW OY OY OY @@ -1086,7 +1151,7 @@ OY OY OY OY -EA +iW NI NI NI @@ -1149,7 +1214,7 @@ NI NI NI NI -EA +iW OY OY OY @@ -1210,24 +1275,24 @@ OY OY OY OY -EA +iW NI EA EA EA EA EA -EA -EA -EA +yK +yK +yK EA EA EA NI EA EA -EA -EA +yK +yK EA EA EA @@ -1273,7 +1338,7 @@ EA EA EA NI -EA +iW OY OY OY @@ -1334,24 +1399,24 @@ OY OY OY OY -EA +iW NI EA OY OY OY OY -OY -OY -OY +yK +po +po OY OY EA NI EA OY -OY -OY +yK +YW OY OY OY @@ -1397,7 +1462,7 @@ OY OY EA NI -EA +iW OY OY OY @@ -1458,22 +1523,24 @@ OY OY OY OY -EA +iW NI EA OY OY OY OY -OY -OY -OY +po +po +po OY OY EA NI EA OY +yK +yC OY OY OY @@ -1481,13 +1548,28 @@ OY OY OY OY -OY -OY -OY -OY -OY -OY -OY +uM +yK +yK +yK +yK +po +po +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +NI +EA OY OY OY @@ -1504,7 +1586,7 @@ OY OY EA NI -EA +iW OY OY OY @@ -1515,13 +1597,12 @@ OY OY OY OY +"} +(9,1,1) = {" OY OY OY OY -EA -NI -EA OY OY OY @@ -1532,8 +1613,6 @@ OY OY OY OY -"} -(9,1,1) = {" OY OY OY @@ -1568,13 +1647,24 @@ OY OY OY OY +iW +NI +EA OY OY OY OY OY +po +yK +yK OY +EA +NI +EA OY +yK +yK OY OY OY @@ -1582,7 +1672,26 @@ OY OY OY OY -EA +yK +yK +yK +yK +yK +po +po +yC +yK +yK +yK +yK +yK +YW +yK +yK +yK +yK +yK +yK NI EA OY @@ -1592,11 +1701,18 @@ OY OY OY OY +Ir +yK +yK +yK +yK +YW +yC +yC +NI +iW OY OY -EA -NI -EA OY OY OY @@ -1605,6 +1721,8 @@ OY OY OY OY +"} +(10,1,1) = {" OY OY OY @@ -1626,9 +1744,6 @@ OY OY OY OY -EA -NI -EA OY OY OY @@ -1643,9 +1758,6 @@ OY OY OY OY -EA -NI -EA OY OY OY @@ -1656,16 +1768,27 @@ OY OY OY OY -"} -(10,1,1) = {" OY OY OY +iW +NI +EA OY OY OY OY OY +Ir +yK +yK +yK +yK +NI +WF +Ij +yK +yK OY OY OY @@ -1673,12 +1796,28 @@ OY OY OY OY +yK +yK OY OY OY +Ij OY OY OY +yK +yK +yK +yC +yC +yK +yK +yK +yK +yK +yK +NI +EA OY OY OY @@ -1686,6 +1825,16 @@ OY OY OY OY +yK +yK +yK +yC +yC +yK +yK +yK +NI +iW OY OY OY @@ -1696,6 +1845,8 @@ OY OY OY OY +"} +(11,1,1) = {" OY OY OY @@ -1706,9 +1857,6 @@ OY OY OY OY -EA -NI -EA OY OY OY @@ -1718,9 +1866,6 @@ OY OY OY OY -EA -NI -EA OY OY OY @@ -1750,7 +1895,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -1760,6 +1905,14 @@ OY OY OY OY +yK +yK +yK +NI +WF +OY +yC +yK OY OY OY @@ -1767,30 +1920,57 @@ OY OY OY OY -EA -NI -EA +yC +yC +Ij +Ij +Lt OY OY OY OY +yK +yK +yK +Ij OY OY OY OY OY OY -"} -(11,1,1) = {" +EA +NI +EA OY OY OY OY OY OY +Ij +yC +yK +yK +yK +yK +yK +yK +yK +NI +iW OY +iW +iW +iW +iW +iW +iW +iW OY OY +"} +(12,1,1) = {" OY OY OY @@ -1821,6 +2001,27 @@ OY OY OY OY +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +NI +EA OY OY OY @@ -1833,6 +2034,28 @@ OY EA NI EA +Ij +yC +yK +yK +yK +yK +yK +yK +yC +yK +yK +yK +yK +yK +yK +yK +po +po +yC +yC +yK +yK OY OY OY @@ -1840,13 +2063,38 @@ OY OY OY OY +EA +NI +yK +yK +YW +yK +yK +yK +yK +yK +yK +YW +yC +OY +Ij OY OY EA NI -EA +iW +OY +iW +eL +eL +eL +eL +eL +iW OY OY +"} +(13,1,1) = {" OY OY OY @@ -1874,16 +2122,64 @@ OY OY OY OY -EA -NI -EA OY OY OY +iW +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +po +po +po +yK +yK +yK +Ir OY OY OY +EA +NI +EA OY +yK +yC +yK +yK +yC +yK +yC +yK +yK +yK +yK +yK +yK +yK +yK +po +sU +yK +yK +yK +yK OY OY OY @@ -1893,19 +2189,36 @@ OY OY EA NI -EA +yK +yC +yK +yC +YW +yC +yK +yK +yK +yK +yK +OY +Ij +OY OY EA -EA -EA -EA -EA -EA -EA +NI +iW +OY +iW +eL +eL +eL +eL +eL +iW OY OY "} -(12,1,1) = {" +(14,1,1) = {" OY OY OY @@ -1936,6 +2249,8 @@ OY OY OY OY +iW +NI EA EA EA @@ -1944,16 +2259,26 @@ EA EA EA EA +yK +yK +yK EA EA EA EA EA EA -EA -EA -EA -EA +NI +po +po +yK +yK +yK +yK +yC +OY +OY +OY EA NI EA @@ -1961,6 +2286,26 @@ OY OY OY OY +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +uM +po +po +yK +yK +yC +Ir +OY +OY OY OY OY @@ -1968,10 +2313,36 @@ OY OY EA NI +yK +yC +yK +yK +yK +yK +yK +yK +yK +yK +yK +OY +OY +OY +OY EA +NI +iW OY +iW +eL +eL +eL +eL +Ar +iW OY OY +"} +(15,1,1) = {" OY OY OY @@ -1998,9 +2369,58 @@ OY OY OY OY -EA -NI -EA +OY +OY +OY +OY +iW +NI +yK +OY +OY +OY +OY +OY +OY +OY +yK +yC +yC +OY +OY +OY +OY +OY +EA +NI +yK +yK +yK +yC +yC +yK +yC +OY +OY +OY +EA +NI +EA +OY +OY +OY +OY +yK +yK +yK +OY +OY +OY +OY +OY +OY +OY +OY OY OY OY @@ -2019,17 +2439,34 @@ EA NI EA OY +OY +OY +OY +OY +OY +Ij +yK +yK +yK +OY +OY +OY +OY EA +NI +iW +OY +iW eL eL eL eL eL -EA +iW OY OY "} -(13,1,1) = {" +(16,1,1) = {" OY OY OY @@ -2060,31 +2497,19 @@ OY OY OY OY -EA -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI +iW NI -NI -NI -NI -NI -NI -EA +yK +yK +OY +OY OY OY OY OY +yK +yC +yK OY OY OY @@ -2095,12 +2520,23 @@ NI EA OY OY +Ij +yK +yK +yK OY OY OY +EA +NI +EA +OY OY OY OY +yK +yK +yK OY OY OY @@ -2114,6 +2550,7 @@ OY OY OY OY +Ij OY OY OY @@ -2132,28 +2569,28 @@ OY OY OY OY -OY -OY -OY +yK +yK +yK OY OY OY OY EA NI -EA +iW OY -EA +iW eL eL eL eL eL -EA +iW OY OY "} -(14,1,1) = {" +(17,1,1) = {" OY OY OY @@ -2184,6 +2621,36 @@ OY OY OY OY +iW +NI +yK +yK +YW +yK +yC +yC +yK +yK +yK +yC +yK +yK +yK +yK +Ir +OY +EA +NI +EA +OY +OY +EA +yC +yK +yK +EA +EA +EA EA NI EA @@ -2191,6 +2658,10 @@ EA EA EA EA +yK +yK +yK +EA EA EA EA @@ -2203,24 +2674,47 @@ EA EA EA EA +WF +EA +EA +EA +EA +EA +EA +EA +EA +EA NI EA +EA +EA +EA +EA +EA OY OY -OY -OY -OY +yK +yC +zQ OY OY OY OY EA NI -EA -OY +iW OY +iW +EA +cK +cK +Ls +EA +iW OY OY +"} +(18,1,1) = {" OY OY OY @@ -2246,38 +2740,105 @@ OY OY OY OY -EA -NI -EA OY OY OY OY OY +iW +NI +yK +yK +yC +yC +YW +yC +yK +yC +yK +yC +yK +yK +yK +po +po OY +EA +NI +EA OY OY +EA +Kt +Kt +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +EA OY OY +yK +yK +yK OY OY OY OY EA NI -EA +iW OY -EA -eL -eL -eL -eL -Ar -EA +iW +ie +ie +ie +ie +ie +iW OY OY "} -(15,1,1) = {" +(19,1,1) = {" OY OY OY @@ -2308,27 +2869,105 @@ OY OY OY OY -EA +iW NI +yK +yK +yK +yK +Ir +yK +yK +yK +yK +yK +uM OY OY +po +po +OY +EA +NI +EA OY OY +EA +NI +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +yK +yK +yK +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +NI +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +NI +EA OY OY +yK +yK +yK OY OY OY OY +EA +NI +iW OY +iW +ie +ie +ie +ie +ie +iW +iW +iW +"} +(20,1,1) = {" OY OY OY OY OY -EA -NI -EA OY OY OY @@ -2338,9 +2977,6 @@ OY OY OY OY -EA -NI -EA OY OY OY @@ -2357,6 +2993,9 @@ OY OY OY OY +iW +NI +yK OY OY OY @@ -2369,830 +3008,8 @@ OY OY OY OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -EA -eL -eL -eL -eL -eL -EA -OY -OY -"} -(16,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -EA -eL -eL -eL -eL -eL -EA -OY -OY -"} -(17,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -EA -EA -EA -EA -EA -EA -EA -EA -NI -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -NI -EA -EA -EA -EA -EA -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -EA -EA -cK -cK -Ls -EA -EA -OY -OY -"} -(18,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -EA -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -EA -ie -ie -ie -ie -ie -EA -OY -OY -"} -(19,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -EA -NI -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -NI -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -EA -ie -ie -ie -ie -ie -EA -EA -EA -"} -(20,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -EA -EA -ie -ie -ie -ie -ie -bE -bE -bE -"} -(21,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -NI -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -OY -OY -OY -EA -NI -EA -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -NI -NI -JC -ie -ie -ie -ie -ie -bE -bE -bE -"} -(22,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -NI -EA -OY -OY +po +yK OY EA NI @@ -3211,9 +3028,9 @@ OY OY OY OY -OY -OY -OY +yK +yK +yK OY OY OY @@ -3248,18 +3065,18 @@ NI EA OY OY -OY -OY -OY +yK +yC +yK OY OY OY OY EA NI -EA -EA -EA +iW +iW +iW ie ie ie @@ -3269,7 +3086,7 @@ bE bE bE "} -(23,1,1) = {" +(21,1,1) = {" OY OY OY @@ -3289,7 +3106,18 @@ OY OY OY OY -EA +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW NI EA EA @@ -3304,19 +3132,8 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -NI -EA -OY -OY +yK +yC OY EA NI @@ -3335,9 +3152,9 @@ OY OY OY OY -OY -OY -OY +yK +yK +yK OY OY OY @@ -3370,20 +3187,20 @@ OY EA NI EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -NI -EA +OY +OY +yK +yC +yK +OY +OY +OY OY EA +NI +NI +NI +JC ie ie ie @@ -3393,7 +3210,7 @@ bE bE bE "} -(24,1,1) = {" +(22,1,1) = {" OY OY OY @@ -3413,85 +3230,12 @@ OY OY OY OY -EA +iW NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA NI -EA -OY -OY -OY -EA NI -EA -OY -OY -EA NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA NI NI NI @@ -3505,75 +3249,92 @@ NI NI NI NI -EA +NI +NI +NI +NI +NI +NI +yC +yC +yC OY EA -ie -ie -ie -ie -ie -bE -bE -bE -"} -(25,1,1) = {" -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +NI +EA OY OY +EA +NI +yK +yK +yK +yK +yC +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +YW +yC +yK +yK +yC +yC +yK +yK +yK OY OY OY OY EA NI +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +NI EA OY OY +yK +yK +yK OY OY OY OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY EA NI EA -OY -OY EA -NI EA +ie +ie +ie +ie +ie +bE +bE +bE +"} +(23,1,1) = {" OY OY OY @@ -3593,29 +3354,7 @@ OY OY OY OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA +iW NI EA EA @@ -3630,18 +3369,96 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +NI +yK +yK +yK +OY +EA +NI +EA +OY +OY +EA +NI +yK +yK +yK +yK +yK +yK +yK +yC +yK +yK +yK +YW +yK +yK +yK +yK +yK +yK +yK +yK +yK +yK +yC +yK +yK +OY OY +OY +EA +NI +yK +yK +yC +YW +yC +yC +yC +yK +yC +yK +yK +yK +yK +NI EA EA EA +yK +yK +yK EA EA EA EA EA +NI +EA +OY EA +ie +ie +ie +ie +ie +bE +bE +bE "} -(26,1,1) = {" +(24,1,1) = {" OY OY OY @@ -3661,7 +3478,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -3701,17 +3518,71 @@ EA OY OY OY +Lt +yC +yC +yK OY OY +yK +yC OY OY OY OY OY +yK +yK OY OY +yK +yK +yC +yK +sU +Ij OY +EA +NI +yK +yK +yK +yK +yK +yK +yK +yK +yC +yK +yK +yK +yK +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +NI +EA OY +EA +ie +ie +ie +ie +ie +bE +bE +bE +"} +(25,1,1) = {" OY OY OY @@ -3725,25 +3596,19 @@ OY OY OY OY -EA -NI -EA -OY -OY -OY -OY -OY OY OY OY OY OY OY -EA +iW NI EA OY OY +Ij +Ij OY OY OY @@ -3760,35 +3625,88 @@ OY OY OY OY +EA +NI +EA OY OY OY +EA +NI +EA OY -"} -(27,1,1) = {" +OY +EA +NI +EA OY OY OY OY OY +yK +yK +Ir OY +yK +yK OY OY OY OY OY +yK +yK OY OY OY +uM +yK +yK +po +sU +yC +yC +NI +EA OY OY +Ij +Ij +OY +yK +yK +yC OY OY OY EA NI -EA -OY +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +iW +WN +iW +iW +iW +iW +iW +iW +iW +iW +iW +"} +(26,1,1) = {" OY OY OY @@ -3808,9 +3726,26 @@ OY OY OY OY -EA +iW NI -EA +yK +yK +yK +yK +yC +yK +yK +yK +yK +yK +yK +yC +yC +yK +yK +OY +OY +OY OY OY OY @@ -3819,8 +3754,14 @@ NI EA OY OY +OY EA NI +yK +yK +yK +yK +NI EA OY OY @@ -3828,16 +3769,44 @@ OY OY OY OY +yK +yK +yK +yK +yK +yK +yC +yC +yK +yK +yK +yK OY OY OY OY +yK +yK +po +po +yK +yK +NI +EA OY OY OY +Ij +Ij +yK +yK +yK OY OY OY +EA +NI +iW OY OY OY @@ -3849,11 +3818,6 @@ OY OY OY OY -EA -NI -EA -OY -OY OY OY OY @@ -3863,11 +3827,10 @@ OY OY OY OY -EA -NI -EA OY OY +"} +(27,1,1) = {" OY OY OY @@ -3887,16 +3850,43 @@ OY OY OY OY +iW +NI +yC +yC +yK +yK +yK +yC +yK +YW +yC +yK +yK +yC +yC +yK +yK +po OY -"} -(28,1,1) = {" OY OY OY OY +EA +NI +EA OY OY OY +EA +NI +yK +yC +yC +YW +NI +EA OY OY OY @@ -3904,20 +3894,43 @@ OY OY OY OY +yK +yK +yC +yK +yC +yK +yK +yK +yK +yK +yC OY OY OY OY OY -EA +yK +po +po +yK +yK NI EA OY OY OY +Ir +yC +yK +yK +yK OY OY OY +EA +NI +iW OY OY OY @@ -3932,24 +3945,16 @@ OY OY OY OY -EA -NI -EA -OY OY OY -EA -NI -EA OY OY -EA -NI -EA OY OY OY OY +"} +(28,1,1) = {" OY OY OY @@ -3969,6 +3974,25 @@ OY OY OY OY +iW +NI +yC +yK +yK +yK +uM +yK +yC +yC +yK +yK +yK +yK +yK +yK +po +po +Ny OY OY OY @@ -3979,6 +4003,33 @@ EA OY OY OY +EA +NI +yC +yC +yK +yK +NI +yK +yK +yK +yK +yK +yC +yK +yK +yK +yC +yK +yC +yK +yK +yK +yK +yK +yK +yK +OY OY OY OY @@ -3993,9 +4044,17 @@ EA OY OY OY +yK +yK +yC +YW +yK OY OY OY +EA +NI +iW OY OY OY @@ -4012,16 +4071,14 @@ OY OY OY OY -"} -(29,1,1) = {" -OY -OY OY OY OY OY OY OY +"} +(29,1,1) = {" OY OY OY @@ -4033,9 +4090,6 @@ OY OY OY OY -EA -NI -EA OY OY OY @@ -4044,6 +4098,9 @@ OY OY OY OY +iW +NI +EA OY OY OY @@ -4056,7 +4113,15 @@ OY OY OY OY -EA +po +po +po +yC +YW +yC +yK +yK +yK NI EA OY @@ -4064,30 +4129,30 @@ OY OY EA NI -EA -OY -OY -EA +yK +uM +yK +yK NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +yK +yC +yK +yC +yC +yK +yK +yK +yK +yC +yK +uM OY OY OY OY OY +yK +yK OY OY OY @@ -4102,18 +4167,18 @@ NI EA OY OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yC +yK +yK +yK +uM OY OY EA NI -EA +iW OY OY OY @@ -4157,7 +4222,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -4173,14 +4238,14 @@ OY OY OY OY -OY -OY -OY -OY -OY -OY -OY -EA +po +yK +yC +yK +yC +yC +yK +yC NI EA OY @@ -4194,6 +4259,7 @@ OY EA NI EA +Ij OY OY OY @@ -4201,17 +4267,16 @@ OY OY OY OY +yC +yC OY OY OY OY OY OY -OY -OY -OY -OY -OY +yK +yC OY OY OY @@ -4225,19 +4290,19 @@ EA NI EA OY +yK +yK +yK OY OY OY -OY -OY -OY -OY -OY -OY +yK +yK +yK OY EA NI -EA +iW OY OY OY @@ -4281,54 +4346,9 @@ OY OY OY OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA -NI -EA -OY -OY -OY -EA -NI -EA -OY -OY -EA -NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +iW +NI +EA OY OY OY @@ -4343,6 +4363,21 @@ OY OY OY OY +yK +yK +yC +yC +yC +yK +yK +NI +yK +yK +yK +YW +yK +NI +EA OY OY EA @@ -4350,6 +4385,22 @@ NI EA OY OY +Ij +Ij +OY +OY +OY +OY +yK +yK +Ij +OY +OY +OY +Ij +yK +yC +uM OY OY OY @@ -4361,7 +4412,21 @@ OY OY EA NI -EA +yC +yC +yC +yK +Ij +Ij +Ij +OY +OY +yK +yK +yK +yK +NI +iW OY OY OY @@ -4405,7 +4470,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -4422,19 +4487,19 @@ EA EA OY OY -OY -OY -OY -OY -OY +yK +yK +yC +Ij +Ij OY EA NI -EA -OY -OY -OY -EA +yK +yK +yC +yC +yK NI EA OY @@ -4450,15 +4515,15 @@ OY OY OY OY +yK +yK OY OY OY OY -OY -OY -OY -OY -OY +yK +yK +yK OY OY OY @@ -4471,11 +4536,9 @@ OY OY EA NI -EA -OY -OY -OY -OY +YW +yC +yK OY OY OY @@ -4483,9 +4546,11 @@ OY OY OY OY -EA +yK +yK +yK NI -EA +iW OY OY OY @@ -4529,7 +4594,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -4546,9 +4611,9 @@ EA EA OY OY -OY -OY -OY +yK +yC +yC OY OY OY @@ -4574,14 +4639,14 @@ OY OY OY OY -OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yK +yK +yK +yC +yK +yK OY OY OY @@ -4609,7 +4674,7 @@ OY OY EA NI -EA +iW OY OY OY @@ -4653,7 +4718,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -4670,9 +4735,9 @@ eL EA OY OY -OY -OY -OY +yC +yK +yK OY OY OY @@ -4698,13 +4763,13 @@ OY OY OY OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yK +yK +yC +yK +yK OY OY OY @@ -4730,10 +4795,10 @@ eL eL EA EA -OY +Ij EA NI -EA +iW OY OY OY @@ -4777,7 +4842,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -4794,9 +4859,9 @@ eL EA OY OY -OY -OY -OY +yC +yC +yK OY OY OY @@ -4813,17 +4878,17 @@ OY OY EA NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yK +yK +yK +yC +yK +yC +yK +yK +yK OY OY OY @@ -4857,7 +4922,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -4901,7 +4966,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -4918,9 +4983,9 @@ eL EA OY OY -OY -OY -OY +yC +yK +yK OY OY OY @@ -4937,17 +5002,17 @@ OY OY EA NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yK +yC +yC +yK +yK +yK +yK +yK +yK OY OY OY @@ -4981,7 +5046,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -5025,7 +5090,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -5043,9 +5108,9 @@ EA OY OY OY -OY -OY -OY +yK +yK +uM OY OY EA @@ -5061,17 +5126,17 @@ OY OY EA NI -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yC +yC +yK +yK +yK +yK +yK +yC +yK OY OY OY @@ -5105,7 +5170,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -5149,7 +5214,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -5167,9 +5232,9 @@ EA OY OY OY -OY -OY -OY +yC +YW +yK OY OY EA @@ -5194,8 +5259,8 @@ OY OY OY OY -OY -OY +yK +yK OY OY OY @@ -5229,7 +5294,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -5273,7 +5338,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -5291,9 +5356,9 @@ EA OY OY OY -OY -OY -OY +yC +YW +yC OY OY EA @@ -5304,10 +5369,10 @@ OY OY EA NI -EA -OY -OY -EA +yK +yK +yK +yK NI EA OY @@ -5318,14 +5383,14 @@ OY OY OY OY -OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yK +yK +yK +yK +yK +yK OY OY OY @@ -5353,7 +5418,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -5397,7 +5462,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -5415,9 +5480,9 @@ EA EA EA EA -EA -EA -EA +yC +yC +yC EA EA EA @@ -5428,10 +5493,10 @@ OY OY EA NI -EA -OY -OY -EA +yK +yK +yC +yK NI EA OY @@ -5442,14 +5507,14 @@ OY OY OY OY -OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yK +yK +yK +yK +yK +yK OY OY OY @@ -5477,7 +5542,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -5521,7 +5586,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -5552,10 +5617,10 @@ OY OY EA NI -EA -OY -OY -EA +yK +yC +yK +yK NI EA OY @@ -5566,14 +5631,14 @@ OY OY OY OY -OY -OY -OY -OY -OY -OY -OY -OY +yK +yK +yK +yK +yK +yC +yC +yK OY OY OY @@ -5601,7 +5666,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -5645,7 +5710,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -5695,9 +5760,9 @@ OY OY OY OY -OY -OY -OY +yC +yC +yK OY OY OY @@ -5725,7 +5790,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -5769,7 +5834,7 @@ OY OY OY OY -EA +iW NI EA OY @@ -5819,9 +5884,9 @@ OY OY OY OY -OY -OY -OY +yK +yC +yC OY OY OY @@ -5849,7 +5914,7 @@ EA OY EA NI -EA +iW OY OY OY @@ -5893,7 +5958,7 @@ OY OY OY OY -EA +iW NI EA EA @@ -5943,9 +6008,9 @@ EA EA EA EA -EA -EA -EA +yK +yK +yK EA EA EA @@ -5973,7 +6038,7 @@ EA EA EA NI -EA +iW OY OY OY @@ -6017,7 +6082,7 @@ OY OY OY OY -EA +iW NI NI NI @@ -6097,7 +6162,7 @@ NI NI NI NI -EA +iW OY OY OY @@ -6141,13 +6206,13 @@ OY OY OY OY -EA -EA -EA -EA -EA -EA -EA +iW +iW +iW +iW +iW +iW +iW hO NI NI @@ -6217,11 +6282,11 @@ nN VH CS NI -EA -EA -EA -EA -EA +iW +iW +iW +iW +iW OY OY OY @@ -6271,7 +6336,7 @@ OY OY OY OY -EA +iW NV NI NI @@ -6341,7 +6406,7 @@ hv VH LT NI -EA +iW OY OY OY @@ -6395,7 +6460,7 @@ OY OY OY OY -EA +iW NV NI NI @@ -6465,7 +6530,7 @@ VH VH CS Bu -EA +iW OY OY OY @@ -6519,57 +6584,57 @@ OY OY OY OY -EA -EA +xW +iW NI NI NI NI NI -EA -EA -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -OY -EA +iW +iW +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +WN +iW CL NI NI @@ -6577,11 +6642,11 @@ NI NI NI Ky -EA -OY -OY -OY -EA +iW +WN +WN +WN +iW NI Se zz @@ -6589,7 +6654,7 @@ Xa zz cS kO -EA +iW OY OY OY diff --git a/_maps/RandomRooms/rcorp/caves/hallway.dmm b/_maps/RandomRooms/rcorp/caves/hallway.dmm index f23b6d90484b..225615893bec 100644 --- a/_maps/RandomRooms/rcorp/caves/hallway.dmm +++ b/_maps/RandomRooms/rcorp/caves/hallway.dmm @@ -24,6 +24,10 @@ /obj/effect/landmark/abnospawn/easycombat, /turf/open/floor/pod/dark, /area/city/outskirts) +"X" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/wall/mineral/titanium/survival/pod, +/area/city/outskirts) (1,1,1) = {" a @@ -919,91 +923,91 @@ a a a a -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X a a a @@ -1043,7 +1047,7 @@ a a a a -H +X G G G @@ -1127,7 +1131,7 @@ G G G G -H +X a a a @@ -1167,7 +1171,7 @@ a a a a -H +X G G G @@ -1251,7 +1255,7 @@ G G G G -H +X a a a @@ -1291,7 +1295,7 @@ a a a a -H +X G N G @@ -1375,7 +1379,7 @@ G G G G -H +X a a a @@ -1415,7 +1419,7 @@ a a a a -H +X G G G @@ -1499,7 +1503,7 @@ H G G G -H +X a a a @@ -1539,7 +1543,7 @@ a a a a -H +X G G G @@ -1623,7 +1627,7 @@ H p p p -H +X a a a @@ -1663,7 +1667,7 @@ a a a a -H +X G G G @@ -1747,7 +1751,7 @@ H G G G -H +X a a a @@ -1787,7 +1791,7 @@ a a a a -H +X p p p @@ -1871,7 +1875,7 @@ H G G G -H +X a a a @@ -1911,7 +1915,7 @@ a a a a -H +X G G G @@ -1995,7 +1999,7 @@ H G G G -H +X a a a @@ -2035,7 +2039,7 @@ a a a a -H +X G G G @@ -2119,7 +2123,7 @@ H G G G -H +X a a a @@ -2159,7 +2163,7 @@ a a a a -H +X G G G @@ -2243,7 +2247,7 @@ H p p p -H +X a a a @@ -2283,7 +2287,7 @@ a a a a -H +X G G G @@ -2367,19 +2371,19 @@ H G G G -H -H -H -H -H -H -H -H -H -H -H -H -H +X +X +X +X +X +X +X +X +X +X +X +X +X "} (20,1,1) = {" a @@ -2407,7 +2411,7 @@ a a a a -H +X G G G @@ -2531,7 +2535,7 @@ a a a a -H +X G G G @@ -2655,7 +2659,7 @@ a a a a -H +X G G G @@ -2779,7 +2783,7 @@ a a a a -H +X G G G @@ -2903,7 +2907,7 @@ a a a a -H +X G G G @@ -3027,71 +3031,71 @@ a a a a -H +X G G G G G -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X G G G G G G -H -H -H -H -H -H -H -H +X +X +X +X +X +X +X +X G G G @@ -3111,19 +3115,19 @@ H G G G -H -H -H -H -H -H -H -H -H -H -H -H -H +X +X +X +X +X +X +X +X +X +X +X +X +X "} (26,1,1) = {" a @@ -3151,13 +3155,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -3201,21 +3205,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -3235,7 +3239,7 @@ H G G G -H +X a a a @@ -3275,13 +3279,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -3325,21 +3329,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -3359,7 +3363,7 @@ H G G G -H +X a a a @@ -3399,13 +3403,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -3449,21 +3453,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -3483,7 +3487,7 @@ H G G G -H +X a a a @@ -3523,13 +3527,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -3573,21 +3577,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -3607,7 +3611,7 @@ H p p G -H +X a a a @@ -3647,13 +3651,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -3697,21 +3701,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -3731,7 +3735,7 @@ H G G G -H +X a a a @@ -3771,13 +3775,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -3821,21 +3825,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -3855,7 +3859,7 @@ H G G G -H +X a a a @@ -3895,13 +3899,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -3945,21 +3949,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -3979,7 +3983,7 @@ H p p p -H +X a a a @@ -4019,13 +4023,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -4069,21 +4073,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -4103,7 +4107,7 @@ G G G G -H +X a a a @@ -4143,13 +4147,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -4193,21 +4197,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -4227,7 +4231,7 @@ G G G G -H +X a a a @@ -4267,13 +4271,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -4317,21 +4321,21 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G @@ -4351,7 +4355,7 @@ G G G G -H +X a a a @@ -4391,13 +4395,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -4441,41 +4445,41 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H -H +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X +X a a a @@ -4515,13 +4519,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -4565,25 +4569,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -4639,13 +4643,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -4689,25 +4693,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -4763,13 +4767,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -4813,25 +4817,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -4887,13 +4891,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -4937,25 +4941,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -5011,13 +5015,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -5061,25 +5065,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -5135,13 +5139,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -5185,25 +5189,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -5259,13 +5263,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -5309,25 +5313,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -5383,13 +5387,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -5433,25 +5437,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -5507,13 +5511,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -5557,25 +5561,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -5631,13 +5635,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -5681,25 +5685,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -5755,13 +5759,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -5805,25 +5809,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -5879,13 +5883,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -5929,25 +5933,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a @@ -6003,13 +6007,13 @@ a a a a -H +X G G G G G -H +X a a a @@ -6053,25 +6057,25 @@ a a a a -H +X G G G G G G -H +X a a a a a a -H +X G G G -H +X a a a diff --git a/_maps/RandomRooms/rcorp/caves/open.dmm b/_maps/RandomRooms/rcorp/caves/open.dmm index fa22c8ef73ef..c07bd9147f3f 100644 --- a/_maps/RandomRooms/rcorp/caves/open.dmm +++ b/_maps/RandomRooms/rcorp/caves/open.dmm @@ -17,6 +17,10 @@ /obj/effect/landmark/abnospawn/easycombat, /turf/open/floor/plating/asteroid, /area/city/outskirts) +"J" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) (1,1,1) = {" a @@ -962,6 +966,13 @@ a a a a +J +J +J +J +J +J +J a a a @@ -987,17 +998,10 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a +J +J +J +J a a a @@ -1081,11 +1085,11 @@ a a a a -a -a -a -a -a +J +J +J +J +J i i i @@ -1093,6 +1097,16 @@ i i i i +J +J +J +J +J +J +J +J +J +J a a a @@ -1107,25 +1121,15 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a +J i i i i -a -a -a -a +J +J +J +J a a a @@ -1204,7 +1208,7 @@ a a a a -a +J i i i @@ -1227,6 +1231,9 @@ i i i i +J +J +J a a a @@ -1237,10 +1244,7 @@ a a a a -a -a -a -a +J i i i @@ -1250,7 +1254,7 @@ i i i i -a +J a a a @@ -1321,13 +1325,13 @@ a a a a +J +J +J +J a a -a -a -a -a -a +J i i i @@ -1354,6 +1358,8 @@ i i i i +J +J a a a @@ -1361,9 +1367,7 @@ a a a a -a -a -a +J i i i @@ -1374,7 +1378,7 @@ i i i i -a +J a a a @@ -1441,16 +1445,16 @@ a a a a -a -a -a -a +J +J +J +J i i i i -a -a +J +J i i i @@ -1480,13 +1484,13 @@ i i i i +J +J a a a a -a -a -a +J i i a @@ -1499,7 +1503,7 @@ i i i i -a +J a a a @@ -1563,8 +1567,8 @@ a a a a -a -a +J +J i i i @@ -1606,11 +1610,11 @@ i i i i +J a +J a -a -a -a +J i a a @@ -1623,7 +1627,7 @@ i i i i -a +J a a a @@ -1686,7 +1690,7 @@ a a a a -a +J i i i @@ -1731,9 +1735,9 @@ i i i i -a +J i -a +J i i a @@ -1747,8 +1751,8 @@ i i i i -a -a +J +J a a a @@ -1807,9 +1811,9 @@ a a a a -a -a -a +J +J +J i i i @@ -1873,7 +1877,7 @@ i i i i -a +J a a a @@ -1929,8 +1933,8 @@ a a a a -a -a +J +J i i i @@ -1998,7 +2002,7 @@ i i i i -a +J a a "} @@ -2051,8 +2055,8 @@ a a a a -a -a +J +J i i i @@ -2122,7 +2126,7 @@ i i i i -a +J a a "} @@ -2173,8 +2177,8 @@ a a a a -a -a +J +J i i i @@ -2247,7 +2251,7 @@ i i i i -a +J a "} (19,1,1) = {" @@ -2291,12 +2295,12 @@ a a a a -a -a -a -a -a -a +J +J +J +J +J +J i i i @@ -2372,7 +2376,7 @@ i i i i -a +J "} (20,1,1) = {" a @@ -2414,7 +2418,7 @@ a a a a -a +J i i i @@ -2486,9 +2490,9 @@ a a a a -a -a -a +J +J +J i i i @@ -2537,7 +2541,7 @@ a a a a -a +J i i i @@ -2605,15 +2609,15 @@ i i i i +J +J +J +J +J a a a -a -a -a -a -a -a +J i i i @@ -2660,7 +2664,7 @@ a a a a -a +J i i i @@ -2728,6 +2732,7 @@ i i i i +J a a a @@ -2737,8 +2742,7 @@ a a a a -a -a +J i i i @@ -2783,7 +2787,7 @@ a a a a -a +J i i i @@ -2852,6 +2856,7 @@ i i i i +J a a a @@ -2861,8 +2866,7 @@ a a a a -a -a +J i i i @@ -2906,7 +2910,7 @@ a a a a -a +J i i i @@ -2975,6 +2979,7 @@ i i i i +J a a a @@ -2986,8 +2991,7 @@ a a a a -a -a +J i i i @@ -3030,7 +3034,7 @@ a a a a -a +J i i a @@ -3099,6 +3103,7 @@ i i i i +J a a a @@ -3111,12 +3116,11 @@ a a a a -a -a -a -a +J +J +J i -a +J "} (26,1,1) = {" a @@ -3154,7 +3158,7 @@ a a a a -a +J i i a @@ -3222,6 +3226,7 @@ i i i i +J a a a @@ -3238,8 +3243,7 @@ a a a a -a -a +J a "} (27,1,1) = {" @@ -3278,7 +3282,7 @@ a a a a -a +J i i a @@ -3345,7 +3349,7 @@ i i i i -a +J a a a @@ -3402,7 +3406,7 @@ a a a a -a +J i i i @@ -3468,7 +3472,7 @@ G i i i -a +J a a a @@ -3525,7 +3529,7 @@ a a a a -a +J i i i @@ -3591,7 +3595,7 @@ i i i i -a +J a a a @@ -3649,7 +3653,7 @@ a a a a -a +J i i i @@ -3714,7 +3718,7 @@ i H i i -a +J a a a @@ -3773,7 +3777,7 @@ a a a a -a +J i i i @@ -3837,7 +3841,7 @@ i i i i -a +J a a a @@ -3896,7 +3900,7 @@ a a a a -a +J i i i @@ -3960,7 +3964,7 @@ i i i i -a +J a a a @@ -4019,7 +4023,7 @@ a a a a -a +J i i i @@ -4083,7 +4087,7 @@ i i i i -a +J a a a @@ -4142,8 +4146,8 @@ a a a a -a -a +J +J i i i @@ -4206,7 +4210,7 @@ i i i i -a +J a a a @@ -4264,8 +4268,8 @@ a a a a -a -a +J +J i i i @@ -4330,7 +4334,7 @@ i a i i -a +J a a a @@ -4387,7 +4391,7 @@ a a a a -a +J i i i @@ -4454,7 +4458,7 @@ a a i i -a +J a a a @@ -4510,7 +4514,7 @@ a a a a -a +J i i i @@ -4578,7 +4582,7 @@ a a i i -a +J a a a @@ -4633,7 +4637,7 @@ a a a a -a +J i i i @@ -4702,7 +4706,7 @@ i i i i -a +J a a a @@ -4756,7 +4760,7 @@ a a a a -a +J i i i @@ -4826,7 +4830,7 @@ i i i i -a +J a a a @@ -4880,7 +4884,7 @@ a a a a -a +J i i i @@ -4951,7 +4955,7 @@ i i i i -a +J a a a @@ -5004,7 +5008,7 @@ a a a a -a +J i i i @@ -5068,13 +5072,13 @@ i i i i -a +J i i i i i -a +J a a a @@ -5127,7 +5131,7 @@ a a a a -a +J i i i @@ -5191,15 +5195,15 @@ i i i i +J a -a -a +J i i i i i -a +J a a a @@ -5251,7 +5255,7 @@ a a a a -a +J i i i @@ -5289,12 +5293,12 @@ i i i i -a -a -a -a -a -a +J +J +J +J +J +J i i i @@ -5314,17 +5318,17 @@ i i i i +J a a a -a -a +J i i i i i -a +J a a a @@ -5374,7 +5378,7 @@ a a a a -a +J i i i @@ -5406,19 +5410,19 @@ i i i i +J +J +J +J +J +J +J a a a a a -a -a -a -a -a -a -a -a +J i i i @@ -5437,18 +5441,18 @@ i i i i +J a a -a -a -a +J +J i i i i i i -a +J a a a @@ -5498,7 +5502,7 @@ a a a a -a +J i i i @@ -5519,6 +5523,17 @@ i i i i +J +J +J +J +J +J +J +J +J +J +J a a a @@ -5532,25 +5547,14 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a +J +J i i i i i -a +J i i i @@ -5560,10 +5564,10 @@ i i i i +J a -a -a -a +J +J i i i @@ -5572,7 +5576,7 @@ i i i i -a +J a a a @@ -5622,7 +5626,7 @@ a a a a -a +J i i i @@ -5642,6 +5646,7 @@ i i i i +J a a a @@ -5668,13 +5673,12 @@ a a a a -a -a -a -a -a -a -a +J +J +J +J +J +J i i i @@ -5684,8 +5688,8 @@ i i i i -a -a +J +J i i i @@ -5696,7 +5700,7 @@ i i i i -a +J a a a @@ -5746,7 +5750,7 @@ a a a a -a +J i i i @@ -5765,6 +5769,7 @@ i i i i +J a a a @@ -5797,8 +5802,7 @@ a a a a -a -a +J i i i @@ -5807,9 +5811,9 @@ i i i i +J a -a -a +J i i i @@ -5820,7 +5824,7 @@ i i i i -a +J a a a @@ -5870,7 +5874,7 @@ a a a a -a +J i i i @@ -5889,6 +5893,7 @@ i i i i +J a a a @@ -5921,8 +5926,7 @@ a a a a -a -a +J i i i @@ -5931,8 +5935,8 @@ i i i i -a -a +J +J i i i @@ -5942,8 +5946,8 @@ i i i i -a -a +J +J a a a @@ -5993,7 +5997,7 @@ a a a a -a +J i i i @@ -6012,6 +6016,7 @@ i i i i +J a a a @@ -6044,8 +6049,7 @@ a a a a -a -a +J i i i @@ -6055,8 +6059,8 @@ i i i i -a -a +J +J i i i @@ -6065,7 +6069,7 @@ i i i i -a +J a a a diff --git a/_maps/RandomRooms/rcorp/caves/pit.dmm b/_maps/RandomRooms/rcorp/caves/pit.dmm index 5129a11f0762..126f1e319465 100644 --- a/_maps/RandomRooms/rcorp/caves/pit.dmm +++ b/_maps/RandomRooms/rcorp/caves/pit.dmm @@ -3,18 +3,41 @@ /turf/closed/indestructible/rock, /area/city/outskirts) "b" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, /obj/structure/railing{ - dir = 1 + dir = 1; + resistance_flags = 115 + }, +/turf/open/floor/fakepit, +/area/city/outskirts) +"c" = ( +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, +/obj/structure/railing/corner{ + dir = 8 }, /turf/open/floor/fakepit, /area/city/outskirts) "d" = ( /obj/structure/railing{ - dir = 9 + dir = 9; + resistance_flags = 115 }, /turf/open/floor/plating/asteroid, /area/city/outskirts) +"e" = ( +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, +/obj/structure/railing/corner{ + dir = 8; + name = "wing-grade railing" + }, +/turf/open/floor/fakepit, +/area/city/outskirts) "g" = ( /obj/structure/railing/corner{ dir = 4 @@ -38,9 +61,12 @@ /turf/open/floor/plating/asteroid, /area/city/outskirts) "k" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, /obj/structure/railing{ - dir = 8 + dir = 8; + resistance_flags = 115 }, /turf/open/floor/fakepit, /area/city/outskirts) @@ -49,22 +75,37 @@ /turf/open/floor/plating/asteroid, /area/city/outskirts) "o" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, /obj/structure/railing/corner, /turf/open/floor/fakepit, /area/city/outskirts) "p" = ( /obj/structure/railing{ - dir = 10 + dir = 10; + resistance_flags = 115 }, /turf/open/floor/plating/asteroid, /area/city/outskirts) "s" = ( /obj/structure/railing{ - dir = 8 + dir = 8; + resistance_flags = 115 + }, +/turf/open/floor/plating/asteroid, +/area/city/outskirts) +"t" = ( +/obj/structure/railing/corner{ + dir = 8; + name = "wing-grade railing" }, /turf/open/floor/plating/asteroid, /area/city/outskirts) +"u" = ( +/obj/structure/railing, +/turf/open/floor/plating/asteroid, +/area/city/outskirts) "v" = ( /obj/structure/railing/corner{ dir = 1 @@ -79,16 +120,35 @@ /area/city/outskirts) "y" = ( /obj/structure/railing{ - dir = 1 + dir = 1; + resistance_flags = 115 }, /turf/open/floor/plating/asteroid, /area/city/outskirts) +"z" = ( +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, +/turf/open/floor/fakepit, +/area/city/outskirts) "C" = ( /obj/effect/landmark/abnospawn/easytank, /turf/open/floor/plating/asteroid, /area/city/outskirts) "D" = ( -/obj/structure/railing, +/obj/structure/railing{ + resistance_flags = 115 + }, +/turf/open/floor/plating/asteroid, +/area/city/outskirts) +"E" = ( +/obj/structure/railing/corner{ + dir = 1; + name = "wing-grade railing" + }, /turf/open/floor/plating/asteroid, /area/city/outskirts) "G" = ( @@ -96,47 +156,94 @@ /turf/open/floor/plating/asteroid, /area/city/outskirts) "H" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, +/turf/open/floor/fakepit, +/area/city/outskirts) +"I" = ( +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, +/obj/structure/railing/corner{ + dir = 1; + name = "wing-grade railing" + }, /turf/open/floor/fakepit, /area/city/outskirts) "K" = ( /turf/open/chasm, /area/city/outskirts) "L" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, /obj/structure/railing{ - dir = 9 + dir = 9; + resistance_flags = 115 }, /turf/open/floor/fakepit, /area/city/outskirts) "O" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, /obj/structure/railing/corner{ dir = 1 }, /turf/open/floor/fakepit, /area/city/outskirts) "Q" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, /obj/structure/railing{ - dir = 4 + dir = 4; + resistance_flags = 115 }, /turf/open/floor/fakepit, /area/city/outskirts) +"R" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/open/chasm, +/area/city/outskirts) "T" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, +/obj/structure/railing{ + resistance_flags = 115 + }, +/turf/open/floor/fakepit, +/area/city/outskirts) +"U" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) +"V" = ( +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, +/obj/structure/railing/corner{ + dir = 4; + name = "wing-grade railing" + }, /turf/open/floor/fakepit, /area/city/outskirts) "X" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, /obj/structure/railing{ - dir = 6 + dir = 6; + resistance_flags = 115 }, /turf/open/floor/fakepit, /area/city/outskirts) "Y" = ( -/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk{ + resistance_flags = 115 + }, /obj/structure/railing/corner{ dir = 4 }, @@ -1386,10 +1493,10 @@ a (11,1,1) = {" a a -a -a -a -a +U +U +U +U a a a @@ -1509,12 +1616,12 @@ a "} (12,1,1) = {" a -a -a -a -a -a -a +U +H +H +H +H +U a a a @@ -1632,17 +1739,17 @@ a a "} (13,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a +U +H +H +H +H +H +H +U +U +U +U a a a @@ -1756,18 +1863,18 @@ a a "} (14,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a +U +H +H +H +H +H +H +H +H +H +H +U a a a @@ -1880,26 +1987,26 @@ a a "} (15,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +H +H +H +H +H +H +H +H +H +H +U +U +U +U +U +U +U +U +U a a a @@ -1995,7 +2102,7 @@ K K K K -a +U a a a @@ -2004,30 +2111,29 @@ a a "} (16,1,1) = {" +U +H +H +H +H +H +H a a +H +H +H +H +H +H +H +H +H +H +U a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -K K K K @@ -2119,9 +2225,10 @@ K K K K -i -a -a +R +d +U +U a a a @@ -2129,25 +2236,25 @@ a "} (17,1,1) = {" a +U +H +H +H +H a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +H +H +H +H +H +H +H +H +H +H +U a a K @@ -2241,37 +2348,37 @@ K K K K -K -i -i +R +d +E i i -a -a +U +U a a "} (18,1,1) = {" a a +U +U +U +H a a a +H +H a a a a a a -a -a -a -a -a -a -a -a -a +H +H +U a a K @@ -2364,38 +2471,38 @@ K K K K -K -i -i +R +d +E i i i i i -a +U a "} (19,1,1) = {" a a a +U +U +H a a a +H +H a a a a a a -a -a -a -a -a -a -a -a +H +H +U a K K @@ -2487,7 +2594,7 @@ K K K K -K +R d v i @@ -2497,109 +2604,30 @@ i i i i -a +U "} (20,1,1) = {" a a +U +H +H +H a a a +H +H a a a a a a +H +H +U a -a -a -a -a -a -a -a -a -a -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K K K K @@ -2612,6 +2640,85 @@ K K K K +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R y i i @@ -2626,26 +2733,25 @@ i (21,1,1) = {" a a +U +H a a a a a +H +H a a a a a a +H +H +U a -a -a -a -a -a -a -a -K K K K @@ -2657,6 +2763,7 @@ K K K K +R L k k @@ -2750,24 +2857,24 @@ i (22,1,1) = {" a a +U +H a a a a a +H +H a a a a a a -a -a -a -a -a -a -a +H +H +U a K K @@ -2779,7 +2886,7 @@ K K K K -K +R L O H @@ -2874,26 +2981,25 @@ i (23,1,1) = {" a a +U +H a a a a +H +H +H +H +H +H +H +H +H +H +H +U a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -K K K K @@ -2903,6 +3009,7 @@ K K K K +R L O H @@ -2998,24 +3105,24 @@ i (24,1,1) = {" a a +U +H a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +H +H +H +H +H +H +H +H +H +H +H +U a K K @@ -3025,7 +3132,7 @@ K K K K -K +R L O H @@ -3122,26 +3229,25 @@ i (25,1,1) = {" a a +U +H a a a a +H +H a a +H +H a a a +H +H +U a -a -a -a -a -a -a -a -a -a -K K K K @@ -3150,6 +3256,7 @@ K K K K +R b H H @@ -3173,9 +3280,9 @@ Q Q Q Q -Q -Q -Q +H +H +H Q Q Q @@ -3239,31 +3346,155 @@ i i i i -a +U i -a +U "} (26,1,1) = {" a +U +H +H +H +H a a +H +H a a +H +H a a a +H +H +U a +K +K +K +K +K +K +K +K +R +b +H +H +H +H +H +o +X +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +b +H +T +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +b +H +H +H +T +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +R +j +g +i +i +i +i +i +U a +U a +"} +(27,1,1) = {" +U +H +H +H +H +H +H a +H +H a a +H +H a a a -a -a -a +H +H +U a K K @@ -3273,15 +3504,15 @@ K K K K -K +R b H H H H -H o X +R K K K @@ -3296,6 +3527,11 @@ K K K K +R +b +H +T +R K K K @@ -3317,17 +3553,13 @@ K K K K -K -K -K -K -K -K +R b H H H T +R K K K @@ -3354,57 +3586,56 @@ K K K K -K +R j g i -i -i -i -i +U +U +U a a a a "} -(27,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +(28,1,1) = {" +U +H +H +H +H +H +H +H +H +H a a +H +H a a a -K -K -K -K -K -K -K -K -K -b H H +U +U +R +R +R +R +R +R +R +R +R +b +H H H o X +R K K K @@ -3420,6 +3651,11 @@ K K K K +R +b +H +T +R K K K @@ -3441,17 +3677,13 @@ K K K K -K -K -K -K -K -K +R b H H H T +R K K K @@ -3479,10 +3711,9 @@ K K K K -K -j -g -i +U +U +U a a a @@ -3491,49 +3722,43 @@ a a a "} -(28,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +(29,1,1) = {" +U +H +H +H +H +H +H +H +H +H a a +H +H a a a -K -K -K -K -K -K -K -K -K -b H H H -o -X -K -K -K -K -K -K +c +k +k +k +k +k +k +k +k +k +I +H +H +H +T +R K K K @@ -3550,6 +3775,11 @@ K K K K +R +b +H +T +R K K K @@ -3571,11 +3801,13 @@ K K K K +R b H H H T +R K K K @@ -3613,44 +3845,44 @@ a a a a -a "} -(29,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +(30,1,1) = {" +U +H +H +H +H +H +H a +H +H a a +H +H a a a -K -K -K -K -K -K -K -K -K -b +H +H +H +H +H +H +H +H +H +H +H +H +H +H H H H T +R K K K @@ -3667,6 +3899,11 @@ K K K K +R +b +H +T +R K K K @@ -3688,18 +3925,13 @@ K K K K -K -K -K -K -K -K -K +R b H H H T +R K K K @@ -3737,44 +3969,44 @@ a a a a -a "} -(30,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +(31,1,1) = {" a +U +H +H +H +H a a +H +H a a +H +H a a a -K -K -K -K -K -K -K -K -K -b +H +H +H +o +Q +Q +Q +Q +Q +Q +Q +Q +Q +V H H H T +R K K K @@ -3791,6 +4023,11 @@ K K K K +R +b +H +T +R K K K @@ -3812,18 +4049,13 @@ K K K K -K -K -K -K -K -K -K +R b H H H T +R K K K @@ -3861,44 +4093,44 @@ a a a a -a "} -(31,1,1) = {" -a -a -a -a -a -a -a -a -a -a +(32,1,1) = {" a a +U +H a a a a +H +H a a +H +H a a a -K -K -K -K -K -K -K -K -K +H +H +U +U +R +R +R +R +R +R +R +R +R b H H H T +R K K K @@ -3915,6 +4147,11 @@ K K K K +R +b +H +T +R K K K @@ -3929,25 +4166,20 @@ K K K K +a +a +a +a K K K -K -K -K -K -K -K -K -K -K -K -K +R b H H H T +R K K K @@ -3977,21 +4209,6 @@ K K K K -K -K -a -a -a -a -a -a -a -"} -(32,1,1) = {" -a -a -a -a a a a @@ -4000,14 +4217,28 @@ a a a a +"} +(33,1,1) = {" a a +U +H a a a a +H +H a a +H +H +H +H +H +H +H +U a K K @@ -4017,12 +4248,13 @@ K K K K -K +R b H H H T +R K K K @@ -4032,20 +4264,18 @@ K K K K -K -K -K -K -K -K -K -K -K -K -K -K -K -K +R +R +R +R +R +R +R +R +b +H +T +R K K K @@ -4063,16 +4293,17 @@ a a a a +a +a K K -K -K +R b H H H T -K +R K K K @@ -4111,27 +4342,27 @@ a a a "} -(33,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a +(34,1,1) = {" a a +U +H a a a a +H +H a a +H +H +H +H +H +H +H +U a K K @@ -4141,12 +4372,13 @@ K K K K -K +R b H H H T +R K K K @@ -4156,16 +4388,18 @@ K K K K -K -K -K -K -K -K -K -a -a -a +R +L +k +k +k +k +k +k +I +H +e +U a a K @@ -4177,11 +4411,8 @@ K K K K -K -K -K -K -K +a +a a a a @@ -4190,12 +4421,13 @@ a a K K -K +R b H H H T +R K K K @@ -4224,19 +4456,8 @@ K K K K -K -K -a -a -a -a -a -a a a -"} -(34,1,1) = {" -a a a a @@ -4244,11 +4465,18 @@ a a a a +"} +(35,1,1) = {" a a +U +H +H a a a +H +H a a a @@ -4256,6 +4484,9 @@ a a a a +H +H +U a K K @@ -4265,12 +4496,13 @@ K K K K -K +R b H H H T +R K K K @@ -4280,17 +4512,18 @@ K K K K -K -K -K -K -K -a -a -a -a -a -a +R +b +H +H +H +H +H +H +H +H +H +U a a a @@ -4299,11 +4532,10 @@ K K K K -K -K -K -K -K +a +a +a +a a a a @@ -4313,14 +4545,13 @@ a a a K -K -K +R b H H H T -K +R K K K @@ -4359,20 +4590,17 @@ a a a "} -(35,1,1) = {" -a -a -a -a -a -a -a +(36,1,1) = {" a a a +U +H a a a +H +H a a a @@ -4380,6 +4608,9 @@ a a a a +H +H +U a K K @@ -4389,12 +4620,13 @@ K K K K -K +R b H H H T +R K K K @@ -4404,15 +4636,18 @@ K K K K -K -K -K -a -a -a -a -a -a +R +U +U +U +U +U +U +U +H +H +H +U a a a @@ -4421,10 +4656,6 @@ a a a a -K -K -K -K a a a @@ -4438,12 +4669,13 @@ a a a K -K +R b H H H T +R K K K @@ -4481,22 +4713,18 @@ a a a a -a "} -(36,1,1) = {" -a -a -a -a -a -a -a +(37,1,1) = {" a a a +U +H a a a +H +H a a a @@ -4504,6 +4732,9 @@ a a a a +H +H +U a K K @@ -4513,12 +4744,13 @@ K K K K -K +R b H H H T +R K K K @@ -4528,12 +4760,6 @@ K K K K -K -K -a -a -a -a a a a @@ -4541,6 +4767,11 @@ a a a a +U +H +H +H +U a a a @@ -4562,13 +4793,13 @@ a a a K -K +R b H H H T -K +R K K K @@ -4607,26 +4838,27 @@ a a a "} -(37,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a +(38,1,1) = {" a a a +U +H a a a +H +H +H +H +H +H +H +H +H +H +H +U a a K @@ -4636,13 +4868,13 @@ K K K K -K -K +R b H H H T +R K K K @@ -4651,13 +4883,6 @@ K K K K -K -K -a -a -a -a -a a a a @@ -4666,6 +4891,11 @@ a a a a +U +H +H +H +U a a a @@ -4687,11 +4917,13 @@ a a K K +R b -H -H -H +i +i +i T +R K K K @@ -4729,29 +4961,28 @@ a a a a -a "} -(38,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a +(39,1,1) = {" a a a +U +H a a a +H +H +H +H +H +H +H +H +H +H +H +U a a K @@ -4761,12 +4992,13 @@ K K K K -K +R b H H H T +R K K K @@ -4775,29 +5007,6 @@ K K K K -K -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a a a a @@ -4806,17 +5015,39 @@ a a a a +U +H +H +H +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U a a K K -K -b +R +d +v i i i -T -K +D +R K K K @@ -4855,18 +5086,12 @@ a a a "} -(39,1,1) = {" -a -a -a -a -a -a -a -a +(40,1,1) = {" a a a +U +H a a a @@ -4876,6 +5101,12 @@ a a a a +H +H +U +U +U +U a a K @@ -4885,12 +5116,13 @@ K K K K -K +R b H H H T +R K K K @@ -4898,12 +5130,6 @@ K K K K -K -K -a -a -a -a a a a @@ -4913,43 +5139,48 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -K -K -K +U +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +U +U +U +U +R d v i i i -D -K -K -K -K +C +x +p +R K K K K K K +R +R K K K @@ -4979,17 +5210,14 @@ a a a "} -(40,1,1) = {" -a -a -a -a -a -a -a -a +(41,1,1) = {" a a +U +H +H +H +H a a a @@ -4997,6 +5225,9 @@ a a a a +H +H +U a a a @@ -5009,33 +5240,19 @@ K K K K -K +R b H H H T +R K K K K K K -K -K -a -a -a -a -a -a -a -a -a -a -a -a -a a a a @@ -5046,35 +5263,49 @@ a a a a -a -a -a -a -a -a -a -a -a -a -K -i +U +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +z +z +z +H +H +H +e +s v i i i -C -x -p -K -K -K -K -K +i +i +i +D +R K K K K K +R +d +p +R K K K @@ -5103,148 +5334,24 @@ a a a "} -(41,1,1) = {" +(42,1,1) = {" a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -K -K -K -K -K -K -K -K -b +U +H +H +H H H H -T -K -K -K -K -K -K -K -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -i -i -i -i -i -i -i -i -x -K -K -K -K -K -K -K -i -i -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -K -a -a -a -a -a -a -a -"} -(42,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a a a a a a a +H +H +U a a a @@ -5256,42 +5363,33 @@ K K K K -K -K +R +R y i i i T +R +R K K K K K -K -K -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a a a a a +U +U +U +U +U +U +U +H +H a a a @@ -5299,11 +5397,20 @@ a a a a +H +H a a a a a +H +H +H +H +H +H +H i i i @@ -5312,18 +5419,18 @@ G i i i -i -i -K -K -K -K -K +t +p +R K -i -i +R K K +R +y +u +R +R K K K @@ -5353,25 +5460,25 @@ a "} (43,1,1) = {" a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +H +H +H +H +H +H +H +H +H +H +H +H +H +H +U +U +U +U a a a @@ -5379,7 +5486,7 @@ K K K K -K +R d s v @@ -5389,28 +5496,24 @@ i h s p +R +R K K -K -K -a -a -a -a -a -a -a -a -a -a -a -a -a a a a a a +U +H +H +H +H +H +H +H +H a a a @@ -5418,11 +5521,15 @@ a a a a +H +H a a a a a +H +H a a a @@ -5437,18 +5544,18 @@ i i i i -i +t a -K +R a -K -K -K -i -i -i -i -K +R +R +R +y +t +s +p +R K K K @@ -5477,37 +5584,34 @@ a "} (44,1,1) = {" a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +U +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +z +z +U a a a K K K -K -i -i -i -i -i +R +d +v i i i @@ -5515,26 +5619,25 @@ i i i i -K -K -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +t +s +p +R +R +U +U +U +U +U +U +z +z +H +H +H +H +H +H a a a @@ -5542,11 +5645,15 @@ a a a a +H +H a a a a a +H +H a a a @@ -5566,15 +5673,15 @@ a a a K +d +s +E i i -i -i -i -i -K -K +D +R K +R K K K @@ -5601,31 +5708,33 @@ a "} (45,1,1) = {" a +U +H +H +H +H +H +H +U +U +U +U +U +U +H +H +H +z +z +U a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -K K K +R +d +v i i i @@ -5636,49 +5745,47 @@ i i i i -i -i -i -K -K -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -i -i -i +x +k +k +I +H +H +H +H +H +z +z +U +U +U +U +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +i +i +i i i i @@ -5688,18 +5795,18 @@ a a a a +x +s +E i i i i -i -i -i -i -K -K +D +R +R a -K +R K K K @@ -5726,31 +5833,31 @@ a (46,1,1) = {" a a +U +H +H +H +H +U +U a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -K -K -i +U +U +U +U +H +H +U +U +U +U +U +R +R +y i i i @@ -5764,42 +5871,42 @@ i i i i -K -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +H +H +H +H +H +H +H +z +z +U a a +U +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H +H i i i @@ -5819,12 +5926,12 @@ i i i i -i -K +D +R a a a -K +R K K K @@ -5851,6 +5958,10 @@ a a a a +U +U +U +U a a a @@ -5860,21 +5971,17 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -K -i -i +U +H +H +H +H +H +H +c +k +s +v i i i @@ -5888,43 +5995,43 @@ i i i i -K -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +H +H +H +H +H +H +H +H +H +U a a +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U +U i i i @@ -5943,15 +6050,15 @@ i i i i -i -i +t +s a a a a -K -K -K +R +R +R K K K @@ -5988,15 +6095,15 @@ a a a a -a -a -a -a -a -a -a -a -K +U +H +H +H +H +H +H +H +H i i m @@ -6012,6 +6119,16 @@ i i i i +U +U +U +U +U +U +U +U +U +U a a a @@ -6037,17 +6154,7 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a +U i i i @@ -6076,8 +6183,8 @@ a a a a -K -K +R +R K a a @@ -6112,15 +6219,15 @@ a a a a -a -a -a -a -a -a -a -a -a +U +U +U +U +U +U +U +U +U i i i @@ -6136,6 +6243,7 @@ i i i i +U a a a @@ -6169,8 +6277,7 @@ a a a a -a -a +U i i i @@ -6202,7 +6309,7 @@ a a a a -K +R a a a diff --git a/_maps/RandomRooms/rcorp/caves/river.dmm b/_maps/RandomRooms/rcorp/caves/river.dmm index 9543294aeb41..9810c6a5db2d 100644 --- a/_maps/RandomRooms/rcorp/caves/river.dmm +++ b/_maps/RandomRooms/rcorp/caves/river.dmm @@ -20,6 +20,10 @@ /obj/effect/landmark/abnospawn/easytank, /turf/open/floor/plating/ashplanet/rocky, /area/city/outskirts) +"Y" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) (1,1,1) = {" a @@ -1102,15 +1106,15 @@ a a a a -a -a -a -a -a -a -a -a -a +Y +Y +Y +Y +Y +Y +Y +Y +Y a a a @@ -1216,16 +1220,16 @@ a a a a -a -a -a -a -a -a -a -a -a -a +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y H H H @@ -1235,17 +1239,17 @@ H H H H -a -a -a -a -a -a -a -a -a -a -a +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y a a a @@ -1337,9 +1341,9 @@ a a a a -a -a -a +Y +Y +Y H H H @@ -1370,8 +1374,8 @@ H H H H -a -a +Y +Y a a a @@ -1458,9 +1462,9 @@ a a a a -a -a -a +Y +Y +Y H H H @@ -1496,8 +1500,8 @@ H H H H -a -a +Y +Y a a a @@ -1579,9 +1583,9 @@ a a a a -a -a -a +Y +Y +Y H H H @@ -1622,7 +1626,7 @@ H H H H -a +Y a a a @@ -1702,7 +1706,7 @@ a a a a -a +Y H H H @@ -1747,7 +1751,7 @@ H H H H -a +Y a a a @@ -1823,9 +1827,9 @@ a a a a -a -a -a +Y +Y +Y H H H @@ -1872,7 +1876,7 @@ H H H H -a +Y a a a @@ -1945,8 +1949,8 @@ a a a a -a -a +Y +Y H H H @@ -1997,7 +2001,7 @@ H H H H -a +Y a a a @@ -2066,9 +2070,9 @@ a a a a -a -a -a +Y +Y +Y H H H @@ -2122,8 +2126,8 @@ H H H H -a -a +Y +Y a a a @@ -2188,8 +2192,8 @@ a a a a -a -a +Y +Y H H H @@ -2248,10 +2252,10 @@ H H H H -a -a -a -a +Y +Y +Y +Y "} (19,1,1) = {" a @@ -2310,8 +2314,8 @@ a a a a -a -a +Y +Y H H H @@ -2432,8 +2436,8 @@ a a a a -a -a +Y +Y H H H @@ -2554,8 +2558,8 @@ a a a a -a -a +Y +Y H H H @@ -2677,7 +2681,7 @@ a a a a -a +Y H H H @@ -2799,8 +2803,8 @@ a a a a -a -a +Y +Y H H H @@ -2906,6 +2910,12 @@ a a a a +Y +Y +Y +Y +Y +Y a a a @@ -2913,16 +2923,10 @@ a a a a -a -a -a -a -a -a -a -a -a -a +Y +Y +Y +Y H H H @@ -3029,20 +3033,20 @@ a a a a -a +Y H H H H H H +Y +Y a -a -a -a -a -a -a +Y +Y +Y +Y H H H @@ -3151,8 +3155,8 @@ a a a a -a -a +Y +Y H H H @@ -3162,7 +3166,7 @@ H H H H -a +Y H H H @@ -3242,8 +3246,8 @@ H H H H -a -a +Y +Y "} (27,1,1) = {" a @@ -3274,7 +3278,7 @@ a a a a -a +Y H H H @@ -3364,8 +3368,8 @@ H H H H -a -a +Y +Y a a "} @@ -3397,7 +3401,7 @@ a a a a -a +Y H H H @@ -3487,7 +3491,7 @@ H H H H -a +Y a a a @@ -3520,7 +3524,7 @@ a a a a -a +Y H H H @@ -3610,7 +3614,7 @@ H H H H -a +Y a a a @@ -3644,7 +3648,7 @@ a a a a -a +Y H H H @@ -3733,7 +3737,7 @@ H H H H -a +Y a a a @@ -3767,7 +3771,7 @@ a a a a -a +Y H H d @@ -3856,7 +3860,7 @@ H H H H -a +Y a a a @@ -3891,7 +3895,7 @@ a a a a -a +Y H H H @@ -3979,7 +3983,7 @@ H H H H -a +Y a a a @@ -4015,7 +4019,7 @@ a a a a -a +Y H H H @@ -4102,7 +4106,7 @@ H H H H -a +Y a a a @@ -4139,7 +4143,7 @@ a a a a -a +Y H H H @@ -4225,7 +4229,7 @@ H H H H -a +Y a a a @@ -4263,7 +4267,7 @@ a a a a -a +Y H H H @@ -4349,7 +4353,7 @@ H H H H -a +Y a a a @@ -4386,7 +4390,7 @@ a a a a -a +Y H H H @@ -4463,7 +4467,7 @@ q q q q -a +Y q q q @@ -4471,8 +4475,8 @@ q H H H -a -a +Y +Y a a a @@ -4510,7 +4514,7 @@ a a a a -a +Y H H H @@ -4587,14 +4591,14 @@ q q q q -a -a +Y +Y q q q q -a -a +Y +Y a a a @@ -4634,7 +4638,7 @@ a a a a -a +Y H H H @@ -4709,14 +4713,14 @@ q q q q +Y +Y a a -a -a -a -a -a -a +Y +Y +Y +Y a a a @@ -4758,7 +4762,7 @@ a a a a -a +Y H H H @@ -4831,8 +4835,8 @@ q q q q -a -a +Y +Y a a a @@ -4882,7 +4886,7 @@ a a a a -a +Y H H H @@ -4953,8 +4957,8 @@ q q q q -a -a +Y +Y a a a @@ -5006,7 +5010,7 @@ a a a a -a +Y H H H @@ -5076,7 +5080,7 @@ q q q q -a +Y a a a @@ -5130,7 +5134,7 @@ a a a a -a +Y H H H @@ -5200,7 +5204,7 @@ q q q q -a +Y a a a @@ -5254,7 +5258,7 @@ a a a a -a +Y H H H @@ -5323,7 +5327,7 @@ q q q q -a +Y a a a @@ -5378,7 +5382,7 @@ a a a a -a +Y H H H @@ -5447,7 +5451,7 @@ q q q q -a +Y a a a @@ -5502,7 +5506,7 @@ a a a a -a +Y H H H @@ -5571,7 +5575,7 @@ q q q q -a +Y a a a @@ -5626,7 +5630,7 @@ a a a a -a +Y H H H @@ -5695,7 +5699,7 @@ H q q q -a +Y a a a @@ -5751,7 +5755,7 @@ a a a a -a +Y H H H @@ -5819,7 +5823,7 @@ H H q q -a +Y a a a @@ -5875,7 +5879,7 @@ a a a a -a +Y H H H @@ -5944,7 +5948,7 @@ H q q q -a +Y a a a @@ -5999,7 +6003,7 @@ a a a a -a +Y H H H @@ -6068,7 +6072,7 @@ H H H H -a +Y a a a diff --git a/_maps/RandomRooms/rcorp/caves/winding.dmm b/_maps/RandomRooms/rcorp/caves/winding.dmm index 597c6f6ad1a3..2ebed1b44e19 100644 --- a/_maps/RandomRooms/rcorp/caves/winding.dmm +++ b/_maps/RandomRooms/rcorp/caves/winding.dmm @@ -17,6 +17,10 @@ /obj/effect/landmark/abnospawn/easycombat, /turf/open/floor/plating/asteroid, /area/city/outskirts) +"P" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) (1,1,1) = {" a @@ -994,10 +998,10 @@ a a a a -a -a -a -a +P +P +P +P a a a @@ -1114,18 +1118,18 @@ a a a a -a -a -a -a +P +P +P +P i i i i -a -a -a -a +P +P +P +P a a a @@ -1237,7 +1241,7 @@ a a a a -a +P i i i @@ -1250,7 +1254,7 @@ i i i i -a +P a a a @@ -1321,6 +1325,15 @@ a a a a +P +P +P +P +P +P +P +P +P a a a @@ -1351,16 +1364,7 @@ a a a a -a -a -a -a -a -a -a -a -a -a +P i i i @@ -1374,7 +1378,7 @@ i i i i -a +P a a a @@ -1441,10 +1445,10 @@ a a a a -a -a -a -a +P +P +P +P i i i @@ -1454,6 +1458,8 @@ i i i i +P +P a a a @@ -1482,9 +1488,7 @@ a a a a -a -a -a +P i i i @@ -1499,7 +1503,7 @@ i i i i -a +P a a a @@ -1563,8 +1567,8 @@ a a a a -a -a +P +P i i i @@ -1580,6 +1584,8 @@ i i i i +P +P a a a @@ -1606,9 +1612,7 @@ a a a a -a -a -a +P i i i @@ -1623,7 +1627,7 @@ i i i i -a +P a a a @@ -1686,7 +1690,7 @@ a a a a -a +P i i i @@ -1706,6 +1710,7 @@ i i i i +P a a a @@ -1730,8 +1735,7 @@ a a a a -a -a +P i i i @@ -1747,8 +1751,8 @@ i i i i -a -a +P +P a a a @@ -1807,9 +1811,9 @@ a a a a -a -a -a +P +P +P i i i @@ -1831,6 +1835,7 @@ i i i i +P a a a @@ -1853,9 +1858,8 @@ a a a a -a -a -a +P +P i i i @@ -1873,7 +1877,7 @@ i i i i -a +P a a a @@ -1929,8 +1933,8 @@ a a a a -a -a +P +P i i i @@ -1956,6 +1960,7 @@ i i i i +P a a a @@ -1975,9 +1980,8 @@ a a a a -a -a -a +P +P i i i @@ -1987,8 +1991,8 @@ i i i i -a -a +P +P i i i @@ -1998,7 +2002,7 @@ i i i i -a +P a a "} @@ -2051,8 +2055,8 @@ a a a a -a -a +P +P i i i @@ -2081,6 +2085,8 @@ i i i i +P +P a a a @@ -2097,9 +2103,7 @@ a a a a -a -a -a +P i i i @@ -2110,10 +2114,10 @@ i i i i +P a a -a -a +P i i i @@ -2122,7 +2126,7 @@ i i i i -a +P a a "} @@ -2173,8 +2177,8 @@ a a a a -a -a +P +P i i i @@ -2207,6 +2211,7 @@ i i i i +P a a a @@ -2222,8 +2227,7 @@ a a a a -a -a +P i i i @@ -2234,11 +2238,11 @@ i i i i +P a a a -a -a +P i i i @@ -2247,7 +2251,7 @@ i i i i -a +P a "} (19,1,1) = {" @@ -2291,12 +2295,12 @@ a a a a -a -a -a -a -a -a +P +P +P +P +P +P i i i @@ -2332,6 +2336,7 @@ i i i i +P a a a @@ -2345,8 +2350,7 @@ a a a a -a -a +P i i i @@ -2357,12 +2361,12 @@ i i i i +P a a a a -a -a +P i i i @@ -2372,7 +2376,7 @@ i i i i -a +P "} (20,1,1) = {" a @@ -2414,7 +2418,7 @@ a a a a -a +P i i i @@ -2457,6 +2461,7 @@ i i i i +P a a a @@ -2466,11 +2471,10 @@ a a a a -a -a -a -a -a +P +P +P +P i i i @@ -2481,14 +2485,14 @@ i i i i +P a a a a a -a -a -a +P +P i i i @@ -2537,7 +2541,7 @@ a a a a -a +P i i i @@ -2582,6 +2586,7 @@ i i i i +P a a a @@ -2589,8 +2594,7 @@ a a a a -a -a +P i i i @@ -2605,6 +2609,7 @@ i i i i +P a a a @@ -2612,8 +2617,7 @@ a a a a -a -a +P i i i @@ -2660,7 +2664,7 @@ a a a a -a +P i i i @@ -2707,13 +2711,13 @@ i i i i +P a a a a a -a -a +P i i i @@ -2728,6 +2732,7 @@ i i i i +P a a a @@ -2737,8 +2742,7 @@ a a a a -a -a +P i i i @@ -2783,7 +2787,7 @@ a a a a -a +P i i i @@ -2831,13 +2835,13 @@ i i i i +P a a a a a -a -a +P i i i @@ -2852,6 +2856,7 @@ i i i i +P a a a @@ -2861,8 +2866,7 @@ a a a a -a -a +P i i i @@ -2906,7 +2910,7 @@ a a a a -a +P i i i @@ -2956,11 +2960,11 @@ i i i i +P a a a -a -a +P i i i @@ -2975,6 +2979,7 @@ i i i i +P a a a @@ -2986,8 +2991,7 @@ a a a a -a -a +P i i i @@ -3030,7 +3034,7 @@ a a a a -a +P i i i @@ -3080,10 +3084,10 @@ i i i i +P a a -a -a +P i i i @@ -3099,6 +3103,7 @@ i i i i +P a a a @@ -3111,12 +3116,11 @@ a a a a -a -a -a -a +P +P +P i -a +P "} (26,1,1) = {" a @@ -3154,7 +3158,7 @@ a a a a -a +P i i i @@ -3205,9 +3209,9 @@ i i i i -a -a -a +P +P +P i i i @@ -3222,6 +3226,7 @@ i i i i +P a a a @@ -3238,8 +3243,7 @@ a a a a -a -a +P a "} (27,1,1) = {" @@ -3278,7 +3282,7 @@ a a a a -a +P i i i @@ -3345,7 +3349,7 @@ i i i i -a +P a a a @@ -3402,7 +3406,7 @@ a a a a -a +P i i i @@ -3468,7 +3472,7 @@ G i i i -a +P a a a @@ -3525,7 +3529,7 @@ a a a a -a +P i i i @@ -3591,7 +3595,7 @@ i i i i -a +P a a a @@ -3649,7 +3653,7 @@ a a a a -a +P i i i @@ -3714,7 +3718,7 @@ i H i i -a +P a a a @@ -3773,7 +3777,7 @@ a a a a -a +P i i i @@ -3837,7 +3841,7 @@ i i i i -a +P a a a @@ -3896,7 +3900,7 @@ a a a a -a +P i i i @@ -3960,7 +3964,7 @@ i i a a -a +P a a a @@ -4019,7 +4023,7 @@ a a a a -a +P i i i @@ -4084,7 +4088,7 @@ a a a a -a +P a a a @@ -4142,8 +4146,8 @@ a a a a -a -a +P +P i i i @@ -4208,7 +4212,7 @@ a a a a -a +P a a a @@ -4264,8 +4268,8 @@ a a a a -a -a +P +P i i i @@ -4332,7 +4336,7 @@ a a a a -a +P a a a @@ -4387,7 +4391,7 @@ a a a a -a +P i i i @@ -4456,7 +4460,7 @@ a a a a -a +P a a a @@ -4510,7 +4514,7 @@ a a a a -a +P i i i @@ -4580,7 +4584,7 @@ a a a a -a +P a a a @@ -4633,7 +4637,7 @@ a a a a -a +P i i i @@ -4704,7 +4708,7 @@ a a a a -a +P a a a @@ -4756,7 +4760,7 @@ a a a a -a +P i i i @@ -4828,7 +4832,7 @@ i a a a -a +P a a a @@ -4880,7 +4884,7 @@ a a a a -a +P i i i @@ -4952,7 +4956,7 @@ i a a a -a +P a a a @@ -5004,7 +5008,7 @@ a a a a -a +P i i i @@ -5076,7 +5080,7 @@ i i a a -a +P a a a @@ -5127,7 +5131,7 @@ a a a a -a +P i i i @@ -5200,7 +5204,7 @@ i i i a -a +P a a a @@ -5251,7 +5255,7 @@ a a a a -a +P i i i @@ -5324,7 +5328,7 @@ i i i i -a +P a a a @@ -5374,7 +5378,7 @@ a a a a -a +P i i i @@ -5448,7 +5452,7 @@ i i i i -a +P a a a @@ -5498,7 +5502,7 @@ a a a a -a +P i i i @@ -5572,7 +5576,7 @@ i i i i -a +P a a a @@ -5622,7 +5626,7 @@ a a a a -a +P i i i @@ -5696,7 +5700,7 @@ i i i i -a +P a a a @@ -5746,7 +5750,7 @@ a a a a -a +P i i i @@ -5820,7 +5824,7 @@ i i i i -a +P a a a @@ -5870,7 +5874,7 @@ a a a a -a +P i i i @@ -5942,8 +5946,8 @@ i i i i -a -a +P +P a a a @@ -5993,7 +5997,7 @@ a a a a -a +P i i i @@ -6065,7 +6069,7 @@ i i i i -a +P a a a diff --git a/_maps/RandomRooms/rcorp/facility/beaches.dmm b/_maps/RandomRooms/rcorp/facility/beaches.dmm index 7511e71b516c..8ca9a639fe84 100644 --- a/_maps/RandomRooms/rcorp/facility/beaches.dmm +++ b/_maps/RandomRooms/rcorp/facility/beaches.dmm @@ -16,6 +16,13 @@ }, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"dv" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakedoor{ + desc = "These things are thick. Doesn't look like they stopped anything important..."; + name = "broken cell door" + }, +/area/city/outskirts) "ee" = ( /obj/machinery/light/broken{ dir = 1 @@ -123,6 +130,10 @@ /obj/effect/landmark/abnospawn/hardsupport, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"FZ" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Gf" = ( /obj/structure/riser/dark, /turf/open/floor/plating/ashplanet/rocky, @@ -133,6 +144,10 @@ }, /turf/open/floor/plating/ashplanet/rocky, /area/city/outskirts) +"GC" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "GH" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/plating, @@ -141,6 +156,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "HE" = ( @@ -176,6 +192,10 @@ }, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"KA" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Lh" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/space/basic, @@ -188,6 +208,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Mq" = ( @@ -234,6 +255,13 @@ /obj/item/reagent_containers/food/drinks/soda_cans/wellcheers_purple, /turf/open/floor/plating/ashplanet/rocky, /area/city/outskirts) +"Wn" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "YI" = ( /obj/item/shard, /turf/open/floor/plasteel/dark, @@ -282,87 +310,87 @@ Tf Tf Mq Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ GZ GZ GZ GZ GZ -Ml -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Mq -Mq -Mq +Wn +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +FZ +FZ +KA GZ GZ GZ Ml -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +FZ +FZ +FZ +FZ +FZ +FZ +FZ +KA +KA GZ Ml -Mq -Mq -Mq -Mq -Mq +KA +FZ +FZ +FZ +FZ Mq Mq Mq @@ -445,7 +473,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -525,7 +553,7 @@ sY vQ vQ vQ -Tf +GC Tf Tf Tf @@ -601,14 +629,14 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ vQ ez ez @@ -688,7 +716,7 @@ sY vQ vQ vQ -Tf +GC Tf Tf Tf @@ -764,7 +792,7 @@ Tf Tf Tf Tf -Mq +FZ sY YI sY @@ -851,7 +879,7 @@ sY vQ vQ vQ -Tf +GC Tf Tf Tf @@ -927,7 +955,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY iD @@ -1014,7 +1042,7 @@ sY vQ vQ vQ -Tf +GC Tf Tf Tf @@ -1090,7 +1118,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY th @@ -1177,7 +1205,7 @@ sY vQ vQ vQ -Tf +GC Tf Tf Tf @@ -1253,7 +1281,7 @@ Tf Tf Tf Tf -Mq +FZ SD iD sY @@ -1340,7 +1368,7 @@ sY vQ vQ vQ -Tf +GC Tf Tf Tf @@ -1416,7 +1444,7 @@ Tf Tf Tf Tf -Mq +FZ iD sY sY @@ -1503,7 +1531,7 @@ sY vQ vQ vQ -Tf +GC Tf Tf Tf @@ -1579,7 +1607,7 @@ Tf Tf Tf Tf -Mq +FZ Mq Mq Mq @@ -1666,7 +1694,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -1742,7 +1770,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -1829,7 +1857,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -1905,7 +1933,7 @@ Tf Tf Tf Tf -Mq +FZ sY YI sY @@ -1992,7 +2020,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -2068,7 +2096,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY iD @@ -2155,7 +2183,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -2231,7 +2259,7 @@ Tf Tf Tf Tf -Mq +FZ cl sY sY @@ -2318,7 +2346,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -2394,7 +2422,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -2481,7 +2509,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -2557,7 +2585,7 @@ Tf Tf Tf Tf -Mq +FZ Mq Mq Mq @@ -2644,7 +2672,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -2720,7 +2748,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -2807,7 +2835,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -2883,7 +2911,7 @@ Tf Tf Tf Tf -Mq +FZ GH sY sY @@ -2970,7 +2998,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -3046,7 +3074,7 @@ Tf Tf Tf Tf -Mq +FZ sY iD sY @@ -3133,7 +3161,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -3209,7 +3237,7 @@ Tf Tf Tf Tf -Mq +FZ SD sY sY @@ -3296,7 +3324,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -3372,7 +3400,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -3459,7 +3487,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -3535,12 +3563,12 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq +FZ +FZ +FZ +FZ +FZ +FZ ez ez ez @@ -3622,7 +3650,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -3703,7 +3731,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -3785,7 +3813,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -3866,7 +3894,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -3948,7 +3976,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -4030,7 +4058,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -4111,7 +4139,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -4194,9 +4222,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +GC +GC +GC ez ez ez @@ -4274,7 +4302,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -4360,8 +4388,8 @@ Tf Tf Tf Tf -Tf -Tf +GC +GC ez ez ez @@ -4437,7 +4465,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -4525,8 +4553,8 @@ Tf Tf Tf Tf -Tf -Tf +GC +GC ez ez ez @@ -4600,7 +4628,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -4690,7 +4718,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -4763,7 +4791,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -4854,9 +4882,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +GC +GC +GC ez vQ vQ @@ -4926,7 +4954,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -5020,7 +5048,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -5089,7 +5117,7 @@ ez vQ vQ vQ -Tf +GC Tf Tf Tf @@ -5184,7 +5212,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -5251,9 +5279,9 @@ ez ez vQ vQ -Tf -Tf -Tf +GC +GC +GC Tf Tf Tf @@ -5338,16 +5366,16 @@ Tf Tf Tf Tf +GC +GC +GC +GC Tf Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf +GC vQ vQ vQ @@ -5417,7 +5445,7 @@ vQ vQ vQ Zc -Tf +GC Tf Tf Tf @@ -5500,17 +5528,17 @@ Tf Tf Tf Tf -Tf +GC ez ez ez ez +GC +GC Tf Tf Tf -Tf -Tf -Tf +GC vQ vQ vQ @@ -5581,9 +5609,9 @@ sT vQ GB vQ -Tf -Tf -Tf +GC +GC +GC Tf Tf Tf @@ -5662,7 +5690,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -5670,10 +5698,10 @@ ez ez ez iD +GC Tf Tf -Tf -Tf +GC vQ vQ Tf @@ -5747,7 +5775,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -5824,7 +5852,7 @@ Tf Tf Tf Tf -Tf +GC ez ez Mq @@ -5833,9 +5861,9 @@ ez Mq Mq ez +GC Tf -Tf -Tf +GC vQ vQ vQ @@ -5911,7 +5939,7 @@ vQ sT vQ vQ -Tf +GC Tf Tf Tf @@ -5986,7 +6014,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -5996,9 +6024,9 @@ sY iD DP aN +GC Tf -Tf -Tf +GC vQ vQ vQ @@ -6074,7 +6102,7 @@ vQ Zc vQ vQ -Tf +GC Tf Tf Tf @@ -6149,7 +6177,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -6160,8 +6188,8 @@ Ze DP ez ez -Tf -Tf +GC +GC vQ vQ vQ @@ -6237,7 +6265,7 @@ Tf vQ vQ vQ -Tf +GC Tf Tf Tf @@ -6312,7 +6340,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -6323,8 +6351,8 @@ iD Oz ez ez -Tf -Tf +GC +GC vQ vQ vQ @@ -6401,7 +6429,7 @@ Tf vQ Jx vQ -Tf +GC Tf Tf Tf @@ -6475,7 +6503,7 @@ Tf Tf Tf Tf -Tf +GC ez ez iD @@ -6486,7 +6514,7 @@ sY ez ez ez -Tf +GC vQ vQ vQ @@ -6564,7 +6592,7 @@ Tf vQ vQ vQ -Tf +GC Tf Tf Tf @@ -6638,7 +6666,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -6649,7 +6677,7 @@ iD ez ez ez -Tf +GC vQ vQ vQ @@ -6727,7 +6755,7 @@ Tf vQ vQ vQ -Tf +GC Tf Tf Tf @@ -6801,7 +6829,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -6812,7 +6840,7 @@ ez iD ez ez -Tf +GC vQ vQ vQ @@ -6889,7 +6917,7 @@ Tf vQ vQ zA -Tf +GC Tf Tf Tf @@ -6965,7 +6993,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -6975,7 +7003,7 @@ ez ez ez ez -Tf +GC vQ vQ vQ @@ -7052,7 +7080,7 @@ Tf vQ vQ vQ -Tf +GC Tf Tf Tf @@ -7128,7 +7156,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -7215,7 +7243,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -7291,7 +7319,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -7377,7 +7405,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -7454,7 +7482,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -7540,7 +7568,7 @@ vQ vQ Jx vQ -Tf +GC Tf Tf Tf @@ -7618,7 +7646,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -7703,7 +7731,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -7781,7 +7809,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -7866,7 +7894,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -7945,7 +7973,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -8029,7 +8057,7 @@ vQ bN vQ vQ -Tf +GC Tf Tf Tf @@ -8109,7 +8137,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -8192,7 +8220,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -8272,7 +8300,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -8293,9 +8321,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +GC +GC +GC ez Tf Tf @@ -8355,7 +8383,7 @@ vQ vQ HG vQ -Tf +GC Tf Tf Tf @@ -8436,7 +8464,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -8455,10 +8483,10 @@ Tf Tf ez ez +GC Tf Tf -Tf -Tf +GC ez vQ Tf @@ -8518,7 +8546,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -8599,7 +8627,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -8619,10 +8647,10 @@ ez ez ez ez +GC Tf Tf -Tf -Tf +GC vQ ez vQ @@ -8633,8 +8661,8 @@ vQ ez ez ez -Tf -Tf +GC +GC vQ vQ ez @@ -8681,7 +8709,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -8763,7 +8791,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -8782,10 +8810,10 @@ ez ez ez ez +GC Tf Tf -Tf -Tf +GC ez ez ez @@ -8793,12 +8821,12 @@ Tf vQ vQ vQ +GC +GC +GC Tf Tf -Tf -Tf -Tf -Tf +GC vQ Tf Tf @@ -8844,7 +8872,7 @@ tU vQ vQ vQ -Tf +GC Tf Tf Tf @@ -8927,10 +8955,10 @@ Tf Tf Tf Tf -Tf +GC vQ vQ -Tf +GC vQ vQ vQ @@ -8945,23 +8973,23 @@ ez vQ ez ez +GC Tf Tf Tf -Tf -Tf -Tf +GC +GC ez ez vQ +GC +GC Tf Tf Tf Tf Tf -Tf -Tf -Tf +GC vQ Tf Tf @@ -9008,7 +9036,7 @@ vQ vQ vQ HL -Tf +GC Tf Tf Tf @@ -9091,9 +9119,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +GC +GC +GC vQ vQ vQ @@ -9108,11 +9136,15 @@ ez ez Mq ez +GC Tf Tf Tf Tf Tf +GC +GC +GC Tf Tf Tf @@ -9120,11 +9152,7 @@ Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf +GC vQ Tf Tf @@ -9171,7 +9199,7 @@ vQ vQ MS Ui -Tf +GC Tf Tf Tf @@ -9256,7 +9284,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -9271,8 +9299,7 @@ ez ez ez vQ -Mq -Tf +FZ Tf Tf Tf @@ -9288,6 +9315,7 @@ Tf Tf Tf Tf +GC vQ vQ vQ @@ -9334,7 +9362,7 @@ vQ vQ Ui tU -Tf +GC Tf Tf Tf @@ -9418,7 +9446,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -9434,11 +9462,7 @@ iD ez ez iD -Mq -Tf -Tf -Tf -Tf +FZ Tf Tf Tf @@ -9455,6 +9479,10 @@ Tf Tf Tf Tf +GC +GC +GC +GC vQ Tf Tf @@ -9485,19 +9513,19 @@ iD GH DP sY -Tf -Tf -Mq -Tf -Tf -Tf -Tf +GC +GC +FZ +GC +GC +GC +GC vQ vQ HL MS Kq -Tf +GC Tf Tf Tf @@ -9579,9 +9607,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +GC +GC +GC vQ vQ vQ @@ -9597,8 +9625,7 @@ Mq ez ez vQ -Mq -Tf +FZ Tf Tf Tf @@ -9618,6 +9645,7 @@ Tf Tf Tf Tf +GC vQ Tf Tf @@ -9646,13 +9674,8 @@ Mq cl iD sY -Mq -Tf -Tf -Tf -Tf -Tf -Tf +FZ +GC Tf Tf Tf @@ -9660,6 +9683,11 @@ Tf Tf Tf Tf +GC +GC +GC +GC +GC Tf Tf Tf @@ -9739,9 +9767,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +GC +GC +GC ez vQ vQ @@ -9760,8 +9788,7 @@ gH ez iD iD -Mq -Tf +FZ Tf Tf Tf @@ -9781,6 +9808,7 @@ Tf Tf Tf Tf +GC vQ vQ Tf @@ -9809,7 +9837,7 @@ Mq iD sY sY -kI +dv Tf Tf Tf @@ -9901,7 +9929,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -9923,8 +9951,7 @@ DP sY iD iD -Mq -Tf +FZ Tf Tf Tf @@ -9945,6 +9972,7 @@ Tf Tf Tf Tf +GC vQ vQ vQ @@ -9968,11 +9996,11 @@ vQ vQ vQ vQ -Mq -Mq -Mq -Mq -Mq +FZ +FZ +FZ +FZ +FZ Tf Tf Tf @@ -10063,7 +10091,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -10086,8 +10114,7 @@ DP sY iD iD -Mq -Tf +FZ Tf Tf Tf @@ -10109,6 +10136,7 @@ Tf Tf Tf Tf +GC vQ Tf Tf @@ -10130,7 +10158,7 @@ sY vQ vQ vQ -Tf +GC Tf Tf Tf @@ -10226,7 +10254,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -10249,8 +10277,7 @@ Mq sY sY iD -Mq -Tf +FZ Tf Tf Tf @@ -10272,6 +10299,7 @@ Tf Tf Tf Tf +GC vQ Tf Tf @@ -10293,7 +10321,7 @@ iD vQ iD vQ -Tf +GC Tf Tf Tf @@ -10389,7 +10417,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -10412,8 +10440,7 @@ kI sY sY iD -Mq -Tf +FZ Tf Tf Tf @@ -10435,6 +10462,7 @@ Tf Tf Tf Tf +GC vQ Tf Tf @@ -10456,7 +10484,7 @@ sY iD vQ vQ -Tf +GC Tf Tf Tf @@ -10552,7 +10580,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -10575,8 +10603,7 @@ Mq sY sY sY -Mq -Tf +FZ Tf Tf Tf @@ -10598,6 +10625,7 @@ Tf Tf Tf Tf +GC vQ vQ Tf @@ -10618,7 +10646,7 @@ Mq Mq vQ vQ -Tf +GC Tf Tf Tf @@ -10715,7 +10743,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -10733,13 +10761,12 @@ ez ez ez ez -Tf -Mq +GC +FZ sY sY sY -Mq -Tf +FZ Tf Tf Tf @@ -10762,6 +10789,7 @@ Tf Tf Tf Tf +GC vQ vQ vQ @@ -10781,7 +10809,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -10877,7 +10905,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -10896,13 +10924,12 @@ ez ez ez ez -Tf +GC Mq -Tf +GC sY sY -Mq -Tf +FZ Tf Tf Tf @@ -10926,6 +10953,7 @@ Tf Tf Tf Tf +GC vQ vQ vQ @@ -10944,7 +10972,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -11040,7 +11068,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -11057,15 +11085,14 @@ vQ vQ ez ez +GC +GC Tf Tf Tf -Tf -Tf -Tf -Tf -Mq -Tf +GC +GC +FZ Tf Tf Tf @@ -11090,6 +11117,7 @@ Tf Tf Tf Tf +GC vQ vQ Tf @@ -11101,12 +11129,12 @@ Tf Tf Tf vQ -Tf -Tf -Tf -Tf -Tf -Tf +GC +GC +GC +GC +GC +GC Tf Tf Tf @@ -11203,7 +11231,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -11219,6 +11247,7 @@ vQ vQ vQ ez +GC Tf Tf Tf @@ -11252,8 +11281,7 @@ Tf Tf Tf Tf -Tf -Tf +GC vQ Tf Tf @@ -11264,7 +11292,7 @@ Tf vQ vQ vQ -Tf +GC Tf Tf Tf @@ -11366,7 +11394,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -11382,6 +11410,7 @@ vQ vQ vQ ez +GC Tf Tf Tf @@ -11415,8 +11444,7 @@ Tf Tf Tf Tf -Tf -Tf +GC vQ vQ vQ @@ -11425,8 +11453,8 @@ Tf vQ Tf vQ -Tf -Tf +GC +GC Tf Tf Tf @@ -11529,7 +11557,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -11544,11 +11572,14 @@ vQ vQ vQ vQ +GC Tf Tf Tf Tf Tf +GC +GC Tf Tf Tf @@ -11577,18 +11608,15 @@ Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf +GC +GC vQ vQ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -11692,7 +11720,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -11707,14 +11735,15 @@ vQ vQ vQ vQ +GC Tf Tf -Tf -Tf -Tf -Tf +GC +GC +GC ez ez +GC Tf Tf Tf @@ -11744,13 +11773,12 @@ Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf +GC +GC +GC +GC +GC +GC Tf Tf Tf @@ -11855,7 +11883,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -11870,17 +11898,17 @@ vQ vQ vQ vQ +GC Tf -Tf -Tf +GC ez ez ez ez ez ez -Tf -Tf +GC +GC Tf Tf Tf @@ -12018,7 +12046,7 @@ Tf Tf Tf Tf -Tf +GC ez ez ez @@ -12032,10 +12060,10 @@ vQ vQ vQ vQ +GC Tf -Tf -Tf -Tf +GC +GC ez ez ez @@ -12044,15 +12072,15 @@ ez ez ez ez +GC Tf Tf +GC +GC Tf -Tf -Tf -Tf -Tf -Tf -Tf +GC +GC +GC Tf Tf Tf @@ -12181,7 +12209,7 @@ Tf Tf Tf Tf -Tf +GC ez ez vQ @@ -12195,8 +12223,8 @@ vQ vQ vQ vQ -Tf -Tf +GC +GC vQ ez ez @@ -12208,15 +12236,15 @@ ez ez ez ez -Tf -Tf +GC +GC ez ez -Tf +GC vQ vQ vQ -Tf +GC Tf Tf Tf @@ -12344,7 +12372,7 @@ Tf Tf Tf Tf -Tf +GC ez ez vQ @@ -12380,7 +12408,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -12507,7 +12535,7 @@ Tf Tf Tf Tf -Tf +GC ez ez vQ @@ -12544,7 +12572,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -12671,7 +12699,7 @@ Tf Tf Tf Tf -Tf +GC ez Mq vQ @@ -12708,7 +12736,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -12834,7 +12862,7 @@ Tf Tf Tf Tf -Tf +GC vQ vQ vQ @@ -12871,7 +12899,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -12993,11 +13021,11 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq +FZ +FZ +FZ +FZ +FZ iD vQ vQ @@ -13034,7 +13062,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -13156,7 +13184,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -13197,7 +13225,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -13319,7 +13347,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY YI @@ -13360,7 +13388,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -13482,7 +13510,7 @@ Tf Tf Tf Tf -Mq +FZ YI sY sY @@ -13523,7 +13551,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -13645,7 +13673,7 @@ Tf Tf Tf Tf -Mq +FZ SD sY sY @@ -13685,7 +13713,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -13808,7 +13836,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -13848,7 +13876,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -13971,7 +13999,7 @@ Tf Tf Tf Tf -Mq +FZ Mq Mq Mq @@ -14010,7 +14038,7 @@ vQ vQ vQ vQ -Tf +GC Tf Tf Tf @@ -14134,7 +14162,7 @@ Tf Tf Tf Tf -Mq +FZ sY YI sY @@ -14173,7 +14201,7 @@ ez ez ez ez -Tf +GC Tf Tf Tf @@ -14297,7 +14325,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -14336,7 +14364,7 @@ ez ez ez ez -Tf +GC Tf Tf Tf @@ -14460,7 +14488,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -14500,7 +14528,7 @@ ez ez ez ez -Tf +GC Tf Tf Tf @@ -14623,7 +14651,7 @@ Tf Tf Tf Tf -Mq +FZ SD sY sY @@ -14648,22 +14676,22 @@ ez ez ez ez -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC +GC ez ez ez -Tf +GC Tf Tf Tf @@ -14786,7 +14814,7 @@ Tf Tf Tf Tf -Mq +FZ sY sY sY @@ -14808,6 +14836,9 @@ vQ ez ez ez +GC +GC +GC Tf Tf Tf @@ -14820,13 +14851,10 @@ Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf +GC +GC ez -Tf +GC Tf Tf Tf @@ -14949,29 +14977,28 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +FZ +GC +GC +GC +GC +GC +GC +GC +GC Tf Tf Tf @@ -14989,6 +15016,7 @@ Tf Tf Tf Tf +GC Tf Tf Tf diff --git a/_maps/RandomRooms/rcorp/facility/beaches2.dmm b/_maps/RandomRooms/rcorp/facility/beaches2.dmm index 927b99784a97..31c219157d66 100644 --- a/_maps/RandomRooms/rcorp/facility/beaches2.dmm +++ b/_maps/RandomRooms/rcorp/facility/beaches2.dmm @@ -22,6 +22,13 @@ "ez" = ( /turf/open/water, /area/city/outskirts) +"gb" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakedoor{ + desc = "These things are thick. Doesn't look like they stopped anything important..."; + name = "broken cell door" + }, +/area/city/outskirts) "gH" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -106,6 +113,10 @@ "uO" = ( /turf/open/floor/plating/ashplanet/ash, /area/city/outskirts) +"uU" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "vQ" = ( /turf/open/floor/plating/ashplanet/rocky, /area/city/outskirts) @@ -113,6 +124,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/syndicate, /area/city/outskirts) "xM" = ( @@ -143,6 +155,11 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/city/outskirts) +"EE" = ( +/obj/effect/landmark/nobasic_incorp_move, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Gf" = ( /obj/item/reagent_containers/food/drinks/soda_cans/wellcheers_purple, /turf/open/floor/plating/ashplanet/rocky, @@ -174,6 +191,10 @@ "Jx" = ( /turf/open/floor/plasteel/stairs/left, /area/city/outskirts) +"JN" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Kq" = ( /turf/open/floor/plasteel/stairs/medium, /area/city/outskirts) @@ -194,6 +215,10 @@ "Mq" = ( /turf/closed/indestructible/syndicate, /area/city/outskirts) +"ML" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "MS" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 8 @@ -210,6 +235,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "Oz" = ( @@ -222,6 +248,13 @@ }, /turf/open/water, /area/city/outskirts) +"Sw" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "SD" = ( /obj/machinery/light{ dir = 1 @@ -290,85 +323,85 @@ Tf Mq Mq Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +JN +JN +JN +JN +JN +JN +JN +JN NS NS NS NS NS xK -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Mq -Mq -Mq +JN +JN +JN +JN +JN +JN +JN +JN +JN +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +JN +JN +ML NS NS NS -xK -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +Sw +JN +JN +JN +JN +JN +JN +JN +ML +ML NS -xK -Mq -Mq -Mq -Mq +Sw +JN +JN +JN +JN Mq Mq Mq @@ -452,7 +485,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -532,7 +565,7 @@ sY vQ vQ vQ -Tf +uU Tf Tf Tf @@ -608,14 +641,14 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +JN +JN +JN +JN +JN +JN +JN +JN vQ ez ez @@ -695,7 +728,7 @@ sY vQ vQ vQ -Tf +uU Tf Tf Tf @@ -771,7 +804,7 @@ Tf Tf Tf Tf -Mq +JN sY YI sY @@ -858,7 +891,7 @@ sY vQ vQ vQ -Tf +uU Tf Tf Tf @@ -934,7 +967,7 @@ Tf Tf Tf Tf -Mq +JN sY sY iD @@ -1021,7 +1054,7 @@ sY vQ vQ vQ -Tf +uU Tf Tf Tf @@ -1097,7 +1130,7 @@ Tf Tf Tf Tf -Mq +JN sY sY th @@ -1184,7 +1217,7 @@ sY vQ vQ vQ -Tf +uU Tf Tf Tf @@ -1260,7 +1293,7 @@ Tf Tf Tf Tf -Mq +JN SD iD sY @@ -1347,7 +1380,7 @@ sY vQ vQ vQ -Tf +uU Tf Tf Tf @@ -1423,7 +1456,7 @@ Tf Tf Tf Tf -Mq +JN iD sY sY @@ -1510,7 +1543,7 @@ sY vQ vQ vQ -Tf +uU Tf Tf Tf @@ -1586,7 +1619,7 @@ Tf Tf Tf Tf -Mq +JN Mq Mq Mq @@ -1673,7 +1706,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -1749,7 +1782,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -1836,7 +1869,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -1912,7 +1945,7 @@ Tf Tf Tf Tf -Mq +JN sY YI sY @@ -1999,7 +2032,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -2075,7 +2108,7 @@ Tf Tf Tf Tf -Mq +JN sY sY iD @@ -2162,7 +2195,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -2238,7 +2271,7 @@ Tf Tf Tf Tf -Mq +JN cl sY sY @@ -2325,7 +2358,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -2401,7 +2434,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -2488,7 +2521,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -2564,7 +2597,7 @@ Tf Tf Tf Tf -Mq +JN Mq Mq Mq @@ -2651,7 +2684,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -2727,7 +2760,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -2814,7 +2847,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -2890,7 +2923,7 @@ Tf Tf Tf Tf -Mq +JN GH sY sY @@ -2977,7 +3010,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -3053,7 +3086,7 @@ Tf Tf Tf Tf -Mq +JN sY iD sY @@ -3140,7 +3173,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -3216,7 +3249,7 @@ Tf Tf Tf Tf -Mq +JN SD sY sY @@ -3303,7 +3336,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -3379,7 +3412,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -3466,7 +3499,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -3542,12 +3575,12 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq +JN +JN +JN +JN +JN +JN ez ez ez @@ -3629,7 +3662,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -3710,7 +3743,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -3792,7 +3825,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -3873,7 +3906,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -3955,7 +3988,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -4037,7 +4070,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -4118,7 +4151,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -4201,9 +4234,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +uU +uU +uU ez ez ez @@ -4281,7 +4314,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -4367,8 +4400,8 @@ Tf Tf Tf Tf -Tf -Tf +uU +uU ez ez ez @@ -4444,7 +4477,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -4532,8 +4565,8 @@ Tf Tf Tf Tf -Tf -Tf +uU +uU ez ez ez @@ -4607,7 +4640,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -4697,7 +4730,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -4770,7 +4803,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -4861,9 +4894,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +uU +uU +uU ez vQ vQ @@ -4933,7 +4966,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -5027,7 +5060,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -5096,7 +5129,7 @@ ez vQ vQ vQ -Tf +uU Tf Tf Tf @@ -5191,7 +5224,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -5258,9 +5291,9 @@ ez ez vQ vQ -Tf -Tf -Tf +uU +uU +uU Tf Tf Tf @@ -5345,16 +5378,16 @@ Tf Tf Tf Tf +uU +uU +uU +uU Tf Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf +uU vQ vQ vQ @@ -5424,7 +5457,7 @@ vQ vQ vQ HG -Tf +uU Tf Tf Tf @@ -5507,17 +5540,17 @@ Tf Tf Tf Tf -Tf +uU ez ez ez ez +uU +uU Tf Tf Tf -Tf -Tf -Tf +uU vQ vQ vQ @@ -5588,9 +5621,9 @@ sT vQ HL vQ -Tf -Tf -Tf +uU +uU +uU Tf Tf Tf @@ -5669,7 +5702,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -5677,10 +5710,10 @@ ez ez ez iD +uU Tf Tf -Tf -Tf +uU vQ vQ Tf @@ -5754,7 +5787,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -5831,7 +5864,7 @@ Tf Tf Tf Tf -Tf +uU ez ez Mq @@ -5840,9 +5873,9 @@ ez Mq Mq ez +uU Tf -Tf -Tf +uU vQ vQ vQ @@ -5918,7 +5951,7 @@ vQ sT vQ vQ -Tf +uU Tf Tf Tf @@ -5993,7 +6026,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -6003,9 +6036,9 @@ sY iD DP aN +uU Tf -Tf -Tf +uU vQ vQ vQ @@ -6081,7 +6114,7 @@ vQ HG vQ vQ -Tf +uU Tf Tf Tf @@ -6156,7 +6189,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -6167,8 +6200,8 @@ Ze DP ez ez -Tf -Tf +uU +uU vQ vQ vQ @@ -6244,7 +6277,7 @@ Tf vQ vQ vQ -Tf +uU Tf Tf Tf @@ -6319,7 +6352,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -6330,8 +6363,8 @@ iD Oz ez ez -Tf -Tf +uU +uU vQ vQ vQ @@ -6408,7 +6441,7 @@ Tf vQ MS vQ -Tf +uU Tf Tf Tf @@ -6482,7 +6515,7 @@ Tf Tf Tf Tf -Tf +uU ez ez iD @@ -6493,7 +6526,7 @@ sY ez ez ez -Tf +uU vQ vQ vQ @@ -6571,7 +6604,7 @@ Tf vQ vQ vQ -Tf +uU Tf Tf Tf @@ -6645,7 +6678,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -6656,7 +6689,7 @@ iD ez ez ez -Tf +uU vQ vQ vQ @@ -6734,7 +6767,7 @@ Tf vQ vQ vQ -Tf +uU Tf Tf Tf @@ -6808,7 +6841,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -6819,7 +6852,7 @@ ez iD ez ez -Tf +uU vQ vQ vQ @@ -6896,7 +6929,7 @@ Tf vQ vQ xM -Tf +uU Tf Tf Tf @@ -6972,7 +7005,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -6982,7 +7015,7 @@ ez ez ez ez -Tf +uU vQ vQ vQ @@ -7059,7 +7092,7 @@ Tf vQ vQ vQ -Tf +uU Tf Tf Tf @@ -7135,7 +7168,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -7222,7 +7255,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -7298,7 +7331,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -7384,7 +7417,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -7461,7 +7494,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -7547,7 +7580,7 @@ vQ vQ MS vQ -Tf +uU Tf Tf Tf @@ -7625,7 +7658,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -7649,8 +7682,8 @@ Tf Tf Tf vQ -Tf -Tf +uU +uU vQ vQ vQ @@ -7662,8 +7695,8 @@ vQ vQ vQ vQ -Tf -Tf +uU +uU vQ ez ez @@ -7710,7 +7743,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -7788,7 +7821,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -7812,9 +7845,9 @@ Tf Tf Tf Tf +uU Tf -Tf -Tf +uU vQ vQ vQ @@ -7822,22 +7855,22 @@ ez ez vQ vQ +uU +uU +uU Tf Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf +uU +uU +uU +uU ez ez ez -Tf -Tf -Tf -Tf +uU +uU +uU +uU ez ez ez @@ -7873,7 +7906,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -7952,7 +7985,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -7975,8 +8008,16 @@ Tf Tf Tf Tf +uU Tf Tf +uU +uU +uU +uU +uU +uU +uU Tf Tf Tf @@ -7986,22 +8027,14 @@ Tf Tf Tf Tf +uU +uU +uU Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf +uU ez ez ez @@ -8036,7 +8069,7 @@ vQ LR vQ vQ -Tf +uU Tf Tf Tf @@ -8116,7 +8149,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -8138,6 +8171,7 @@ Tf Tf Tf Tf +uU Tf Tf Tf @@ -8164,10 +8198,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf -Tf +uU +uU +uU Mq iD sY @@ -8199,7 +8232,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -8279,7 +8312,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -8301,6 +8334,7 @@ Tf Tf Tf Tf +uU Tf Tf Tf @@ -8329,8 +8363,7 @@ Tf Tf Tf Tf -Tf -Tf +uU vQ sY sY @@ -8362,7 +8395,7 @@ vQ vQ MZ vQ -Tf +uU Tf Tf Tf @@ -8443,7 +8476,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -8464,6 +8497,7 @@ ez ez Tf Tf +uU Tf Tf Tf @@ -8492,8 +8526,7 @@ Tf Tf Tf Tf -Tf -Tf +uU vQ sY sY @@ -8525,7 +8558,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -8606,7 +8639,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -8626,6 +8659,7 @@ ez ez ez ez +uU Tf Tf Tf @@ -8656,8 +8690,7 @@ Tf Tf Tf Tf -Tf -Mq +JN sY sY sY @@ -8688,7 +8721,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -8770,7 +8803,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -8789,6 +8822,7 @@ ez ez ez ez +uU Tf Tf Tf @@ -8819,8 +8853,7 @@ Tf Tf Tf Tf -Tf -Mq +JN sY sY sY @@ -8851,7 +8884,7 @@ tU vQ vQ vQ -Tf +uU Tf Tf Tf @@ -8934,10 +8967,10 @@ Tf Tf Tf Tf -Tf +uU vQ vQ -Tf +uU vQ vQ vQ @@ -8952,6 +8985,7 @@ ez vQ ez ez +uU Tf Tf Tf @@ -8982,8 +9016,7 @@ Tf Tf Tf Tf -Tf -Mq +JN sY iD sY @@ -9015,7 +9048,7 @@ vQ vQ vQ SE -Tf +uU Tf Tf Tf @@ -9098,9 +9131,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +uU +uU +uU vQ vQ vQ @@ -9115,6 +9148,7 @@ ez ez Mq ez +uU Tf Tf Tf @@ -9145,8 +9179,7 @@ Tf Tf Tf Tf -Tf -Mq +JN sY iD sY @@ -9178,7 +9211,7 @@ vQ vQ Ui Gf -Tf +uU Tf Tf Tf @@ -9263,7 +9296,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -9278,7 +9311,7 @@ ez ez ez vQ -Mq +JN Tf Tf Tf @@ -9309,7 +9342,7 @@ Tf Tf Tf Tf -Mq +JN sY iD sY @@ -9341,7 +9374,7 @@ vQ vQ Gf tU -Tf +uU Tf Tf Tf @@ -9425,7 +9458,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -9441,7 +9474,7 @@ iD ez ez iD -Mq +JN Tf Tf Tf @@ -9472,7 +9505,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -9492,19 +9525,19 @@ iD GH DP sY -Tf -Tf -Mq -Tf -Tf -Tf -Tf +uU +uU +JN +uU +uU +uU +uU vQ vQ SE Ui Zc -Tf +uU Tf Tf Tf @@ -9586,9 +9619,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +uU +uU +uU vQ vQ vQ @@ -9604,7 +9637,7 @@ Mq ez ez vQ -Mq +JN Tf Tf Tf @@ -9631,11 +9664,11 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq +JN +JN +JN +JN +JN sY sY sY @@ -9653,13 +9686,8 @@ Mq cl iD sY -Mq -Tf -Tf -Tf -Tf -Tf -Tf +JN +uU Tf Tf Tf @@ -9667,6 +9695,11 @@ Tf Tf Tf Tf +uU +uU +uU +uU +uU Tf Tf Tf @@ -9746,9 +9779,9 @@ Tf Tf Tf Tf -Tf -Tf -Tf +uU +uU +uU ez vQ vQ @@ -9767,7 +9800,7 @@ gH ez iD iD -Mq +JN Tf Tf Tf @@ -9794,7 +9827,7 @@ Tf Tf Tf Tf -Mq +JN iD sY sY @@ -9816,7 +9849,7 @@ Mq iD sY sY -kI +gb Tf Tf Tf @@ -9908,7 +9941,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -9930,7 +9963,7 @@ DP sY iD iD -Mq +JN Tf Tf Tf @@ -9957,7 +9990,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -9975,11 +10008,11 @@ vQ vQ vQ vQ -Mq -Mq -Mq -Mq -Mq +JN +JN +JN +JN +EE Tf Tf Tf @@ -10070,7 +10103,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -10093,7 +10126,7 @@ DP sY iD iD -Mq +JN Tf Tf Tf @@ -10120,7 +10153,7 @@ Tf Tf Tf Tf -Mq +JN sY iD iD @@ -10137,7 +10170,7 @@ sY vQ vQ vQ -Tf +uU Tf Tf Tf @@ -10233,7 +10266,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -10256,7 +10289,7 @@ Mq sY sY iD -Mq +JN Tf Tf Tf @@ -10283,7 +10316,7 @@ Tf Tf Tf Tf -Mq +JN jN iD sY @@ -10300,7 +10333,7 @@ iD vQ iD vQ -Tf +uU Tf Tf Tf @@ -10396,7 +10429,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -10419,7 +10452,7 @@ kI sY sY iD -Mq +JN Tf Tf Tf @@ -10446,7 +10479,7 @@ Tf Tf Tf Tf -Mq +JN iD iD iD @@ -10463,7 +10496,7 @@ sY iD vQ vQ -Tf +uU Tf Tf Tf @@ -10559,7 +10592,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -10577,12 +10610,12 @@ ez Mq ez ez -Mq -Mq +JN +JN sY sY sY -Mq +JN Tf Tf Tf @@ -10609,23 +10642,23 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +JN +JN +JN +JN +JN +JN +JN +JN +JN +JN Mq Mq Mq Mq vQ vQ -Tf +uU Tf Tf Tf @@ -10722,7 +10755,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -10740,13 +10773,12 @@ ez ez ez ez -Tf -Mq +uU +JN sY sY sY -Mq -Tf +JN Tf Tf Tf @@ -10782,13 +10814,14 @@ Tf Tf Tf Tf +uU vQ vQ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -10884,7 +10917,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -10903,13 +10936,12 @@ ez ez ez ez -Tf -Mq -Tf +uU +JN +uU sY sY -Mq -Tf +JN Tf Tf Tf @@ -10946,12 +10978,13 @@ Tf Tf Tf Tf +uU vQ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -11047,7 +11080,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -11064,13 +11097,13 @@ vQ vQ ez ez +uU +uU Tf Tf Tf -Tf -Tf -Tf -Tf +uU +uU Mq Tf Tf @@ -11109,11 +11142,11 @@ Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf +uU +uU +uU +uU +uU Tf Tf Tf @@ -11210,7 +11243,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -11226,7 +11259,7 @@ vQ vQ vQ ez -Tf +uU Tf Tf Tf @@ -11373,7 +11406,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -11389,7 +11422,7 @@ vQ vQ vQ ez -Tf +uU Tf Tf Tf @@ -11536,7 +11569,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -11551,14 +11584,14 @@ vQ vQ vQ vQ +uU Tf Tf Tf Tf Tf -Tf -Tf -Tf +uU +uU Tf Tf Tf @@ -11699,7 +11732,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -11714,15 +11747,15 @@ vQ vQ vQ vQ +uU Tf Tf -Tf -Tf -Tf -Tf +uU +uU +uU ez ez -Tf +uU Tf Tf Tf @@ -11862,7 +11895,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -11877,17 +11910,17 @@ vQ vQ vQ vQ +uU Tf -Tf -Tf +uU ez ez ez ez ez ez -Tf -Tf +uU +uU Tf Tf Tf @@ -12025,7 +12058,7 @@ Tf Tf Tf Tf -Tf +uU ez ez ez @@ -12039,10 +12072,10 @@ vQ vQ vQ vQ +uU Tf -Tf -Tf -Tf +uU +uU ez ez ez @@ -12051,15 +12084,15 @@ ez ez ez ez +uU Tf Tf +uU +uU Tf -Tf -Tf -Tf -Tf -Tf -Tf +uU +uU +uU Tf Tf Tf @@ -12188,7 +12221,7 @@ Tf Tf Tf Tf -Tf +uU ez ez vQ @@ -12202,8 +12235,8 @@ vQ vQ vQ vQ -Tf -Tf +uU +uU vQ ez ez @@ -12215,15 +12248,15 @@ ez ez ez ez -Tf -Tf +uU +uU ez ez -Tf +uU vQ vQ vQ -Tf +uU Tf Tf Tf @@ -12351,7 +12384,7 @@ Tf Tf Tf Tf -Tf +uU ez ez vQ @@ -12387,7 +12420,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -12514,7 +12547,7 @@ Tf Tf Tf Tf -Tf +uU ez ez vQ @@ -12551,7 +12584,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -12678,7 +12711,7 @@ Tf Tf Tf Tf -Tf +uU ez Mq vQ @@ -12715,7 +12748,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -12841,7 +12874,7 @@ Tf Tf Tf Tf -Tf +uU vQ vQ vQ @@ -12878,7 +12911,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -13000,11 +13033,11 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq +JN +JN +JN +JN +JN iD vQ vQ @@ -13041,7 +13074,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -13163,7 +13196,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -13204,7 +13237,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -13326,7 +13359,7 @@ Tf Tf Tf Tf -Mq +JN sY sY YI @@ -13367,7 +13400,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -13489,7 +13522,7 @@ Tf Tf Tf Tf -Mq +JN YI sY sY @@ -13530,7 +13563,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -13652,7 +13685,7 @@ Tf Tf Tf Tf -Mq +JN SD sY sY @@ -13692,7 +13725,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -13815,7 +13848,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -13855,7 +13888,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -13978,7 +14011,7 @@ Tf Tf Tf Tf -Mq +JN Mq Mq Mq @@ -14017,7 +14050,7 @@ vQ vQ vQ vQ -Tf +uU Tf Tf Tf @@ -14141,7 +14174,7 @@ Tf Tf Tf Tf -Mq +JN sY YI sY @@ -14180,7 +14213,7 @@ ez ez ez ez -Tf +uU Tf Tf Tf @@ -14304,7 +14337,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -14343,7 +14376,7 @@ ez ez ez ez -Tf +uU Tf Tf Tf @@ -14467,7 +14500,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -14507,7 +14540,7 @@ ez ez ez ez -Tf +uU Tf Tf Tf @@ -14630,7 +14663,7 @@ Tf Tf Tf Tf -Mq +JN SD sY sY @@ -14655,22 +14688,22 @@ ez ez ez ez -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU +uU ez ez ez -Tf +uU Tf Tf Tf @@ -14793,7 +14826,7 @@ Tf Tf Tf Tf -Mq +JN sY sY sY @@ -14815,6 +14848,9 @@ vQ ez ez ez +uU +uU +uU Tf Tf Tf @@ -14827,13 +14863,10 @@ Tf Tf Tf Tf -Tf -Tf -Tf -Tf -Tf +uU +uU ez -Tf +uU Tf Tf Tf @@ -14956,29 +14989,28 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf +JN +JN +JN +JN +JN +JN +JN +JN +JN +JN +JN +JN +JN +JN +uU +uU +uU +uU +uU +uU +uU +uU Tf Tf Tf @@ -14996,6 +15028,7 @@ Tf Tf Tf Tf +uU Tf Tf Tf diff --git a/_maps/RandomRooms/rcorp/facility/city.dmm b/_maps/RandomRooms/rcorp/facility/city.dmm index 0de0fd1a80ee..fd7dd038192f 100644 --- a/_maps/RandomRooms/rcorp/facility/city.dmm +++ b/_maps/RandomRooms/rcorp/facility/city.dmm @@ -10,6 +10,10 @@ }, /turf/open/floor/wood, /area/city/outskirts) +"aj" = ( +/obj/effect/landmark/abnospawn/hardtank, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/outskirts) "ap" = ( /obj/structure/fireplace, /turf/open/floor/wood, @@ -49,6 +53,10 @@ /obj/structure/fence/cut, /turf/open/floor/plating/grass, /area/city/outskirts) +"aP" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakeglass, +/area/city/outskirts) "aR" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -173,6 +181,10 @@ /obj/structure/table/optable, /turf/open/floor/wood, /area/city/outskirts) +"cd" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "cr" = ( /obj/structure/closet/cabinet, /obj/item/reagent_containers/glass/bowl, @@ -458,6 +470,10 @@ }, /turf/open/floor/carpet/black, /area/city/outskirts) +"fp" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "fr" = ( /obj/machinery/shower{ pixel_y = 19 @@ -643,6 +659,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/syndicate, /area/city/outskirts) "ip" = ( @@ -1253,6 +1270,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "pV" = ( @@ -1894,6 +1912,7 @@ /obj/machinery/door/airlock/grunge{ name = "association office" }, +/obj/effect/landmark/nobasic_incorp_move, /turf/open/floor/wood, /area/city/outskirts) "wN" = ( @@ -2464,10 +2483,7 @@ /turf/open/floor/wood, /area/city/outskirts) "Ef" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/obj/effect/landmark/zombiespawn, +/obj/effect/landmark/abnospawn/hardcombat, /turf/open/floor/plating/ashplanet/rocky, /area/city/outskirts) "El" = ( @@ -3236,6 +3252,10 @@ /obj/structure/chair/sofa/right, /turf/open/floor/wood, /area/city/outskirts) +"Od" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Oe" = ( /obj/structure/closet/crate, /turf/open/floor/facility/dark, @@ -3404,6 +3424,10 @@ /obj/machinery/door/airlock/glass_large, /turf/open/floor/wood, /area/city/outskirts) +"Qc" = ( +/obj/effect/landmark/abnospawn/rhinobuster, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/outskirts) "Qi" = ( /obj/structure/closet/crate/trashcart, /obj/item/bodypart/l_arm, @@ -3662,6 +3686,13 @@ /obj/effect/spawner/lootdrop/maint_drugs, /turf/open/floor/wood, /area/city/outskirts) +"SS" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "ST" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -3678,6 +3709,10 @@ /obj/structure/rack, /turf/open/floor/wood, /area/city/outskirts) +"Tf" = ( +/obj/effect/landmark/abnospawn/hardsupport, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/outskirts) "Tp" = ( /obj/structure/mineral_door/wood, /turf/open/floor/carpet, @@ -3699,6 +3734,10 @@ }, /turf/open/floor/wood, /area/city/outskirts) +"TJ" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/reinforced, +/area/city/outskirts) "TN" = ( /obj/structure/fluff/hedge/opaque, /obj/machinery/light{ @@ -4208,76 +4247,76 @@ Fl Fl Fl Fl -Fl +Od pS pS pS pS pS ik -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -Fl -Fl -Fl +Od +Od +Od +Od +Od +Od +Od +Od +Od +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +Od +Od +fp pS pS pS -ik -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +SS +Od +Od +Od +Od +Od +Od +Od +fp +fp pS -ik -Fl -Fl +SS +fp +Od Fl Fl Fl @@ -4371,7 +4410,7 @@ WS WS WS Vg -Vg +TJ Au Au Au @@ -4439,7 +4478,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -4534,7 +4573,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -4602,7 +4641,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -4697,8 +4736,8 @@ WS WS WS WS -Vg -Vg +TJ +TJ Au Au Au @@ -4765,7 +4804,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -4861,7 +4900,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -4928,7 +4967,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -5024,7 +5063,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -5091,7 +5130,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -5187,7 +5226,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -5254,7 +5293,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -5350,7 +5389,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -5417,7 +5456,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -5513,13 +5552,13 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ +TJ +TJ Au Vg Vg @@ -5580,7 +5619,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -5682,7 +5721,7 @@ WS WS WS WS -Vg +TJ be Vg sR @@ -5743,7 +5782,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -5845,7 +5884,7 @@ WS WS WS WS -Vg +TJ Au Vg Si @@ -5906,7 +5945,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -6007,8 +6046,8 @@ WS WS WS WS -Vg -Vg +TJ +TJ Au Vg cV @@ -6069,7 +6108,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -6170,7 +6209,7 @@ WS WS WS WS -Vg +TJ Au Au Vg @@ -6232,7 +6271,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -6333,7 +6372,7 @@ WS WS WS WS -Vg +TJ Au Vg Vg @@ -6395,7 +6434,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -6496,7 +6535,7 @@ WS WS WS WS -Vg +TJ JL Vg ta @@ -6558,7 +6597,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -6659,7 +6698,7 @@ WS WS WS WS -Vg +TJ Au Vg wf @@ -6721,7 +6760,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -6822,7 +6861,7 @@ WS WS WS WS -Vg +TJ be Vg wn @@ -6884,7 +6923,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -6984,8 +7023,8 @@ WS WS WS WS -Vg -Vg +TJ +TJ Au Vg Oe @@ -7047,7 +7086,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -7147,7 +7186,7 @@ Vg Vg Vg Vg -Vg +TJ Au sF Vg @@ -7210,7 +7249,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -7310,7 +7349,7 @@ fa aJ sI wI -Vg +TJ Au Au Vg @@ -7373,7 +7412,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -7473,7 +7512,7 @@ eD aJ mL tZ -Vg +TJ Au Ld Vg @@ -7536,7 +7575,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -7636,7 +7675,7 @@ ap aJ mL RE -Vg +TJ Gi Au vY @@ -7699,7 +7738,7 @@ OA HD HD HD -Vg +TJ WS WS WS @@ -7799,12 +7838,12 @@ Vg CP Vg Vg -Vg -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ +TJ Au Au Au @@ -7862,7 +7901,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -7967,7 +8006,7 @@ aJ td aJ kl -Vg +TJ Au Au Au @@ -8025,7 +8064,7 @@ OA HD HD HD -Vg +TJ WS WS WS @@ -8188,7 +8227,7 @@ Vg HD HD HD -Vg +TJ WS WS WS @@ -8293,7 +8332,7 @@ Vo zk aJ ct -GI +aP Au Au Au @@ -8319,7 +8358,7 @@ YE Vg RL Vg -Vq +Au Vg Ul Vg @@ -8346,12 +8385,12 @@ Vg DM Au Au -Vg -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ +TJ WS WS WS @@ -8456,7 +8495,7 @@ aJ aJ aJ pa -GI +aP Au Au Au @@ -8509,7 +8548,7 @@ Qb Au Au Au -Vg +TJ WS WS WS @@ -8619,7 +8658,7 @@ Vg Vg hT Vg -Vg +TJ Au Au Au @@ -8672,7 +8711,7 @@ aJ Au Au Au -Vg +TJ WS WS WS @@ -8782,7 +8821,7 @@ Vg kl aJ kP -Vg +TJ Au Au Au @@ -8835,7 +8874,7 @@ Vg DM Au Au -Vg +TJ WS WS WS @@ -8945,7 +8984,7 @@ Vg GX aJ Yw -Vg +TJ Au Au Au @@ -8998,7 +9037,7 @@ GI Au Au Au -Vg +TJ WS WS WS @@ -9108,7 +9147,7 @@ kH aJ aJ Yw -Vg +TJ Au Au Au @@ -9161,7 +9200,7 @@ GI Au Au Au -Vg +TJ WS WS WS @@ -9271,7 +9310,7 @@ Vg DW aJ Ee -Vg +TJ Au Au Au @@ -9324,7 +9363,7 @@ GI Au Au Au -Vg +TJ WS WS WS @@ -9434,7 +9473,7 @@ Vg GI hT GI -Vg +TJ Au Au Au @@ -9487,7 +9526,7 @@ GI Au Au Au -Vg +TJ WS WS WS @@ -9597,7 +9636,7 @@ Vg Rr aJ ea -Vg +TJ Au Au Au @@ -9650,7 +9689,7 @@ GI Au Au Au -Vg +TJ WS WS WS @@ -9760,7 +9799,7 @@ Vg Rn aJ aJ -GI +aP Au Au Au @@ -9813,7 +9852,7 @@ GI Au Au Au -Vg +TJ WS WS WS @@ -9923,7 +9962,7 @@ Vg Vo aJ aJ -GI +aP Au Au Au @@ -9976,8 +10015,8 @@ Vg Au Au Au -Vg -Vg +TJ +TJ WS WS WS @@ -10086,7 +10125,7 @@ aJ aJ aJ aJ -GI +aP Au Au Au @@ -10140,7 +10179,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -10249,7 +10288,7 @@ Vg ae aJ kl -Vg +TJ Au Au Au @@ -10303,7 +10342,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -10412,7 +10451,7 @@ Vg Vg da Vg -Vg +TJ Au Au Au @@ -10466,7 +10505,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -10575,7 +10614,7 @@ Vg Xo Ww tY -Vg +TJ Au Au Au @@ -10629,7 +10668,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -10738,7 +10777,7 @@ Vg fr Ww Ww -Vg +TJ Au Au Au @@ -10792,7 +10831,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -10901,7 +10940,7 @@ Vg Vg Vg Vg -Vg +TJ Au Au Au @@ -10955,7 +10994,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -11064,7 +11103,7 @@ EX EX EX Pb -Vg +TJ Au Au Au @@ -11118,7 +11157,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -11227,7 +11266,7 @@ Au Au Au yd -Vg +TJ Au Au Au @@ -11245,7 +11284,7 @@ Au Au LH Ld -Vq +Au Au be sF @@ -11281,7 +11320,7 @@ WS WS WS WS -Vg +TJ WS WS WS @@ -11390,7 +11429,7 @@ Au Au Au Au -Vg +TJ Au Au Au @@ -11430,7 +11469,7 @@ Au Au Au LH -vY +Ld Au sF Au @@ -11444,7 +11483,7 @@ WS WS WS WS -Vg +TJ WS WS WS @@ -11553,7 +11592,7 @@ Au Au Au Au -Vg +TJ Au Au Au @@ -11607,7 +11646,7 @@ Au Au WS WS -Vg +TJ WS WS WS @@ -11716,7 +11755,7 @@ Au Au Au Au -Vg +TJ Au Au Au @@ -11770,7 +11809,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -11879,7 +11918,7 @@ Vg Vg Vg Vg -Vg +TJ Au Au Au @@ -11933,7 +11972,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -12042,7 +12081,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -12096,7 +12135,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -12205,7 +12244,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -12258,8 +12297,8 @@ Vg Au Au Au -Vg -Vg +TJ +TJ WS WS WS @@ -12368,7 +12407,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -12421,7 +12460,7 @@ Vg Au Au Au -Vg +TJ WS WS WS @@ -12531,7 +12570,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -12584,7 +12623,7 @@ LH Au Au Au -Vg +TJ WS WS WS @@ -12694,7 +12733,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -12747,7 +12786,7 @@ Vg Au Au Au -Vg +TJ WS WS WS @@ -12857,7 +12896,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -12888,7 +12927,7 @@ Au sF Au Ld -Vq +Au Au Au Au @@ -12910,7 +12949,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -13020,7 +13059,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -13073,7 +13112,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -13183,7 +13222,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -13236,7 +13275,7 @@ GT Au Au Au -Vg +TJ WS WS WS @@ -13346,7 +13385,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -13399,7 +13438,7 @@ GT Au Au Au -Vg +TJ WS WS WS @@ -13509,7 +13548,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -13562,7 +13601,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -13670,9 +13709,9 @@ WS WS WS WS -Vg -Vg -Vg +TJ +TJ +TJ Vg Vg Au @@ -13725,7 +13764,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -13833,7 +13872,7 @@ WS WS WS WS -Vg +TJ sQ kF xQ @@ -13888,7 +13927,7 @@ GT Au Au Au -Vg +TJ WS WS WS @@ -13996,14 +14035,14 @@ WS WS WS WS -Vg +TJ qi kF WR GS Au Au -Vq +Au Vg Au Vg @@ -14051,7 +14090,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -14159,7 +14198,7 @@ WS WS WS WS -Vg +TJ xQ kF xQ @@ -14214,7 +14253,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -14322,7 +14361,7 @@ WS WS WS WS -Vg +TJ vk xQ xQ @@ -14368,7 +14407,7 @@ WS WS WS Vg -Vq +Au Vg Rg Au @@ -14377,7 +14416,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -14485,8 +14524,8 @@ WS WS WS WS -Vg -Vg +TJ +TJ Yx Vg Vg @@ -14540,7 +14579,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -14649,7 +14688,7 @@ WS WS WS WS -Vg +TJ xQ Ex Vg @@ -14689,6 +14728,7 @@ Au Au Au Au +Qc Au Au Au @@ -14697,13 +14737,12 @@ Au Au Au Au -Vq -Au +Tf Au Au Au Au -Vg +TJ WS WS WS @@ -14812,7 +14851,7 @@ WS WS WS WS -Vg +TJ KS bQ Vg @@ -14849,12 +14888,12 @@ WS Au Au En +aj Au Au Au Au -En -Au +Ef Au Au Au @@ -14866,7 +14905,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -14975,7 +15014,7 @@ WS WS WS WS -Vg +TJ Vg Vg Vg @@ -15020,16 +15059,16 @@ Au Au Au Au +Ef Au +Tf Au Au Au Au Au Au -Au -Au -Vg +TJ WS WS WS @@ -15138,7 +15177,7 @@ WS WS WS WS -Vg +TJ qU Ir Au @@ -15192,7 +15231,7 @@ MN Vg Vg Mk -Vg +TJ WS WS WS @@ -15301,7 +15340,7 @@ WS WS WS WS -Vg +TJ tx Au Au @@ -15355,7 +15394,7 @@ aJ fF Vg Au -Vg +TJ WS WS WS @@ -15464,7 +15503,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -15483,7 +15522,7 @@ xO ST cO XE -Ef +Uc Ld Au Vg @@ -15518,7 +15557,7 @@ aJ vS Vg Au -Vg +TJ WS WS WS @@ -15627,7 +15666,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -15681,7 +15720,7 @@ aJ GM Vg SI -Vg +TJ WS WS WS @@ -15790,7 +15829,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -15844,7 +15883,7 @@ aJ um Vg Au -Vg +TJ WS WS WS @@ -15953,7 +15992,7 @@ WS WS WS WS -Vg +TJ Au Au VS @@ -16007,8 +16046,8 @@ iz Vg Vg Gi -Vg -Vg +TJ +TJ WS WS WS @@ -16116,8 +16155,8 @@ WS WS WS WS -Vg -Vg +TJ +TJ Mk Vg Vg @@ -16171,7 +16210,7 @@ FZ Vg Au Au -Vg +TJ WS WS WS @@ -16280,7 +16319,7 @@ WS WS WS WS -Vg +TJ Au be Au @@ -16334,7 +16373,7 @@ tz Vg Vg Au -Vg +TJ WS WS WS @@ -16443,11 +16482,11 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ Au Vg oH @@ -16497,7 +16536,7 @@ aJ oB Vg Au -Vg +TJ WS WS WS @@ -16610,7 +16649,7 @@ WS WS WS WS -Vg +TJ Au Vg de @@ -16660,7 +16699,7 @@ aJ Vg Vg Au -Vg +TJ WS WS WS @@ -16773,7 +16812,7 @@ WS WS WS WS -Vg +TJ Au Vg Vg @@ -16805,7 +16844,7 @@ Au Au Au Gi -Vq +Au Au Au Au @@ -16823,7 +16862,7 @@ oB Vg Au SI -Vg +TJ WS WS WS @@ -16936,7 +16975,7 @@ WS WS WS WS -Vg +TJ Gi Au be @@ -16985,8 +17024,8 @@ Vg Vg Vg Au -Vg -Vg +TJ +TJ WS WS WS @@ -17099,13 +17138,13 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ +TJ +TJ Au Gi Au @@ -17148,7 +17187,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -17268,16 +17307,16 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ Au Au Au @@ -17307,11 +17346,11 @@ Vg Vg Vg Au -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ WS WS WS @@ -17440,10 +17479,10 @@ WS WS WS WS -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ be Vg le @@ -17470,7 +17509,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -17606,7 +17645,7 @@ WS WS WS WS -Vg +TJ Au Vg Ie @@ -17627,13 +17666,13 @@ TY KP Vg Au -Vg -Vg -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ +TJ +TJ WS WS WS @@ -17769,7 +17808,7 @@ WS WS WS WS -Vg +TJ Au Vg Vg @@ -17790,7 +17829,7 @@ TY AI Vg Au -Vg +TJ WS WS WS @@ -17932,7 +17971,7 @@ WS WS WS WS -Vg +TJ Au Gi Vg @@ -17953,7 +17992,7 @@ TY dS Vg Au -Vg +TJ WS WS WS @@ -18095,8 +18134,8 @@ WS WS WS WS -Vg -Vg +TJ +TJ Au Au Au @@ -18116,7 +18155,7 @@ TY KP Vg Au -Vg +TJ WS WS WS @@ -18259,13 +18298,13 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ +TJ +TJ WS Vg Vg @@ -18279,7 +18318,7 @@ Vg Vg Vg Au -Vg +TJ WS WS WS @@ -18428,7 +18467,7 @@ WS WS WS WS -Vg +TJ Au Au Au @@ -18442,7 +18481,7 @@ Au Au Au Au -Vg +TJ WS WS WS @@ -18591,21 +18630,21 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ +TJ WS WS WS diff --git a/_maps/RandomRooms/rcorp/facility/city2.dmm b/_maps/RandomRooms/rcorp/facility/city2.dmm index 54424618a963..6490be66fa3a 100644 --- a/_maps/RandomRooms/rcorp/facility/city2.dmm +++ b/_maps/RandomRooms/rcorp/facility/city2.dmm @@ -1880,6 +1880,7 @@ /obj/machinery/door/airlock/grunge{ name = "association office" }, +/obj/effect/landmark/nobasic_incorp_move, /turf/open/floor/wood, /area/city/outskirts) "wN" = ( @@ -1910,6 +1911,11 @@ }, /turf/open/floor/wood, /area/city/outskirts) +"wX" = ( +/obj/structure/curtain/cloth/fancy, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakeglass, +/area/city/outskirts) "xc" = ( /obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -1966,6 +1972,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "xH" = ( @@ -2024,6 +2031,10 @@ }, /turf/open/floor/plating/ashplanet/rocky, /area/city/outskirts) +"yl" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakeglass, +/area/city/outskirts) "yn" = ( /obj/item/assembly/mousetrap/armed, /turf/open/floor/plating/ashplanet/rocky, @@ -3049,6 +3060,10 @@ }, /turf/open/floor/plating/ashplanet/rocky, /area/city/outskirts) +"Lv" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/reinforced, +/area/city/outskirts) "Lz" = ( /obj/structure/table/reinforced, /obj/item/food/bread/plain, @@ -3275,6 +3290,13 @@ }, /turf/open/floor/plasteel, /area/city/outskirts) +"OL" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "OO" = ( /obj/structure/table/reinforced, /obj/item/food/meat/slab, @@ -3399,10 +3421,18 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/city/outskirts) +"Qn" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "Qr" = ( /obj/structure/rack, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"Qs" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Qt" = ( /obj/machinery/hydroponics, /turf/open/indestructible/white, @@ -3664,6 +3694,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Tp" = ( @@ -3728,6 +3759,10 @@ }, /turf/open/floor/wood, /area/city/outskirts) +"TR" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "TT" = ( /obj/structure/sink/kitchen{ dir = 1; @@ -4192,76 +4227,76 @@ Fl Fl Fl Fl -Fl +TR xD xD xD xD xD Te -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -Fl -Fl -Fl +TR +TR +TR +TR +TR +TR +TR +TR +TR +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +Qn +TR +TR +Qs xD xD xD -Te -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +OL +TR +TR +TR +TR +TR +TR +TR +Qs +Qs xD -Te -Fl -Fl +OL +Qs +TR Fl Fl Fl @@ -4355,7 +4390,7 @@ WS WS WS Vg -Vg +Lv Au Au Au @@ -4423,7 +4458,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -4518,7 +4553,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -4586,7 +4621,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -4681,8 +4716,8 @@ WS WS WS WS -Vg -Vg +Lv +Lv Au Au Au @@ -4749,7 +4784,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -4845,7 +4880,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -4912,7 +4947,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -5008,7 +5043,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -5075,7 +5110,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -5171,7 +5206,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -5238,7 +5273,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -5334,7 +5369,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -5401,7 +5436,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -5497,13 +5532,13 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv +Lv +Lv Au Vg Vg @@ -5564,7 +5599,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -5666,7 +5701,7 @@ WS WS WS WS -Vg +Lv be Vg sR @@ -5727,7 +5762,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -5829,7 +5864,7 @@ WS WS WS WS -Vg +Lv Au Vg Si @@ -5890,7 +5925,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -5991,8 +6026,8 @@ WS WS WS WS -Vg -Vg +Lv +Lv Au Vg cV @@ -6053,7 +6088,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -6154,7 +6189,7 @@ WS WS WS WS -Vg +Lv Au Au Vg @@ -6216,7 +6251,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -6317,7 +6352,7 @@ WS WS WS WS -Vg +Lv Au Vg Vg @@ -6379,7 +6414,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -6480,7 +6515,7 @@ WS WS WS WS -Vg +Lv JL Vg ta @@ -6542,7 +6577,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -6643,7 +6678,7 @@ WS WS WS WS -Vg +Lv Au Vg wf @@ -6705,7 +6740,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -6806,7 +6841,7 @@ WS WS WS WS -Vg +Lv be Vg wn @@ -6868,7 +6903,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -6968,8 +7003,8 @@ WS WS WS WS -Vg -Vg +Lv +Lv Au Vg Oe @@ -7031,7 +7066,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -7131,7 +7166,7 @@ Vg Vg Vg Vg -Vg +Lv Au sF Vg @@ -7194,7 +7229,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -7294,7 +7329,7 @@ fa aJ sI wI -Vg +Lv Au Au Vg @@ -7357,7 +7392,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -7457,7 +7492,7 @@ eD aJ mL tZ -Vg +Lv Au Ld Vg @@ -7520,7 +7555,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -7620,7 +7655,7 @@ ap aJ mL RE -Vg +Lv Gi Au Ld @@ -7683,7 +7718,7 @@ OA HD HD HD -Vg +Lv WS WS WS @@ -7783,12 +7818,12 @@ Vg CP Vg Vg -Vg -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv +Lv Au Au Au @@ -7846,7 +7881,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -7951,7 +7986,7 @@ aJ td aJ kl -Vg +Lv Au Au Au @@ -8009,7 +8044,7 @@ OA HD HD HD -Vg +Lv WS WS WS @@ -8172,7 +8207,7 @@ Vg HD HD HD -Vg +Lv WS WS WS @@ -8277,7 +8312,7 @@ Vo zk aJ ct -GI +yl Au Au Au @@ -8330,12 +8365,12 @@ Vg DM Au Au -Vg -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv +Lv WS WS WS @@ -8440,7 +8475,7 @@ aJ aJ aJ pa -GI +yl Au Au Au @@ -8493,7 +8528,7 @@ Qb Au Au Au -Vg +Lv WS WS WS @@ -8603,7 +8638,7 @@ Vg Vg hT Vg -Vg +Lv Au Au Au @@ -8656,7 +8691,7 @@ aJ Au Au Au -Vg +Lv WS WS WS @@ -8766,7 +8801,7 @@ Vg kl aJ kP -Vg +Lv Au Au Au @@ -8819,7 +8854,7 @@ Vg DM Au Au -Vg +Lv WS WS WS @@ -8929,7 +8964,7 @@ Vg GX aJ Yw -Vg +Lv Au Au Au @@ -8982,7 +9017,7 @@ GI Au Au Au -Vg +Lv WS WS WS @@ -9092,7 +9127,7 @@ kH aJ aJ Yw -Vg +Lv Au Au Au @@ -9145,7 +9180,7 @@ GI Au Au Au -Vg +Lv WS WS WS @@ -9255,7 +9290,7 @@ Vg DW aJ Ee -Vg +Lv Au Au Au @@ -9308,7 +9343,7 @@ GI Au Au Au -Vg +Lv WS WS WS @@ -9418,7 +9453,7 @@ Vg GI hT GI -Vg +Lv Au Au Au @@ -9471,7 +9506,7 @@ GI Au Au Au -Vg +Lv WS WS WS @@ -9581,7 +9616,7 @@ Vg Rr aJ ea -Vg +Lv Au Au Au @@ -9634,7 +9669,7 @@ GI Au Au Au -Vg +Lv WS WS WS @@ -9744,7 +9779,7 @@ Vg Rn aJ aJ -GI +yl Au Au Au @@ -9797,7 +9832,7 @@ GI Au Au Au -Vg +Lv WS WS WS @@ -9907,7 +9942,7 @@ Vg Vo aJ aJ -GI +yl Au Au Au @@ -9960,8 +9995,8 @@ Vg Au Au Au -Vg -Vg +Lv +Lv WS WS WS @@ -10070,7 +10105,7 @@ aJ aJ aJ aJ -GI +yl Au Au Au @@ -10124,7 +10159,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -10233,7 +10268,7 @@ Vg ae aJ kl -Vg +Lv Au Au Au @@ -10287,7 +10322,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -10396,7 +10431,7 @@ Vg Vg da Vg -Vg +Lv Au Au Au @@ -10450,7 +10485,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -10559,7 +10594,7 @@ Vg Xo Ww tY -Vg +Lv WS WS WS @@ -10613,7 +10648,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -10722,7 +10757,7 @@ Vg fr Ww Ww -Vg +Lv WS WS WS @@ -10776,7 +10811,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -10885,7 +10920,7 @@ Vg Vg Vg Vg -Vg +Lv Au WS WS @@ -10939,7 +10974,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -11048,7 +11083,7 @@ EX EX EX Pb -Vg +Lv Au Au WS @@ -11102,7 +11137,7 @@ WS WS WS WS -Vg +Lv WS WS WS @@ -11211,7 +11246,7 @@ Au Au Au yd -Vg +Lv Au Au Au @@ -11265,7 +11300,7 @@ WS WS WS WS -Vg +Lv WS WS WS @@ -11374,7 +11409,7 @@ Au Au Au Au -Vg +Lv Au Au Au @@ -11428,7 +11463,7 @@ Au Au WS WS -Vg +Lv WS WS WS @@ -11537,7 +11572,7 @@ Au Au Au Au -Vg +Lv Au Au Au @@ -11591,7 +11626,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -11700,7 +11735,7 @@ Au Au Au Au -Vg +Lv Au Au Au @@ -11754,7 +11789,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -11863,7 +11898,7 @@ Vg Vg Vg Vg -Vg +Lv Au Au Au @@ -11917,7 +11952,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -12026,7 +12061,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -12080,7 +12115,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -12189,7 +12224,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -12242,8 +12277,8 @@ Vg Au Au Au -Vg -Vg +Lv +Lv WS WS WS @@ -12352,7 +12387,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -12405,7 +12440,7 @@ Vg Au Au Au -Vg +Lv WS WS WS @@ -12515,7 +12550,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -12568,7 +12603,7 @@ LH Au Au Au -Vg +Lv WS WS WS @@ -12678,7 +12713,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -12731,7 +12766,7 @@ Vg Au Au Au -Vg +Lv WS WS WS @@ -12841,7 +12876,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -12894,7 +12929,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -13004,7 +13039,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -13057,7 +13092,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -13167,7 +13202,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -13220,7 +13255,7 @@ GT Au Au Au -Vg +Lv WS WS WS @@ -13330,7 +13365,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -13383,7 +13418,7 @@ GT Au Au Au -Vg +Lv WS WS WS @@ -13493,7 +13528,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -13546,7 +13581,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -13656,9 +13691,9 @@ WS WS Vg Vg -Vg -Vg -Vg +Lv +Lv +Lv Au Au Au @@ -13709,7 +13744,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -13821,7 +13856,7 @@ Vg sQ kF xQ -GS +wX Au Au Au @@ -13872,7 +13907,7 @@ GT Au Au Au -Vg +Lv WS WS WS @@ -13984,7 +14019,7 @@ Vg qi kF WR -GS +wX Au Au Au @@ -14035,7 +14070,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -14147,7 +14182,7 @@ Vg xQ kF xQ -GS +wX Au Au Au @@ -14198,7 +14233,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -14310,7 +14345,7 @@ Vg vk xQ xQ -GS +wX Au Au Au @@ -14361,7 +14396,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -14473,7 +14508,7 @@ Vg Vg Yx Vg -Vg +Lv Au Au Au @@ -14524,7 +14559,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -14636,7 +14671,7 @@ WS Vg xQ Ex -Vg +Lv Au Au Au @@ -14687,7 +14722,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -14799,7 +14834,7 @@ WS Vg KS bQ -Vg +Lv Au Au Au @@ -14850,7 +14885,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -14959,10 +14994,10 @@ WS WS WS WS -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv Vg Vg Vg @@ -15013,7 +15048,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -15122,7 +15157,7 @@ WS WS WS WS -Vg +Lv qU Ir Au @@ -15176,7 +15211,7 @@ MN Vg Vg Mk -Vg +Lv WS WS WS @@ -15285,7 +15320,7 @@ WS WS WS WS -Vg +Lv tx Au Au @@ -15339,7 +15374,7 @@ aJ fF Vg Au -Vg +Lv WS WS WS @@ -15448,7 +15483,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -15502,7 +15537,7 @@ aJ vS Vg Au -Vg +Lv WS WS WS @@ -15611,7 +15646,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -15665,7 +15700,7 @@ aJ GM Vg SI -Vg +Lv WS WS WS @@ -15774,7 +15809,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -15828,7 +15863,7 @@ aJ um Vg Au -Vg +Lv WS WS WS @@ -15937,7 +15972,7 @@ WS WS WS WS -Vg +Lv Au Au VS @@ -15991,8 +16026,8 @@ iz Vg Vg Gi -Vg -Vg +Lv +Lv WS WS WS @@ -16100,8 +16135,8 @@ WS WS WS WS -Vg -Vg +Lv +Lv Mk Vg Vg @@ -16155,7 +16190,7 @@ FZ Vg Au Au -Vg +Lv WS WS WS @@ -16264,7 +16299,7 @@ WS WS WS WS -Vg +Lv Au be Au @@ -16318,7 +16353,7 @@ tz Vg Vg Au -Vg +Lv WS WS WS @@ -16427,11 +16462,11 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv Au Vg oH @@ -16481,7 +16516,7 @@ aJ oB Vg Au -Vg +Lv WS WS WS @@ -16594,7 +16629,7 @@ WS WS WS WS -Vg +Lv Au Vg de @@ -16644,7 +16679,7 @@ aJ Vg Vg Au -Vg +Lv WS WS WS @@ -16757,7 +16792,7 @@ WS WS WS WS -Vg +Lv Au Vg Vg @@ -16807,7 +16842,7 @@ oB Vg Au SI -Vg +Lv WS WS WS @@ -16920,7 +16955,7 @@ WS WS WS WS -Vg +Lv Gi Au be @@ -16969,8 +17004,8 @@ Vg Vg Vg Au -Vg -Vg +Lv +Lv WS WS WS @@ -17083,13 +17118,13 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv +Lv +Lv Au Gi Au @@ -17132,7 +17167,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -17252,16 +17287,16 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv Au Au Au @@ -17291,11 +17326,11 @@ Vg Vg Vg Au -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv WS WS WS @@ -17424,10 +17459,10 @@ WS WS WS WS -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv be Vg le @@ -17454,7 +17489,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -17590,7 +17625,7 @@ WS WS WS WS -Vg +Lv Au Vg Ie @@ -17611,13 +17646,13 @@ TY KP Vg Au -Vg -Vg -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv +Lv +Lv WS WS WS @@ -17753,7 +17788,7 @@ WS WS WS WS -Vg +Lv Au Vg Vg @@ -17774,7 +17809,7 @@ TY AI Vg Au -Vg +Lv WS WS WS @@ -17916,7 +17951,7 @@ WS WS WS WS -Vg +Lv Au Gi Vg @@ -17937,7 +17972,7 @@ TY dS Vg Au -Vg +Lv WS WS WS @@ -18079,8 +18114,8 @@ WS WS WS WS -Vg -Vg +Lv +Lv Au Au Au @@ -18100,7 +18135,7 @@ TY KP Vg Au -Vg +Lv WS WS WS @@ -18243,13 +18278,13 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv +Lv +Lv WS Vg Vg @@ -18263,7 +18298,7 @@ Vg Vg Vg Au -Vg +Lv WS WS WS @@ -18412,7 +18447,7 @@ WS WS WS WS -Vg +Lv Au Au Au @@ -18426,7 +18461,7 @@ Au Au Au Au -Vg +Lv WS WS WS @@ -18575,21 +18610,21 @@ WS WS WS WS -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg -Vg +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv +Lv WS WS WS diff --git a/_maps/RandomRooms/rcorp/facility/maze.dmm b/_maps/RandomRooms/rcorp/facility/maze.dmm index e68a0f34f6be..27b40b91d344 100644 --- a/_maps/RandomRooms/rcorp/facility/maze.dmm +++ b/_maps/RandomRooms/rcorp/facility/maze.dmm @@ -119,6 +119,10 @@ }, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"su" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "sH" = ( /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 8 @@ -153,6 +157,10 @@ /obj/machinery/light/small, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"wM" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "xd" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 @@ -180,6 +188,10 @@ }, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"AE" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Ba" = ( /obj/effect/turf_decal/siding/wideplating/dark/corner{ dir = 8 @@ -206,6 +218,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "Gh" = ( @@ -236,6 +249,13 @@ slowdown = 0 }, /area/city/outskirts) +"HH" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "IF" = ( /obj/machinery/light/small{ dir = 4 @@ -294,6 +314,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Op" = ( @@ -417,78 +438,78 @@ Fl Fl Fl Fl -Fl -Fl -Fl +AE +AE +AE FE FE FE FE FE -Oo -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -Fl -Fl -Fl +HH +AE +AE +AE +AE +AE +AE +AE +AE +AE +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +su +AE +AE +wM FE FE FE Oo -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE +AE +wM +wM FE Oo -Fl -Fl +wM +AE Fl Fl Fl @@ -579,7 +600,7 @@ WS WS Fl Fl -Fl +AE ry HD oS @@ -650,7 +671,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -743,7 +764,7 @@ WS WS WS Fl -Fl +AE ry HD oS @@ -813,7 +834,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -907,7 +928,7 @@ WS WS WS Fl -Fl +AE ry oS oS @@ -976,7 +997,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -1070,7 +1091,7 @@ WS WS WS WS -Fl +AE ry oS oS @@ -1139,7 +1160,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -1233,7 +1254,7 @@ WS WS WS WS -Fl +AE ry oS oS @@ -1302,7 +1323,7 @@ Fl sq oS oS -Fl +AE WS WS WS @@ -1396,7 +1417,7 @@ WS WS WS WS -Fl +AE Sm oS oS @@ -1465,7 +1486,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -1551,15 +1572,15 @@ WS WS WS WS -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE +AE +AE +AE ry oS oS @@ -1628,7 +1649,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -1713,7 +1734,7 @@ WS WS WS WS -Fl +AE Fl HD HD @@ -1791,7 +1812,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -1876,7 +1897,7 @@ WS WS WS WS -Fl +AE HD HD Fl @@ -1954,7 +1975,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -2039,7 +2060,7 @@ WS WS WS WS -Fl +AE HD Fl Fl @@ -2117,7 +2138,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -2202,7 +2223,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -2280,7 +2301,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -2365,7 +2386,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -2443,7 +2464,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -2522,12 +2543,12 @@ WS WS WS WS -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE Fl CP Fl @@ -2606,7 +2627,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -2684,7 +2705,7 @@ WS WS WS WS -Fl +AE Fl ry HD @@ -2769,7 +2790,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -2847,7 +2868,7 @@ WS WS WS WS -Fl +AE ry HD oS @@ -2932,7 +2953,7 @@ Fl oS oS YJ -Fl +AE WS WS WS @@ -3010,7 +3031,7 @@ WS WS WS WS -Fl +AE Sm oS oS @@ -3095,7 +3116,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -3173,7 +3194,7 @@ WS WS WS WS -Fl +AE ry oS oS @@ -3258,7 +3279,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -3336,7 +3357,7 @@ WS WS WS WS -Fl +AE ry oS oS @@ -3421,7 +3442,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -3497,8 +3518,8 @@ WS WS WS WS -Fl -Fl +AE +AE Fl ry oS @@ -3584,7 +3605,7 @@ CP oS oS oS -Fl +AE WS WS WS @@ -3660,7 +3681,7 @@ WS WS WS WS -Fl +AE HD CP HD @@ -3747,7 +3768,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -3823,7 +3844,7 @@ WS WS WS WS -Fl +AE HD Fl ry @@ -3910,7 +3931,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -3986,7 +4007,7 @@ WS WS WS WS -Fl +AE HD Fl ry @@ -4073,7 +4094,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -4149,7 +4170,7 @@ WS WS WS WS -Fl +AE HD Fl ry @@ -4236,7 +4257,7 @@ Fl sq oS oS -Fl +AE WS WS WS @@ -4312,7 +4333,7 @@ WS WS WS WS -Fl +AE HD Fl ry @@ -4399,7 +4420,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -4475,7 +4496,7 @@ WS WS WS WS -Fl +AE HD CP HD @@ -4562,7 +4583,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -4638,7 +4659,7 @@ WS WS WS WS -Fl +AE HD Fl ry @@ -4725,7 +4746,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -4801,7 +4822,7 @@ WS WS WS WS -Fl +AE HD Fl ry @@ -4888,7 +4909,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -4964,7 +4985,7 @@ WS WS WS WS -Fl +AE HD Fl Sm @@ -5051,7 +5072,7 @@ Fl oS oS oS -Fl +AE WS WS WS @@ -5127,7 +5148,7 @@ WS WS WS WS -Fl +AE HD Fl ry @@ -5214,7 +5235,7 @@ Fl bF yc zt -Fl +AE WS WS WS @@ -5290,7 +5311,7 @@ WS WS WS WS -Fl +AE HD Fl Fl @@ -5377,7 +5398,7 @@ Fl MD gS aN -Fl +AE WS WS WS @@ -5453,7 +5474,7 @@ WS WS WS WS -Fl +AE HD Fl Fl @@ -5539,8 +5560,8 @@ WS Fl Fl gS -Fl -Fl +AE +AE WS WS WS @@ -5616,7 +5637,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -5702,7 +5723,7 @@ WS WS Fl gS -Fl +AE WS WS WS @@ -5779,7 +5800,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -5865,7 +5886,7 @@ WS WS Fl gS -Fl +AE WS WS WS @@ -5942,7 +5963,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -6028,7 +6049,7 @@ WS WS Fl gS -Fl +AE WS WS WS @@ -6105,7 +6126,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -6191,7 +6212,7 @@ WS WS Fl gS -Fl +AE WS WS WS @@ -6268,7 +6289,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -6354,7 +6375,7 @@ WS WS Fl gS -Fl +AE WS WS WS @@ -6431,7 +6452,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -6517,8 +6538,8 @@ WS WS Fl gS -Fl -Fl +AE +AE WS WS WS @@ -6594,7 +6615,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -6681,8 +6702,8 @@ Fl Fl gS KU -Fl -Fl +AE +AE WS WS WS @@ -6757,7 +6778,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -6845,7 +6866,7 @@ pm gS KU HD -Fl +AE WS WS WS @@ -6920,7 +6941,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -7008,7 +7029,7 @@ pm gS KU HD -Fl +AE WS WS WS @@ -7083,7 +7104,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -7171,8 +7192,8 @@ sH Jh sJ HD -Fl -Fl +AE +AE WS WS WS @@ -7246,7 +7267,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -7335,8 +7356,8 @@ HD HD HD HD -Fl -Fl +AE +AE WS WS WS @@ -7409,7 +7430,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -7482,14 +7503,14 @@ Fl HD HD HD -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE +AE +AE HD HD Fl @@ -7499,7 +7520,7 @@ HD HD HD HD -Fl +AE WS WS WS @@ -7572,7 +7593,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -7645,14 +7666,14 @@ Fl HD HD HD -Fl +AE WS WS WS WS WS WS -Fl +AE HD HD Fl @@ -7662,7 +7683,7 @@ HD HD HD HD -Fl +AE WS WS WS @@ -7735,7 +7756,7 @@ WS WS WS WS -Fl +AE HD Fl WS @@ -7808,14 +7829,14 @@ Fl HD HD HD -Fl +AE WS WS WS WS WS WS -Fl +AE HD HD Fl @@ -7825,7 +7846,7 @@ HD HD HD HD -Fl +AE WS WS WS @@ -7898,7 +7919,7 @@ WS WS WS WS -Fl +AE HD Fl Fl @@ -7971,14 +7992,14 @@ Fl HD HD HD -Fl +AE WS WS WS WS WS WS -Fl +AE HD HD HD @@ -7988,7 +8009,7 @@ HD HD HD HD -Fl +AE WS WS WS @@ -8061,7 +8082,7 @@ WS WS WS WS -Fl +AE HD HD Fl @@ -8134,14 +8155,14 @@ Fl HD HD HD -Fl +AE WS WS WS WS WS WS -Fl +AE HD HD HD @@ -8151,7 +8172,7 @@ Fl Fl HD HD -Fl +AE WS WS WS @@ -8224,7 +8245,7 @@ WS WS WS WS -Fl +AE Fl HD HD @@ -8297,14 +8318,14 @@ Fl HD HD HD -Fl +AE WS WS WS WS WS WS -Fl +AE HD HD HD @@ -8314,7 +8335,7 @@ Fl Fl HD HD -Fl +AE WS WS WS @@ -8388,9 +8409,9 @@ WS WS WS WS -Fl -Fl -Fl +AE +AE +AE Fl gS Fl @@ -8460,14 +8481,14 @@ Fl HD HD HD -Fl +AE WS WS WS WS WS WS -Fl +AE HD HD HD @@ -8477,7 +8498,7 @@ HD Fl HD HD -Fl +AE WS WS WS @@ -8554,7 +8575,7 @@ WS WS WS WS -Fl +AE gS Fl WS @@ -8623,15 +8644,15 @@ Fl HD HD HD -Fl +AE WS WS WS WS WS WS -Fl -Fl +AE +AE HD HD HD @@ -8640,7 +8661,7 @@ HD zl HD HD -Fl +AE WS WS WS @@ -8714,9 +8735,9 @@ WS WS WS WS -Fl -Fl -Fl +AE +AE +AE Fl gS Fl @@ -8759,15 +8780,15 @@ gS gS tp gp -Fl -WS -WS -Fl -Fl -Fl -Fl -Fl -Fl +AE +su +su +AE +AE +AE +AE +AE +AE HD HD HD @@ -8786,7 +8807,7 @@ Fl HD HD HD -Fl +AE WS WS WS @@ -8794,16 +8815,16 @@ WS WS WS WS -Fl -Fl +AE +AE HD HD HD HD HD HD -Fl -Fl +AE +AE WS WS WS @@ -8877,7 +8898,7 @@ WS WS WS WS -Fl +AE gS gS gS @@ -8922,7 +8943,7 @@ gS gS gS KU -Fl +AE WS WS WS @@ -8930,7 +8951,7 @@ WS WS WS WS -Fl +AE HD HD HD @@ -8949,7 +8970,7 @@ Fl HD HD HD -Fl +AE WS WS WS @@ -8958,14 +8979,14 @@ WS WS WS WS -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE +AE +AE WS WS WS @@ -9040,7 +9061,7 @@ WS WS WS WS -Fl +AE gS Fl Fl @@ -9085,7 +9106,7 @@ gS gS gS KU -Fl +AE WS WS WS @@ -9093,7 +9114,7 @@ WS WS WS WS -Fl +AE HD HD HD @@ -9112,7 +9133,7 @@ Fl HD HD HD -Fl +AE WS WS WS @@ -9203,7 +9224,7 @@ WS WS WS WS -Fl +AE gS Fl WS @@ -9248,7 +9269,7 @@ gS gS gS KU -Fl +AE WS WS WS @@ -9256,7 +9277,7 @@ WS WS WS WS -Fl +AE HD HD HD @@ -9275,7 +9296,7 @@ Fl HD HD HD -Fl +AE WS WS WS @@ -9366,7 +9387,7 @@ WS WS WS WS -Fl +AE gS Fl WS @@ -9411,7 +9432,7 @@ gS gS gS KU -Fl +AE WS WS WS @@ -9419,7 +9440,7 @@ WS WS WS WS -Fl +AE HD HD HD @@ -9438,7 +9459,7 @@ HD HD HD HD -Fl +AE WS WS WS @@ -9529,7 +9550,7 @@ WS WS WS WS -Fl +AE gS Fl Fl @@ -9574,7 +9595,7 @@ gS gS gS KU -Fl +AE WS WS WS @@ -9582,7 +9603,7 @@ WS WS WS WS -Fl +AE HD HD HD @@ -9601,7 +9622,7 @@ HD HD HD HD -Fl +AE WS WS WS @@ -9692,7 +9713,7 @@ WS WS WS WS -Fl +AE gS gS gS @@ -9737,7 +9758,7 @@ gS gS gS KU -Fl +AE WS WS WS @@ -9745,7 +9766,7 @@ WS WS WS WS -Fl +AE IF HD HD @@ -9763,8 +9784,8 @@ HD HD HD IF -Fl -Fl +AE +AE WS WS WS @@ -9855,9 +9876,9 @@ WS WS WS WS -Fl -Fl -Fl +AE +AE +AE gS Fl Fl @@ -9900,7 +9921,7 @@ gS gS gS KU -Fl +AE WS WS WS @@ -9908,8 +9929,8 @@ WS WS WS WS -Fl -Fl +AE +AE HD HD HD @@ -9925,8 +9946,8 @@ HD HD HD HD -Fl -Fl +AE +AE WS WS WS @@ -10020,7 +10041,7 @@ WS WS WS WS -Fl +AE gS gS Fl @@ -10063,7 +10084,7 @@ gS gS gS KU -Fl +AE WS WS WS @@ -10072,23 +10093,23 @@ WS WS WS WS -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE WS WS WS @@ -10184,7 +10205,7 @@ WS WS WS Fl -Fl +AE gS Fl WS @@ -10226,7 +10247,7 @@ gS gS gS Fl -Fl +AE WS WS WS @@ -10347,7 +10368,7 @@ WS WS WS WS -Fl +AE gS Fl WS @@ -10389,7 +10410,7 @@ gS gS gS aN -Fl +AE WS WS WS @@ -10510,7 +10531,7 @@ WS WS WS WS -Fl +AE gS Fl Fl @@ -10552,7 +10573,7 @@ gS gS gS aN -Fl +AE WS WS WS @@ -10673,7 +10694,7 @@ WS WS WS WS -Fl +AE gS gS Fl @@ -10715,7 +10736,7 @@ RY RY RY Oh -Fl +AE WS WS WS @@ -10836,7 +10857,7 @@ WS WS WS WS -Fl +AE nY gS Fl @@ -10878,7 +10899,7 @@ oS oS oS oS -Fl +AE WS WS WS @@ -10999,7 +11020,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -11041,7 +11062,7 @@ oS Fl Fl oS -Fl +AE WS WS WS @@ -11162,7 +11183,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -11204,7 +11225,7 @@ oS Fl Fl oS -Fl +AE WS WS WS @@ -11325,7 +11346,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -11367,7 +11388,7 @@ oS oS oS oS -Fl +AE WS WS WS @@ -11488,7 +11509,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -11530,7 +11551,7 @@ oS oS oS oS -Fl +AE WS WS WS @@ -11651,7 +11672,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -11693,7 +11714,7 @@ Fl Fl oS oS -Fl +AE WS WS WS @@ -11814,7 +11835,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -11856,7 +11877,7 @@ Fl Fl oS oS -Fl +AE Fl WS WS @@ -11977,7 +11998,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -12020,7 +12041,7 @@ oS oS oS oS -Fl +AE WS WS WS @@ -12140,7 +12161,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -12183,7 +12204,7 @@ oS Fl Fl oS -Fl +AE WS WS WS @@ -12303,7 +12324,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -12346,7 +12367,7 @@ oS Fl Fl oS -Fl +AE WS WS WS @@ -12466,7 +12487,7 @@ WS WS WS WS -Fl +AE pm gS Fl @@ -12509,7 +12530,7 @@ oS oS oS oS -Fl +AE WS WS WS @@ -12629,7 +12650,7 @@ WS WS WS WS -Fl +AE pm gS KU @@ -12672,7 +12693,7 @@ Fl Fl oS oS -Fl +AE WS WS WS @@ -12792,7 +12813,7 @@ WS WS WS WS -Fl +AE pm gS tp @@ -12835,7 +12856,7 @@ Fl Fl oS YJ -Fl +AE WS WS WS @@ -12955,7 +12976,7 @@ WS WS WS WS -Fl +AE pm gS gS @@ -12998,7 +13019,7 @@ oS oS oS oS -Fl +AE WS WS WS @@ -13118,7 +13139,7 @@ WS WS WS WS -Fl +AE Ba nY gS @@ -13161,8 +13182,8 @@ HD HD HD HD -Fl -Fl +AE +AE Fl WS WS @@ -13281,7 +13302,7 @@ WS WS WS WS -Fl +AE Fl sH Jh @@ -13326,8 +13347,8 @@ HD HD HD HD -Fl -Fl +AE +AE Fl WS WS @@ -13445,11 +13466,11 @@ WS WS WS WS -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE Fl gS gS @@ -13491,7 +13512,7 @@ oS HD HD HD -Fl +AE Fl WS WS @@ -13612,16 +13633,16 @@ WS WS WS WS -Fl +AE PF xd gS gS Kn Oh -Fl -Fl -Fl +AE +AE +AE pm gS KU @@ -13655,7 +13676,7 @@ oS oS HD HD -Fl +AE Fl WS WS @@ -13775,16 +13796,16 @@ WS WS WS WS -Fl +AE oS PF RY RY Oh oS -Fl +AE WS -Fl +AE pm gS KU @@ -13819,7 +13840,7 @@ oS oS HD HD -Fl +AE WS WS WS @@ -13938,16 +13959,16 @@ WS WS WS WS -Fl +AE oS oS oS oS oS oS -Fl +AE WS -Fl +AE pm gS KU @@ -13982,7 +14003,7 @@ oS oS oS HD -Fl +AE Fl WS WS @@ -14101,16 +14122,16 @@ WS WS WS WS -Fl +AE Fl oS oS oS oS Fl -Fl +AE WS -Fl +AE pm gS tp @@ -14146,7 +14167,7 @@ Op oS HD HD -Fl +AE WS WS WS @@ -14265,15 +14286,15 @@ WS WS WS WS -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE WS WS -Fl +AE pm gS gS @@ -14310,7 +14331,7 @@ Op oS HD HD -Fl +AE WS WS WS @@ -14436,7 +14457,7 @@ WS WS WS WS -Fl +AE Ba nY gS @@ -14473,7 +14494,7 @@ Op oS HD HD -Fl +AE WS WS WS @@ -14600,7 +14621,7 @@ WS WS WS Fl -Fl +AE sH Jh Jh @@ -14636,7 +14657,7 @@ Op oS HD HD -Fl +AE WS WS WS @@ -14764,24 +14785,24 @@ WS WS WS Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE Fl oS Fl @@ -14799,7 +14820,7 @@ Op oS HD HD -Fl +AE WS WS WS @@ -14945,7 +14966,7 @@ WS WS WS WS -Fl +AE sq Fl Fl @@ -14962,7 +14983,7 @@ Op oS HD Fl -Fl +AE WS WS WS @@ -15108,7 +15129,7 @@ WS WS WS WS -Fl +AE oS oS oS @@ -15124,7 +15145,7 @@ Op oS HD HD -Fl +AE WS WS WS @@ -15270,7 +15291,7 @@ WS WS WS Fl -Fl +AE Fl Fl oS @@ -15287,7 +15308,7 @@ oS oS HD Fl -Fl +AE WS WS WS @@ -15432,7 +15453,7 @@ WS WS WS Fl -Fl +AE ry HD oS @@ -15449,7 +15470,7 @@ oS oS HD HD -Fl +AE WS WS WS @@ -15594,7 +15615,7 @@ WS WS WS Fl -Fl +AE Qh ia yc @@ -15612,7 +15633,7 @@ oS HD HD Fl -Fl +AE WS WS WS @@ -15756,7 +15777,7 @@ WS WS WS WS -Fl +AE ry pm gS @@ -15773,8 +15794,8 @@ oS HD HD HD -Fl -Fl +AE +AE WS WS WS @@ -15919,7 +15940,7 @@ WS WS WS WS -Fl +AE ry pm KZ @@ -15934,8 +15955,8 @@ oS HD HD HD -Fl -Fl +AE +AE Fl WS WS @@ -16082,7 +16103,7 @@ WS WS WS WS -Fl +AE ry pm gS @@ -16095,8 +16116,8 @@ oS mR oS HD -Fl -Fl +AE +AE Fl WS WS @@ -16246,7 +16267,7 @@ WS WS WS Fl -Fl +AE hV Jh RY @@ -16258,7 +16279,7 @@ oS oS HD HD -Fl +AE WS WS WS @@ -16410,7 +16431,7 @@ WS WS WS Fl -Fl +AE ry HD HD @@ -16421,7 +16442,7 @@ HD HD HD Fl -Fl +AE WS WS WS @@ -16574,16 +16595,16 @@ WS WS WS Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +AE +AE +AE +AE +AE +AE +AE +AE +AE +AE WS WS WS diff --git a/_maps/RandomRooms/rcorp/facility/maze2.dmm b/_maps/RandomRooms/rcorp/facility/maze2.dmm index da1562fc7f12..8c701d5be942 100644 --- a/_maps/RandomRooms/rcorp/facility/maze2.dmm +++ b/_maps/RandomRooms/rcorp/facility/maze2.dmm @@ -59,12 +59,23 @@ }, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"gv" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "gw" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 }, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"hp" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "hF" = ( /obj/structure/riser/dark, /turf/open/floor/plasteel/dark, @@ -91,6 +102,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/syndicate, /area/city/outskirts) "nd" = ( @@ -128,6 +140,10 @@ /obj/effect/landmark/abnospawn/hardsupport, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"pT" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "pY" = ( /obj/machinery/light/small, /turf/open/floor/plasteel/dark, @@ -185,6 +201,10 @@ slowdown = 0 }, /area/city/outskirts) +"yq" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "zr" = ( /obj/effect/landmark/abnospawn/rhinobuster, /turf/open/floor/plasteel/dark, @@ -243,6 +263,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "FA" = ( @@ -383,85 +404,85 @@ tZ tZ tZ tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq Fc Fc Fc Fc Fc mW -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -rB -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq +yq +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +pT +yq +yq +gv Fc Fc Fc -mW -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +hp +yq +yq +yq +yq +yq +yq +yq +gv +gv Fc -mW -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +hp +gv +yq +yq +yq +yq +yq +yq +yq rB rB rB @@ -546,7 +567,7 @@ rB rB tZ tZ -tZ +yq df Mz cg @@ -617,7 +638,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -709,8 +730,8 @@ rB rB rB rB -tZ -tZ +yq +yq df Mz cg @@ -780,7 +801,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -873,8 +894,8 @@ rB rB rB rB -tZ -tZ +yq +yq df cg cg @@ -943,7 +964,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -1037,7 +1058,7 @@ rB rB rB rB -tZ +yq df cg cg @@ -1106,7 +1127,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -1200,7 +1221,7 @@ rB rB rB rB -tZ +yq df cg cg @@ -1269,7 +1290,7 @@ tZ NP cg cg -tZ +yq rB rB rB @@ -1363,7 +1384,7 @@ rB rB rB rB -tZ +yq uV cg cg @@ -1432,7 +1453,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -1518,15 +1539,15 @@ rB rB rB rB -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq +yq df cg cg @@ -1595,7 +1616,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -1680,8 +1701,8 @@ rB rB rB rB -tZ -tZ +yq +yq Mz Mz Mz @@ -1758,7 +1779,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -1843,7 +1864,7 @@ rB rB rB rB -tZ +yq Mz Mz tZ @@ -1921,7 +1942,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -2006,7 +2027,7 @@ rB rB rB rB -tZ +yq Mz tZ tZ @@ -2084,7 +2105,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -2169,7 +2190,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -2247,7 +2268,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -2332,7 +2353,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -2410,7 +2431,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -2489,13 +2510,13 @@ rB rB rB rB -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq nC tZ tZ @@ -2573,7 +2594,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -2651,8 +2672,8 @@ rB rB rB rB -tZ -tZ +yq +yq df Mz Mz @@ -2736,7 +2757,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -2814,7 +2835,7 @@ rB rB rB rB -tZ +yq df Mz cg @@ -2899,7 +2920,7 @@ tZ cg cg pY -tZ +yq rB rB rB @@ -2977,7 +2998,7 @@ rB rB rB rB -tZ +yq uV cg cg @@ -3062,7 +3083,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -3140,7 +3161,7 @@ rB rB rB rB -tZ +yq df cg cg @@ -3225,7 +3246,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -3303,7 +3324,7 @@ rB rB rB rB -tZ +yq df cg cg @@ -3388,7 +3409,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -3464,9 +3485,9 @@ rB rB rB rB -tZ -tZ -tZ +yq +yq +yq df cg cg @@ -3551,7 +3572,7 @@ nC cg cg cg -tZ +yq rB rB rB @@ -3627,7 +3648,7 @@ rB rB rB rB -tZ +yq Mz nC Mz @@ -3714,7 +3735,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -3790,7 +3811,7 @@ rB rB rB rB -tZ +yq Mz tZ df @@ -3877,7 +3898,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -3953,7 +3974,7 @@ rB rB rB rB -tZ +yq Mz tZ df @@ -4040,7 +4061,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -4116,7 +4137,7 @@ rB rB rB rB -tZ +yq Mz tZ df @@ -4203,7 +4224,7 @@ tZ NP cg cg -tZ +yq rB rB rB @@ -4279,7 +4300,7 @@ rB rB rB rB -tZ +yq Mz tZ df @@ -4366,7 +4387,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -4442,7 +4463,7 @@ rB rB rB rB -tZ +yq Mz nC Mz @@ -4529,7 +4550,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -4605,7 +4626,7 @@ rB rB rB rB -tZ +yq Mz tZ df @@ -4692,7 +4713,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -4768,7 +4789,7 @@ rB rB rB rB -tZ +yq Mz tZ df @@ -4855,7 +4876,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -4931,7 +4952,7 @@ rB rB rB rB -tZ +yq Mz tZ uV @@ -5018,7 +5039,7 @@ tZ cg cg cg -tZ +yq rB rB rB @@ -5094,7 +5115,7 @@ rB rB rB rB -tZ +yq Mz tZ df @@ -5181,7 +5202,7 @@ tZ FA gw th -tZ +yq rB rB rB @@ -5257,7 +5278,7 @@ rB rB rB rB -tZ +yq Mz tZ tZ @@ -5344,7 +5365,7 @@ tZ hY iA aC -tZ +yq rB rB rB @@ -5420,7 +5441,7 @@ rB rB rB rB -tZ +yq Mz tZ tZ @@ -5506,8 +5527,8 @@ rB tZ tZ iA -tZ -tZ +yq +yq rB rB rB @@ -5583,7 +5604,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -5596,29 +5617,29 @@ tZ tZ tZ nC -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq iA tZ rB @@ -5669,7 +5690,7 @@ rB rB tZ iA -tZ +yq rB rB rB @@ -5746,7 +5767,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -5759,7 +5780,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -5781,7 +5802,7 @@ rB rB rB rB -tZ +yq iA tZ rB @@ -5832,7 +5853,7 @@ rB rB tZ iA -tZ +yq rB rB rB @@ -5909,7 +5930,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -5922,7 +5943,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -5944,7 +5965,7 @@ rB rB rB rB -tZ +yq iA tZ tZ @@ -5995,7 +6016,7 @@ rB rB tZ iA -tZ +yq rB rB rB @@ -6072,7 +6093,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -6085,7 +6106,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -6107,7 +6128,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -6158,7 +6179,7 @@ rB rB tZ iA -tZ +yq rB rB rB @@ -6235,7 +6256,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -6248,7 +6269,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -6270,7 +6291,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -6321,7 +6342,7 @@ rB rB tZ iA -tZ +yq rB rB rB @@ -6398,7 +6419,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -6411,7 +6432,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -6433,7 +6454,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -6484,8 +6505,8 @@ rB rB tZ iA -tZ -tZ +yq +yq rB rB rB @@ -6561,7 +6582,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -6574,7 +6595,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -6596,7 +6617,7 @@ rB rB rB rB -tZ +yq iA iA nB @@ -6648,8 +6669,8 @@ tZ tZ iA eQ -tZ -tZ +yq +yq rB rB rB @@ -6724,7 +6745,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -6737,7 +6758,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -6759,7 +6780,7 @@ rB rB rB rB -tZ +yq iA iA eQ @@ -6812,7 +6833,7 @@ cB iA eQ Mz -tZ +yq rB rB rB @@ -6887,7 +6908,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -6900,7 +6921,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -6922,7 +6943,7 @@ rB rB rB rB -tZ +yq iA iA eQ @@ -6975,7 +6996,7 @@ cB iA eQ Mz -tZ +yq rB rB rB @@ -7050,7 +7071,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -7063,7 +7084,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -7085,7 +7106,7 @@ rB rB rB rB -tZ +yq iA iA eQ @@ -7138,8 +7159,8 @@ Ej FQ aE Mz -tZ -tZ +yq +yq rB rB rB @@ -7213,7 +7234,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -7226,7 +7247,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -7248,7 +7269,7 @@ rB rB rB rB -tZ +yq iA iA eQ @@ -7302,8 +7323,8 @@ Mz Mz Mz Mz -tZ -tZ +yq +yq rB rB rB @@ -7376,7 +7397,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -7389,7 +7410,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -7411,7 +7432,7 @@ rB rB rB rB -tZ +yq iA iA eQ @@ -7449,14 +7470,14 @@ tZ Mz Mz Mz -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq Mz Mz tZ @@ -7466,7 +7487,7 @@ Mz Mz Mz Mz -tZ +yq rB rB rB @@ -7539,7 +7560,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -7552,7 +7573,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -7574,7 +7595,7 @@ rB rB rB rB -tZ +yq iA iA eQ @@ -7612,14 +7633,14 @@ tZ Mz Mz Mz -tZ +yq rB rB rB rB rB rB -tZ +yq Mz Mz tZ @@ -7629,7 +7650,7 @@ Mz Mz Mz Mz -tZ +yq rB rB rB @@ -7702,7 +7723,7 @@ rB rB rB rB -tZ +yq Mz tZ rB @@ -7715,7 +7736,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -7737,7 +7758,7 @@ rB rB rB rB -tZ +yq iA iA oe @@ -7775,14 +7796,14 @@ tZ Mz Mz Mz -tZ +yq rB rB rB rB rB rB -tZ +yq Mz Mz tZ @@ -7792,7 +7813,7 @@ Mz Mz Mz Mz -tZ +yq rB rB rB @@ -7865,7 +7886,7 @@ rB rB rB rB -tZ +yq Mz tZ tZ @@ -7878,7 +7899,7 @@ rB tZ tZ Mz -tZ +yq rB rB rB @@ -7900,7 +7921,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -7938,14 +7959,14 @@ tZ Mz Mz Mz -tZ +yq rB rB rB rB rB rB -tZ +yq Mz Mz Mz @@ -7955,7 +7976,7 @@ Mz Mz Mz Mz -tZ +yq rB rB rB @@ -8028,7 +8049,7 @@ rB rB rB rB -tZ +yq Mz Mz tZ @@ -8041,7 +8062,7 @@ tZ tZ Mz Mz -tZ +yq rB rB rB @@ -8063,7 +8084,7 @@ rB rB rB rB -tZ +yq tj iA iA @@ -8101,14 +8122,14 @@ tZ Mz Mz Mz -tZ +yq rB rB rB rB rB rB -tZ +yq Mz Mz Mz @@ -8118,7 +8139,7 @@ tZ tZ Mz Mz -tZ +yq rB rB rB @@ -8191,8 +8212,8 @@ rB rB rB rB -tZ -tZ +yq +yq Mz Mz Mz @@ -8203,8 +8224,8 @@ Mz Mz Mz Mz -tZ -tZ +yq +yq rB rB rB @@ -8226,8 +8247,8 @@ rB rB rB rB -tZ -tZ +yq +yq iA iA iA @@ -8264,14 +8285,14 @@ tZ Mz Mz Mz -tZ +yq rB rB rB rB rB rB -tZ +yq Mz Mz Mz @@ -8281,7 +8302,7 @@ tZ tZ Mz Mz -tZ +yq rB rB rB @@ -8355,18 +8376,18 @@ rB rB rB rB -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq rB rB rB @@ -8390,8 +8411,8 @@ rB rB rB rB -tZ -tZ +yq +yq iA iA iA @@ -8427,14 +8448,14 @@ tZ Mz Mz Mz -tZ +yq rB rB rB rB rB rB -tZ +yq Mz Mz Mz @@ -8444,7 +8465,7 @@ Mz tZ Mz Mz -tZ +yq rB rB rB @@ -8554,8 +8575,8 @@ rB rB rB rB -tZ -tZ +yq +yq iA iA iA @@ -8590,15 +8611,15 @@ tZ Mz Mz Mz -tZ +yq rB rB rB rB rB rB -tZ -tZ +yq +yq Mz Mz Mz @@ -8607,7 +8628,7 @@ Mz sH Mz Mz -tZ +yq rB rB rB @@ -8718,8 +8739,8 @@ rB rB rB rB -tZ -tZ +yq +yq tj iA iA @@ -8753,7 +8774,7 @@ tZ Mz Mz Mz -tZ +yq rB rB rB @@ -8761,16 +8782,16 @@ rB rB rB rB -tZ -tZ +yq +yq Mz Mz Mz Mz Mz Mz -tZ -tZ +yq +yq rB rB rB @@ -8882,8 +8903,8 @@ rB rB rB rB -tZ -tZ +yq +yq iA iA iA @@ -8916,7 +8937,7 @@ tZ Mz Mz Mz -tZ +yq rB rB rB @@ -8925,14 +8946,14 @@ rB rB rB rB -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq rB rB rB @@ -9046,7 +9067,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -9079,7 +9100,7 @@ tZ Mz Mz Mz -tZ +yq rB rB rB @@ -9209,7 +9230,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -9242,7 +9263,7 @@ tZ Mz Mz Mz -tZ +yq rB rB rB @@ -9372,7 +9393,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -9405,7 +9426,7 @@ Mz Mz Mz Mz -tZ +yq rB rB rB @@ -9535,7 +9556,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -9568,7 +9589,7 @@ Mz Mz Mz Mz -tZ +yq rB rB rB @@ -9698,7 +9719,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -9730,8 +9751,8 @@ Mz Mz Mz Wd -tZ -tZ +yq +yq rB rB rB @@ -9861,7 +9882,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -9892,8 +9913,8 @@ Mz Mz Mz Mz -tZ -tZ +yq +yq rB rB rB @@ -10024,7 +10045,7 @@ rB rB rB rB -tZ +yq iA iA iA @@ -10047,15 +10068,15 @@ tZ tZ tZ Mz -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq +yq rB rB rB @@ -10186,8 +10207,8 @@ rB rB rB rB -tZ -tZ +yq +yq iA iA iA @@ -10210,7 +10231,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -10349,7 +10370,7 @@ rB rB rB rB -tZ +yq cB iA iA @@ -10373,7 +10394,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -10512,7 +10533,7 @@ rB rB rB rB -tZ +yq cB iA iA @@ -10536,7 +10557,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -10675,7 +10696,7 @@ rB rB rB rB -tZ +yq Ej Dr Dr @@ -10699,7 +10720,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -10838,7 +10859,7 @@ rB rB rB rB -tZ +yq Mz cg cg @@ -10862,7 +10883,7 @@ tZ tZ tZ Mz -tZ +yq rB rB rB @@ -10999,9 +11020,9 @@ rB rB rB rB -tZ -tZ -tZ +yq +yq +yq Mz cg cg @@ -11025,7 +11046,7 @@ Mz Mz nC Mz -tZ +yq rB rB rB @@ -11160,9 +11181,9 @@ rB rB rB rB -tZ -tZ -tZ +yq +yq +yq df Mz Mz @@ -11188,7 +11209,7 @@ tZ tZ tZ Mz -tZ +yq rB rB rB @@ -11322,8 +11343,8 @@ rB rB rB rB -tZ -tZ +yq +yq df Mz Mz @@ -11351,7 +11372,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -11484,8 +11505,8 @@ rB rB rB rB -tZ -tZ +yq +yq df Mz cg @@ -11514,7 +11535,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -11647,7 +11668,7 @@ rB rB rB rB -tZ +yq df Mz cg @@ -11677,7 +11698,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -11809,8 +11830,8 @@ rB rB rB rB -tZ -tZ +yq +yq df cg cg @@ -11840,7 +11861,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -11972,7 +11993,7 @@ rB rB rB rB -tZ +yq df Mz cg @@ -12003,7 +12024,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -12135,7 +12156,7 @@ rB rB rB rB -tZ +yq df Mz cg @@ -12166,7 +12187,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -12298,7 +12319,7 @@ rB rB rB rB -tZ +yq df Mz cg @@ -12329,7 +12350,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -12461,8 +12482,8 @@ rB rB rB rB -tZ -tZ +yq +yq df cg cg @@ -12492,7 +12513,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -12625,7 +12646,7 @@ rB rB rB rB -tZ +yq df Mz cg @@ -12655,7 +12676,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -12788,8 +12809,8 @@ rB rB rB rB -tZ -tZ +yq +yq df Mz cg @@ -12818,7 +12839,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -12952,8 +12973,8 @@ rB rB rB rB -tZ -tZ +yq +yq df Mz Mz @@ -12981,7 +13002,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -13116,9 +13137,9 @@ rB rB rB rB -tZ -tZ -tZ +yq +yq +yq df Mz Mz @@ -13144,7 +13165,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -13281,8 +13302,8 @@ rB rB rB rB -tZ -tZ +yq +yq Mz Mz Mz @@ -13307,7 +13328,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -13445,7 +13466,7 @@ rB rB rB rB -tZ +yq cg cg cg @@ -13470,7 +13491,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -13608,7 +13629,7 @@ rB rB rB rB -tZ +yq cg cg cg @@ -13633,7 +13654,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -13771,7 +13792,7 @@ rB rB rB rB -tZ +yq tZ tZ cg @@ -13796,7 +13817,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -13934,7 +13955,7 @@ rB rB rB rB -tZ +yq tZ tZ cg @@ -13959,7 +13980,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -14097,7 +14118,7 @@ rB rB rB rB -tZ +yq cg cg cg @@ -14122,7 +14143,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -14260,7 +14281,7 @@ rB rB rB rB -tZ +yq cg cg tZ @@ -14285,7 +14306,7 @@ rB rB tZ Mz -tZ +yq rB rB rB @@ -14423,7 +14444,7 @@ rB rB rB rB -tZ +yq cg cg tZ @@ -14448,7 +14469,7 @@ tZ tZ tZ Mz -tZ +yq rB rB rB @@ -14586,7 +14607,7 @@ rB rB rB rB -tZ +yq cg cg cg @@ -14611,7 +14632,7 @@ Mz Mz Mz Mz -tZ +yq rB rB rB @@ -14749,7 +14770,7 @@ rB rB rB rB -tZ +yq cg tZ tZ @@ -14766,15 +14787,15 @@ hF cg Mz Mz -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq +yq rB rB rB @@ -14912,7 +14933,7 @@ rB rB rB rB -tZ +yq NP tZ tZ @@ -14928,8 +14949,8 @@ tZ hF cg Mz -tZ -tZ +yq +yq rB rB rB @@ -15075,7 +15096,7 @@ rB rB rB rB -tZ +yq cg cg cg @@ -15091,7 +15112,7 @@ hF cg Mz Mz -tZ +yq rB rB rB @@ -15236,9 +15257,9 @@ rB rB rB rB -tZ -tZ -tZ +yq +yq +yq tZ cg cg @@ -15253,8 +15274,8 @@ cg cg cg Mz -tZ -tZ +yq +yq rB rB rB @@ -15398,8 +15419,8 @@ rB rB rB rB -tZ -tZ +yq +yq df Mz cg @@ -15416,7 +15437,7 @@ cg cg Mz Mz -tZ +yq rB rB rB @@ -15560,8 +15581,8 @@ rB rB rB rB -tZ -tZ +yq +yq Xe JK gw @@ -15578,8 +15599,8 @@ cg cg Mz Mz -tZ -tZ +yq +yq rB rB rB @@ -15723,7 +15744,7 @@ rB rB rB rB -tZ +yq df cB iA @@ -15740,8 +15761,8 @@ cg Mz Mz Mz -tZ -tZ +yq +yq rB rB rB @@ -15886,7 +15907,7 @@ rB rB rB rB -tZ +yq df cB Um @@ -15901,9 +15922,9 @@ cg Mz Mz Mz -tZ -tZ -tZ +yq +yq +yq rB rB rB @@ -16049,7 +16070,7 @@ rB rB rB rB -tZ +yq df cB iA @@ -16062,9 +16083,9 @@ cg mR cg Mz -tZ -tZ -tZ +yq +yq +yq rB rB rB @@ -16212,8 +16233,8 @@ rB rB rB rB -tZ -tZ +yq +yq Ev FQ Dr @@ -16225,7 +16246,7 @@ cg cg Mz Mz -tZ +yq rB rB rB @@ -16376,8 +16397,8 @@ rB rB rB rB -tZ -tZ +yq +yq df Mz Mz @@ -16387,8 +16408,8 @@ Mz Mz Mz Mz -tZ -tZ +yq +yq rB rB rB @@ -16540,17 +16561,17 @@ rB rB rB rB -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ -tZ +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq +yq rB rB rB diff --git a/_maps/RandomRooms/rcorp/facility/nest.dmm b/_maps/RandomRooms/rcorp/facility/nest.dmm index a8d77ebda95c..b124257b9096 100644 --- a/_maps/RandomRooms/rcorp/facility/nest.dmm +++ b/_maps/RandomRooms/rcorp/facility/nest.dmm @@ -283,9 +283,7 @@ dir = 4; pixel_y = 10 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/plating/ashplanet, /area/city/outskirts) "fe" = ( @@ -340,13 +338,8 @@ /turf/open/floor/mineral/plastitanium, /area/city/outskirts) "gJ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 2 - }, -/obj/effect/decal/cleanable/blood/footprints{ - dir = 4 - }, -/turf/open/floor/plating/ashplanet, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, /area/city/outskirts) "gT" = ( /obj/structure/grille/broken, @@ -938,6 +931,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/closed/indestructible/syndicate, /area/city/outskirts) "rV" = ( @@ -1294,6 +1288,11 @@ }, /turf/open/floor/facility/dark, /area/city/outskirts) +"yh" = ( +/obj/structure/sign/poster/contraband/city_cola, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "yk" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/plasteel/airless/white, @@ -1362,9 +1361,7 @@ /turf/open/floor/carpet/green, /area/city/outskirts) "zt" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/plasteel/dark, /area/city/outskirts) "zA" = ( @@ -1771,6 +1768,10 @@ }, /turf/open/floor/plating/ashplanet, /area/city/outskirts) +"Im" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "IL" = ( /obj/structure/table/reinforced, /obj/machinery/light/small{ @@ -1817,10 +1818,8 @@ /turf/open/floor/plasteel/dark, /area/city/outskirts) "Jj" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 2 - }, -/turf/open/floor/plating/ashplanet, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, /area/city/outskirts) "Jl" = ( /obj/effect/decal/cleanable/blood/gibs/body, @@ -2054,6 +2053,13 @@ /obj/structure/curtain/cloth/fancy, /turf/open/floor/wood, /area/city/outskirts) +"NX" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Oe" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/dry_ramen{ @@ -2071,6 +2077,7 @@ /area/city/outskirts) "OL" = ( /obj/machinery/door/poddoor/shutters/indestructible, +/obj/effect/landmark/nobasic_incorp_move, /turf/open/floor/carpet/black, /area/city/outskirts) "OQ" = ( @@ -2202,6 +2209,11 @@ /obj/structure/sign/poster/contraband/city_cola, /turf/closed/indestructible/syndicate, /area/city/outskirts) +"Rb" = ( +/obj/structure/sign/poster, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Ri" = ( /obj/machinery/vending/donksofttoyvendor, /turf/open/floor/wood, @@ -2553,6 +2565,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "XA" = ( @@ -2654,9 +2667,7 @@ /turf/open/floor/plasteel/dark, /area/city/outskirts) "YJ" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plasteel/dark, /area/city/outskirts) @@ -2789,17 +2800,100 @@ cg cg cg wQ -wQ -wQ +Jj +Jj +Xr Xr Xr Xr Xr +NX +Jj +Jj +Jj +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +gJ +Im +Xr +Xr +Xr +rQ +Jj +Jj +Jj +Jj +Jj +Jj +Im +Im Xr rQ -wQ -wQ -wQ +Im +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Rb +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +gJ cg cg cg @@ -2828,6 +2922,58 @@ cg cg cg cg +"} +(2,1,1) = {" +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +OL +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +lo +mI +mI +mI +Ts +uh +mI +mI +hD +RW +wQ cg cg cg @@ -2842,46 +2988,6 @@ cg cg cg cg -wQ -Xr -Xr -Xr -rQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -Xr -rQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -Bc -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ cg cg cg @@ -2910,141 +3016,46 @@ cg cg cg cg -cg -"} -(2,1,1) = {" -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -OL -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -lo -mI -mI -mI -Jj -uh -mI -mI -hD -RW -wQ -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -cg -nx -yy -yy -yy -yy -rf -yy -yy -yy -yy -yy -yy -yy -yy -yy -yy -rf -yy -yy -yy -yy -Nl -yy -yy -yy -yy -yy -yy -yy -rf -yy -yy -yy -yy -yy -Nl -rf -yy -yy -wQ +nx +yy +yy +yy +yy +rf +yy +yy +yy +yy +yy +yy +yy +yy +yy +yy +rf +yy +yy +yy +yy +Nl +yy +yy +yy +yy +yy +yy +yy +rf +yy +yy +yy +yy +yy +Nl +rf +yy +yy +Jj cg cg cg @@ -3076,7 +3087,7 @@ cg cg "} (3,1,1) = {" -wQ +Jj Sr Sr Sr @@ -3119,7 +3130,7 @@ lx mI mI hD -Jj +Ts uh mI mI @@ -3207,7 +3218,7 @@ yy yy yy yy -wQ +Jj cg cg cg @@ -3239,7 +3250,7 @@ cg cg "} (4,1,1) = {" -wQ +Jj PH Dq Dq @@ -3282,7 +3293,7 @@ lx mI mI mI -Jj +Ts uh hD mI @@ -3370,7 +3381,7 @@ yy yy yy yy -wQ +Jj cg cg cg @@ -3402,7 +3413,7 @@ cg cg "} (5,1,1) = {" -wQ +Jj Hx rn rn @@ -3445,7 +3456,7 @@ lx mI mI mI -Jj +Ts uh mI mI @@ -3533,7 +3544,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -3565,7 +3576,7 @@ cg cg "} (6,1,1) = {" -wQ +Jj Hx rn XF @@ -3608,7 +3619,7 @@ lx hD mI mI -Jj +Ts uh mI mI @@ -3696,7 +3707,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -3728,7 +3739,7 @@ cg cg "} (7,1,1) = {" -wQ +Jj Hx rn XF @@ -3771,7 +3782,7 @@ lx mI mI mI -Jj +Ts uh mI mI @@ -3859,7 +3870,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -3891,7 +3902,7 @@ cg cg "} (8,1,1) = {" -wQ +Jj Hx rn XF @@ -3934,7 +3945,7 @@ ZL mI mI mI -Jj +Ts uh mI mI @@ -4022,7 +4033,7 @@ wQ yy yy yy -Bc +Rb cg cg cg @@ -4054,7 +4065,7 @@ cg cg "} (9,1,1) = {" -wQ +Jj Hx rn XF @@ -4097,7 +4108,7 @@ lx mI mI hD -Jj +Ts uh mI mI @@ -4185,7 +4196,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -4217,7 +4228,7 @@ cg cg "} (10,1,1) = {" -wQ +Jj Hx rn XF @@ -4348,7 +4359,7 @@ wQ yy yy Nl -wQ +Jj cg cg cg @@ -4380,7 +4391,7 @@ cg cg "} (11,1,1) = {" -wQ +Jj Hx rn XF @@ -4511,7 +4522,7 @@ Bc yy yy yy -wQ +Jj cg cg cg @@ -4543,7 +4554,7 @@ cg cg "} (12,1,1) = {" -wQ +Jj Hx rn XF @@ -4674,7 +4685,7 @@ wQ XO yy yy -wQ +Jj cg cg cg @@ -4706,7 +4717,7 @@ cg cg "} (13,1,1) = {" -wQ +Jj Hx rn XF @@ -4837,7 +4848,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -4869,7 +4880,7 @@ cg cg "} (14,1,1) = {" -wQ +Jj Hx rn XF @@ -4912,7 +4923,7 @@ lx mI mI mI -gJ +al eF Jb Jb @@ -5000,7 +5011,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -5032,7 +5043,7 @@ cg cg "} (15,1,1) = {" -wQ +Jj Hx rn XF @@ -5163,7 +5174,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -5195,7 +5206,7 @@ cg cg "} (16,1,1) = {" -wQ +Jj Hx rn XF @@ -5326,7 +5337,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -5358,7 +5369,7 @@ cg cg "} (17,1,1) = {" -wQ +Jj Hx rn rn @@ -5458,7 +5469,7 @@ mI mI mI mI -Jj +Ts uh mI mI @@ -5489,7 +5500,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -5521,7 +5532,7 @@ cg cg "} (18,1,1) = {" -wQ +Jj xn QK QK @@ -5621,7 +5632,7 @@ mI mI YS mI -Jj +Ts uh mI mI @@ -5652,7 +5663,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -5684,7 +5695,7 @@ cg cg "} (19,1,1) = {" -wQ +Jj pw wQ Sr @@ -5815,7 +5826,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -5847,7 +5858,7 @@ cg cg "} (20,1,1) = {" -wQ +Jj Ld wQ Sr @@ -5978,7 +5989,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -6010,7 +6021,7 @@ cg cg "} (21,1,1) = {" -wQ +Jj Ld wQ pw @@ -6141,7 +6152,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -6173,7 +6184,7 @@ cg cg "} (22,1,1) = {" -wQ +Jj Mm wQ Ld @@ -6304,7 +6315,7 @@ wQ yy yy yy -wQ +Jj cg cg cg @@ -6336,7 +6347,7 @@ cg cg "} (23,1,1) = {" -wQ +Jj Ld wQ Ld @@ -6467,7 +6478,7 @@ yy yy yy yy -wQ +Jj cg cg cg @@ -6499,7 +6510,7 @@ cg cg "} (24,1,1) = {" -wQ +Jj Ld wQ Ld @@ -6630,7 +6641,7 @@ yy yy yy yy -wQ +Jj cg cg cg @@ -6662,7 +6673,7 @@ cg cg "} (25,1,1) = {" -wQ +Jj Ld wQ Ld @@ -6793,7 +6804,7 @@ yy yy VJ yy -wQ +Jj cg cg cg @@ -6825,7 +6836,7 @@ cg cg "} (26,1,1) = {" -wQ +Jj Ld wQ Ld @@ -6953,9 +6964,9 @@ mI mI wT wQ -wQ -wQ -wQ +Jj +Jj +Jj wQ cg cg @@ -6988,7 +6999,7 @@ cg cg "} (27,1,1) = {" -wQ +Jj Ld wQ Mm @@ -7115,7 +7126,7 @@ mI mI ks wT -wQ +Jj cg cg cg @@ -7151,7 +7162,7 @@ cg cg "} (28,1,1) = {" -wQ +Jj Ld wQ Ld @@ -7278,7 +7289,7 @@ mI mI hD wT -wQ +Jj cg cg cg @@ -7314,7 +7325,7 @@ cg cg "} (29,1,1) = {" -wQ +Jj Ld Ld Ld @@ -7441,7 +7452,7 @@ mI mI mI wT -Bc +Rb cg cg cg @@ -7477,7 +7488,7 @@ cg cg "} (30,1,1) = {" -wQ +Jj Ld Hp wQ @@ -7604,7 +7615,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -7640,7 +7651,7 @@ cg cg "} (31,1,1) = {" -wQ +Jj Ld Ld Ld @@ -7767,7 +7778,7 @@ mI mI hD wT -wQ +Jj cg cg cg @@ -7803,7 +7814,7 @@ cg cg "} (32,1,1) = {" -wQ +Jj Mm dd Ld @@ -7930,7 +7941,7 @@ mI mI mI dm -wQ +Jj cg cg cg @@ -7966,7 +7977,7 @@ cg cg "} (33,1,1) = {" -wQ +Jj Ld Ld Ld @@ -8093,7 +8104,7 @@ mI wh mI wT -wQ +Jj cg cg cg @@ -8129,7 +8140,7 @@ cg cg "} (34,1,1) = {" -wQ +Jj Ld Ld Ld @@ -8256,7 +8267,7 @@ hD mI mI wT -wQ +Jj cg cg cg @@ -8292,7 +8303,7 @@ cg cg "} (35,1,1) = {" -wQ +Jj jb wQ wQ @@ -8419,7 +8430,7 @@ mI mI mI wT -QU +yh cg cg cg @@ -8455,7 +8466,7 @@ cg cg "} (36,1,1) = {" -wQ +Jj Ld wQ Ld @@ -8582,7 +8593,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -8618,7 +8629,7 @@ cg cg "} (37,1,1) = {" -wQ +Jj Ld wQ Ld @@ -8745,7 +8756,7 @@ mI mI hD wT -wQ +Jj cg cg cg @@ -8781,7 +8792,7 @@ cg cg "} (38,1,1) = {" -wQ +Jj Ld wQ Ld @@ -8908,7 +8919,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -8944,7 +8955,7 @@ cg cg "} (39,1,1) = {" -wQ +Jj Ld wQ Mm @@ -9071,7 +9082,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -9107,7 +9118,7 @@ cg cg "} (40,1,1) = {" -wQ +Jj Ld wQ Ld @@ -9234,7 +9245,7 @@ mI mI Br wT -wQ +Jj cg cg cg @@ -9270,7 +9281,7 @@ cg cg "} (41,1,1) = {" -wQ +Jj Ld wQ Ld @@ -9397,7 +9408,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -9433,7 +9444,7 @@ cg cg "} (42,1,1) = {" -wQ +Jj Ld wQ Ld @@ -9560,7 +9571,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -9596,7 +9607,7 @@ cg cg "} (43,1,1) = {" -wQ +Jj Ld wQ Ld @@ -9723,7 +9734,7 @@ hD mI mI wT -wQ +Jj cg cg cg @@ -9759,7 +9770,7 @@ cg cg "} (44,1,1) = {" -wQ +Jj Ld wQ Ld @@ -9886,7 +9897,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -9922,7 +9933,7 @@ cg cg "} (45,1,1) = {" -wQ +Jj Ld wQ Ld @@ -10049,7 +10060,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -10085,7 +10096,7 @@ cg cg "} (46,1,1) = {" -wQ +Jj Ld wQ Ld @@ -10212,7 +10223,7 @@ mI mI hD wT -wQ +Jj cg cg cg @@ -10248,7 +10259,7 @@ cg cg "} (47,1,1) = {" -wQ +Jj Ld wQ Ld @@ -10375,7 +10386,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -10411,7 +10422,7 @@ cg cg "} (48,1,1) = {" -wQ +Jj Mm wQ Mm @@ -10538,7 +10549,7 @@ wh wh mI wT -Bc +Rb cg cg cg @@ -10574,7 +10585,7 @@ cg cg "} (49,1,1) = {" -wQ +Jj Ld wQ Ld @@ -10701,7 +10712,7 @@ mI mI hD wT -wQ +Jj cg cg cg @@ -10737,7 +10748,7 @@ cg cg "} (50,1,1) = {" -wQ +Jj Ld wQ Ld @@ -10864,7 +10875,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -10900,7 +10911,7 @@ cg cg "} (51,1,1) = {" -wQ +Jj Ld wQ Ld @@ -11027,7 +11038,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -11063,7 +11074,7 @@ cg cg "} (52,1,1) = {" -wQ +Jj Ld wQ Ld @@ -11190,7 +11201,7 @@ hD mI mI dm -wQ +Jj cg cg cg @@ -11226,7 +11237,7 @@ cg cg "} (53,1,1) = {" -wQ +Jj Ld wQ Ld @@ -11353,7 +11364,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -11389,7 +11400,7 @@ cg cg "} (54,1,1) = {" -wQ +Jj Ld wQ Ld @@ -11516,7 +11527,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -11552,7 +11563,7 @@ cg cg "} (55,1,1) = {" -wQ +Jj Ld Ld Ld @@ -11679,7 +11690,7 @@ mI mI hD wT -wQ +Jj cg cg cg @@ -11715,7 +11726,7 @@ cg cg "} (56,1,1) = {" -wQ +Jj jb wQ wQ @@ -11842,7 +11853,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -11878,7 +11889,7 @@ cg cg "} (57,1,1) = {" -wQ +Jj Ld wQ Ld @@ -11921,7 +11932,7 @@ lx hD wh mI -Jj +Ts uh mI mI @@ -12005,7 +12016,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -12041,7 +12052,7 @@ cg cg "} (58,1,1) = {" -wQ +Jj Ld wQ aH @@ -12084,7 +12095,7 @@ jh mI mI mI -Jj +Ts uh mI mI @@ -12162,13 +12173,13 @@ YS mI mI mI -Jj +Ts uh mI ks mI wT -wQ +Jj cg cg cg @@ -12204,7 +12215,7 @@ cg cg "} (59,1,1) = {" -wQ +Jj Mm wQ wQ @@ -12247,7 +12258,7 @@ mI mI mI hD -Jj +Ts uh Br mI @@ -12325,13 +12336,13 @@ mI mI mI wh -Jj +Ts uh mI mI mI wT -wQ +Jj cg cg cg @@ -12367,7 +12378,7 @@ cg cg "} (60,1,1) = {" -wQ +Jj Ld wQ Be @@ -12410,7 +12421,7 @@ mI mI mI mI -Jj +Ts uh mI mI @@ -12488,13 +12499,13 @@ mI mI YS mI -Jj +Ts uh mI mI mI wT -wQ +Jj cg cg cg @@ -12530,7 +12541,7 @@ cg cg "} (61,1,1) = {" -wQ +Jj Ld wQ tA @@ -12573,7 +12584,7 @@ mI mI mI mI -Jj +Ts eF Jb Jb @@ -12657,7 +12668,7 @@ mI mI mI wT -Bc +Rb cg cg cg @@ -12693,7 +12704,7 @@ cg cg "} (62,1,1) = {" -wQ +Jj Ld wQ ww @@ -12820,7 +12831,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -12856,7 +12867,7 @@ cg cg "} (63,1,1) = {" -wQ +Jj Ld wQ tA @@ -12983,7 +12994,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -13019,7 +13030,7 @@ cg cg "} (64,1,1) = {" -wQ +Jj Ld wQ ww @@ -13146,7 +13157,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -13182,7 +13193,7 @@ cg cg "} (65,1,1) = {" -wQ +Jj Ld wQ tA @@ -13309,7 +13320,7 @@ mI mI mI wT -wQ +Jj cg cg cg @@ -13345,7 +13356,7 @@ cg cg "} (66,1,1) = {" -wQ +Jj Mm wQ ww @@ -13472,7 +13483,7 @@ uv uv uv jT -wQ +Jj cg cg cg @@ -13508,7 +13519,7 @@ cg cg "} (67,1,1) = {" -wQ +Jj Ld wQ tA @@ -13635,7 +13646,7 @@ wQ Bc wQ cZ -wQ +Jj cg cg cg @@ -13671,7 +13682,7 @@ cg cg "} (68,1,1) = {" -wQ +Jj Ld wQ ww @@ -13798,7 +13809,7 @@ wl sz mj TP -wQ +Jj cg cg cg @@ -13834,7 +13845,7 @@ cg cg "} (69,1,1) = {" -wQ +Jj Ld wQ tA @@ -13961,7 +13972,7 @@ mj ru oZ aF -wQ +Jj cg cg cg @@ -13997,7 +14008,7 @@ cg cg "} (70,1,1) = {" -wQ +Jj Ld wQ tA @@ -14124,7 +14135,7 @@ mj Ke pI WI -wQ +Jj cg cg cg @@ -14160,7 +14171,7 @@ cg cg "} (71,1,1) = {" -wQ +Jj Ld wQ yE @@ -14287,7 +14298,7 @@ sz LA mj ru -wQ +Jj cg cg cg @@ -14323,7 +14334,7 @@ cg cg "} (72,1,1) = {" -wQ +Jj Ld wQ AQ @@ -14450,7 +14461,7 @@ mj LA mj qd -wQ +Jj cg cg cg @@ -14486,7 +14497,7 @@ cg cg "} (73,1,1) = {" -wQ +Jj Mm wQ tA @@ -14613,7 +14624,7 @@ ru WX FL Eu -wQ +Jj cg cg cg @@ -14649,7 +14660,7 @@ cg cg "} (74,1,1) = {" -wQ +Jj Ld wQ tA @@ -14776,7 +14787,7 @@ wl mj mj mj -wQ +Jj cg cg cg @@ -14812,7 +14823,7 @@ cg cg "} (75,1,1) = {" -wQ +Jj Ld wQ yE @@ -14940,7 +14951,7 @@ wQ wQ cZ wQ -wQ +Jj cg cg cg @@ -14975,7 +14986,7 @@ cg cg "} (76,1,1) = {" -wQ +Jj Ld wQ YA @@ -15103,7 +15114,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -15138,7 +15149,7 @@ cg cg "} (77,1,1) = {" -wQ +Jj pw wQ rF @@ -15266,7 +15277,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -15301,7 +15312,7 @@ cg cg "} (78,1,1) = {" -wQ +Jj Sw Sa Sa @@ -15429,7 +15440,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -15464,7 +15475,7 @@ cg cg "} (79,1,1) = {" -wQ +Jj pa Du Hr @@ -15592,7 +15603,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -15627,7 +15638,7 @@ cg cg "} (80,1,1) = {" -wQ +Jj pa Hr Hr @@ -15755,7 +15766,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -15790,7 +15801,7 @@ cg cg "} (81,1,1) = {" -wQ +Jj pa Hr Hr @@ -15918,7 +15929,7 @@ Bc mI mI NR -wQ +Jj cg cg cg @@ -15953,7 +15964,7 @@ cg cg "} (82,1,1) = {" -wQ +Jj pa Hr iq @@ -16081,7 +16092,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -16116,7 +16127,7 @@ cg cg "} (83,1,1) = {" -wQ +Jj pa Hr Kr @@ -16244,7 +16255,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -16279,7 +16290,7 @@ cg cg "} (84,1,1) = {" -wQ +Jj pa Hr Kr @@ -16407,7 +16418,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -16442,7 +16453,7 @@ cg cg "} (85,1,1) = {" -wQ +Jj pa Hr Hr @@ -16570,7 +16581,7 @@ wQ mI mI zd -wQ +Jj cg cg cg @@ -16605,7 +16616,7 @@ cg cg "} (86,1,1) = {" -wQ +Jj pa Hr Hr @@ -16733,7 +16744,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -16768,7 +16779,7 @@ cg cg "} (87,1,1) = {" -wQ +Jj nt Hr Kr @@ -16896,7 +16907,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -16931,7 +16942,7 @@ cg cg "} (88,1,1) = {" -wQ +Jj pa Hr Uk @@ -17059,7 +17070,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -17094,7 +17105,7 @@ cg cg "} (89,1,1) = {" -wQ +Jj pa Hr Hr @@ -17194,7 +17205,7 @@ mI mI mI mI -Jj +Ts uh mI mI @@ -17222,7 +17233,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -17257,7 +17268,7 @@ cg cg "} (90,1,1) = {" -wQ +Jj pa Hr Hr @@ -17357,7 +17368,7 @@ mI ks mI mI -Jj +Ts uh mI mI @@ -17385,7 +17396,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -17420,7 +17431,7 @@ cg cg "} (91,1,1) = {" -wQ +Jj pa Hr iq @@ -17520,7 +17531,7 @@ mI mI mI mI -Jj +Ts uh mI mI @@ -17548,7 +17559,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -17583,7 +17594,7 @@ cg cg "} (92,1,1) = {" -wQ +Jj pa Hr Kr @@ -17711,7 +17722,7 @@ wQ mI mI mI -wQ +Jj cg cg cg @@ -17746,7 +17757,7 @@ cg cg "} (93,1,1) = {" -wQ +Jj pa Du Kr @@ -17874,7 +17885,7 @@ mI mI mI mI -wQ +Jj cg cg cg @@ -17909,7 +17920,7 @@ cg cg "} (94,1,1) = {" -wQ +Jj pa Hr Hr @@ -18037,7 +18048,7 @@ mI mI mI NR -Bc +Rb cg cg cg @@ -18072,7 +18083,7 @@ cg cg "} (95,1,1) = {" -wQ +Jj pa Hr Hr @@ -18111,7 +18122,7 @@ mI mI wQ wQ -wQ +Jj wQ wQ mI @@ -18200,7 +18211,7 @@ mI mI mI mI -wQ +Jj cg cg cg @@ -18235,7 +18246,7 @@ cg cg "} (96,1,1) = {" -wQ +Jj pa Hr Hr @@ -18273,9 +18284,9 @@ mI mI mI AH -wQ +Jj cg -wQ +Jj lx mI mI @@ -18349,21 +18360,21 @@ HI oV oV wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj mI mI mI -wQ +Jj cg cg cg @@ -18398,7 +18409,7 @@ cg cg "} (97,1,1) = {" -wQ +Jj mf yZ yZ @@ -18436,9 +18447,9 @@ mI mI mI AH -wQ +Jj cg -wQ +Jj HM uv uv @@ -18511,7 +18522,7 @@ KP xV oV oV -wQ +Jj cg cg cg @@ -18523,9 +18534,9 @@ cg cg cg wQ -wQ -wQ -wQ +Jj +Jj +Jj wQ cg cg @@ -18561,24 +18572,24 @@ cg cg "} (98,1,1) = {" -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj AH AH AH @@ -18599,81 +18610,81 @@ yf AH AH AH -wQ +Jj cg wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -Bc -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -Bc -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Rb +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Rb +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj wQ cg cg @@ -18742,26 +18753,26 @@ cg cg cg wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -Bc -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ -wQ +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Rb +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj +Jj wQ cg cg diff --git a/_maps/RandomRooms/rcorp/facility/offices.dmm b/_maps/RandomRooms/rcorp/facility/offices.dmm index c44499e278ff..714b0cdeb132 100644 --- a/_maps/RandomRooms/rcorp/facility/offices.dmm +++ b/_maps/RandomRooms/rcorp/facility/offices.dmm @@ -46,6 +46,13 @@ /obj/structure/chair/sofa/corp/left, /turf/open/floor/plasteel, /area/city/outskirts) +"eS" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "fa" = ( /obj/structure/chair/office{ dir = 1 @@ -213,6 +220,11 @@ }, /turf/open/floor/plasteel, /area/city/outskirts) +"rI" = ( +/obj/structure/sign/poster/lobotomycorp/random, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "rS" = ( /obj/machinery/light{ dir = 4 @@ -274,6 +286,17 @@ }, /turf/open/floor/wood, /area/city/outskirts) +"xR" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) +"yT" = ( +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/open/floor/plating/asteroid, +/area/city/outskirts) "zh" = ( /obj/effect/turf_decal/siding/purple/corner{ dir = 1 @@ -296,6 +319,10 @@ /obj/structure/chair/comfy/black, /turf/open/floor/carpet/red, /area/city/outskirts) +"Dt" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Dw" = ( /obj/effect/turf_decal/siding/purple{ dir = 6 @@ -379,6 +406,10 @@ "Of" = ( /turf/open/floor/carpet/red, /area/city/outskirts) +"Og" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Po" = ( /obj/effect/turf_decal/siding/purple/corner{ dir = 4 @@ -506,78 +537,78 @@ Fl Fl Fl Fl +Og Fl Fl -Fl -oX -oX -oX -oX -oX -iB -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -Fl -Fl -Fl -oX oX oX -iB -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl oX oX oX iB -Fl +Og +Og +Og +Og +Og +Og +Og +Og +Og +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +xR +Og +Og +Dt +yT +yT +yT +eS +Og +Og +Og +Og +Og +Og +Og +Dt +yT +yT +yT +eS +Og Fl Fl Fl @@ -670,14 +701,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl +Og WS WS WS @@ -723,7 +754,7 @@ WS WS Fl Fl -Fl +Og HD Ub HD @@ -739,7 +770,7 @@ Fl Ub HD HD -Fl +Og WS WS WS @@ -833,15 +864,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl -WS +Og WS WS WS @@ -887,6 +917,7 @@ WS WS WS WS +xR HD Ub HD @@ -902,7 +933,7 @@ Fl HD HD Ub -Fl +Og WS WS WS @@ -996,15 +1027,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl -WS +Og WS WS WS @@ -1050,6 +1080,7 @@ WS WS WS WS +xR HD Ub Ub @@ -1065,7 +1096,7 @@ WS Ub HD Ub -Fl +Og WS WS WS @@ -1159,15 +1190,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl -WS +Og WS WS WS @@ -1213,6 +1243,7 @@ WS WS WS WS +xR HD HD Ub @@ -1228,7 +1259,7 @@ WS Ub HD HD -WS +xR WS WS WS @@ -1322,15 +1353,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl -WS +Og WS WS WS @@ -1376,6 +1406,7 @@ WS WS WS WS +xR HD HD Ub @@ -1391,7 +1422,7 @@ WS Ub HD HD -WS +xR WS WS WS @@ -1485,15 +1516,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl -WS +Og WS WS WS @@ -1539,6 +1569,7 @@ WS WS WS WS +xR HD HD Ub @@ -1554,7 +1585,7 @@ WS Ub HD HD -WS +xR WS WS WS @@ -1648,15 +1679,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl -WS +Og WS WS WS @@ -1702,6 +1732,7 @@ WS WS WS WS +xR HD HD Ub @@ -1717,7 +1748,7 @@ WS Ub Ub HD -WS +xR WS WS WS @@ -1811,15 +1842,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl -WS +Og WS WS WS @@ -1865,6 +1895,7 @@ WS WS WS WS +xR HD HD Ub @@ -1880,7 +1911,7 @@ WS HD HD Ub -WS +xR WS WS WS @@ -1974,15 +2005,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl -WS +Og WS WS WS @@ -2028,6 +2058,7 @@ WS WS WS WS +xR Ub HD HD @@ -2043,7 +2074,7 @@ Fl HD HD Ub -Fl +Og WS WS WS @@ -2137,14 +2168,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl +Og WS WS WS @@ -2190,7 +2221,7 @@ WS WS WS WS -Fl +Og Ub Ub Ub @@ -2206,7 +2237,7 @@ Fl HD HD HD -Fl +Og WS WS WS @@ -2300,14 +2331,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl +Og WS WS WS @@ -2353,7 +2384,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -2369,7 +2400,7 @@ Fl Ub HD HD -Fl +Og WS WS WS @@ -2463,14 +2494,14 @@ WS WS WS WS -Fl +Og oS oS oS oS oS oS -Fl +Og WS WS WS @@ -2516,7 +2547,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -2532,7 +2563,7 @@ lW HD HD HD -Fl +Og WS WS WS @@ -2626,14 +2657,14 @@ WS WS WS WS -Fl +Og oS oS bn oS oS oS -Fl +Og WS WS WS @@ -2679,7 +2710,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -2695,7 +2726,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -2790,12 +2821,12 @@ WS WS WS Fl -Fl +Og oS oS oS oS -Fl +Og Fl WS WS @@ -2842,7 +2873,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -2858,7 +2889,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -2954,10 +2985,10 @@ WS WS WS Fl -Fl -Fl -Fl -Fl +Og +Og +Og +Og Fl WS WS @@ -3005,7 +3036,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -3021,7 +3052,7 @@ Ub Ub HD HD -Fl +Og WS WS WS @@ -3168,7 +3199,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -3184,7 +3215,7 @@ Ub Ub HD HD -Fl +Og WS WS WS @@ -3331,7 +3362,7 @@ WS WS WS WS -Fl +Og HD Ub HD @@ -3347,7 +3378,7 @@ Ub Ub HD HD -Fl +Og WS WS WS @@ -3494,7 +3525,7 @@ WS WS WS WS -Fl +Og HD Ub Ub @@ -3510,7 +3541,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -3657,7 +3688,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -3673,7 +3704,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -3820,7 +3851,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -3836,7 +3867,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -3983,7 +4014,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -3999,7 +4030,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -4146,7 +4177,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -4162,7 +4193,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -4305,10 +4336,10 @@ WS WS WS WS -Fl -Fl -Fl -Fl +Og +Og +Og +Og Fl Fl Fl @@ -4326,10 +4357,10 @@ aJ Fl Fl Fl -Fl -Fl -Fl -Fl +Og +Og +Og +Og WS WS WS @@ -4468,7 +4499,7 @@ WS WS WS WS -Fl +Og xb vT Iq @@ -4492,7 +4523,7 @@ vT Iq vT xb -Fl +Og WS WS WS @@ -4631,7 +4662,7 @@ WS WS WS WS -Fl +Og xb Tn cH @@ -4655,7 +4686,7 @@ vT cH Ez xb -Fl +Og WS WS WS @@ -4794,7 +4825,7 @@ WS WS WS WS -Fl +Og Uj vT cH @@ -4818,7 +4849,7 @@ vT cH vT Uj -Fl +Og WS WS WS @@ -4957,7 +4988,7 @@ WS WS WS WS -Fl +Og Uj vT vT @@ -4981,7 +5012,7 @@ vT vT vT Uj -Fl +Og WS WS WS @@ -5120,7 +5151,7 @@ WS WS WS WS -Fl +Og Fl Fl Fl @@ -5144,7 +5175,7 @@ Fl Fl Fl Fl -Fl +Og WS WS WS @@ -5283,7 +5314,7 @@ WS WS WS WS -Fl +Og xb vT Iq @@ -5307,7 +5338,7 @@ vT Iq vT xb -Fl +Og WS WS WS @@ -5446,7 +5477,7 @@ WS WS WS WS -Fl +Og xb Tn cH @@ -5470,7 +5501,7 @@ vT cH Ez xb -Fl +Og WS WS WS @@ -5609,7 +5640,7 @@ WS WS WS WS -Fl +Og Uj vT cH @@ -5633,7 +5664,7 @@ vT cH vT Uj -Fl +Og WS WS WS @@ -5772,7 +5803,7 @@ WS WS WS WS -Fl +Og Uj vT vT @@ -5796,7 +5827,7 @@ vT vT vT Uj -Fl +Og WS WS WS @@ -5935,7 +5966,7 @@ WS WS WS WS -Fl +Og Fl Fl Fl @@ -5959,7 +5990,7 @@ Fl Fl Fl Fl -Fl +Og WS WS WS @@ -6098,7 +6129,7 @@ WS WS WS WS -Fl +Og xb vT Iq @@ -6122,7 +6153,7 @@ vT Iq vT xb -Fl +Og WS WS WS @@ -6261,7 +6292,7 @@ WS WS WS WS -Fl +Og xb Tn cH @@ -6285,7 +6316,7 @@ vT cH Ez xb -Fl +Og WS WS WS @@ -6424,7 +6455,7 @@ WS WS WS WS -Fl +Og Uj vT cH @@ -6448,7 +6479,7 @@ vT cH vT Uj -Fl +Og WS WS WS @@ -6587,7 +6618,7 @@ WS WS WS WS -Fl +Og Uj vT vT @@ -6611,7 +6642,7 @@ vT vT vT Uj -Fl +Og WS WS WS @@ -6751,7 +6782,7 @@ WS WS WS Fl -Fl +Og Fl Qq Fl @@ -6773,8 +6804,8 @@ Fl Fl Qq Fl -Fl -Fl +Og +Og WS WS WS @@ -6915,7 +6946,7 @@ WS WS WS WS -Fl +Og HD Fl HD @@ -6935,7 +6966,7 @@ oh HD Fl HD -Fl +Og WS WS WS @@ -7078,7 +7109,7 @@ WS WS WS WS -Fl +Og HD Fl HD @@ -7098,7 +7129,7 @@ GN HD Fl HD -Fl +Og WS WS WS @@ -7241,7 +7272,7 @@ WS WS WS WS -Fl +Og HD Fl HD @@ -7261,7 +7292,7 @@ Fl HD Fl HD -Fl +Og WS WS WS @@ -7404,7 +7435,7 @@ WS WS WS WS -Fl +Og HD Fl HD @@ -7424,7 +7455,7 @@ lW HD Fl HD -Fl +Og WS WS WS @@ -7567,7 +7598,7 @@ WS WS WS WS -Fl +Og HD Fl HD @@ -7587,7 +7618,7 @@ HD HD Fl HD -Fl +Og WS WS WS @@ -7719,18 +7750,18 @@ WS WS WS Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +Og +Og +Og +Og +Og +Og +Og Fl WS WS WS -Fl +Og HD Fl HD @@ -7750,7 +7781,7 @@ fa HD Fl HD -Fl +Og WS WS WS @@ -7881,7 +7912,7 @@ WS WS WS WS -Fl +Og bF nD Of @@ -7889,11 +7920,11 @@ Of Of wZ wP -Fl +Og WS WS WS -Fl +Og HD Fl HD @@ -7913,7 +7944,7 @@ GN HD Fl HD -Fl +Og WS WS WS @@ -8044,7 +8075,7 @@ WS WS WS WS -Fl +Og bF Of vt @@ -8053,9 +8084,9 @@ Of Of Of Fl -Fl -Fl -Fl +Og +Og +Og Fl Qq Fl @@ -8076,7 +8107,7 @@ Fl HD Fl Qq -Fl +Og WS WS WS @@ -8207,7 +8238,7 @@ WS WS WS WS -Fl +Og bF Of Of @@ -8239,7 +8270,7 @@ lW HD HD HD -Fl +Og WS WS WS @@ -8370,7 +8401,7 @@ WS WS WS WS -Fl +Og bF Of BU @@ -8402,7 +8433,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -8533,7 +8564,7 @@ WS WS WS WS -Fl +Og bF Of Of @@ -8564,8 +8595,8 @@ rg fa HD Fl -Fl -Fl +Og +Og WS WS WS @@ -8696,7 +8727,7 @@ WS WS WS WS -Fl +Og bF Of Nw @@ -8705,11 +8736,11 @@ Of Of Of Fl -Fl -Fl -Fl -Fl -Fl +Og +Og +Og +Og +Og Fl HD GN @@ -8726,7 +8757,7 @@ Fl XP GN HD -Fl +Og WS WS WS @@ -8859,7 +8890,7 @@ WS WS WS WS -Fl +Og bF rS Of @@ -8867,13 +8898,13 @@ Of Of Of rS -Fl +Og WS WS WS WS WS -Fl +Og HD Fl Fl @@ -8889,7 +8920,7 @@ Fl Fl Fl HD -Fl +Og WS WS WS @@ -9023,20 +9054,20 @@ WS WS WS Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +Og +Og +Og +Og +Og +Og +Og Fl WS WS WS WS WS -Fl +Og HD lW HD @@ -9052,7 +9083,7 @@ HD HD lW HD -Fl +Og WS WS WS @@ -9199,7 +9230,7 @@ WS WS WS WS -Fl +Og HD HD HD @@ -9215,7 +9246,7 @@ HD HD HD HD -Fl +Og WS WS WS @@ -9362,7 +9393,7 @@ WS WS WS WS -Fl +Og HD wr rg @@ -9378,7 +9409,7 @@ Fl rg fa HD -Fl +Og WS WS WS @@ -9525,7 +9556,7 @@ WS WS WS WS -Fl +Og HD GN XP @@ -9541,7 +9572,7 @@ Fl XP GN HD -Fl +Og WS WS WS @@ -9688,7 +9719,7 @@ WS WS WS WS -Fl +Og HD Fl Fl @@ -9704,7 +9735,7 @@ Fl Fl Fl HD -Fl +Og WS WS WS @@ -9851,7 +9882,7 @@ WS WS WS WS -Fl +Og HD lW HD @@ -9867,7 +9898,7 @@ HD HD lW HD -Fl +Og WS WS WS @@ -10015,7 +10046,7 @@ WS WS WS Fl -Fl +Og HD HD HD @@ -10030,7 +10061,7 @@ HD HD HD Fl -Fl +Og WS WS WS @@ -10179,20 +10210,20 @@ WS WS WS Fl -Fl -Fl -Fl -Fl -Fl +Og +Og +Og +Og +Og Qq Qq Qq Fl -Fl -Fl -Fl -Fl -Fl +Og +Og +Og +Og +Og WS WS WS @@ -10346,11 +10377,11 @@ WS WS WS WS -Fl +Og kK HD ep -Fl +Og WS WS WS @@ -10508,13 +10539,13 @@ WS WS WS WS -Fl +Og Fl cq HD ZR Fl -Fl +Og WS WS WS @@ -10671,13 +10702,13 @@ WS WS WS WS -Fl +Og wM Mw HD Hr ME -Fl +Og WS WS WS @@ -10834,13 +10865,13 @@ WS WS WS WS -Fl +Og qq HD HD HD Up -Fl +Og WS WS WS @@ -10997,13 +11028,13 @@ WS WS WS WS -Fl +Og eu Po HD qE ln -Fl +Og WS WS WS @@ -11160,13 +11191,13 @@ WS WS WS WS -Fl +Og Ug kK HD ep Fl -Fl +Og WS WS WS @@ -11324,11 +11355,11 @@ WS WS WS WS -Fl +Og Aw HD ZR -Fl +Og WS WS WS @@ -11479,26 +11510,26 @@ WS WS WS WS -Fl -Fl -Fl -Fl -Fl -Ug -Fl -Fl +Og +Og +Og +Og +Og +rI +Og +Og Fl kK HD ep Fl -Fl -Fl -Ug -Fl -Fl -Fl -Fl +Og +Og +rI +Og +Og +Og +Og Fl WS WS @@ -11642,7 +11673,7 @@ WS WS WS WS -Fl +Og kc MU kZ @@ -11662,7 +11693,7 @@ kZ kZ MU tl -Fl +Og WS WS WS @@ -11805,7 +11836,7 @@ WS WS WS WS -Fl +Og aM HD HD @@ -11825,7 +11856,7 @@ HD HD HD TX -Fl +Og WS WS WS @@ -11968,7 +11999,7 @@ WS WS WS WS -Fl +Og aM HD fY @@ -11988,7 +12019,7 @@ iH mt HD TX -Fl +Og WS WS WS @@ -12128,9 +12159,9 @@ WS WS WS Fl -Fl -Fl -Fl +Og +Og +Og Fl oV HD @@ -12151,7 +12182,7 @@ Fl oV HD TX -Fl +Og WS WS WS @@ -12290,7 +12321,7 @@ WS WS WS WS -Fl +Og Ke Ke Ke @@ -12314,7 +12345,7 @@ Fl aM HD TX -Fl +Og WS WS WS @@ -12453,7 +12484,7 @@ WS WS WS WS -Fl +Og Ke Ke Ke @@ -12477,7 +12508,7 @@ Fl aM HD TX -Fl +Og WS WS WS @@ -12616,7 +12647,7 @@ WS WS WS WS -Fl +Og Ke gG Ke @@ -12640,7 +12671,7 @@ Fl aM HD qT -Fl +Og WS WS WS @@ -12779,7 +12810,7 @@ WS WS WS WS -Fl +Og Ke Ke Ke @@ -12803,7 +12834,7 @@ Fl aM HD TX -Fl +Og WS WS WS @@ -12942,7 +12973,7 @@ WS WS WS WS -Fl +Og Ke Ke Ke @@ -12966,7 +12997,7 @@ Qq aM HD TX -Fl +Og WS WS WS @@ -13105,7 +13136,7 @@ WS WS WS WS -Fl +Og Fl Ke Ke @@ -13129,7 +13160,7 @@ Fl oV HD TX -Fl +Og WS WS WS @@ -13268,7 +13299,7 @@ WS WS WS WS -Fl +Og Ke Ke IT @@ -13292,7 +13323,7 @@ Fl aM HD TX -Fl +Og WS WS WS @@ -13431,7 +13462,7 @@ WS WS WS WS -Fl +Og Ke Ke Ke @@ -13455,7 +13486,7 @@ Fl aM HD TX -Fl +Og WS WS WS @@ -13594,7 +13625,7 @@ WS WS WS WS -Fl +Og Ke qF Ke @@ -13618,7 +13649,7 @@ Fl aM HD qT -Fl +Og WS WS WS @@ -13757,7 +13788,7 @@ WS WS WS WS -Fl +Og Ke Ke Ke @@ -13781,7 +13812,7 @@ Fl aM HD TX -Fl +Og WS WS WS @@ -13920,7 +13951,7 @@ WS WS WS WS -Fl +Og Ke Ke Ke @@ -13944,7 +13975,7 @@ Qq di iH Dw -Fl +Og WS WS WS @@ -14084,29 +14115,29 @@ WS WS WS Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og +Og Fl WS WS diff --git a/_maps/RandomRooms/rcorp/facility/raidboss.dmm b/_maps/RandomRooms/rcorp/facility/raidboss.dmm index d8ee26feb1ed..b56c52ba3ccb 100644 --- a/_maps/RandomRooms/rcorp/facility/raidboss.dmm +++ b/_maps/RandomRooms/rcorp/facility/raidboss.dmm @@ -14,13 +14,22 @@ /obj/item/toy/plush/yuri, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"hl" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "oS" = ( /turf/open/floor/plasteel/dark, /area/city/outskirts) +"pz" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "qF" = ( /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "rh" = ( @@ -31,6 +40,10 @@ /obj/structure/bough, /turf/open/floor/facility, /area/city/outskirts) +"zA" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Au" = ( /obj/effect/landmark/abnospawn/raidboss, /turf/open/floor/facility, @@ -38,9 +51,17 @@ "Fl" = ( /turf/closed/indestructible/syndicate, /area/city/outskirts) +"FT" = ( +/obj/effect/landmark/abnospawn/rhinobuster, +/turf/open/floor/facility, +/area/city/outskirts) "HD" = ( /turf/open/floor/facility, /area/city/outskirts) +"PA" = ( +/obj/effect/landmark/abnospawn/hardsupport, +/turf/open/floor/facility, +/area/city/outskirts) "Vg" = ( /obj/effect/gibspawner/human, /turf/open/floor/facility, @@ -49,6 +70,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/closed/indestructible/syndicate, /area/city/outskirts) "WS" = ( @@ -94,7 +116,7 @@ WS WS WS WS -WS +pz Fl aN aN @@ -103,69 +125,69 @@ aN aN Fl Fl -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -WS -Fl -Fl -Fl +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +pz +hl +hl +zA qF qF qF VG -Fl -Fl -Fl -Fl -Fl -Fl -Fl -Fl +hl +hl +hl +hl +hl +hl +hl +zA qF qF qF VG -Fl +hl Fl Fl Fl @@ -258,14 +280,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -311,7 +333,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -327,7 +349,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -421,14 +443,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -474,7 +496,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -490,7 +512,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -584,14 +606,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -637,7 +659,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -653,7 +675,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -747,14 +769,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -800,7 +822,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -816,7 +838,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -910,14 +932,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -963,7 +985,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -979,7 +1001,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -1073,14 +1095,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -1126,7 +1148,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -1142,7 +1164,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -1236,14 +1258,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -1289,7 +1311,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -1305,7 +1327,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -1399,14 +1421,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -1452,7 +1474,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -1468,7 +1490,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -1562,14 +1584,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -1615,7 +1637,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -1631,7 +1653,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -1725,14 +1747,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -1778,7 +1800,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -1794,7 +1816,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -1888,14 +1910,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -1941,7 +1963,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -1957,7 +1979,7 @@ Fl HD HD HD -Fl +hl WS WS WS @@ -2051,14 +2073,14 @@ WS WS WS WS -Fl +hl oS oS oS oS oS oS -Fl +hl WS WS WS @@ -2104,7 +2126,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -2120,7 +2142,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -2214,14 +2236,14 @@ WS WS WS WS -Fl +hl oS oS bn oS oS oS -Fl +hl WS WS WS @@ -2267,7 +2289,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -2283,7 +2305,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -2378,12 +2400,12 @@ WS WS WS Fl -Fl +hl oS oS oS oS -Fl +hl Fl WS WS @@ -2430,7 +2452,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -2446,7 +2468,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -2542,10 +2564,10 @@ WS WS WS Fl -Fl -Fl -Fl -Fl +hl +hl +hl +hl Fl WS WS @@ -2593,7 +2615,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -2609,7 +2631,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -2756,7 +2778,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -2772,7 +2794,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -2919,7 +2941,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -2935,7 +2957,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -3082,7 +3104,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -3098,7 +3120,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -3245,7 +3267,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -3261,7 +3283,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -3408,7 +3430,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -3424,7 +3446,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -3571,7 +3593,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -3587,7 +3609,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -3734,23 +3756,23 @@ WS WS WS WS -Fl -HD +hl HD HD HD HD HD +PA Vg Au HD -HD +PA HD HD aM HD HD -Fl +hl WS WS WS @@ -3897,7 +3919,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -3913,7 +3935,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -4060,7 +4082,7 @@ WS WS WS WS -Fl +hl HD HD Vg @@ -4076,7 +4098,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -4223,8 +4245,7 @@ WS WS WS WS -Fl -HD +hl HD HD HD @@ -4232,6 +4253,7 @@ HD HD HD HD +PA aM HD HD @@ -4239,7 +4261,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -4386,7 +4408,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -4402,7 +4424,7 @@ HD HD HD Vg -Fl +hl WS WS WS @@ -4549,8 +4571,7 @@ WS WS WS WS -Fl -HD +hl HD HD HD @@ -4558,6 +4579,7 @@ HD HD HD HD +FT aM HD HD @@ -4565,7 +4587,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -4712,7 +4734,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -4728,7 +4750,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -4875,7 +4897,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -4891,7 +4913,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -5038,7 +5060,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -5054,7 +5076,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -5201,7 +5223,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -5217,7 +5239,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -5364,7 +5386,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -5380,7 +5402,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -5527,7 +5549,7 @@ WS WS WS WS -Fl +hl HD HD HD @@ -5543,7 +5565,7 @@ HD HD HD HD -Fl +hl WS WS WS @@ -5691,22 +5713,22 @@ WS WS WS Fl -Fl -Fl -Fl -Fl +hl +hl +hl +hl Fl rh rh rh rh rh -Fl -Fl -Fl -Fl -Fl -Fl +hl +hl +hl +hl +hl +hl WS WS WS @@ -5858,13 +5880,13 @@ WS WS WS WS -Fl +hl rh rh rh rh rh -Fl +hl WS WS WS @@ -6021,13 +6043,13 @@ WS WS WS WS -Fl +hl rh rh rh rh rh -Fl +hl WS WS WS @@ -6184,13 +6206,13 @@ WS WS WS WS -Fl +hl HD HD HD HD HD -Fl +hl WS WS WS @@ -6347,13 +6369,13 @@ WS WS WS WS -Fl +hl HD HD vq HD HD -Fl +hl WS WS WS @@ -6510,13 +6532,13 @@ WS WS WS WS -Fl +hl HD HD HD HD HD -Fl +hl WS WS WS @@ -6674,11 +6696,11 @@ WS WS WS Fl -Fl -Fl -Fl -Fl -Fl +hl +hl +hl +hl +hl Fl WS WS diff --git a/_maps/RandomRooms/rcorp/facility/skeld.dmm b/_maps/RandomRooms/rcorp/facility/skeld.dmm index b3cc84ada8e8..36ebd08111b4 100644 --- a/_maps/RandomRooms/rcorp/facility/skeld.dmm +++ b/_maps/RandomRooms/rcorp/facility/skeld.dmm @@ -63,6 +63,7 @@ /area/city/outskirts) "bN" = ( /obj/structure/sign/poster/lobotomycorp/hhpp, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/reinforced, /area/city/outskirts) "cc" = ( @@ -826,6 +827,7 @@ /area/city/outskirts) "uy" = ( /obj/structure/sign/poster/official/we_watch, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/reinforced, /area/city/outskirts) "uW" = ( @@ -1190,6 +1192,10 @@ }, /turf/open/floor/plasteel/white, /area/city/outskirts) +"Cx" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "CJ" = ( /obj/structure/chair/stool/bar, /obj/structure/sign/ordealmonitor{ @@ -1286,6 +1292,10 @@ }, /turf/open/floor/plasteel, /area/city/outskirts) +"Fk" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "Fw" = ( /obj/structure/table/wood/poker, /turf/open/floor/carpet/royalblue, @@ -1377,6 +1387,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "Hh" = ( @@ -1642,6 +1653,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Mq" = ( @@ -2018,6 +2030,14 @@ "XH" = ( /turf/open/floor/plasteel/white, /area/city/outskirts) +"XV" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) +"Yb" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/reinforced, +/area/city/outskirts) "Yf" = ( /obj/machinery/computer/camera_advanced, /turf/open/floor/carpet/stellar, @@ -2154,81 +2174,81 @@ Mq Mq Mq Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +Cx +Cx +Cx +Cx +Cx +Fk +Fk GZ GZ GZ GZ GZ Ml -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Mq -Mq -Mq +Fk +Cx +Cx +Cx +Cx +Cx +Cx +Cx +Cx +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +Cx +Cx +Fk GZ GZ GZ Ml -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +Cx +Cx +Cx +Cx +Cx +Cx +Cx +Cx +Fk GZ Ml -Mq +Cx Mq Mq Mq @@ -2321,7 +2341,7 @@ Tf Tf Tf Tf -Mq +Cx vQ vQ vQ @@ -2331,7 +2351,7 @@ vQ vQ vQ vQ -Mq +Cx Tf Tf Tf @@ -2375,7 +2395,7 @@ Ze iD iD iD -Ze +Yb jX Lh Lh @@ -2391,7 +2411,7 @@ Ze vQ vQ vQ -Ze +Yb Tf Tf Tf @@ -2484,7 +2504,7 @@ Tf Tf Tf Tf -Mq +Cx vQ vQ vQ @@ -2494,7 +2514,7 @@ vQ vQ vQ vQ -Mq +Cx Tf Tf Tf @@ -2538,7 +2558,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -2554,10 +2574,10 @@ Ze vQ vQ vQ -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb Tf Tf Tf @@ -2647,7 +2667,7 @@ Tf Tf Tf Tf -Mq +Cx vQ vQ Mq @@ -2657,7 +2677,7 @@ Mq vQ vQ vQ -Mq +Cx Tf Tf Tf @@ -2682,16 +2702,16 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb Tf Tf Tf @@ -2701,7 +2721,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -2720,7 +2740,7 @@ vQ ob YI YI -Ze +Yb Tf Tf Tf @@ -2810,7 +2830,7 @@ Tf Tf Tf Tf -Mq +Cx vQ vQ Mq @@ -2820,7 +2840,7 @@ vQ vQ vQ vQ -Mq +Cx Tf Tf Tf @@ -2845,7 +2865,7 @@ Tf Tf Tf Tf -Ze +Yb YI YI ob @@ -2854,7 +2874,7 @@ ob vQ vQ vQ -Ze +Yb Tf Tf Tf @@ -2864,7 +2884,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -2883,7 +2903,7 @@ vQ ob YI YI -Ze +Yb Tf Tf Tf @@ -2973,7 +2993,7 @@ Tf Tf Tf Tf -Mq +Cx vQ vQ Mq @@ -2983,7 +3003,7 @@ Mq vQ vQ vQ -Mq +Cx Tf Tf Tf @@ -3008,7 +3028,7 @@ Ze Ze Ze Ze -Ze +Yb aS YI ob @@ -3017,17 +3037,17 @@ ob vQ vQ vQ -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb Lh Lh Lh @@ -3046,7 +3066,7 @@ vQ ob YI YI -Ze +Yb Tf Tf Tf @@ -3136,7 +3156,7 @@ Tf Tf Tf Tf -Mq +Cx vQ vQ vQ @@ -3146,7 +3166,7 @@ vQ vQ vQ vQ -Mq +Cx Tf Tf Tf @@ -3171,7 +3191,7 @@ Ze iD iD iD -Ze +Yb YI YI ob @@ -3209,7 +3229,7 @@ vQ ob YI YI -Ze +Yb Tf Tf Tf @@ -3299,7 +3319,7 @@ Tf Tf Tf Tf -Mq +Cx vQ vQ vQ @@ -3309,7 +3329,7 @@ vQ vQ vQ vQ -Mq +Cx Tf Tf Tf @@ -3334,7 +3354,7 @@ Ze iD iD iD -Ze +Yb YI YI ob @@ -3372,7 +3392,7 @@ vQ vQ YI YI -Ze +Yb Tf Tf Tf @@ -3462,7 +3482,7 @@ Tf Tf Tf Tf -Mq +Cx vQ vQ vQ @@ -3472,7 +3492,7 @@ vQ vQ vQ vQ -Mq +Cx Tf Tf Tf @@ -3497,7 +3517,7 @@ Ze iD iD iD -Ze +Yb YI YI vQ @@ -3535,7 +3555,7 @@ vQ vQ YI YI -Ze +Yb Tf Tf Tf @@ -3625,17 +3645,17 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +Cx +Cx +Cx +Cx +Cx +Cx +Cx +Cx +Cx +Cx +Cx Tf Tf Tf @@ -3660,7 +3680,7 @@ Ze iD iD iD -Ze +Yb YI YI YI @@ -3698,7 +3718,7 @@ YI YI YI YI -Ze +Yb Tf Tf Tf @@ -3823,7 +3843,7 @@ Ze iD iD iD -Ze +Yb YI YI YI @@ -3861,7 +3881,7 @@ YI YI YI YI -Ze +Yb Tf Tf Tf @@ -3986,7 +4006,7 @@ Ze Ze Ze Ze -Ze +Yb xz YI YI @@ -4024,7 +4044,7 @@ YI YI YI cc -Ze +Yb Tf Tf Tf @@ -4149,7 +4169,7 @@ Tf Tf Tf Tf -Ze +Yb vQ YI YI @@ -4187,7 +4207,7 @@ YI YI YI vQ -Ze +Yb Tf Tf Tf @@ -4312,8 +4332,8 @@ Tf Tf Tf Tf -Ze -Ze +Yb +Yb YI YI YI @@ -4349,8 +4369,8 @@ Ze YI YI YI -Ze -Ze +Yb +Yb Tf Tf Tf @@ -4476,7 +4496,7 @@ Tf Tf Tf Tf -Ze +Yb jX Lh Lh @@ -4512,7 +4532,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -4639,7 +4659,7 @@ Ze Ze Ze Ze -Ze +Yb Lh Lh Lh @@ -4675,7 +4695,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -4802,7 +4822,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -4838,7 +4858,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -4965,7 +4985,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -5001,7 +5021,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -5128,7 +5148,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -5164,7 +5184,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -5291,7 +5311,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -5327,15 +5347,15 @@ Ze Lh Lh Lh -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb jf jf jf @@ -5454,7 +5474,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -5498,7 +5518,7 @@ Lh Lh Lh Lh -Ze +Yb jf Tf jf @@ -5617,7 +5637,7 @@ Ze Ze Ze Ze -Ze +Yb Lh Lh Lh @@ -5661,7 +5681,7 @@ Lh Lh Lh Lh -Ze +Yb jf Tf jf @@ -5780,7 +5800,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -5824,7 +5844,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -5943,7 +5963,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -5987,7 +6007,7 @@ Ze Lh Lh Lh -Ze +Yb jf jf jf @@ -6106,7 +6126,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -6150,7 +6170,7 @@ Ze Lh Lh Lh -Ze +Yb jf Tf jf @@ -6269,7 +6289,7 @@ Ze iD iD iD -Ze +Yb jX Lh Lh @@ -6313,7 +6333,7 @@ Ze Lh Lh Lh -Ze +Yb jf Tf jf @@ -6432,7 +6452,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -6476,7 +6496,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -6595,7 +6615,7 @@ Ze Ze Ze Ze -Ze +Yb Lh Lh Lh @@ -6639,7 +6659,7 @@ Ze Lh Lh Lh -Ze +Yb jf jf jf @@ -6758,7 +6778,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -6802,7 +6822,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -6921,7 +6941,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -6965,7 +6985,7 @@ wn Lh Lh Lh -Ze +Yb jf jf jf @@ -7084,7 +7104,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -7128,7 +7148,7 @@ DY Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -7247,7 +7267,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -7291,7 +7311,7 @@ DY Lh Lh Lh -Ze +Yb jf jf jf @@ -7410,7 +7430,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -7454,7 +7474,7 @@ DY Lh Lh Lh -Ze +Yb jf Tf jf @@ -7573,7 +7593,7 @@ Ze Ze Ze Ze -Ze +Yb Lh Lh Lh @@ -7617,7 +7637,7 @@ Va Lh Lh Lh -Ze +Yb jf Tf jf @@ -7736,7 +7756,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -7780,7 +7800,7 @@ WP Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -7899,7 +7919,7 @@ Ze iD iD iD -Ze +Yb jX Lh Lh @@ -7943,7 +7963,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -8062,7 +8082,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -8106,7 +8126,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -8225,7 +8245,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -8269,7 +8289,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -8388,7 +8408,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -8432,7 +8452,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -8551,7 +8571,7 @@ Ze Ze Ze Ze -Ze +Yb Lh Lh Lh @@ -8595,7 +8615,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -8714,7 +8734,7 @@ Tf Tf Tf Tf -Ze +Yb Lh Lh Lh @@ -8758,7 +8778,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -8865,19 +8885,19 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb fs Lh Tu @@ -8921,7 +8941,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -9028,7 +9048,7 @@ Tf Tf Tf Tf -Ze +Yb ee AA HL @@ -9084,10 +9104,10 @@ Ze ii Lh oj -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb Tf Tf Tf @@ -9191,7 +9211,7 @@ Tf Tf Tf Tf -Ze +Yb gM Bq Bq @@ -9250,7 +9270,7 @@ vQ vQ vQ vQ -Ze +Yb Tf Tf Tf @@ -9413,7 +9433,7 @@ pH pH ZP vQ -Ze +Yb Tf Tf Tf @@ -9517,7 +9537,7 @@ Tf Tf Tf Tf -Ze +Yb jx Bq Kr @@ -9576,7 +9596,7 @@ pH pH ZP vQ -Ze +Yb Tf Tf Tf @@ -9680,7 +9700,7 @@ Tf Tf Tf Tf -Ze +Yb jK Bq LR @@ -9739,7 +9759,7 @@ pH pH au vQ -Ze +Yb Tf Tf Tf @@ -9843,7 +9863,7 @@ Tf Tf Tf Tf -Ze +Yb pm Bq Bq @@ -9902,7 +9922,7 @@ pH pH pH vQ -Ze +Yb Tf Tf Tf @@ -10006,7 +10026,7 @@ Tf Tf Tf Tf -Ze +Yb qb Gf MS @@ -10065,7 +10085,7 @@ pH pH pH vQ -Ze +Yb Tf Tf Tf @@ -10169,7 +10189,7 @@ Tf Tf Tf Tf -Ze +Yb Ze Ze Ze @@ -10228,7 +10248,7 @@ pH pH pH vQ -Ze +Yb Tf Tf Tf @@ -10332,7 +10352,7 @@ Tf Tf Tf Tf -Ze +Yb Ze GH MZ @@ -10391,7 +10411,7 @@ pH pH pH vQ -Ze +Yb Tf Tf Tf @@ -10495,7 +10515,7 @@ Tf Tf Tf Tf -Ze +Yb qC HG HG @@ -10554,7 +10574,7 @@ pH pH pH vQ -Ze +Yb Tf Tf Tf @@ -10658,7 +10678,7 @@ Tf Tf Tf Tf -Ze +Yb qG HG HG @@ -10717,7 +10737,7 @@ pH pH ZP vQ -Ze +Yb Tf Tf Tf @@ -10821,7 +10841,7 @@ Tf Tf Tf Tf -Ze +Yb tU HG HG @@ -10880,7 +10900,7 @@ pH pH ZP vQ -Ze +Yb Tf Tf Tf @@ -10984,7 +11004,7 @@ Tf Tf Tf Tf -Ze +Yb xM HG HG @@ -11043,7 +11063,7 @@ pH pH au vQ -Ze +Yb Tf Tf Tf @@ -11147,7 +11167,7 @@ Tf Tf Tf Tf -Ze +Yb Aj HG HG @@ -11206,7 +11226,7 @@ vQ sj vQ vQ -Ze +Yb Tf Tf Tf @@ -11310,8 +11330,8 @@ Tf Tf Tf Tf -Ze -Ze +Yb +Yb SD Oz SD @@ -11356,20 +11376,20 @@ Ze ii Lh oj -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb Tf Tf Tf @@ -11474,19 +11494,19 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb fs Lh Tu @@ -11519,7 +11539,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -11649,7 +11669,7 @@ Tf Tf Tf Tf -Ze +Yb Lh Lh Lh @@ -11682,7 +11702,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -11812,7 +11832,7 @@ Tf Tf Tf Tf -Ze +Yb Lh Lh Lh @@ -11845,7 +11865,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -11971,11 +11991,11 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb Lh Lh Lh @@ -12008,18 +12028,18 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb Tf Tf Tf @@ -12134,7 +12154,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -12171,10 +12191,10 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf -Ze +Yb oR se eU @@ -12182,7 +12202,7 @@ Zc PU Mz DE -Ze +Yb Tf Tf Tf @@ -12297,7 +12317,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -12334,10 +12354,10 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf -Ze +Yb CJ Fw eU @@ -12345,7 +12365,7 @@ Zc il lX vI -Ze +Yb Tf Tf Tf @@ -12460,7 +12480,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -12497,10 +12517,10 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf -Ze +Yb Zc si eU @@ -12508,7 +12528,7 @@ Zc il Pc vI -Ze +Yb Tf Tf Tf @@ -12623,7 +12643,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -12660,10 +12680,10 @@ Ze Lh Lh Lh -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb Zc Zc Zc @@ -12671,7 +12691,7 @@ Zc il fV vI -Ze +Yb Tf Tf Tf @@ -12786,7 +12806,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -12834,11 +12854,11 @@ Zc Dp VX So -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb Tf Tf Tf @@ -12949,7 +12969,7 @@ Ze Ze Ze Ze -Ze +Yb Ze Ze Ze @@ -13001,7 +13021,7 @@ Ze JE pZ ZG -Ze +Yb Tf Tf Tf @@ -13112,7 +13132,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -13164,7 +13184,7 @@ IH Id pw Ll -Ze +Yb Tf Tf Tf @@ -13275,7 +13295,7 @@ Ze iD iD iD -Ze +Yb rU Lh Lh @@ -13327,7 +13347,7 @@ IH Uj pw bE -Ze +Yb Tf Tf Tf @@ -13438,7 +13458,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -13490,7 +13510,7 @@ Ze hU pw rf -Ze +Yb Tf Tf Tf @@ -13601,7 +13621,7 @@ Ze iD iD iD -Ze +Yb jX Lh Lh @@ -13653,7 +13673,7 @@ wq sK sK qI -Ze +Yb Tf Tf Tf @@ -13764,7 +13784,7 @@ Ze iD iD iD -Ze +Yb Lh Lh Lh @@ -13812,11 +13832,11 @@ Zc Zc eU wV -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb Tf Tf Tf @@ -13927,7 +13947,7 @@ Ze Ze Ze Ze -Ze +Yb Lh Lh Lh @@ -13975,7 +13995,7 @@ Zc Zc If wV -Ze +Yb Tf Tf Tf @@ -14090,8 +14110,8 @@ Tf Tf Tf Tf -Ze -Ze +Yb +Yb GR Lh Lh @@ -14130,15 +14150,15 @@ Lh Ze Ze Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb Tf Tf Tf @@ -14254,8 +14274,8 @@ Tf Tf Tf Tf -Ze -Ze +Yb +Yb aI nh nh @@ -14293,7 +14313,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -14418,7 +14438,7 @@ Tf Tf Tf Tf -Ze +Yb ZH jY TM @@ -14456,7 +14476,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -14581,7 +14601,7 @@ Tf Tf Tf Tf -Ze +Yb qm TM gV @@ -14619,7 +14639,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -14744,7 +14764,7 @@ Tf Tf Tf Tf -Ze +Yb NQ TM NQ @@ -14782,7 +14802,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -14907,7 +14927,7 @@ Tf Tf Tf Tf -Ze +Yb Mb wO Pm @@ -14931,10 +14951,10 @@ Lh Lh Lh Lh -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb Ze Ze Ze @@ -14945,7 +14965,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -15070,13 +15090,13 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb iD iD iD @@ -15094,10 +15114,10 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf -Ze +Yb iD iD iD @@ -15108,7 +15128,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -15239,7 +15259,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -15257,10 +15277,10 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf -Ze +Yb iD iD iD @@ -15271,7 +15291,7 @@ Lh Lh Lh rU -Ze +Yb Tf Tf Tf @@ -15402,11 +15422,11 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb Ze Ze Ze @@ -15414,16 +15434,16 @@ Ze Lh Lh Lh -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb Tf Tf -Ze +Yb iD iD iD @@ -15434,7 +15454,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -15569,7 +15589,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -15577,7 +15597,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -15586,7 +15606,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -15597,7 +15617,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -15732,7 +15752,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -15740,7 +15760,7 @@ Ze Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -15749,7 +15769,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -15760,7 +15780,7 @@ Lh Lh Lh Lh -Ze +Yb Tf Tf Tf @@ -15895,7 +15915,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -15903,7 +15923,7 @@ Ze jX Lh Lh -Ze +Yb Tf Tf Tf @@ -15912,18 +15932,18 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb Ze Ze Ze IH Ue IH -Ze -Ze +Yb +Yb Tf Tf Tf @@ -16058,7 +16078,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -16066,7 +16086,7 @@ Ze Lh Lh Ks -Ze +Yb Tf Tf Tf @@ -16078,14 +16098,14 @@ Tf Tf Tf Tf -Ze +Yb ld lH Ze DX HG HG -Ze +Yb Tf Tf Tf @@ -16221,7 +16241,7 @@ Tf Tf Tf Tf -Ze +Yb iD iD iD @@ -16229,7 +16249,7 @@ Ze gD Lh Lh -Ze +Yb Tf Tf Tf @@ -16241,14 +16261,14 @@ Tf Tf Tf Tf -Ze +Yb Bp lH Ue HG HG HG -Ze +Yb Tf Tf Tf @@ -16384,18 +16404,18 @@ Tf Tf Tf Tf -Ze -Ze +Yb +Yb Ze Ze Ze Zg Lh lT -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb Tf Tf Tf @@ -16404,14 +16424,14 @@ Tf Tf Tf Tf -Ze +Yb qj Cq Ze SD xA SD -Ze +Yb Tf Tf Tf @@ -16548,7 +16568,7 @@ Tf Tf Tf Tf -Ze +Yb Ze Rr cl @@ -16558,7 +16578,7 @@ FO cl cl Rr -Ze +Yb Tf Tf Tf @@ -16567,14 +16587,14 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb +Yb +Yb Tf Tf Tf @@ -16711,7 +16731,7 @@ Tf Tf Tf Tf -Ze +Yb fl nN cl @@ -16721,7 +16741,7 @@ cl cl cl cl -Ze +Yb Tf Tf Tf @@ -16874,7 +16894,7 @@ Tf Tf Tf Tf -Ze +Yb aq LY cl @@ -16884,7 +16904,7 @@ Ze Ze Ze Ze -Ze +Yb Tf Tf Tf @@ -17037,7 +17057,7 @@ Tf Tf Tf Tf -Ze +Yb cl cl cl @@ -17200,7 +17220,7 @@ Tf Tf Tf Tf -Ze +Yb aq LY cl @@ -17210,7 +17230,7 @@ cl fu sY rD -Ze +Yb Tf Tf Tf @@ -17363,7 +17383,7 @@ Tf Tf Tf Tf -Ze +Yb qs Hh cl @@ -17373,8 +17393,8 @@ cl Ze Ze Ze -Ze -Ze +Yb +Yb Tf Tf Tf @@ -17526,7 +17546,7 @@ Tf Tf Tf Tf -Ze +Yb cl cl cl @@ -17689,7 +17709,7 @@ Tf Tf Tf Tf -Ze +Yb cl cl cl @@ -17700,7 +17720,7 @@ Bl lF sY rD -Ze +Yb Tf Tf Tf @@ -17852,18 +17872,18 @@ Tf Tf Tf Tf -Ze -Ze +Yb +Yb TJ cl cl cl cl Ep -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb Tf Tf Tf @@ -18016,14 +18036,14 @@ Tf Tf Tf Tf -Ze +Yb zd cl cl Ab -Ze -Ze -Ze +Yb +Yb +Yb Tf Tf Tf @@ -18179,12 +18199,12 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze +Yb +Yb +Yb +Yb +Yb +Yb Tf Tf Tf diff --git a/_maps/RandomRooms/rcorp/facility/standard.dmm b/_maps/RandomRooms/rcorp/facility/standard.dmm index c933e91850f9..010c85835066 100644 --- a/_maps/RandomRooms/rcorp/facility/standard.dmm +++ b/_maps/RandomRooms/rcorp/facility/standard.dmm @@ -8,6 +8,7 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/closed/indestructible/syndicate, /area/city/outskirts) "aX" = ( @@ -70,6 +71,13 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/carpet/orange, /area/city/outskirts) +"ci" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "cs" = ( /obj/effect/turf_decal/siding/purple/corner, /turf/open/floor/plasteel/dark, @@ -1117,7 +1125,7 @@ dir = 10 }, /obj/structure/rack, -/obj/item/ego_weapon/ranged/clerk, +/obj/item/gun/ego_gun/clerk, /turf/open/floor/plasteel/dark, /area/city/outskirts) "vS" = ( @@ -1237,6 +1245,10 @@ }, /turf/open/floor/facility/white, /area/city/outskirts) +"yf" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakeglass, +/area/city/outskirts) "yh" = ( /obj/structure/chair/office{ dir = 4 @@ -1623,6 +1635,7 @@ /turf/open/floor/plasteel/dark, /area/city/outskirts) "EO" = ( +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/reinforced, /area/city/outskirts) "ET" = ( @@ -1709,6 +1722,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "Ge" = ( @@ -1789,6 +1803,10 @@ }, /turf/open/floor/carpet/orange, /area/city/outskirts) +"HK" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "HM" = ( /obj/effect/turf_decal/siding/green{ dir = 1 @@ -1881,7 +1899,7 @@ dir = 9 }, /obj/structure/rack, -/obj/item/ego_weapon/ranged/clerk, +/obj/item/gun/ego_gun/clerk, /turf/open/floor/plasteel/dark, /area/city/outskirts) "Jl" = ( @@ -2154,6 +2172,13 @@ /obj/effect/turf_decal/siding/red, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"NM" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakedoor{ + desc = "These things are thick. Doesn't look like they stopped anything important..."; + name = "broken cell door" + }, +/area/city/outskirts) "NQ" = ( /obj/structure/grille, /turf/open/floor/plating/asteroid, @@ -2340,6 +2365,10 @@ /obj/machinery/camera/autoname, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"QN" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "QY" = ( /obj/effect/turf_decal/siding/purple/corner{ dir = 8 @@ -2751,6 +2780,10 @@ }, /turf/open/floor/carpet/black, /area/city/outskirts) +"YU" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "Zd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2833,76 +2866,76 @@ GX GX GX GX -GX +QN FW FW FW FW FW -aQ -GX -GX -GX -GX -GX -GX -GX -GX -GX -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -GX -GX -GX +ci +QN +QN +QN +QN +QN +QN +QN +QN +QN +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +YU +QN +QN +HK FW FW FW aQ -GX -GX -GX -GX -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN +QN +QN +HK +HK FW aQ -GX -GX +HK +QN GX GX GX @@ -2989,14 +3022,14 @@ GX GX GX GX +QN +QN GX GX GX GX GX -GX -GX -GX +QN Im Im Im @@ -3066,7 +3099,7 @@ bN bN Qi gi -GX +QN GX GX GX @@ -3151,15 +3184,15 @@ GX GX GX GX -GX +QN kq kq +QN GX GX GX GX -GX -GX +QN Im Im Im @@ -3229,7 +3262,7 @@ Wz Wz fB nO -GX +QN GX GX GX @@ -3313,16 +3346,16 @@ nd GX GX GX -GX +QN AS Pp Pp AS +QN GX GX GX -GX -GX +QN GX Im Im @@ -3392,7 +3425,7 @@ Wz ha sh TI -GX +QN GX GX GX @@ -3476,16 +3509,16 @@ nd GX GX GX -GX +QN kq Pp Pp kq +QN GX GX GX -GX -GX +QN GX Im Im @@ -3555,7 +3588,7 @@ ha ha fB Pp -GX +QN GX GX GX @@ -3640,15 +3673,15 @@ GX GX GX GX -GX +QN GX Pp GX +QN GX GX GX -GX -GX +QN GX Im Im @@ -3718,7 +3751,7 @@ ha Wz sh qz -GX +QN GX GX GX @@ -3803,15 +3836,15 @@ GX GX GX GX -GX +QN pX Cf xH +QN GX GX GX -GX -GX +QN GX Im Im @@ -3881,7 +3914,7 @@ ha ha sh xL -GX +QN GX GX GX @@ -3966,15 +3999,15 @@ GX GX GX GX -GX +QN tQ Pp NJ +QN GX GX GX -GX -GX +QN GX Im Im @@ -4044,7 +4077,7 @@ ha ha sh vM -GX +QN GX GX GX @@ -4129,15 +4162,15 @@ GX GX GX GX -GX +QN rs Pp NJ +QN GX GX GX -GX -GX +QN Im Im Im @@ -4207,7 +4240,7 @@ ha XD GL Pp -GX +QN GX GX GX @@ -4292,15 +4325,15 @@ GX GX GX GX -GX +QN tQ LN NJ +QN GX GX GX -GX -GX +QN Im Im Im @@ -4370,7 +4403,7 @@ RA GX GX GX -GX +QN GX GX GX @@ -4455,15 +4488,15 @@ GX GX GX GX -GX +QN Bk Pp NJ +QN GX GX GX -GX -GX +QN GX GX Im @@ -4533,7 +4566,7 @@ ng Tw oN vQ -GX +QN GX GX GX @@ -4618,15 +4651,15 @@ GX GX GX GX -GX +QN lA Pp NJ +QN GX -GX -GX -GX -GX +QN +QN +QN LN LN LN @@ -4696,7 +4729,7 @@ Pp Pp Pp KF -GX +QN GX GX GX @@ -4781,13 +4814,13 @@ GX GX GX GX -GX +QN Bk jO NJ -xX +yf gB -xX +yf dr LN nl @@ -4859,7 +4892,7 @@ Pp Pp pP KF -GX +QN GX GX GX @@ -4944,13 +4977,13 @@ GX GX GX GX -GX +QN Bk jO NJ -xX +yf gB -xX +yf Tk iQ LS @@ -5022,7 +5055,7 @@ pP pP pP KF -GX +QN GX GX GX @@ -5107,13 +5140,13 @@ GX GX GX GX -GX +QN rs jO NJ -xX +yf gB -GX +QN gR LN LS @@ -5185,6 +5218,7 @@ Pp Pp Jl DB +QN GX GX GX @@ -5199,9 +5233,8 @@ GX GX GX GX -GX -GX -GX +QN +QN GX GX GX @@ -5270,13 +5303,13 @@ GX GX GX GX -GX +QN Bk jO NJ -xX +yf gB -xX +yf Ut LN tD @@ -5348,9 +5381,8 @@ nd nd nd nd +YU nd -nd -GX GX GX GX @@ -5363,12 +5395,13 @@ GX GX GX GX +QN Im Im -GX -GX -GX -GX +QN +QN +QN +QN GX GX GX @@ -5377,7 +5410,7 @@ GX nd nd nd -nd +YU nd nd nd @@ -5433,13 +5466,13 @@ GX GX GX GX -GX +QN Bk Pp NJ -xX +yf gB -xX +yf Tk iQ LS @@ -5510,13 +5543,10 @@ xB Pp Jl nd +YU nd nd nd -nd -GX -GX -GX GX GX GX @@ -5525,6 +5555,9 @@ GX GX GX GX +QN +QN +QN Im Im Im @@ -5532,19 +5565,19 @@ Im Im Im gB -GX -GX -GX -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN +QN +QN +QN Im -GX -nd -nd -nd +QN +YU +YU +YU nd nd nd @@ -5596,13 +5629,13 @@ GX GX GX GX -GX +QN Bk Pp wz -xX +yf gB -GX +QN Lx LN LS @@ -5672,7 +5705,7 @@ GX xB Pp KF -GX +QN GX nd nd @@ -5684,7 +5717,7 @@ GX GX GX GX -GX +QN Im Im Im @@ -5708,8 +5741,8 @@ jZ gB gX gX -nd -nd +YU +YU nd nd nd @@ -5759,13 +5792,13 @@ GX GX GX GX -GX +QN Bk Pp NJ -xX +yf gB -xX +yf Ut Pp LS @@ -5835,7 +5868,7 @@ GX xB Pp KF -GX +QN GX GX nd @@ -5846,7 +5879,7 @@ GX GX GX GX -GX +QN Im Im Im @@ -5873,7 +5906,7 @@ gB gB gB Im -GX +QN nd nd nd @@ -5922,13 +5955,13 @@ GX GX GX GX -GX +QN Bk Pp NJ -xX +yf gB -xX +yf Tk XE LS @@ -5998,7 +6031,7 @@ GX lD Pp KF -GX +QN GX GX GX @@ -6008,7 +6041,7 @@ GX GX GX GX -GX +QN Im Im Im @@ -6036,9 +6069,9 @@ GX Nf Im jZ -GX -nd -nd +QN +YU +YU nd nd nd @@ -6085,11 +6118,11 @@ GX GX GX GX -GX +QN rs Pp wz -GX +QN GX EO bo @@ -6161,7 +6194,7 @@ GX xB Pp KF -GX +QN GX GX GX @@ -6171,7 +6204,7 @@ GX GX GX GX -GX +QN Im Im Im @@ -6202,8 +6235,8 @@ dZ Im Im Im -nd -nd +YU +YU nd nd nd @@ -6248,13 +6281,13 @@ nd nd GX GX -GX +QN Bk Pp wz -GX -GX -GX +QN +QN +QN GX GX GX @@ -6324,7 +6357,7 @@ GX xB Pp KF -GX +QN GX GX GX @@ -6334,7 +6367,7 @@ GX GX GX GX -GX +QN Im Im Im @@ -6367,7 +6400,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -6411,7 +6444,7 @@ nd nd GX GX -GX +QN tQ Pp LN @@ -6487,6 +6520,7 @@ GX QM Pp KF +QN GX GX GX @@ -6496,8 +6530,7 @@ GX GX GX GX -GX -GX +QN Im Im Ix @@ -6531,7 +6564,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -6574,7 +6607,7 @@ nd nd GX GX -GX +QN Sk Pp Pp @@ -6650,6 +6683,7 @@ GX xB Pp KF +QN GX GX GX @@ -6659,8 +6693,7 @@ GX GX GX GX -GX -GX +QN Im GX GX @@ -6694,7 +6727,7 @@ Hv Im Im Im -nd +YU nd nd nd @@ -6737,7 +6770,7 @@ nd nd GX GX -GX +QN tQ Pp Pp @@ -6753,9 +6786,9 @@ LN LN LN jO -GX -GX -GX +QN +QN +QN Im Im Im @@ -6813,6 +6846,7 @@ GX xB Pp KF +QN GX GX GX @@ -6822,8 +6856,7 @@ GX GX GX GX -GX -GX +QN Im jO jO @@ -6857,7 +6890,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -6900,32 +6933,32 @@ nd nd GX GX -GX +QN Bk Pp NJ +QN +QN +QN +QN +QN +QN +QN +QN +QN +QN +QN +QN GX GX GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -nd -nd +QN +QN +QN +QN +QN +YU +YU Im Im Im @@ -6976,6 +7009,7 @@ GX lD Pp Ct +QN GX GX GX @@ -6986,8 +7020,7 @@ GX GX GX GX -GX -GX +QN Im Im jO @@ -7020,7 +7053,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -7063,11 +7096,11 @@ nd nd nd GX -GX +QN rs Pp NJ -GX +QN nd nd nd @@ -7089,8 +7122,8 @@ nd nd nd nd -nd -nd +YU +YU Im Im Im @@ -7139,7 +7172,7 @@ GX xB Pp nd -nd +YU nd GX GX @@ -7151,7 +7184,7 @@ nd GX GX GX -GX +QN xt Im Im @@ -7184,7 +7217,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -7226,11 +7259,11 @@ nd nd nd nd -GX +QN Bk LN NJ -GX +QN nd nd nd @@ -7253,7 +7286,7 @@ nd nd nd nd -nd +YU Im Im Im @@ -7302,7 +7335,7 @@ GX Jl nd nd -nd +YU nd nd GX @@ -7314,7 +7347,7 @@ nd GX GX GX -GX +QN Im Im Im @@ -7347,7 +7380,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -7389,13 +7422,11 @@ nd nd nd nd -GX +QN uV Rg eP -GX -nd -nd +QN nd nd nd @@ -7418,6 +7449,8 @@ nd nd nd nd +YU +YU Im Im LN @@ -7465,7 +7498,7 @@ nd xB Jl KF -GX +QN nd nd GX @@ -7477,7 +7510,7 @@ nd GX GX GX -GX +QN Im Im Im @@ -7510,7 +7543,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -7553,11 +7586,10 @@ nd nd nd GX +QN +QN +QN GX -GX -GX -GX -nd nd nd nd @@ -7579,6 +7611,7 @@ nd nd nd nd +YU pY gB Im @@ -7628,7 +7661,7 @@ nd nd nd Jl -GX +QN nd GX GX @@ -7640,7 +7673,7 @@ nd nd GX GX -GX +QN Im Im GX @@ -7673,7 +7706,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -7740,7 +7773,7 @@ nd nd nd nd -nd +YU gX pY gX @@ -7791,7 +7824,7 @@ nd nd Pp KF -GX +QN GX GX GX @@ -7803,7 +7836,7 @@ nd nd GX GX -GX +QN Im Im Im @@ -7836,7 +7869,7 @@ gB Im Im Im -nd +YU nd nd nd @@ -7903,7 +7936,7 @@ nd nd nd nd -nd +YU Jl GX qy @@ -7954,7 +7987,7 @@ GX lD Jl KF -GX +QN GX GX GX @@ -7966,7 +7999,7 @@ nd nd GX GX -GX +QN Im Im Im @@ -7999,7 +8032,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -8065,7 +8098,7 @@ nd nd nd nd -nd +YU gX Jl kR @@ -8117,7 +8150,7 @@ TQ xB nd nd -nd +YU GX GX GX @@ -8128,7 +8161,7 @@ GX nd nd nd -GX +QN GX GX gB @@ -8162,7 +8195,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -8228,7 +8261,7 @@ nd nd nd nd -nd +YU GX GX GX @@ -8280,7 +8313,7 @@ TQ Jl Pp Pp -nd +YU nd nd GX @@ -8290,7 +8323,7 @@ GX nd nd nd -nd +YU GX GX GX @@ -8325,7 +8358,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -8391,7 +8424,7 @@ nd nd nd nd -nd +YU Jl LN pY @@ -8443,17 +8476,17 @@ GX Du Jl Jl +QN GX GX GX GX GX GX -GX -nd nd nd nd +YU Pp gX EL @@ -8488,7 +8521,7 @@ Im Im Im Im -nd +YU nd nd nd @@ -8554,7 +8587,7 @@ nd nd nd nd -nd +YU Jl Pp TQ @@ -8600,13 +8633,13 @@ Tb oX GX Jl -nd -nd -nd -nd -nd -nd -nd +YU +YU +YU +YU +YU +YU +YU GX GX GX @@ -8615,7 +8648,7 @@ GX GX nd nd -nd +YU gX vj HZ @@ -8650,7 +8683,7 @@ Im Im Hv Im -GX +QN nd nd nd @@ -8718,7 +8751,7 @@ nd nd nd nd -nd +YU gX TQ gB @@ -8764,9 +8797,9 @@ UM GX TQ TQ -GX -nd +QN nd +YU nd nd nd @@ -8778,7 +8811,7 @@ GX GX nd nd -nd +YU KZ Ii gB @@ -8812,7 +8845,7 @@ Im LN Im Im -GX +QN GX nd nd @@ -8882,8 +8915,8 @@ nd nd nd nd -nd -GX +YU +QN qR Im Im @@ -8928,11 +8961,11 @@ GX gX Pp Jl -GX +QN Pk -nd -nd -nd +YU +YU +YU nd nd GX @@ -8940,7 +8973,7 @@ GX GX GX nd -nd +YU GX sL gX @@ -8975,7 +9008,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -9047,7 +9080,7 @@ nd nd nd nd -nd +YU Im Im Im @@ -9095,7 +9128,7 @@ pY GM gX DB -GX +QN nd nd nd @@ -9103,7 +9136,7 @@ GX GX nd nd -nd +YU GX un Yx @@ -9138,7 +9171,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -9210,7 +9243,7 @@ nd nd nd nd -nd +YU Im Im Im @@ -9258,15 +9291,15 @@ pY Im LN zc -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN GX nd nd -nd +YU GX GX GX @@ -9301,7 +9334,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -9374,7 +9407,7 @@ nd nd nd nd -nd +YU gX jO GX @@ -9425,10 +9458,10 @@ hq BB BB BB -GX +QN GX nd -nd +YU gB GX GX @@ -9463,7 +9496,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -9537,7 +9570,7 @@ nd nd nd nd -nd +YU nd nd GX @@ -9588,10 +9621,10 @@ pY Jl BB BB -GX +QN GX nd -nd +YU Im Im GX @@ -9626,7 +9659,7 @@ Im Hv Im gB -GX +QN GX nd nd @@ -9700,7 +9733,7 @@ nd nd nd nd -nd +YU nd nd nd @@ -9751,9 +9784,9 @@ hq Jl BB BB -GX -nd +QN nd +YU gB Im GX @@ -9789,7 +9822,7 @@ Im Im gB gB -GX +QN GX nd nd @@ -9863,7 +9896,7 @@ nd nd nd nd -nd +YU nd jO GX @@ -9914,9 +9947,9 @@ hq Af gX BB -GX -nd +QN nd +YU gB nd GX @@ -9947,12 +9980,12 @@ Im jO jO gX -nd -nd -nd -nd +YU +YU +YU +YU gX -GX +QN GX nd nd @@ -10025,7 +10058,7 @@ nd nd nd nd -nd +YU gB Im Im @@ -10077,8 +10110,8 @@ GX gX Jl Af -kR -nd +NM +YU gX Im Im @@ -10112,9 +10145,9 @@ Im Im Im gX +YU nd -nd -nd +YU nd nd nd @@ -10183,11 +10216,11 @@ nd nd nd nd -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN Im Im Im @@ -10240,8 +10273,8 @@ GX pY pY hq -GX -nd +QN +YU Im Im Im @@ -10276,7 +10309,7 @@ Im Im Im gB -nd +YU nd nd nd @@ -10346,7 +10379,7 @@ nd nd nd nd -GX +QN LN Jl Yx @@ -10439,7 +10472,7 @@ Im Im Im jO -GX +QN GX GX nd @@ -10509,7 +10542,7 @@ nd nd nd nd -GX +QN Pp gX gB @@ -10602,7 +10635,7 @@ Im Im gB LN -GX +QN GX nd nd @@ -10672,7 +10705,7 @@ nd nd nd nd -GX +QN Jl Jl Jl @@ -10765,7 +10798,7 @@ Im Im jO LN -GX +QN nd nd nd @@ -10835,7 +10868,7 @@ nd nd nd nd -GX +QN fY Jl LN @@ -10927,7 +10960,7 @@ Im Im Im jO -GX +QN GX nd nd @@ -10998,7 +11031,7 @@ nd nd nd nd -GX +QN Pp wC Jl @@ -11088,8 +11121,8 @@ Im Im Im Im -GX -GX +QN +QN GX nd nd @@ -11161,7 +11194,7 @@ nd nd nd nd -GX +QN hq TQ GX @@ -11250,7 +11283,7 @@ gX Im jO Im -GX +QN GX GX nd @@ -11324,7 +11357,7 @@ nd nd nd nd -GX +QN Pp Jl Pp @@ -11412,7 +11445,7 @@ nd nd gB jO -GX +QN GX nd nd @@ -11487,7 +11520,7 @@ nd nd nd nd -GX +QN Jl Pp Jl @@ -11574,7 +11607,7 @@ Im Im nd gX -GX +QN GX nd nd @@ -11650,7 +11683,7 @@ nd nd nd nd -GX +QN gX Pp Tf @@ -11736,7 +11769,7 @@ jO Im Im nd -nd +YU GX nd nd @@ -11813,7 +11846,7 @@ nd nd nd nd -GX +QN Ll Jl Jl @@ -11898,7 +11931,7 @@ LN Im Im Im -nd +YU nd nd nd @@ -11976,7 +12009,7 @@ nd nd nd nd -GX +QN Jl LN Pp @@ -12060,7 +12093,7 @@ Im Im Im Im -GX +QN nd nd nd @@ -12139,7 +12172,7 @@ nd nd nd nd -GX +QN GX GX GX @@ -12222,7 +12255,7 @@ gB Im Im Im -GX +QN GX nd nd @@ -12302,7 +12335,7 @@ nd nd nd GX -GX +QN lH lH Ho @@ -12353,17 +12386,17 @@ Im Im Im Im -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN +QN +QN +QN +QN +QN +QN Im Im Ix @@ -12383,8 +12416,8 @@ Im Im Im Im -GX -GX +QN +QN GX GX nd @@ -12464,7 +12497,7 @@ nd nd nd nd -GX +QN BZ lH pO @@ -12513,6 +12546,9 @@ Im Im Im Im +QN +QN +QN GX GX GX @@ -12523,18 +12559,15 @@ GX GX GX GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN +QN +QN +QN +QN Im Im Ix @@ -12545,7 +12578,7 @@ Im Im Im Im -GX +QN GX GX nd @@ -12628,7 +12661,7 @@ nd nd nd GX -GX +QN WS yh lH @@ -12673,6 +12706,9 @@ Im Im Im Im +QN +QN +QN GX GX GX @@ -12694,20 +12730,17 @@ GX GX GX GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN +QN +QN +QN +QN +QN +QN GX GX nd @@ -12791,7 +12824,7 @@ nd nd nd GX -GX +QN oa pV pE @@ -12831,11 +12864,11 @@ Im Im Im Im -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN GX GX GX @@ -12954,7 +12987,7 @@ nd nd nd GX -GX +QN Pf Pp Pp @@ -12992,8 +13025,8 @@ Im Im Im Im -GX -GX +QN +QN GX GX GX @@ -13117,7 +13150,7 @@ nd nd nd GX -GX +QN wo Pp ZJ @@ -13154,7 +13187,7 @@ Im Im Im Im -GX +QN GX GX GX @@ -13280,7 +13313,7 @@ nd nd nd GX -GX +QN rl Pp Pp @@ -13316,7 +13349,7 @@ Im Im Im Im -GX +QN GX GX GX @@ -13443,7 +13476,7 @@ nd nd nd GX -GX +QN fV fu iy @@ -13477,8 +13510,8 @@ Im Im Im Im -GX -GX +QN +QN GX GX GX @@ -13606,7 +13639,7 @@ nd nd nd GX -GX +QN xQ WD pO @@ -13639,7 +13672,7 @@ Im Im gX Im -GX +QN GX GX GX @@ -13769,7 +13802,7 @@ nd nd nd GX -GX +QN lH lH lH @@ -13802,7 +13835,7 @@ Im Im Im Im -GX +QN GX GX GX @@ -13932,7 +13965,7 @@ nd nd nd GX -GX +QN wI wI cD @@ -13965,7 +13998,7 @@ Im Im Im Im -GX +QN GX GX GX @@ -14095,7 +14128,7 @@ nd nd GX GX -GX +QN GX GX GX @@ -14127,7 +14160,7 @@ Im Im Im Im -GX +QN GX GX GX @@ -14257,7 +14290,7 @@ nd nd nd GX -GX +QN Im Im Im @@ -14290,7 +14323,7 @@ Im Im Im Im -GX +QN GX GX GX @@ -14419,7 +14452,7 @@ nd nd nd nd -GX +QN Im Im Im @@ -14453,7 +14486,7 @@ Im Im Im Im -GX +QN GX GX nd @@ -14582,7 +14615,7 @@ nd nd nd GX -GX +QN Im Im LN @@ -14616,7 +14649,7 @@ Im Im Im Im -GX +QN GX GX nd @@ -14744,7 +14777,7 @@ nd nd nd GX -GX +QN Im Im Im @@ -14779,7 +14812,7 @@ Im gX Im Im -GX +QN GX nd nd @@ -14906,7 +14939,7 @@ nd nd nd nd -GX +QN Im Im Im @@ -14942,7 +14975,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -15069,7 +15102,7 @@ nd nd nd nd -GX +QN Im Im Im @@ -15105,7 +15138,7 @@ LN Im Im Im -GX +QN GX nd nd @@ -15232,7 +15265,7 @@ nd nd nd nd -GX +QN Im Im Im @@ -15268,7 +15301,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -15395,7 +15428,7 @@ nd nd nd nd -GX +QN Im Im Im @@ -15430,7 +15463,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -15558,7 +15591,7 @@ nd nd nd nd -GX +QN Im Im Im @@ -15593,7 +15626,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -15722,7 +15755,7 @@ nd nd nd GX -GX +QN Im Im Im @@ -15756,7 +15789,7 @@ Im Im Im Im -GX +QN nd nd nd @@ -15885,7 +15918,7 @@ nd nd nd nd -GX +QN Im Im Im @@ -15919,7 +15952,7 @@ Im Im Im Im -GX +QN nd nd nd @@ -16049,7 +16082,7 @@ nd nd nd nd -GX +QN Im Im Im @@ -16081,7 +16114,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -16212,7 +16245,7 @@ nd nd nd nd -nd +YU gX Im Im @@ -16244,7 +16277,7 @@ Im Im Im Im -GX +QN nd nd nd @@ -16376,7 +16409,7 @@ nd nd nd nd -nd +YU gX jO Im @@ -16406,7 +16439,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -16540,8 +16573,8 @@ nd nd nd nd -nd -nd +YU +YU gB LN Im @@ -16568,7 +16601,7 @@ Im Im Im Im -GX +QN GX nd nd @@ -16704,10 +16737,10 @@ nd nd nd nd -nd -nd -nd -nd +YU +YU +YU +YU gB gB Im @@ -16730,7 +16763,7 @@ Im Im Im Im -GX +QN nd nd nd @@ -16866,7 +16899,7 @@ nd nd GX GX -GX +QN gX LN jO @@ -16891,8 +16924,8 @@ Im Im Im Im -GX -GX +QN +QN GX nd nd @@ -17030,7 +17063,7 @@ GX GX GX GX -GX +QN Im Im Im @@ -17052,8 +17085,8 @@ Im Im Im Im -GX -GX +QN +QN GX GX nd @@ -17193,7 +17226,7 @@ GX GX GX GX -GX +QN Im Im Im @@ -17213,8 +17246,8 @@ Im Im Im Im -GX -GX +QN +QN GX GX GX @@ -17356,7 +17389,7 @@ GX GX GX GX -GX +QN Im Im Im @@ -17376,7 +17409,7 @@ Im Im Im Im -GX +QN GX GX nd @@ -17520,8 +17553,8 @@ GX GX GX GX -GX -GX +QN +QN Im Im Im @@ -17538,7 +17571,7 @@ Im Im Im Im -GX +QN GX GX GX @@ -17685,11 +17718,11 @@ GX GX GX GX -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN Im Im Im @@ -17697,10 +17730,10 @@ Im Im Im Im -GX -GX -GX -GX +QN +QN +QN +QN GX nd nd @@ -17853,13 +17886,13 @@ GX GX GX GX -GX -GX -GX -GX -GX -GX -GX +QN +QN +QN +QN +QN +QN +QN GX GX GX diff --git a/_maps/RandomRooms/rcorp/facility/standard2.dmm b/_maps/RandomRooms/rcorp/facility/standard2.dmm index 9c0d981020f1..ea5c5bf58ee0 100644 --- a/_maps/RandomRooms/rcorp/facility/standard2.dmm +++ b/_maps/RandomRooms/rcorp/facility/standard2.dmm @@ -8,6 +8,14 @@ /obj/machinery/button/door/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) +"aS" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/syndicate, /area/city/outskirts) "aX" = ( @@ -887,6 +895,10 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/carpet/purple, /area/city/outskirts) +"rp" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "rr" = ( /obj/effect/turf_decal/siding/red/corner{ dir = 1 @@ -1121,7 +1133,7 @@ dir = 10 }, /obj/structure/rack, -/obj/item/ego_weapon/ranged/clerk, +/obj/item/gun/ego_gun/clerk, /turf/open/floor/plasteel/dark, /area/city/outskirts) "vS" = ( @@ -1157,6 +1169,13 @@ /obj/machinery/rnd/bepis, /turf/open/floor/carpet/purple, /area/city/outskirts) +"wu" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakedoor{ + desc = "These things are thick. Doesn't look like they stopped anything important..."; + name = "broken cell door" + }, +/area/city/outskirts) "wz" = ( /obj/effect/turf_decal/siding/red, /obj/effect/turf_decal/sand, @@ -1558,6 +1577,10 @@ /obj/machinery/camera/autoname, /turf/open/floor/plating, /area/city/outskirts) +"Dx" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/fakeglass, +/area/city/outskirts) "DB" = ( /obj/effect/turf_decal/siding/brown, /turf/open/floor/plating, @@ -1627,6 +1650,7 @@ /turf/open/floor/plasteel/dark, /area/city/outskirts) "EO" = ( +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/reinforced, /area/city/outskirts) "ET" = ( @@ -1713,6 +1737,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "inside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "Ge" = ( @@ -1885,7 +1910,7 @@ dir = 9 }, /obj/structure/rack, -/obj/item/ego_weapon/ranged/clerk, +/obj/item/gun/ego_gun/clerk, /turf/open/floor/plasteel/dark, /area/city/outskirts) "Jl" = ( @@ -2093,6 +2118,10 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/city/outskirts) +"MI" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "MM" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -2149,6 +2178,10 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"NA" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "NH" = ( /obj/machinery/light/cold, /obj/structure/table/wood/fancy/blue, @@ -2847,77 +2880,77 @@ GX GX GX GX -GX +rp FW FW FW FW FW -aQ -GX -GX -GX -GX -GX -GX -GX -GX -GX -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -nd -GX -GX -GX +aS +rp +rp +rp +rp +rp +rp +rp +rp +rp +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +MI +rp +rp +NA FW FW FW aQ -GX -GX -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp +NA +NA FW aQ -GX -GX -GX +NA +rp +rp GX GX GX @@ -3003,14 +3036,14 @@ GX GX GX GX +rp +rp GX GX GX GX GX -GX -GX -GX +rp Im Im Im @@ -3080,7 +3113,7 @@ bN bN Qi gi -GX +rp GX GX GX @@ -3165,15 +3198,15 @@ GX GX GX GX -GX +rp kq kq +rp GX GX GX GX -GX -GX +rp Im Im Im @@ -3243,7 +3276,7 @@ Wz Wz fB nO -GX +rp GX GX GX @@ -3327,17 +3360,17 @@ nd GX GX GX -GX +rp AS Pp Pp AS +rp GX GX GX GX -GX -GX +rp Im Im Im @@ -3406,7 +3439,7 @@ Wz ha sh TI -GX +rp GX GX GX @@ -3490,17 +3523,17 @@ nd GX GX GX -GX +rp kq Pp Pp kq +rp GX GX GX GX -GX -GX +rp Im Im Im @@ -3569,7 +3602,7 @@ ha ha fB Pp -GX +rp GX GX GX @@ -3654,16 +3687,16 @@ GX GX GX GX -GX +rp GX Pp GX +rp GX GX GX GX -GX -GX +rp Im Im Im @@ -3732,7 +3765,7 @@ ha Wz sh qz -GX +rp GX GX GX @@ -3817,16 +3850,16 @@ GX GX GX GX -GX +rp pX Cf xH +rp GX GX GX GX -GX -GX +rp Im Im Im @@ -3895,7 +3928,7 @@ ha ha sh xL -GX +rp GX GX GX @@ -3980,16 +4013,16 @@ GX GX GX GX -GX +rp tQ Pp NJ +rp GX GX GX GX -GX -GX +rp Im Im Im @@ -4058,7 +4091,7 @@ ha ha sh vM -GX +rp GX GX GX @@ -4143,15 +4176,15 @@ GX GX GX GX -GX +rp rs Pp NJ +rp GX GX GX -GX -GX +rp Im Im Im @@ -4221,7 +4254,7 @@ ha XD GL Pp -GX +rp GX GX GX @@ -4306,15 +4339,15 @@ GX GX GX GX -GX +rp tQ LN NJ +rp GX GX GX -GX -GX +rp Im Im Im @@ -4384,7 +4417,7 @@ RA GX GX GX -GX +rp GX GX GX @@ -4469,15 +4502,15 @@ GX GX GX GX -GX +rp Bk Pp NJ +rp GX GX GX -GX -GX +rp GX GX Im @@ -4547,7 +4580,7 @@ ng Tw oN vQ -GX +rp GX GX GX @@ -4632,14 +4665,14 @@ GX GX GX GX -GX +rp lA Pp NJ +rp GX GX -GX -GX +rp GX LN LN @@ -4710,7 +4743,7 @@ Pp Pp Pp KF -GX +rp GX GX GX @@ -4795,13 +4828,13 @@ GX GX GX GX -GX +rp Bk jO NJ -xX +Dx gB -xX +Dx dr LN nl @@ -4873,7 +4906,7 @@ Pp Pp pP KF -GX +rp GX GX GX @@ -4958,13 +4991,13 @@ GX GX GX GX -GX +rp Bk jO NJ -xX +Dx gB -xX +Dx Tk iQ LS @@ -5036,7 +5069,7 @@ pP pP pP KF -GX +rp GX GX GX @@ -5121,13 +5154,13 @@ GX GX GX GX -GX +rp rs jO NJ -xX +Dx gB -GX +rp gR LN LS @@ -5199,6 +5232,7 @@ Pp Pp Jl DB +rp GX GX GX @@ -5213,9 +5247,8 @@ GX GX GX GX -GX -GX -GX +rp +rp GX GX GX @@ -5284,13 +5317,13 @@ GX GX GX GX -GX +rp Bk jO NJ -xX +Dx gB -xX +Dx Ut LN tD @@ -5361,10 +5394,9 @@ Jl nd nd nd +MI nd nd -nd -GX GX GX GX @@ -5377,21 +5409,22 @@ GX GX GX GX +rp Im Im +rp +rp +rp +rp GX GX GX GX GX -GX -GX -GX -GX -nd nd nd nd +MI nd nd nd @@ -5447,13 +5480,13 @@ GX GX GX GX -GX +rp Bk Pp NJ -xX +Dx gB -xX +Dx Tk iQ LS @@ -5523,14 +5556,11 @@ GX xB Pp Jl +MI nd nd nd nd -nd -GX -GX -GX GX GX GX @@ -5539,6 +5569,9 @@ GX GX GX GX +rp +rp +rp Im Im Im @@ -5546,19 +5579,19 @@ Im Im Im gB -GX -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp +rp Im -GX -nd -nd -nd +rp +MI +MI +MI nd nd nd @@ -5610,13 +5643,13 @@ GX GX GX GX -GX +rp Bk Pp wz -xX +Dx gB -GX +rp Lx LN LS @@ -5686,7 +5719,7 @@ GX xB Pp KF -GX +rp GX nd nd @@ -5698,7 +5731,7 @@ GX GX GX GX -GX +rp Im Im Im @@ -5722,8 +5755,8 @@ jZ gB gX gX -nd -nd +MI +MI nd nd nd @@ -5773,13 +5806,13 @@ GX GX GX GX -GX +rp Bk Pp NJ -xX +Dx gB -xX +Dx Ut Pp LS @@ -5849,7 +5882,7 @@ GX xB Pp KF -GX +rp GX GX nd @@ -5860,7 +5893,7 @@ GX GX GX GX -GX +rp Im Im Im @@ -5887,7 +5920,7 @@ gB gB gB Im -GX +rp nd nd nd @@ -5936,13 +5969,13 @@ GX GX GX GX -GX +rp Bk Pp NJ -xX +Dx gB -xX +Dx Tk XE LS @@ -6012,7 +6045,7 @@ GX lD Pp KF -GX +rp GX GX GX @@ -6022,7 +6055,7 @@ GX GX GX GX -GX +rp Im Im Im @@ -6050,9 +6083,9 @@ GX Nf Im jZ -GX -nd -nd +rp +MI +MI nd nd nd @@ -6099,11 +6132,11 @@ GX GX GX GX -GX +rp rs Pp wz -GX +rp GX EO bo @@ -6175,7 +6208,7 @@ GX xB Pp KF -GX +rp GX GX GX @@ -6185,7 +6218,7 @@ GX GX GX GX -GX +rp Im Im Im @@ -6216,8 +6249,8 @@ dZ Im Im Im -nd -nd +MI +MI nd nd nd @@ -6262,13 +6295,13 @@ nd nd GX GX -GX +rp Bk Pp wz -GX -GX -GX +rp +rp +rp GX GX GX @@ -6338,7 +6371,7 @@ GX xB Pp KF -GX +rp GX GX GX @@ -6348,7 +6381,7 @@ GX GX GX GX -GX +rp Im Im Im @@ -6381,7 +6414,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -6425,7 +6458,7 @@ nd nd GX GX -GX +rp tQ Pp LN @@ -6501,6 +6534,7 @@ GX QM Pp KF +rp GX GX GX @@ -6510,8 +6544,7 @@ GX GX GX GX -GX -GX +rp Im Im Ix @@ -6545,7 +6578,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -6588,7 +6621,7 @@ nd nd GX GX -GX +rp Sk Pp Pp @@ -6664,6 +6697,7 @@ GX xB Pp KF +rp GX GX GX @@ -6673,8 +6707,7 @@ GX GX GX GX -GX -GX +rp Im GX GX @@ -6708,7 +6741,7 @@ Hv Im Im Im -nd +MI nd nd nd @@ -6751,7 +6784,7 @@ nd nd GX GX -GX +rp tQ Pp Pp @@ -6827,6 +6860,7 @@ GX xB Pp KF +rp GX GX GX @@ -6836,8 +6870,7 @@ GX GX GX GX -GX -GX +rp Im jO jO @@ -6871,7 +6904,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -6914,32 +6947,32 @@ nd nd GX GX -GX +rp Bk Pp NJ -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -nd -nd +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +MI +MI Im Im Im @@ -6990,6 +7023,7 @@ GX lD Pp Ct +rp GX GX GX @@ -7000,8 +7034,7 @@ GX GX GX GX -GX -GX +rp Im Im jO @@ -7034,7 +7067,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -7077,11 +7110,11 @@ nd nd nd GX -GX +rp rs Pp NJ -GX +rp nd nd nd @@ -7103,8 +7136,8 @@ nd nd nd nd -nd -nd +MI +MI Im Im Im @@ -7153,7 +7186,7 @@ GX xB Pp nd -nd +MI nd GX GX @@ -7165,7 +7198,7 @@ nd GX GX GX -GX +rp xt Im Im @@ -7198,7 +7231,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -7240,11 +7273,11 @@ nd nd nd nd -GX +rp Bk LN NJ -GX +rp nd nd nd @@ -7267,7 +7300,7 @@ nd nd nd nd -nd +MI Im Im Im @@ -7316,7 +7349,7 @@ GX Jl nd nd -nd +MI nd nd GX @@ -7328,7 +7361,7 @@ nd GX GX GX -GX +rp Im Im Im @@ -7361,7 +7394,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -7403,12 +7436,11 @@ nd nd nd nd -GX +rp uV Rg eP -GX -nd +rp nd nd nd @@ -7431,6 +7463,7 @@ nd nd nd nd +MI nd Im Im @@ -7479,7 +7512,7 @@ nd xB Jl KF -GX +rp nd nd GX @@ -7491,7 +7524,7 @@ nd GX GX GX -GX +rp Im Im Im @@ -7524,7 +7557,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -7567,9 +7600,9 @@ nd nd nd GX -GX -GX -GX +rp +rp +rp GX nd nd @@ -7592,7 +7625,7 @@ nd nd nd nd -nd +MI pY gB Im @@ -7642,7 +7675,7 @@ nd nd nd Jl -GX +rp nd GX GX @@ -7654,7 +7687,7 @@ nd nd GX GX -GX +rp Im Im GX @@ -7687,7 +7720,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -7754,7 +7787,7 @@ nd nd nd nd -nd +MI gX pY gX @@ -7805,7 +7838,7 @@ nd nd Pp KF -GX +rp GX GX GX @@ -7817,7 +7850,7 @@ nd nd GX GX -GX +rp Im Im Im @@ -7850,7 +7883,7 @@ gB Im Im Im -nd +MI nd nd nd @@ -7917,7 +7950,7 @@ nd nd nd nd -nd +MI Jl GX qy @@ -7968,7 +8001,7 @@ GX lD Jl KF -GX +rp GX GX GX @@ -7980,7 +8013,7 @@ nd nd GX GX -GX +rp Im Im Im @@ -8013,7 +8046,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -8079,7 +8112,7 @@ nd nd nd nd -nd +MI gX Jl kR @@ -8131,7 +8164,7 @@ TQ xB nd nd -nd +MI GX GX GX @@ -8143,7 +8176,7 @@ nd nd nd GX -GX +rp GX gB Im @@ -8176,7 +8209,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -8242,7 +8275,7 @@ nd nd nd nd -nd +MI GX GX GX @@ -8294,7 +8327,7 @@ TQ Jl Pp Pp -nd +MI nd nd GX @@ -8305,7 +8338,7 @@ nd nd nd nd -GX +rp GX GX xt @@ -8339,7 +8372,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -8405,7 +8438,7 @@ nd nd nd nd -nd +MI Jl LN pY @@ -8457,17 +8490,17 @@ GX Du Jl Jl +rp GX GX GX GX GX GX -GX -nd nd nd nd +MI Pp gX EL @@ -8502,7 +8535,7 @@ Im Im Im Im -nd +MI nd nd nd @@ -8568,7 +8601,7 @@ nd nd nd nd -nd +MI Jl Pp TQ @@ -8620,7 +8653,7 @@ nd nd nd nd -nd +MI GX GX GX @@ -8629,7 +8662,7 @@ GX GX nd nd -nd +MI gX vj HZ @@ -8664,7 +8697,7 @@ Im Im Hv Im -GX +rp nd nd nd @@ -8732,7 +8765,7 @@ nd nd nd nd -nd +MI gX TQ gB @@ -8783,7 +8816,7 @@ nd nd nd nd -nd +MI nd GX GX @@ -8792,7 +8825,7 @@ GX GX nd nd -nd +MI KZ Ii gB @@ -8826,7 +8859,7 @@ Im LN Im Im -GX +rp GX nd nd @@ -8896,8 +8929,8 @@ nd nd nd nd -nd -GX +MI +rp qR Im Im @@ -8946,7 +8979,7 @@ GX Pk nd nd -nd +MI nd nd GX @@ -8954,7 +8987,7 @@ GX GX GX nd -nd +MI GX sL gX @@ -8989,7 +9022,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -9061,7 +9094,7 @@ nd nd nd nd -nd +MI Im Im Im @@ -9109,7 +9142,7 @@ pY GM gX DB -GX +rp nd nd nd @@ -9117,7 +9150,7 @@ GX GX nd nd -nd +MI GX un Yx @@ -9152,7 +9185,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -9224,7 +9257,7 @@ nd nd nd nd -nd +MI Im Im Im @@ -9272,15 +9305,15 @@ pY Im LN zc +rp +rp +rp +rp GX GX -GX -GX -GX -GX -nd nd nd +MI GX GX GX @@ -9315,7 +9348,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -9387,7 +9420,7 @@ nd nd nd nd -nd +MI nd gX jO @@ -9439,10 +9472,10 @@ hq BB BB BB +rp GX -GX -nd nd +MI gB GX GX @@ -9477,7 +9510,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -9550,7 +9583,7 @@ nd nd nd nd -nd +MI nd nd nd @@ -9602,10 +9635,10 @@ pY Jl BB BB +rp GX -GX -nd nd +MI Im Im GX @@ -9640,7 +9673,7 @@ Im Hv Im gB -GX +rp GX nd nd @@ -9713,7 +9746,7 @@ nd nd nd nd -nd +MI nd nd nd @@ -9765,9 +9798,9 @@ hq Jl BB BB -GX -nd +rp nd +MI gB Im GX @@ -9803,7 +9836,7 @@ Im Im gB gB -GX +rp GX nd nd @@ -9876,7 +9909,7 @@ nd nd nd nd -nd +MI nd nd jO @@ -9928,9 +9961,9 @@ hq Af gX BB -GX -nd +rp nd +MI gB nd GX @@ -9966,7 +9999,7 @@ nd nd nd gX -GX +rp GX nd nd @@ -10039,7 +10072,7 @@ nd nd nd nd -nd +MI gB Im Im @@ -10091,8 +10124,8 @@ GX gX Jl Af -kR -nd +wu +MI gX Im Im @@ -10128,7 +10161,7 @@ Im gX nd nd -nd +MI nd nd nd @@ -10197,11 +10230,11 @@ nd nd nd nd -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp Im Im Im @@ -10254,8 +10287,8 @@ GX pY pY hq -GX -nd +rp +MI Im Im Im @@ -10290,7 +10323,7 @@ Im Im Im gB -nd +MI nd nd nd @@ -10360,7 +10393,7 @@ nd nd nd nd -GX +rp LN Jl Yx @@ -10453,7 +10486,7 @@ Im Im Im jO -GX +rp GX GX nd @@ -10523,7 +10556,7 @@ nd nd nd nd -GX +rp Pp gX gB @@ -10616,7 +10649,7 @@ Im Im gB LN -GX +rp GX nd nd @@ -10686,7 +10719,7 @@ nd nd nd nd -GX +rp Jl Jl Jl @@ -10779,7 +10812,7 @@ Im Im jO LN -GX +rp nd nd nd @@ -10849,7 +10882,7 @@ nd nd nd nd -GX +rp fY Jl LN @@ -10941,7 +10974,7 @@ Im Im Im jO -GX +rp GX nd nd @@ -11012,7 +11045,7 @@ nd nd nd nd -GX +rp Pp wC Jl @@ -11102,8 +11135,8 @@ Im Im Im Im -GX -GX +rp +rp GX nd nd @@ -11175,7 +11208,7 @@ nd nd nd nd -GX +rp hq TQ GX @@ -11264,7 +11297,7 @@ gX Im jO Im -GX +rp GX GX nd @@ -11338,7 +11371,7 @@ nd nd nd nd -GX +rp Pp Jl Pp @@ -11426,7 +11459,7 @@ nd nd gB jO -GX +rp GX nd nd @@ -11501,7 +11534,7 @@ nd nd nd nd -GX +rp Jl Pp Jl @@ -11588,7 +11621,7 @@ Im Im nd gX -GX +rp GX nd nd @@ -11664,7 +11697,7 @@ nd nd nd nd -GX +rp gX Pp Tf @@ -11750,7 +11783,7 @@ jO Im Im nd -nd +MI GX nd nd @@ -11827,7 +11860,7 @@ nd nd nd nd -GX +rp Ll Jl Jl @@ -11912,7 +11945,7 @@ LN Im Im Im -nd +MI nd nd nd @@ -11990,7 +12023,7 @@ nd nd nd nd -GX +rp Jl LN Pp @@ -12074,7 +12107,7 @@ Im Im Im Im -GX +rp nd nd nd @@ -12153,7 +12186,7 @@ nd nd nd nd -GX +rp GX GX GX @@ -12236,7 +12269,7 @@ gB Im Im Im -GX +rp GX nd nd @@ -12316,7 +12349,7 @@ nd nd nd GX -GX +rp lH lH Ho @@ -12367,17 +12400,17 @@ Im Im Im Im -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp Im Im Ix @@ -12397,8 +12430,8 @@ Im Im Im Im -GX -GX +rp +rp GX GX nd @@ -12478,7 +12511,7 @@ nd nd nd nd -GX +rp BZ lH pO @@ -12527,6 +12560,9 @@ Im Im Im Im +rp +rp +rp GX GX GX @@ -12538,17 +12574,14 @@ GX GX GX GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp +rp Im Im Ix @@ -12559,7 +12592,7 @@ Im Im Im Im -GX +rp GX GX nd @@ -12642,7 +12675,7 @@ nd nd nd GX -GX +rp WS yh lH @@ -12687,6 +12720,9 @@ Im Im Im Im +rp +rp +rp GX GX GX @@ -12709,19 +12745,16 @@ GX GX GX GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp GX GX nd @@ -12805,7 +12838,7 @@ nd nd nd GX -GX +rp oa pV pE @@ -12845,11 +12878,11 @@ Im Im Im Im -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp GX GX GX @@ -12968,7 +13001,7 @@ nd nd nd GX -GX +rp Pf Pp Pp @@ -13006,8 +13039,8 @@ Im Im Im Im -GX -GX +rp +rp GX GX GX @@ -13131,7 +13164,7 @@ nd nd nd GX -GX +rp wo Pp ZJ @@ -13168,7 +13201,7 @@ Im Im Im Im -GX +rp GX GX GX @@ -13294,7 +13327,7 @@ nd nd nd GX -GX +rp rl Pp Pp @@ -13330,7 +13363,7 @@ Im Im Im Im -GX +rp GX GX GX @@ -13457,7 +13490,7 @@ nd nd nd GX -GX +rp fV fu iy @@ -13491,8 +13524,8 @@ Im Im Im Im -GX -GX +rp +rp GX GX GX @@ -13620,7 +13653,7 @@ nd nd nd GX -GX +rp xQ WD pO @@ -13653,7 +13686,7 @@ Im Im gX Im -GX +rp GX GX GX @@ -13783,7 +13816,7 @@ nd nd nd GX -GX +rp lH lH lH @@ -13816,7 +13849,7 @@ Im Im Im Im -GX +rp GX GX GX @@ -13946,7 +13979,7 @@ nd nd nd GX -GX +rp wI wI cD @@ -13979,7 +14012,7 @@ Im Im Im Im -GX +rp GX GX GX @@ -14109,7 +14142,7 @@ nd nd GX GX -GX +rp GX GX GX @@ -14141,7 +14174,7 @@ Im Im Im Im -GX +rp GX GX GX @@ -14271,7 +14304,7 @@ nd nd nd GX -GX +rp Im Im Im @@ -14304,7 +14337,7 @@ Im Im Im Im -GX +rp GX GX GX @@ -14433,7 +14466,7 @@ nd nd nd nd -GX +rp Im Im Im @@ -14467,7 +14500,7 @@ Im Im Im Im -GX +rp GX GX nd @@ -14574,13 +14607,13 @@ nd nd nd GX -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp GX nd nd @@ -14595,8 +14628,8 @@ nd nd nd GX -GX -GX +rp +rp Im Im LN @@ -14630,7 +14663,7 @@ Im Im Im Im -GX +rp GX GX nd @@ -14736,7 +14769,7 @@ nd nd nd GX -GX +rp pa Im Im @@ -14744,20 +14777,20 @@ Im Im Im Im -GX -GX -GX -GX -GX -GX -GX -GX -GX -GX -nd -nd -GX -GX +rp +rp +rp +rp +rp +rp +rp +rp +rp +rp +MI +MI +rp +rp Im Im Im @@ -14793,7 +14826,7 @@ Im gX Im Im -GX +rp GX nd nd @@ -14898,7 +14931,7 @@ nd nd nd nd -GX +rp pa bR pa @@ -14956,7 +14989,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -15061,7 +15094,7 @@ nd nd nd nd -GX +rp In bR bR @@ -15119,7 +15152,7 @@ LN Im Im Im -GX +rp GX nd nd @@ -15224,28 +15257,28 @@ nd nd nd GX -GX +rp In Wb In Uf GX Im -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp Im -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp Im Im Im @@ -15282,7 +15315,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -15386,14 +15419,14 @@ nd nd nd nd -GX +rp pa In In Im Im Im -GX +rp GX nd nd @@ -15401,7 +15434,7 @@ nd nd nd GX -GX +rp GX nd nd @@ -15409,7 +15442,7 @@ nd nd nd GX -GX +rp Im Im Im @@ -15444,7 +15477,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -15549,13 +15582,13 @@ nd nd nd nd -GX +rp Im BZ BZ Vn -GX -GX +rp +rp GX nd nd @@ -15572,7 +15605,7 @@ nd nd nd nd -GX +rp Im Im Im @@ -15607,7 +15640,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -15712,11 +15745,11 @@ nd nd nd nd -GX +rp Im Im Im -GX +rp GX nd nd @@ -15735,7 +15768,7 @@ nd nd nd nd -GX +rp GX Im Im @@ -15770,7 +15803,7 @@ Im Im Im Im -GX +rp nd nd nd @@ -15876,9 +15909,9 @@ nd nd nd GX -GX -GX -GX +rp +rp +rp GX nd nd @@ -15899,7 +15932,7 @@ nd nd nd nd -GX +rp Im Im Im @@ -15933,7 +15966,7 @@ Im Im Im Im -GX +rp nd nd nd @@ -16063,7 +16096,7 @@ nd nd nd nd -GX +rp Im Im Im @@ -16095,7 +16128,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -16226,7 +16259,7 @@ nd nd nd nd -nd +MI gX Im Im @@ -16258,7 +16291,7 @@ Im Im Im Im -GX +rp nd nd nd @@ -16390,7 +16423,7 @@ nd nd nd nd -nd +MI gX jO Im @@ -16420,7 +16453,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -16554,7 +16587,7 @@ nd nd nd nd -nd +MI nd gB LN @@ -16582,7 +16615,7 @@ Im Im Im Im -GX +rp GX nd nd @@ -16717,7 +16750,7 @@ nd nd nd nd -nd +MI nd nd nd @@ -16744,7 +16777,7 @@ Im Im Im Im -GX +rp nd nd nd @@ -16880,7 +16913,7 @@ nd nd GX GX -GX +rp gX LN jO @@ -16905,8 +16938,8 @@ Im Im Im Im -GX -GX +rp +rp GX nd nd @@ -17044,7 +17077,7 @@ GX GX GX GX -GX +rp Im Im Im @@ -17066,8 +17099,8 @@ Im Im Im Im -GX -GX +rp +rp GX GX nd @@ -17207,7 +17240,7 @@ GX GX GX GX -GX +rp Im Im Im @@ -17227,8 +17260,8 @@ Im Im Im Im -GX -GX +rp +rp GX GX GX @@ -17370,7 +17403,7 @@ GX GX GX GX -GX +rp Im Im Im @@ -17390,7 +17423,7 @@ Im Im Im Im -GX +rp GX GX nd @@ -17534,8 +17567,8 @@ GX GX GX GX -GX -GX +rp +rp Im Im Im @@ -17552,7 +17585,7 @@ Im Im Im Im -GX +rp GX GX GX @@ -17699,11 +17732,11 @@ GX GX GX GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp Im Im Im @@ -17711,10 +17744,10 @@ Im Im Im Im -GX -GX -GX -GX +rp +rp +rp +rp GX nd nd @@ -17867,13 +17900,13 @@ GX GX GX GX -GX -GX -GX -GX -GX -GX -GX +rp +rp +rp +rp +rp +rp +rp GX GX GX diff --git a/_maps/RandomRooms/rcorp/facility/xenos.dmm b/_maps/RandomRooms/rcorp/facility/xenos.dmm index 78fc034c386e..0594a7836a8b 100644 --- a/_maps/RandomRooms/rcorp/facility/xenos.dmm +++ b/_maps/RandomRooms/rcorp/facility/xenos.dmm @@ -63,6 +63,7 @@ /area/city/outskirts) "bN" = ( /obj/structure/sign/poster/lobotomycorp/hhpp, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/reinforced, /area/city/outskirts) "cc" = ( @@ -178,6 +179,13 @@ /mob/living/carbon/alien/humanoid/drone, /turf/open/floor/carpet, /area/city/outskirts) +"gF" = ( +/obj/machinery/button/door/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "gH" = ( /turf/open/floor/carpet/orange, /area/city/outskirts) @@ -489,6 +497,10 @@ }, /turf/open/floor/plasteel, /area/city/outskirts) +"oz" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "oO" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -835,6 +847,7 @@ /area/city/outskirts) "uy" = ( /obj/structure/sign/poster/official/we_watch, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/reinforced, /area/city/outskirts) "uW" = ( @@ -975,6 +988,10 @@ /obj/machinery/icecream_vat, /turf/open/floor/plasteel/white, /area/city/outskirts) +"yc" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "yJ" = ( /obj/structure/table/glass, /obj/item/storage/backpack/duffelbag/med/surgery{ @@ -1806,6 +1823,10 @@ /mob/living/carbon/alien/humanoid/royal/queen, /turf/open/floor/carpet, /area/city/outskirts) +"RM" = ( +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/closed/indestructible/syndicate, +/area/city/outskirts) "So" = ( /obj/structure/chair/sofa/corp/corner{ dir = 8 @@ -2012,6 +2033,10 @@ }, /turf/open/floor/plasteel/dark, /area/city/outskirts) +"WJ" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/reinforced, +/area/city/outskirts) "WP" = ( /obj/structure/sign/warning/electricshock, /turf/closed/indestructible/reinforced, @@ -2133,6 +2158,13 @@ /obj/structure/weightmachine/weightlifter, /turf/open/floor/carpet/red, /area/city/outskirts) +"ZS" = ( +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "inside" + }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, +/turf/open/floor/plating/asteroid, +/area/city/outskirts) (1,1,1) = {" Tf @@ -2165,14 +2197,14 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +oz +oz +oz +oz +oz +oz +oz +oz Mq Mq Mq @@ -2184,67 +2216,67 @@ GZ Ml Mq Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Tf -Mq -Mq -Mq -GZ -GZ -GZ -Ml -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -GZ -Ml -Mq -Mq +oz +oz +oz +oz +oz +oz +oz +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +yc +oz +oz +RM +ZS +ZS +ZS +gF +oz +oz +oz +oz +oz +oz +oz +RM +RM +ZS +gF +RM +oz Mq Mq Mq @@ -2336,7 +2368,7 @@ Tf Tf Tf Tf -Mq +oz vQ vQ vQ @@ -2346,7 +2378,7 @@ vQ vQ vQ vQ -Mq +oz Tf Tf Tf @@ -2390,7 +2422,7 @@ Ze iD iD iD -Ze +WJ jX Lh Lh @@ -2406,7 +2438,7 @@ Ze vQ vQ vQ -Ze +WJ Tf Tf Tf @@ -2499,7 +2531,7 @@ Tf Tf Tf Tf -Mq +oz vQ vQ vQ @@ -2509,7 +2541,7 @@ vQ vQ vQ vQ -Mq +oz Tf Tf Tf @@ -2553,7 +2585,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -2569,10 +2601,10 @@ Ze vQ vQ vQ -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ Tf Tf Tf @@ -2662,7 +2694,7 @@ Tf Tf Tf Tf -Mq +oz vQ vQ Mq @@ -2672,7 +2704,7 @@ Mq vQ vQ vQ -Mq +oz Tf Tf Tf @@ -2697,16 +2729,16 @@ Tf Tf Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ Tf Tf Tf @@ -2716,7 +2748,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -2735,7 +2767,7 @@ vQ ob YI YI -Ze +WJ Tf Tf Tf @@ -2825,7 +2857,7 @@ Tf Tf Tf Tf -Mq +oz vQ vQ Mq @@ -2835,7 +2867,7 @@ vQ vQ vQ vQ -Mq +oz Tf Tf Tf @@ -2860,7 +2892,7 @@ Tf Tf Tf Tf -Ze +WJ YI YI ob @@ -2869,7 +2901,7 @@ ob vQ vQ vQ -Ze +WJ Tf Tf Tf @@ -2879,7 +2911,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -2898,7 +2930,7 @@ vQ ob YI YI -Ze +WJ Tf Tf Tf @@ -2988,7 +3020,7 @@ Tf Tf Tf Tf -Mq +oz vQ vQ Mq @@ -2998,7 +3030,7 @@ Mq vQ vQ vQ -Mq +oz Tf Tf Tf @@ -3023,7 +3055,7 @@ Ze Ze Ze Ze -Ze +WJ aS YI ob @@ -3033,16 +3065,16 @@ vQ vQ vQ Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ Lh Lh Lh @@ -3061,7 +3093,7 @@ vQ ob YI YI -Ze +WJ Tf Tf Tf @@ -3151,7 +3183,7 @@ Tf Tf Tf Tf -Mq +oz vQ vQ vQ @@ -3161,7 +3193,7 @@ vQ vQ vQ vQ -Mq +oz Tf Tf Tf @@ -3186,7 +3218,7 @@ Ze iD iD iD -Ze +WJ YI YI ob @@ -3224,7 +3256,7 @@ vQ ob YI YI -Ze +WJ Tf Tf Tf @@ -3314,7 +3346,7 @@ Tf Tf Tf Tf -Mq +oz vQ vQ vQ @@ -3324,7 +3356,7 @@ vQ vQ vQ vQ -Mq +oz Tf Tf Tf @@ -3349,7 +3381,7 @@ Ze iD iD iD -Ze +WJ YI YI ob @@ -3387,7 +3419,7 @@ vQ vQ YI YI -Ze +WJ Tf Tf Tf @@ -3477,7 +3509,7 @@ Tf Tf Tf Tf -Mq +oz vQ vQ vQ @@ -3487,7 +3519,7 @@ vQ vQ vQ vQ -Mq +oz Tf Tf Tf @@ -3512,7 +3544,7 @@ Ze iD iD iD -Ze +WJ YI YI vQ @@ -3550,7 +3582,7 @@ vQ vQ YI YI -Ze +WJ Tf Tf Tf @@ -3640,17 +3672,17 @@ Tf Tf Tf Tf -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq -Mq +oz +oz +oz +oz +oz +oz +oz +oz +oz +oz +oz Tf Tf Tf @@ -3675,7 +3707,7 @@ Ze iD iD iD -Ze +WJ YI YI YI @@ -3713,7 +3745,7 @@ YI YI YI YI -Ze +WJ Tf Tf Tf @@ -3838,7 +3870,7 @@ Ze iD iD iD -Ze +WJ YI YI YI @@ -3876,7 +3908,7 @@ YI YI YI YI -Ze +WJ Tf Tf Tf @@ -4001,7 +4033,7 @@ Ze Ze Ze Ze -Ze +WJ xz YI YI @@ -4039,7 +4071,7 @@ YI YI YI cc -Ze +WJ Tf Tf Tf @@ -4164,7 +4196,7 @@ Tf Tf Tf Tf -Ze +WJ vQ YI YI @@ -4202,7 +4234,7 @@ YI YI YI vQ -Ze +WJ Tf Tf Tf @@ -4328,7 +4360,7 @@ Tf Tf Tf Ze -Ze +WJ YI YI YI @@ -4364,8 +4396,8 @@ Ze YI YI YI -Ze -Ze +WJ +WJ Tf Tf Tf @@ -4491,7 +4523,7 @@ Tf Tf Tf Tf -Ze +WJ jX Lh Lh @@ -4527,7 +4559,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -4654,7 +4686,7 @@ Ze Ze Ze Ze -Ze +WJ Lh Lh Lh @@ -4690,7 +4722,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -4817,7 +4849,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -4853,7 +4885,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -4980,7 +5012,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -5016,7 +5048,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -5143,7 +5175,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -5179,7 +5211,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -5306,7 +5338,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -5342,15 +5374,15 @@ Ze Lh Lh Lh -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ jf jf jf @@ -5469,7 +5501,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -5513,7 +5545,7 @@ Lh Lh Lh Lh -Ze +WJ jf Tf jf @@ -5632,7 +5664,7 @@ Ze Ze Ze Ze -Ze +WJ Lh Lh Lh @@ -5676,7 +5708,7 @@ Lh Lh Lh Lh -Ze +WJ jf Tf jf @@ -5795,7 +5827,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -5839,7 +5871,7 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -5958,7 +5990,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -6002,7 +6034,7 @@ Ze Lh Lh Lh -Ze +WJ jf jf jf @@ -6121,7 +6153,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -6165,7 +6197,7 @@ Ze Lh Lh Lh -Ze +WJ jf Tf jf @@ -6284,7 +6316,7 @@ Ze iD iD iD -Ze +WJ jX Lh Lh @@ -6328,7 +6360,7 @@ Ze Lh Lh Lh -Ze +WJ jf Tf jf @@ -6447,7 +6479,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -6491,7 +6523,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -6610,7 +6642,7 @@ Ze Ze Ze Ze -Ze +WJ Lh Lh Lh @@ -6654,7 +6686,7 @@ Ze Lh Lh Lh -Ze +WJ jf jf jf @@ -6773,7 +6805,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -6817,7 +6849,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -6936,7 +6968,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -6980,7 +7012,7 @@ wn Lh Lh Lh -Ze +WJ jf jf jf @@ -7099,7 +7131,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -7143,7 +7175,7 @@ DY Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -7262,7 +7294,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -7306,7 +7338,7 @@ DY Lh Lh Lh -Ze +WJ jf jf jf @@ -7425,7 +7457,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -7469,7 +7501,7 @@ DY Lh Lh Lh -Ze +WJ jf Tf jf @@ -7588,7 +7620,7 @@ Ze Ze Ze Ze -Ze +WJ Lh Lh Lh @@ -7632,7 +7664,7 @@ Va Lh Lh Lh -Ze +WJ jf Tf jf @@ -7751,7 +7783,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -7795,7 +7827,7 @@ WP Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -7914,7 +7946,7 @@ Ze iD iD iD -Ze +WJ jX Lh Lh @@ -7958,7 +7990,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -8077,7 +8109,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -8121,7 +8153,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -8240,7 +8272,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -8284,7 +8316,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -8403,7 +8435,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -8447,7 +8479,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -8566,7 +8598,7 @@ Ze Ze Ze Ze -Ze +WJ Lh Lh Lh @@ -8610,7 +8642,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -8729,7 +8761,7 @@ Tf Tf Tf Tf -Ze +WJ Lh Lh Lh @@ -8773,7 +8805,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -8881,17 +8913,17 @@ Tf Tf Tf Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ Ze fs Lh @@ -8936,7 +8968,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -9043,7 +9075,7 @@ Tf Tf Tf Tf -Ze +WJ ee AA HL @@ -9099,10 +9131,10 @@ Ze ii Lh oj -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ Tf Tf Tf @@ -9206,7 +9238,7 @@ Tf Tf Tf Tf -Ze +WJ gM Bq Bq @@ -9265,7 +9297,7 @@ vQ vQ vQ vQ -Ze +WJ Tf Tf Tf @@ -9428,7 +9460,7 @@ pH pH ZP vQ -Ze +WJ Tf Tf Tf @@ -9532,7 +9564,7 @@ Tf Tf Tf Tf -Ze +WJ jx Bq Kr @@ -9591,7 +9623,7 @@ pH pH ZP vQ -Ze +WJ Tf Tf Tf @@ -9695,7 +9727,7 @@ Tf Tf Tf Tf -Ze +WJ jK Bq LR @@ -9754,7 +9786,7 @@ pH pH au vQ -Ze +WJ Tf Tf Tf @@ -9858,7 +9890,7 @@ Tf Tf Tf Tf -Ze +WJ pm Bq Bq @@ -9917,7 +9949,7 @@ pH pH pH vQ -Ze +WJ Tf Tf Tf @@ -10021,7 +10053,7 @@ Tf Tf Tf Tf -Ze +WJ qb Gf MS @@ -10080,7 +10112,7 @@ pH pH pH vQ -Ze +WJ Tf Tf Tf @@ -10184,7 +10216,7 @@ Tf Tf Tf Tf -Ze +WJ Ze Ze Ze @@ -10243,7 +10275,7 @@ pH pH pH vQ -Ze +WJ Tf Tf Tf @@ -10347,7 +10379,7 @@ Tf Tf Tf Tf -Ze +WJ Ze GH MZ @@ -10406,7 +10438,7 @@ pH pH pH vQ -Ze +WJ Tf Tf Tf @@ -10510,7 +10542,7 @@ Tf Tf Tf Tf -Ze +WJ qC HG HG @@ -10569,7 +10601,7 @@ pH pH pH vQ -Ze +WJ Tf Tf Tf @@ -10673,7 +10705,7 @@ Tf Tf Tf Tf -Ze +WJ qG HG HG @@ -10732,7 +10764,7 @@ pH pH ZP vQ -Ze +WJ Tf Tf Tf @@ -10836,7 +10868,7 @@ Tf Tf Tf Tf -Ze +WJ tU HG HG @@ -10895,7 +10927,7 @@ pH pH ZP vQ -Ze +WJ Tf Tf Tf @@ -10999,7 +11031,7 @@ Tf Tf Tf Tf -Ze +WJ xM HG HG @@ -11058,7 +11090,7 @@ pH pH au vQ -Ze +WJ Tf Tf Tf @@ -11162,7 +11194,7 @@ Tf Tf Tf Tf -Ze +WJ Aj HG HG @@ -11221,7 +11253,7 @@ vQ sj vQ vQ -Ze +WJ Tf Tf Tf @@ -11326,7 +11358,7 @@ Tf Tf Tf Ze -Ze +WJ SD Oz SD @@ -11371,20 +11403,20 @@ Ze ii Lh oj -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ Tf Tf Tf @@ -11490,18 +11522,18 @@ Tf Tf Tf Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ fs Lh Tu @@ -11534,7 +11566,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -11664,7 +11696,7 @@ Tf Tf Tf Tf -Ze +WJ Lh Lh Lh @@ -11697,7 +11729,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -11827,7 +11859,7 @@ Tf Tf Tf Tf -Ze +WJ Lh Lh Lh @@ -11860,7 +11892,7 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -11990,7 +12022,7 @@ Ze Ze Ze Ze -Ze +WJ Lh Lh Lh @@ -12023,18 +12055,18 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ Tf Tf Tf @@ -12153,7 +12185,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -12186,10 +12218,10 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf -Ze +WJ oR se eU @@ -12197,7 +12229,7 @@ Zc PU Mz DE -Ze +WJ Tf Tf Tf @@ -12316,7 +12348,7 @@ Ze iD iD iD -Ze +WJ jX Lh Lh @@ -12349,10 +12381,10 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf -Ze +WJ CJ Fw eU @@ -12360,7 +12392,7 @@ Zc il lX vI -Ze +WJ Tf Tf Tf @@ -12479,7 +12511,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Qo @@ -12512,10 +12544,10 @@ Ze Lh Lh Lh -Ze +WJ Tf Tf -Ze +WJ Zc si eU @@ -12523,7 +12555,7 @@ Zc il Pc vI -Ze +WJ Tf Tf Tf @@ -12642,7 +12674,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -12675,10 +12707,10 @@ Ze Lh Lh Lh -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ Zc Zc Zc @@ -12686,7 +12718,7 @@ Zc il fV vI -Ze +WJ Tf Tf Tf @@ -12805,7 +12837,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -12849,11 +12881,11 @@ Zc Dp VX So -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ Tf Tf Tf @@ -12965,10 +12997,10 @@ Ze Ze Ze Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ Lh Lh Lh @@ -13016,7 +13048,7 @@ Ze JE pZ ZG -Ze +WJ Tf Tf Tf @@ -13127,7 +13159,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -13179,7 +13211,7 @@ IH Id pw Ll -Ze +WJ Tf Tf Tf @@ -13290,7 +13322,7 @@ Ze iD iD iD -Ze +WJ rU Lh Lh @@ -13342,7 +13374,7 @@ IH Uj pw bE -Ze +WJ Tf Tf Tf @@ -13453,7 +13485,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -13505,7 +13537,7 @@ Ze hU pw rf -Ze +WJ Tf Tf Tf @@ -13616,7 +13648,7 @@ Ze iD iD iD -Ze +WJ jX Lh Lh @@ -13668,7 +13700,7 @@ wq sK sK qI -Ze +WJ Tf Tf Tf @@ -13779,7 +13811,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -13827,11 +13859,11 @@ Zc Zc eU wV -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ Tf Tf Tf @@ -13942,7 +13974,7 @@ Ze Ze Ze Ze -Ze +WJ Lh Lh Lh @@ -13990,7 +14022,7 @@ Zc Zc If wV -Ze +WJ Tf Tf Tf @@ -14105,7 +14137,7 @@ Tf Tf Tf Tf -Ze +WJ Ze GR Lh @@ -14114,9 +14146,9 @@ Lh Lh Lh Ze -Ze -Ze -Ze +WJ +WJ +WJ Ze Lh Lh @@ -14146,14 +14178,14 @@ Ze Ze Ze Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ +WJ +WJ Tf Tf Tf @@ -14269,18 +14301,18 @@ Tf Tf Tf Tf -Ze -Ze +WJ +WJ aI nh nh Ze Tb -Ze +WJ Tf Tf Tf -Ze +WJ Lh Qo Lh @@ -14433,17 +14465,17 @@ Tf Tf Tf Tf -Ze +WJ ZH jY TM TM TM +WJ Ze Ze Ze -Ze -Ze +WJ Lh Lh Lh @@ -14471,7 +14503,7 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -14596,17 +14628,17 @@ Tf Tf Tf Tf -Ze +WJ qm TM gV TM NQ -Ze +WJ iD iD iD -Ze +WJ Lh Lh Lh @@ -14634,7 +14666,7 @@ Lh Qo Lh Lh -Ze +WJ Tf Tf Tf @@ -14759,17 +14791,17 @@ Tf Tf Tf Tf -Ze +WJ NQ TM NQ TM NQ -Ze +WJ iD iD iD -Ze +WJ jX Lh Lh @@ -14797,7 +14829,7 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -14922,17 +14954,17 @@ Tf Tf Tf Tf -Ze +WJ Mb wO Pm UN sF -Ze +WJ iD iD iD -Ze +WJ Lh Lh Lh @@ -14947,8 +14979,8 @@ Lh Lh Lh Ze -Ze -Ze +WJ +WJ Ze Ze Ze @@ -14960,7 +14992,7 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -15086,16 +15118,16 @@ Tf Tf Tf Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -15109,10 +15141,10 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf -Ze +WJ iD iD iD @@ -15123,7 +15155,7 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -15258,7 +15290,7 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh @@ -15272,10 +15304,10 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf -Ze +WJ iD iD iD @@ -15286,7 +15318,7 @@ Lh Lh Lh rU -Ze +WJ Tf Tf Tf @@ -15422,23 +15454,23 @@ Ze Ze Ze Ze -Ze -Ze -Ze +WJ +WJ +WJ Ze Lh Lh Lh Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ Ze Tf Tf -Ze +WJ iD iD iD @@ -15449,7 +15481,7 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -15588,11 +15620,11 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -15601,7 +15633,7 @@ Tf Tf Tf Tf -Ze +WJ iD iD iD @@ -15612,7 +15644,7 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -15751,11 +15783,11 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -15764,7 +15796,7 @@ Tf Tf Tf Tf -Ze +WJ iD iD iD @@ -15775,7 +15807,7 @@ Lh Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -15914,11 +15946,11 @@ Ze iD iD iD -Ze +WJ jX Lh Lh -Ze +WJ Tf Tf Tf @@ -15928,8 +15960,8 @@ Tf Tf Tf Ze -Ze -Ze +WJ +WJ Ze Ze Ze @@ -15937,7 +15969,7 @@ Ze IH Ue IH -Ze +WJ Ze Tf Tf @@ -16077,11 +16109,11 @@ Ze iD iD iD -Ze +WJ Lh Qo Lh -Ze +WJ Tf Tf Tf @@ -16093,14 +16125,14 @@ Tf Tf Tf Tf -Ze +WJ ld lH Ze DX HG HG -Ze +WJ Tf Tf Tf @@ -16240,11 +16272,11 @@ Ze iD iD iD -Ze +WJ Lh Lh Lh -Ze +WJ Tf Tf Tf @@ -16256,14 +16288,14 @@ Tf Tf Tf Tf -Ze +WJ Bp lH Ue HG HG HG -Ze +WJ Tf Tf Tf @@ -16402,14 +16434,14 @@ Tf Ze Ze Ze -Ze -Ze +WJ +WJ Zg Lh lT Ze -Ze -Ze +WJ +WJ Ze Tf Tf @@ -16419,14 +16451,14 @@ Tf Tf Tf Tf -Ze +WJ qj Cq Ze SD xA SD -Ze +WJ Tf Tf Tf @@ -16564,7 +16596,7 @@ Tf Tf Tf Ze -Ze +WJ Rr cl cl @@ -16573,7 +16605,7 @@ cl cl cl Rr -Ze +WJ Tf Tf Tf @@ -16583,12 +16615,12 @@ Tf Tf Tf Ze -Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ +WJ Ze Tf Tf @@ -16726,7 +16758,7 @@ Tf Tf Tf Tf -Ze +WJ fl nN cl @@ -16736,7 +16768,7 @@ mZ cl cl cl -Ze +WJ Tf Tf Tf @@ -16889,7 +16921,7 @@ Tf Tf Tf Tf -Ze +WJ aq LY gD @@ -16899,7 +16931,7 @@ Ze Ze Ze Ze -Ze +WJ Tf Tf Tf @@ -17052,7 +17084,7 @@ Tf Tf Tf Tf -Ze +WJ cl gD mZ @@ -17215,7 +17247,7 @@ Tf Tf Tf Tf -Ze +WJ aq LY cl @@ -17225,7 +17257,7 @@ cl fu sY rD -Ze +WJ Tf Tf Tf @@ -17378,7 +17410,7 @@ Tf Tf Tf Tf -Ze +WJ qs Hh cl @@ -17388,7 +17420,7 @@ cl Ze Ze Ze -Ze +WJ Ze Tf Tf @@ -17541,7 +17573,7 @@ Tf Tf Tf Tf -Ze +WJ cl cl cl @@ -17704,7 +17736,7 @@ Tf Tf Tf Tf -Ze +WJ cl cl cl @@ -17715,7 +17747,7 @@ Bl lF ru rD -Ze +WJ Tf Tf Tf @@ -17868,7 +17900,7 @@ Tf Tf Tf Ze -Ze +WJ TJ iW cl @@ -17876,8 +17908,8 @@ cl cl Ep Ze -Ze -Ze +WJ +WJ Ze Tf Tf @@ -18031,14 +18063,14 @@ Tf Tf Tf Tf -Ze +WJ zd cl cl Ab Ze -Ze -Ze +WJ +WJ Tf Tf Tf @@ -18195,11 +18227,11 @@ Tf Tf Tf Ze -Ze -Ze -Ze -Ze -Ze +WJ +WJ +WJ +WJ +WJ Tf Tf Tf diff --git a/_maps/RandomRooms/wcorp/carriage1.dmm b/_maps/RandomRooms/wcorp/carriage1.dmm index 9951e2864cd0..6a38993aebac 100644 --- a/_maps/RandomRooms/wcorp/carriage1.dmm +++ b/_maps/RandomRooms/wcorp/carriage1.dmm @@ -154,10 +154,6 @@ /obj/structure/table/wood, /turf/open/floor/carpet/blue, /area/city/outskirts) -"V" = ( -/obj/structure/displaycase, -/turf/open/floor/carpet/blue, -/area/city/outskirts) "X" = ( /obj/structure/chair/wood, /turf/open/floor/carpet/blue, @@ -230,7 +226,7 @@ a "} (5,1,1) = {" a -V +M M M S @@ -238,7 +234,7 @@ S R M M -V +M a "} (6,1,1) = {" @@ -282,7 +278,7 @@ a "} (9,1,1) = {" a -V +M M M M @@ -290,7 +286,7 @@ F M S M -V +M a "} (10,1,1) = {" diff --git a/_maps/RandomRooms/wcorp/kitchen.dmm b/_maps/RandomRooms/wcorp/kitchen.dmm index 8a228a1e5548..4eda90161417 100644 --- a/_maps/RandomRooms/wcorp/kitchen.dmm +++ b/_maps/RandomRooms/wcorp/kitchen.dmm @@ -8,8 +8,8 @@ icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 1 + dir = 1; + icon_state = "trails_2" }, /turf/open/floor/carpet/royalblack, /area/city/outskirts) @@ -21,8 +21,8 @@ /area/city/outskirts) "aS" = ( /obj/effect/decal/cleanable/blood/gibs/up{ - icon_state = "tracks"; - dir = 8 + dir = 8; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/up{ icon_state = "splatter5" @@ -46,16 +46,16 @@ /area/city/outskirts) "cg" = ( /obj/effect/decal/cleanable/blood/gibs/body{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/body{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/body{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /turf/open/floor/mineral/titanium/tiled/white, /area/city/outskirts) @@ -93,16 +93,16 @@ /area/city/outskirts) "er" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 4 + dir = 4; + icon_state = "trails_2" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 8 + dir = 8; + icon_state = "trails_2" }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium, @@ -122,16 +122,16 @@ /area/city/outskirts) "gC" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 5 + dir = 5; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 5 + dir = 5; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 5 + dir = 5; + icon_state = "trails_2" }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium, @@ -153,8 +153,8 @@ /area/city/outskirts) "jq" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium, @@ -166,7 +166,6 @@ /turf/open/floor/mineral/plastitanium, /area/city/outskirts) "pd" = ( -/obj/machinery/deepfryer, /obj/effect/decal/cleanable/blood/gibs/body{ icon_state = "coatblood" }, @@ -176,13 +175,14 @@ /obj/effect/decal/cleanable/blood/gibs/body{ icon_state = "floor1" }, +/obj/structure/table/reinforced, /turf/open/floor/mineral/titanium/tiled/white, /area/city/outskirts) "qc" = ( /obj/effect/decal/cleanable/glass, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium, @@ -196,8 +196,8 @@ /area/city/outskirts) "sd" = ( /obj/effect/decal/cleanable/blood/tracks{ - icon_state = "gib5"; - dir = 4 + dir = 4; + icon_state = "gib5" }, /turf/open/floor/carpet/royalblack, /area/city/outskirts) @@ -224,12 +224,12 @@ /area/city/outskirts) "tM" = ( /obj/effect/decal/cleanable/blood/gibs/up{ - icon_state = "gib3-old"; - dir = 4 + dir = 4; + icon_state = "gib3-old" }, /obj/effect/decal/cleanable/blood/gibs/up{ - icon_state = "tracks"; - dir = 8 + dir = 8; + icon_state = "tracks" }, /turf/open/floor/mineral/plastitanium, /area/city/outskirts) @@ -268,8 +268,8 @@ /area/city/outskirts) "vk" = ( /obj/effect/decal/cleanable/blood/gibs/body{ - icon_state = "tracks"; - dir = 10 + dir = 10; + icon_state = "tracks" }, /turf/open/floor/mineral/titanium/tiled/white, /area/city/outskirts) @@ -314,12 +314,12 @@ /area/city/outskirts) "zU" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 10 + dir = 10; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 10 + dir = 10; + icon_state = "trails_2" }, /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 4; @@ -355,8 +355,8 @@ /area/city/outskirts) "DI" = ( /obj/effect/decal/cleanable/blood/gibs/up{ - icon_state = "tracks"; - dir = 10 + dir = 10; + icon_state = "tracks" }, /turf/open/floor/mineral/plastitanium, /area/city/outskirts) @@ -374,16 +374,16 @@ /area/city/outskirts) "EX" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 4 + dir = 4; + icon_state = "trails_2" }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium, @@ -413,12 +413,12 @@ /area/city/outskirts) "Iv" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 9 + dir = 9; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 9 + dir = 9; + icon_state = "trails_2" }, /obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/mineral/plastitanium, @@ -442,12 +442,12 @@ /area/city/outskirts) "Jh" = ( /obj/effect/decal/cleanable/blood/gibs/up{ - icon_state = "tracks"; - dir = 5 + dir = 5; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/up{ - icon_state = "tracks"; - dir = 5 + dir = 5; + icon_state = "tracks" }, /turf/open/floor/mineral/plastitanium, /area/city/outskirts) @@ -462,12 +462,12 @@ icon_state = "drip1" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 4 + dir = 4; + icon_state = "trails_2" }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium, @@ -499,12 +499,12 @@ icon_state = "gibbl1" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 6 + dir = 6; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 6 + dir = 6; + icon_state = "trails_2" }, /turf/open/floor/carpet/royalblack, /area/city/outskirts) @@ -545,12 +545,12 @@ /area/city/outskirts) "OH" = ( /obj/effect/decal/cleanable/blood/gibs/body{ - icon_state = "gib3"; - dir = 4 + dir = 4; + icon_state = "gib3" }, /obj/effect/decal/cleanable/blood/gibs/body{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /turf/open/floor/mineral/titanium/tiled/white, /area/city/outskirts) @@ -596,12 +596,12 @@ /area/city/outskirts) "Rt" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "trails_2"; - dir = 8 + dir = 8; + icon_state = "trails_2" }, /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/mineral/plastitanium, @@ -615,8 +615,8 @@ /area/city/outskirts) "TW" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /obj/effect/decal/cleanable/blood/gibs/torso{ icon_state = "u_dangerous_l" @@ -626,12 +626,12 @@ /area/city/outskirts) "Ud" = ( /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "gib3"; - dir = 4 + dir = 4; + icon_state = "gib3" }, /obj/effect/decal/cleanable/blood/gibs/torso{ - icon_state = "tracks"; - dir = 4 + dir = 4; + icon_state = "tracks" }, /turf/open/floor/carpet/royalblack, /area/city/outskirts) diff --git a/_maps/RandomRooms/wcorp/library.dmm b/_maps/RandomRooms/wcorp/library.dmm index 34f0fb934258..93ee4c4297bb 100644 --- a/_maps/RandomRooms/wcorp/library.dmm +++ b/_maps/RandomRooms/wcorp/library.dmm @@ -1,6 +1,57 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "fU" = ( -/turf/open/space/basic, +/turf/open/floor/wood, +/area/city/outskirts) +"rM" = ( +/obj/structure/chair/stool, +/turf/open/floor/wood, +/area/city/outskirts) +"se" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/wood, +/area/city/outskirts) +"vy" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/wood, +/area/city/outskirts) +"wB" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 9 + }, +/turf/open/floor/wood, +/area/city/outskirts) +"BY" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/city/outskirts) +"Pc" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/wood, +/area/city/outskirts) +"QR" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/turf/open/floor/wood, +/area/city/outskirts) +"Rf" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/floor/wood, +/area/city/outskirts) +"Ro" = ( +/obj/structure/bookcase/random, +/turf/open/floor/wood, +/area/city/outskirts) +"VI" = ( +/obj/structure/chair/comfy/black{ + dir = 1 + }, +/turf/open/floor/wood, /area/city/outskirts) "Xn" = ( /turf/closed/wall/mineral/plastitanium, @@ -22,13 +73,13 @@ Xn (2,1,1) = {" Xn fU +Ro +Ro +Ro fU -fU -fU -fU -fU -fU -fU +Ro +Ro +Ro fU Xn "} @@ -48,9 +99,9 @@ Xn (4,1,1) = {" Xn fU -fU -fU -fU +Pc +vy +Pc fU fU fU @@ -61,13 +112,13 @@ Xn (5,1,1) = {" Xn fU +Ro +Ro +Ro fU -fU -fU -fU -fU -fU -fU +Ro +Ro +Ro fU Xn "} @@ -77,10 +128,10 @@ fU fU fU fU -fU -fU -fU -fU +wB +Pc +Pc +Pc fU Xn "} @@ -90,7 +141,7 @@ fU fU fU fU -fU +se fU fU fU @@ -100,13 +151,13 @@ Xn (8,1,1) = {" Xn fU -fU -fU -fU -fU -fU -fU -fU +Ro +Ro +Ro +Rf +Ro +Ro +Ro fU Xn "} @@ -120,58 +171,58 @@ fU fU fU fU -fU +VI Xn "} (10,1,1) = {" Xn +rM +BY +BY +rM fU fU fU fU -fU -fU -fU -fU -fU +QR Xn "} (11,1,1) = {" Xn +rM +BY +BY +rM fU fU fU fU -fU -fU -fU -fU -fU +VI Xn "} (12,1,1) = {" Xn +rM +BY +BY +rM fU fU fU fU -fU -fU -fU -fU -Xn +QR Xn "} (13,1,1) = {" Xn -Xn -Xn fU fU fU fU fU fU -Xn +fU +fU +VI Xn "} diff --git a/_maps/RandomRooms/wcorp/passenger2.dmm b/_maps/RandomRooms/wcorp/passenger2.dmm index 3e5748cea80f..0a437698b654 100644 --- a/_maps/RandomRooms/wcorp/passenger2.dmm +++ b/_maps/RandomRooms/wcorp/passenger2.dmm @@ -1,22 +1,17 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ah" = ( +"bH" = ( /obj/machinery/light{ - dir = 2 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/city/outskirts) -"bH" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +"cn" = ( +/obj/machinery/light{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel/dark, /area/city/outskirts) -"cn" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/carpet/royalblue, -/area/city/outskirts) "eo" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/tracks{ @@ -24,25 +19,22 @@ }, /turf/open/floor/carpet/royalblue, /area/city/outskirts) -"eZ" = ( -/obj/effect/decal/cleanable/blood/gibs/up, -/obj/effect/decal/cleanable/blood/bubblegum, +"eT" = ( +/obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plasteel/dark, /area/city/outskirts) "fV" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/carpet/royalblue, -/area/city/outskirts) -"hz" = ( -/obj/effect/decal/cleanable/xenoblood/xsplatter, -/turf/open/floor/carpet/royalblue, +/obj/structure/railing{ + dir = 2 + }, +/turf/open/floor/plasteel/dark, /area/city/outskirts) "hN" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plasteel/dark/side{ +/obj/machinery/light{ dir = 1 }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plasteel/dark, /area/city/outskirts) "hQ" = ( /obj/effect/decal/cleanable/blood/footprints{ @@ -51,50 +43,49 @@ /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/royalblue, /area/city/outskirts) "iO" = ( /turf/open/floor/carpet/royalblue, /area/city/outskirts) "kt" = ( -/obj/structure/railing{ - dir = 1 - }, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/floor/plasteel/dark/side{ dir = 1 }, /area/city/outskirts) "lu" = ( -/obj/effect/decal/cleanable/blood/splatter, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 6 - }, -/turf/open/floor/carpet/royalblue, +/obj/effect/decal/cleanable/blood/gibs/bubblegum, +/turf/open/floor/plasteel/dark, /area/city/outskirts) "lz" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, +/obj/structure/railing{ + dir = 2 + }, /turf/open/floor/plasteel/dark/side, /area/city/outskirts) "mH" = ( -/turf/open/floor/plasteel/dark/side{ - dir = 8 - }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plasteel/dark, /area/city/outskirts) "mU" = ( -/obj/effect/decal/cleanable/blood/footprints{ - dir = 4 - }, +/obj/effect/decal/cleanable/blood/gibs/down, /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, -/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/royalblue, /area/city/outskirts) "nj" = ( -/obj/structure/railing{ - dir = 8 +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/plasteel/dark, +/area/city/outskirts) +"nz" = ( +/obj/machinery/light{ + dir = 2 }, +/obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plasteel/dark, /area/city/outskirts) "nL" = ( @@ -102,24 +93,24 @@ /turf/closed/wall/r_wall/syndicate, /area/city/outskirts) "nO" = ( -/obj/machinery/light{ +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/side{ dir = 1 }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plasteel/dark, /area/city/outskirts) "nX" = ( /turf/closed/wall/r_wall/syndicate, /area/city/outskirts) "pa" = ( -/obj/effect/decal/cleanable/blood/gibs/down, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 8 - }, +/obj/effect/decal/cleanable/xenoblood/xsplatter, /turf/open/floor/carpet/royalblue, /area/city/outskirts) "qc" = ( -/obj/effect/decal/cleanable/blood/drip, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/city/outskirts) "qh" = ( @@ -137,37 +128,27 @@ }, /turf/open/floor/carpet/royalblue, /area/city/outskirts) -"tR" = ( -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/plasteel/dark, -/area/city/outskirts) "tV" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plasteel/dark/corner{ - dir = 4 - }, +/obj/effect/decal/cleanable/xenoblood/xgibs, +/turf/open/floor/carpet/royalblue, /area/city/outskirts) "vr" = ( -/turf/open/floor/plasteel/dark/corner, -/area/city/outskirts) -"wj" = ( -/obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/floor/plasteel/dark, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plasteel/dark/side, /area/city/outskirts) "xn" = ( -/turf/open/floor/plasteel/dark/corner{ - dir = 8 - }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/carpet/royalblue, /area/city/outskirts) "xF" = ( -/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plasteel/dark, /area/city/outskirts) "yl" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/royalblue, /area/city/outskirts) "yw" = ( @@ -176,34 +157,27 @@ }, /area/city/outskirts) "zE" = ( -/obj/structure/displaycase/trophy, -/turf/open/floor/plasteel/dark, -/area/city/outskirts) -"AD" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plasteel/dark/side{ - dir = 4 - }, -/area/city/outskirts) -"Bk" = ( /obj/structure/railing{ - dir = 1 + dir = 8 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/city/outskirts) "Bz" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plasteel/dark/side{ - dir = 8 +/obj/effect/decal/cleanable/blood/tracks{ + dir = 9 }, +/turf/open/floor/carpet/royalblue, /area/city/outskirts) "Ci" = ( -/obj/effect/decal/cleanable/xenoblood/xgibs, +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, /turf/open/floor/carpet/royalblue, /area/city/outskirts) "Cr" = ( +/obj/effect/decal/cleanable/blood/footprints{ + dir = 4 + }, /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, @@ -211,187 +185,161 @@ /area/city/outskirts) "Cx" = ( /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark/side, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/royalblue, /area/city/outskirts) "CV" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood, /turf/open/floor/carpet/royalblue, /area/city/outskirts) "Eu" = ( -/turf/open/floor/plasteel/dark, -/area/city/outskirts) -"Fv" = ( -/obj/structure/railing{ +/obj/structure/chair/comfy/shuttle{ dir = 4 }, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/city/outskirts) -"HE" = ( -/obj/structure/railing{ - dir = 8 - }, +"Fv" = ( +/obj/structure/displaycase/trophy, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/city/outskirts) "JY" = ( -/obj/structure/railing{ - dir = 2 - }, +/obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plasteel/dark/side, /area/city/outskirts) "KK" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/effect/decal/cleanable/blood/bubblegum, /turf/open/floor/plasteel/dark, /area/city/outskirts) "KM" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/carpet/royalblue, -/area/city/outskirts) -"Lw" = ( /obj/effect/decal/cleanable/blood/gibs/bubblegum, /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/carpet/royalblue, /area/city/outskirts) -"Nm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, +"Lw" = ( +/obj/structure/barricade/wooden, +/obj/structure/barricade/wooden/crude, +/turf/open/floor/plasteel/dark/side, /area/city/outskirts) "NN" = ( -/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark/side, /area/city/outskirts) +"OE" = ( +/obj/machinery/light{ + dir = 2 + }, +/turf/open/floor/plasteel/dark, +/area/city/outskirts) "PA" = ( +/obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/blood/tracks{ - dir = 9 + dir = 6 }, /turf/open/floor/carpet/royalblue, /area/city/outskirts) "Ri" = ( -/obj/structure/displaycase/trophy, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/dark, -/area/city/outskirts) -"Rw" = ( -/turf/open/floor/plasteel/dark/side{ - dir = 4 - }, -/area/city/outskirts) -"RK" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/structure/railing{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/city/outskirts) -"SY" = ( +"SD" = ( /obj/structure/railing{ - dir = 2 + dir = 1 }, /turf/open/floor/plasteel/dark, /area/city/outskirts) "SZ" = ( -/obj/machinery/light{ - dir = 1 - }, /turf/open/floor/plasteel/dark, /area/city/outskirts) "Ui" = ( -/obj/machinery/light{ - dir = 2 - }, -/obj/effect/decal/cleanable/blood/gibs/old, -/turf/open/floor/plasteel/dark, -/area/city/outskirts) -"Wd" = ( -/obj/effect/decal/cleanable/blood/gibs/bubblegum, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/city/outskirts) "Xh" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel/dark, /area/city/outskirts) "Xn" = ( +/obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/plasteel/dark/side, +/turf/open/floor/plasteel/dark, /area/city/outskirts) "Yt" = ( -/obj/structure/barricade/wooden, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plasteel/dark/corner{ - dir = 1 - }, +/obj/structure/displaycase/trophy, +/turf/open/floor/plasteel/dark, /area/city/outskirts) (1,1,1) = {" nX -nX -Rw +cn +Ui +yw tV -iO -yl -iO +rQ +Cx vr -AD -nX +SZ +OE nX "} (2,1,1) = {" nX Xh -Nm +Xh yw Ci rQ -cn -Xn -Eu -ah +iO +qh +Xh +Xh nX "} (3,1,1) = {" nX -RK -RK +SZ +lu yw -yl -rQ iO -qh -RK -RK +Cr +iO +JY +Xn +eT nX "} (4,1,1) = {" nX Eu -Wd +Xh yw -iO +xn hQ iO NN xF -wj +Xh nX "} (5,1,1) = {" nX bH -RK +mH yw -fV +iO mU iO -Cx +qh KK -RK +nz nX "} (6,1,1) = {" @@ -402,125 +350,99 @@ yw iO pa iO -qh -eZ +Lw +qc Ui -nX +nL "} (7,1,1) = {" nX -Eu +fV Fv -yw +nO iO -hz +Ci iO lz -Fv -Nm +Yt +SD nL "} (8,1,1) = {" nX -SY +SZ Ri kt iO -yl iO -JY +iO +qh zE -Bk -nL +SZ +nX "} (9,1,1) = {" nX -Eu +bH nj -hN -iO -iO +yw +yl iO +CV qh -HE -Eu +SZ +OE nX "} (10,1,1) = {" nX -SZ -tR +Eu +Xh yw -CV iO +Bz KM qh -Eu -ah +Xh +Xh nX "} (11,1,1) = {" nX -bH -RK +SZ +mH yw -iO +Bz PA -Lw +iO qh -RK -RK +SZ +lu nX "} (12,1,1) = {" nX +Xh Eu -qc -yw -PA -lu -iO -qh -Eu -Wd -nX -"} -(13,1,1) = {" -nX -RK -bH yw eo iO -yl -Xn -RK -RK +Ci +vr +Xh +Xh nX "} -(14,1,1) = {" +(13,1,1) = {" nX -nO -Eu +hN +SZ yw eo iO iO qh -Eu -ah -nX -"} -(15,1,1) = {" -nX -nX -mH -Yt -Cr -yl -iO -xn -Bz -nX +SZ +OE nX "} diff --git a/_maps/RandomRooms/wcorp/stage.dmm b/_maps/RandomRooms/wcorp/stage.dmm index 38f99cab4118..3e1d4ee5456d 100644 --- a/_maps/RandomRooms/wcorp/stage.dmm +++ b/_maps/RandomRooms/wcorp/stage.dmm @@ -33,15 +33,9 @@ /turf/open/floor/wood, /area/city/outskirts) "fB" = ( -/obj/structure/stairs/east, -/turf/open/floor/wood, -/area/city/outskirts) -"fF" = ( -/obj/structure/stairs/east, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/turf/open/floor/plasteel/stairs{ + dir = 8 }, -/turf/open/floor/wood, /area/city/outskirts) "fY" = ( /obj/effect/decal/cleanable/blood/gibs/up, @@ -93,8 +87,9 @@ /turf/open/floor/wood, /area/city/outskirts) "qE" = ( -/obj/structure/stairs/west, -/turf/open/floor/wood, +/turf/open/floor/plasteel/stairs{ + dir = 4 + }, /area/city/outskirts) "qK" = ( /obj/effect/turf_decal/siding/wood{ @@ -206,13 +201,6 @@ }, /turf/open/floor/wood, /area/city/outskirts) -"Ci" = ( -/obj/structure/stairs/west, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood, -/area/city/outskirts) "Cl" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -464,7 +452,7 @@ EK "} (3,1,1) = {" EK -fF +fB Yg EK fu @@ -568,7 +556,7 @@ EK "} (11,1,1) = {" EK -Ci +qE Ay EK Dk diff --git a/_maps/map_files/Alpha/alphacorp.dmm b/_maps/map_files/Alpha/alphacorp.dmm index 42b47760021d..edc2b6d8edd0 100644 --- a/_maps/map_files/Alpha/alphacorp.dmm +++ b/_maps/map_files/Alpha/alphacorp.dmm @@ -1578,6 +1578,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/landmark/department_center, /obj/machinery/navbeacon/wayfinding/informationdepartment, +/obj/machinery/holopad, /turf/open/floor/facility/dark, /area/department_main/information) "lo" = ( @@ -1853,6 +1854,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/navbeacon/wayfinding/controldepartment, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/carpet/red, /area/department_main/control) "nH" = ( @@ -2104,6 +2106,18 @@ /obj/structure/chair/comfy/beige, /turf/open/floor/carpet/orange, /area/department_main/training) +"pA" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/siding/brown, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/department_main/training) "pF" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -2213,7 +2227,8 @@ /area/department_main/safety) "qv" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" + name = "Records Office Secure Area"; + hackProof = 1 }, /turf/open/floor/carpet/black, /area/department_main/records) @@ -2628,7 +2643,8 @@ /area/department_main/training) "tO" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office" + name = "Records Office"; + hackProof = 1 }, /obj/structure/fans/tiny, /turf/open/floor/plasteel/elevatorshaft, @@ -5017,7 +5033,9 @@ "Ne" = ( /obj/structure/fans/tiny, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/hatch, +/obj/machinery/door/airlock/hatch{ + hackProof = 1 + }, /turf/open/floor/plasteel/elevatorshaft, /area/department_main/training) "Nf" = ( @@ -5068,6 +5086,7 @@ /obj/effect/landmark/department_center, /obj/machinery/navbeacon/wayfinding/centralcommanddepartment, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/wood, /area/department_main/command) "Nw" = ( @@ -6126,6 +6145,7 @@ "Vt" = ( /obj/effect/landmark/department_center, /obj/machinery/navbeacon/wayfinding/safetydepartment, +/obj/machinery/holopad, /turf/open/floor/carpet/green, /area/department_main/safety) "Vu" = ( @@ -47314,7 +47334,7 @@ uL pu KH ed -uL +pA qO Ky zW diff --git a/_maps/map_files/Beta/betacorp.dmm b/_maps/map_files/Beta/betacorp.dmm index f17d6c458574..e2897b679742 100644 --- a/_maps/map_files/Beta/betacorp.dmm +++ b/_maps/map_files/Beta/betacorp.dmm @@ -547,7 +547,8 @@ /area/department_main/command) "da" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office" + name = "Records Office"; + hackProof = 1 }, /turf/open/floor/plasteel/dark, /area/department_main/records) @@ -913,6 +914,7 @@ "ez" = ( /obj/effect/landmark/department_center, /obj/machinery/navbeacon/wayfinding/welfaredepartment, +/obj/machinery/holopad, /turf/open/floor/carpet/royalblue, /area/department_main/welfare) "eA" = ( @@ -2388,6 +2390,7 @@ "md" = ( /obj/effect/landmark/department_center, /obj/machinery/navbeacon/wayfinding/controldepartment, +/obj/machinery/holopad, /turf/open/floor/facility/dark, /area/department_main/control) "mg" = ( @@ -3461,6 +3464,11 @@ }, /turf/open/floor/carpet/orange, /area/department_main/training) +"rf" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/holopad, +/turf/open/floor/carpet/red, +/area/department_main/discipline) "rg" = ( /obj/machinery/disposal/bin, /obj/structure/sign/departments/custodian{ @@ -4593,7 +4601,8 @@ /area/facility_hallway/discipline) "vZ" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" + name = "Records Office Secure Area"; + hackProof = 1 }, /turf/open/floor/carpet/black, /area/department_main/records) @@ -5059,6 +5068,7 @@ /area/facility_hallway/north) "yx" = ( /mob/living/simple_animal/bot/cleanbot/medbay, +/obj/machinery/holopad, /turf/open/floor/carpet/green, /area/department_main/safety) "yy" = ( @@ -6786,6 +6796,7 @@ }, /obj/effect/landmark/department_center, /obj/machinery/navbeacon/wayfinding/trainingdepartment, +/obj/machinery/holopad, /turf/open/floor/plasteel, /area/department_main/training) "HC" = ( @@ -8431,6 +8442,7 @@ "PZ" = ( /obj/effect/landmark/department_center, /obj/machinery/navbeacon/wayfinding/informationdepartment, +/obj/machinery/holopad, /turf/open/floor/facility/dark, /area/department_main/information) "Qa" = ( @@ -9695,6 +9707,7 @@ pixel_y = 5 }, /obj/machinery/navbeacon/wayfinding/centralcommanddepartment, +/obj/machinery/holopad, /turf/open/floor/wood, /area/department_main/command) "WI" = ( @@ -37582,7 +37595,7 @@ rN Ns oT oT -Ns +rf Qi on VS diff --git a/_maps/map_files/Delta/deltacorp.dmm b/_maps/map_files/Delta/deltacorp.dmm index 4f6b149c9da1..78195f8eebcd 100644 --- a/_maps/map_files/Delta/deltacorp.dmm +++ b/_maps/map_files/Delta/deltacorp.dmm @@ -4314,6 +4314,7 @@ dir = 4 }, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/bronze, /area/department_main/training) "jE" = ( @@ -5381,6 +5382,7 @@ }, /obj/structure/disposalpipe/junction, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia{ color = "#ccc8c0" }, @@ -6067,6 +6069,7 @@ dir = 9 }, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia, /area/department_main/control) "nS" = ( @@ -9708,6 +9711,7 @@ color = "#090807"; dir = 4 }, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia{ color = "#ccc8c0" }, @@ -10225,6 +10229,7 @@ color = "#bf48b1"; dir = 4 }, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia, /area/department_main/command) "xJ" = ( @@ -13064,6 +13069,7 @@ dir = 4 }, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia, /area/department_main/welfare) "DT" = ( @@ -15065,6 +15071,7 @@ dir = 4 }, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia, /area/department_main/discipline) "II" = ( diff --git a/_maps/map_files/Epsilon/epsiloncorp.dmm b/_maps/map_files/Epsilon/epsiloncorp.dmm index 27bc6829827c..ded8895a112a 100644 --- a/_maps/map_files/Epsilon/epsiloncorp.dmm +++ b/_maps/map_files/Epsilon/epsiloncorp.dmm @@ -1886,6 +1886,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/holopad, /turf/open/floor/bronze, /area/department_main/command) "fL" = ( @@ -4778,6 +4779,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/sepia, /area/department_main/welfare) +"oq" = ( +/obj/machinery/door/airlock/glass{ + icon = 'icons/obj/doors/airlocks/station/science.dmi'; + hackProof = 1 + }, +/turf/open/floor/facility/halls, +/area/facility_hallway/information) "or" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -4797,7 +4805,8 @@ /area/facility_hallway/human) "ow" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" + name = "Records Office Secure Area"; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/facility_hallway/information) @@ -8858,6 +8867,7 @@ }, /obj/machinery/navbeacon/wayfinding/welfaredepartment, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia{ color = "#ccc8c0" }, @@ -10261,6 +10271,7 @@ }, /obj/machinery/navbeacon/wayfinding/controldepartment, /mob/living/simple_animal/bot/cleanbot, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia{ color = "#ccc8c0" }, @@ -10766,6 +10777,7 @@ icon_state = "LC2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia{ color = "#ccc8c0" }, @@ -11888,6 +11900,7 @@ icon_state = "LC2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/holopad, /turf/open/floor/plasteel/sepia{ color = "#ccc8c0" }, @@ -12933,7 +12946,8 @@ /obj/machinery/door/airlock{ icon = 'icons/obj/doors/airlocks/station/science.dmi'; max_integrity = 500; - name = "Information Department" + name = "Information Department"; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/facility_hallway/information) @@ -50386,12 +50400,12 @@ pH pH pH pH -WF +oq sl sl sl sl -WF +oq jd jd ow diff --git a/_maps/map_files/Eta/etacorp.dmm b/_maps/map_files/Eta/etacorp.dmm index fe6377f0cfeb..e39255416800 100644 --- a/_maps/map_files/Eta/etacorp.dmm +++ b/_maps/map_files/Eta/etacorp.dmm @@ -336,6 +336,7 @@ desc = "Even in death, a clerk does their job." }, /obj/machinery/navbeacon/wayfinding/trainingdepartment, +/obj/machinery/holopad, /turf/open/floor/mineral/titanium/purple{ color = "#ffa500"; name = "floor" @@ -695,6 +696,7 @@ set_luminosity = 24 }, /obj/machinery/navbeacon/wayfinding/controldepartment, +/obj/machinery/holopad, /turf/open/floor/mineral/titanium/yellow{ name = "floor" }, @@ -1143,7 +1145,8 @@ /area/facility_hallway/safety) "fR" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" + name = "Records Office Secure Area"; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/facility_hallway/records) @@ -2009,7 +2012,8 @@ /obj/machinery/door/airlock{ icon = 'icons/obj/doors/airlocks/station/science.dmi'; max_integrity = 500; - name = "Information Department" + name = "Information Department"; + hackProof = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/facility/halls, @@ -2701,6 +2705,7 @@ }, /obj/machinery/light/floor, /obj/structure/disposalpipe/segment, +/obj/machinery/holopad, /turf/open/floor/facility/dark, /area/department_main/command) "mK" = ( @@ -6647,6 +6652,7 @@ }, /obj/machinery/navbeacon/wayfinding/informationdepartment, /obj/structure/disposalpipe/junction/yjunction, +/obj/machinery/holopad, /turf/open/floor/mineral/titanium/purple{ name = "floor" }, @@ -10010,6 +10016,7 @@ desc = "Even in death, a clerk does their job." }, /obj/machinery/navbeacon/wayfinding/safetydepartment, +/obj/machinery/holopad, /turf/open/floor/mineral/titanium/purple{ color = "#7FFF00"; name = "floor" diff --git a/_maps/map_files/Event/city.dmm b/_maps/map_files/Event/city.dmm index ea2d47eb2bc5..800ec5e600e0 100644 --- a/_maps/map_files/Event/city.dmm +++ b/_maps/map_files/Event/city.dmm @@ -459,6 +459,11 @@ "fM" = ( /obj/machinery/light, /obj/structure/table/wood, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder, /turf/open/floor/facility/white, /area/city/fixers) "fP" = ( @@ -1019,12 +1024,28 @@ /turf/open/floor/plating/beach/sand, /area/city) "mV" = ( -/obj/item/folder, -/obj/item/folder, -/obj/item/folder, -/obj/item/folder, -/obj/item/folder, /obj/structure/table/wood, +/obj/item/toner/large{ + pixel_x = 2; + pixel_y = -8 + }, +/obj/item/toner/large{ + pixel_y = -4; + pixel_x = 1 + }, +/obj/item/toner/large, +/obj/item/toner/large{ + pixel_y = 4; + pixel_x = -1 + }, +/obj/item/toner/large{ + pixel_y = 8; + pixel_x = -2 + }, +/obj/item/toner/large{ + pixel_y = 12; + pixel_x = -3 + }, /turf/open/floor/facility/white, /area/city/fixers) "mW" = ( diff --git a/_maps/map_files/Event/city_fixer.dmm b/_maps/map_files/Event/city_fixer.dmm index 50ee07285c17..f2d471ab758b 100644 --- a/_maps/map_files/Event/city_fixer.dmm +++ b/_maps/map_files/Event/city_fixer.dmm @@ -576,7 +576,7 @@ dir = 1 }, /turf/open/floor/carpet/black, -/area/city) +/area/city/house) "iX" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -606,7 +606,7 @@ }, /obj/item/modular_computer/laptop/preset/fixer, /turf/open/floor/carpet/black, -/area/city) +/area/city/house) "jJ" = ( /obj/structure/rack{ pixel_x = -1 @@ -651,6 +651,17 @@ "jP" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/civilian, +/obj/item/toner/large{ + pixel_y = 4; + pixel_x = 4 + }, +/obj/item/toner/large{ + pixel_y = 8 + }, +/obj/item/toner/large{ + pixel_y = 12; + pixel_x = -4 + }, /turf/open/floor/facility/white, /area/city/fixers) "ka" = ( @@ -1107,6 +1118,18 @@ }, /turf/open/floor/facility/dark, /area/city/shop) +"qD" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "outside"; + name = "prosthetics clinic shutters"; + pixel_y = 26; + req_access_txt = "9" + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city) "qF" = ( /obj/structure/itemselling, /turf/open/floor/facility/white, @@ -1215,17 +1238,8 @@ /area/city) "tb" = ( /obj/structure/chair/wood, -/obj{ - name = "---Merge conflict marker---" - }, -/obj/machinery/button/door{ - id = "outside"; - name = "prosthetics clinic shutters"; - pixel_y = 26; - req_access_txt = "9" - }, /turf/open/floor/carpet/black, -/area/city) +/area/city/house) "td" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, @@ -2172,14 +2186,11 @@ /turf/open/floor/facility/dark, /area/city/fixers) "Do" = ( -/obj/machinery/door/airlock/public{ - name = "prosthetic surgery clinic" - }, /obj/machinery/door/poddoor/shutters/indestructible{ id = "outside" }, -/turf/closed/indestructible/reinforced, -/area/city/house) +/turf/closed/indestructible/fakeglass, +/area/city/shop) "Dq" = ( /obj/structure/rack, /obj/item/price_tagger, @@ -2193,8 +2204,11 @@ /turf/open/floor/facility/dark, /area/city/shop) "Du" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/door/airlock/public{ + name = "prosthetic surgery clinic" + }, +/obj/machinery/door/poddoor/shutters/indestructible{ + id = "outside" }, /turf/open/floor/plasteel/white, /area/city/shop) @@ -2605,11 +2619,9 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_checkpoint) "Ow" = ( -/obj/machinery/door/poddoor/shutters/indestructible{ - id = "outside" - }, -/turf/closed/indestructible/reinforced, -/area/city/house) +/obj/machinery/light, +/turf/open/floor/plating/ashplanet/rocky, +/area/city) "OT" = ( /turf/closed/indestructible/reinforced, /area/city/shop) @@ -2850,6 +2862,18 @@ /obj/structure/curtain/cloth, /turf/closed/indestructible/fakeglass, /area/city/fixers) +"Vg" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "outside"; + name = "prosthetics clinic shutters"; + pixel_y = 26; + req_access_txt = "9" + }, +/turf/open/floor/plasteel/white, +/area/city/shop) "Vw" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 @@ -24463,12 +24487,12 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +OT +OT +OT +OT +OT Oq Oq Oq @@ -24720,12 +24744,12 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq +OT +yT +UG +FP +QN +OT Oq Oq Oq @@ -24971,11 +24995,17 @@ Oq Oq Oq Oq +Oq +Oq OT OT OT OT OT +yX +XR +XR +XR OT Oq Oq @@ -24986,12 +25016,6 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq XK XK XK @@ -25229,10 +25253,16 @@ Oq Oq Oq OT -yT -UG -FP +OT +OT +cl +zQ +iP +OT QN +XR +XR +XR OT Oq Oq @@ -25242,12 +25272,6 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq XK XK XK @@ -25481,22 +25505,22 @@ Oq Oq Oq Oq +Oq +Oq +Oq +Oq OT +GW +Gn +nU +nU +nU OT OT +QD OT +QD OT -yX -XR -XR -XR -OT -Oq -Oq -Oq -Oq -Oq -Oq Oq Oq Oq @@ -25736,24 +25760,24 @@ Oq Oq Oq Oq -OT -OT -OT -cl -zQ -iP -OT -QN -XR -XR -XR -OT Oq Oq Oq Oq Oq Oq +OT +OT +OT +wp +XR +nU +OT +Vg +nU +QN +nU +OT Oq Oq Oq @@ -25993,18 +26017,6 @@ Oq Oq Oq Oq -OT -GW -Gn -nU -nU -nU -OT -OT -QD -OT -QD -OT Oq Oq Oq @@ -26013,6 +26025,18 @@ Oq Oq Oq Oq +OT +wp +XR +nU +QD +nU +lu +QN +nU +OT +Oq +Oq Oq Oq Oq @@ -26250,14 +26274,20 @@ Oq Oq Oq Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq OT -OT -OT -wp +OX XR nU OT -Du +nU nU QN nU @@ -26270,12 +26300,6 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq XK XK XK @@ -26509,22 +26533,22 @@ Oq Oq Oq Oq -OT -wp -XR -nU -QD -nU -lu -QN -nU -OT Oq Oq Oq Oq Oq Oq +OT +OT +OT +OT +OT +OT +Do +Do +Du +OT Oq Oq Oq @@ -26766,21 +26790,21 @@ Oq Oq Oq Oq -OT -OX -XR -nU -OT -nU -nU -QN -nU +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Xi -Xi -Xi -Xi +qD +Hm +Ow HA HA HA @@ -27029,9 +27053,9 @@ Oq Xi Xi Xi -Ow -Ow -Do +Xi +Xi +Xi Xi Xi Xi diff --git a/_maps/map_files/Event/rcorp.dmm b/_maps/map_files/Event/rcorp.dmm index f9ade199c936..91d235c6921f 100644 --- a/_maps/map_files/Event/rcorp.dmm +++ b/_maps/map_files/Event/rcorp.dmm @@ -55,6 +55,7 @@ "cL" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, +/obj/effect/landmark/nobasic_incorp_move, /turf/open/floor/pod/dark, /area/city/outskirts) "cW" = ( @@ -65,6 +66,7 @@ /area/city/outskirts) "dd" = ( /obj/effect/spawner/room/rcorp, +/obj/effect/landmark/nobasic_incorp_move, /turf/closed/indestructible/rock, /area/city/outskirts) "du" = ( @@ -216,6 +218,10 @@ /obj/item/gun/energy/e_gun/rabbit/minigun, /turf/open/floor/pod/dark, /area/city/outskirts) +"jO" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/wall/mineral/titanium/survival/pod, +/area/city/outskirts) "kl" = ( /obj/structure/chair/comfy{ dir = 1 @@ -228,6 +234,10 @@ }, /turf/open/floor/pod/dark, /area/city/outskirts) +"kA" = ( +/obj/effect/landmark/nobasic_incorp_move, +/turf/closed/indestructible/rock, +/area/city/outskirts) "kG" = ( /obj/structure/rack, /obj/item/grenade/smokebomb, @@ -349,6 +359,12 @@ /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/telecomms/mainframe, /area/city/outskirts) +"ph" = ( +/obj/machinery/jukebox{ + req_access = list() + }, +/turf/open/floor/pod/dark, +/area/city/outskirts) "pi" = ( /obj/structure/rack, /obj/item/gun/energy/e_gun/rabbitdash/heavy, @@ -451,6 +467,7 @@ /obj/machinery/door/poddoor/shutters/indestructible{ id = "outside" }, +/obj/effect/landmark/nobasic_incorp_move/disappearing, /turf/open/floor/plating/asteroid, /area/city/outskirts) "xp" = ( @@ -760,6 +777,7 @@ name = "raven team prep"; req_access_txt = "7" }, +/obj/effect/landmark/nobasic_incorp_move, /turf/open/floor/pod, /area/city/outskirts) "Kh" = ( @@ -848,6 +866,7 @@ /area/city/outskirts) "Oi" = ( /obj/structure/table/reinforced, +/obj/effect/landmark/nobasic_incorp_move, /turf/open/floor/pod/dark, /area/city/outskirts) "OA" = ( @@ -902,6 +921,7 @@ name = "Officer's meet"; req_access_txt = "19" }, +/obj/effect/landmark/nobasic_incorp_move, /turf/open/floor/pod, /area/city/outskirts) "Qn" = ( @@ -965,6 +985,11 @@ /obj/item/storage/box/barrier, /turf/open/floor/pod/dark, /area/city/outskirts) +"Rl" = ( +/obj/structure/window/shuttle/survival_pod, +/obj/effect/landmark/nobasic_incorp_move, +/turf/open/floor/pod, +/area/city/outskirts) "Rv" = ( /obj/structure/chair/comfy, /turf/open/floor/pod, @@ -1931,27 +1956,27 @@ oi oi oi oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA oi oi oi @@ -2131,9 +2156,9 @@ oi oi oi oi -oi -oi -oi +kA +kA +kA PG PG gP @@ -2153,22 +2178,22 @@ aC PG PG PG -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA oi oi oi @@ -2332,8 +2357,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -2370,8 +2395,8 @@ PG PG PG PG -oi -oi +kA +kA oi oi oi @@ -2531,10 +2556,10 @@ oi oi oi oi -oi -oi -oi -oi +kA +kA +kA +kA PG PG PG @@ -2573,7 +2598,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -2733,7 +2758,7 @@ oi oi oi oi -oi +kA PG PG PG @@ -2775,8 +2800,8 @@ PG PG PG PG -oi -oi +kA +kA oi oi oi @@ -2934,8 +2959,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -2978,7 +3003,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -3135,8 +3160,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -3180,8 +3205,8 @@ PG PG PG PG -oi -oi +kA +kA oi oi oi @@ -3337,7 +3362,7 @@ oi oi oi oi -oi +kA PG PG PG @@ -3383,7 +3408,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -3538,8 +3563,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -3585,8 +3610,8 @@ PG PG PG PG -oi -oi +kA +kA oi oi oi @@ -3740,7 +3765,7 @@ oi oi oi oi -oi +kA PG PG PG @@ -3788,7 +3813,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -3942,7 +3967,7 @@ oi oi oi oi -oi +kA PG PG PG @@ -3990,7 +4015,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -4143,8 +4168,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -4192,7 +4217,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -4344,8 +4369,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -4394,7 +4419,7 @@ sS sS sS sS -aC +jO oi oi oi @@ -4545,8 +4570,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -4596,7 +4621,7 @@ DH GU NT zj -aC +jO oi oi oi @@ -4745,9 +4770,9 @@ oi oi oi oi -oi -oi -oi +kA +kA +kA PG PG PG @@ -4798,7 +4823,7 @@ ZJ hP wA zj -aC +jO oi oi oi @@ -4945,9 +4970,9 @@ oi oi oi oi -oi -oi -oi +kA +kA +kA PG PG PG @@ -5000,7 +5025,7 @@ PG ZJ FO zj -aC +jO oi oi oi @@ -5146,8 +5171,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -5202,7 +5227,7 @@ PG ZJ FO zj -aC +jO oi oi oi @@ -5385,7 +5410,7 @@ PG PG PG PG -Qd +ph Ew FE YM @@ -5404,7 +5429,7 @@ PG ZJ FO zj -aC +jO oi oi oi @@ -5606,7 +5631,7 @@ PG PG dY MP -aC +jO oi oi oi @@ -5808,7 +5833,7 @@ PG PG Yv MP -aC +jO oi oi oi @@ -6010,7 +6035,7 @@ PG PG sS sS -aC +jO oi oi oi @@ -6156,8 +6181,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -6212,7 +6237,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -6359,9 +6384,9 @@ oi oi oi oi -oi -oi -oi +kA +kA +kA PG PG PG @@ -6414,7 +6439,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -6563,8 +6588,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -6600,12 +6625,12 @@ PG PG PG Kh -aC -sS -sS -sS -sS -aC +jO +Rl +Rl +Rl +Rl +jO PG PG PG @@ -6616,7 +6641,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -6766,8 +6791,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -6787,27 +6812,27 @@ PG gP gP gP -aC -aC -aC -sS -sS -sS -sS -sS -aC -aC +jO +jO +jO +Rl +Rl +Rl +Rl +Rl +jO +jO PG PG PG PG tZ -aC +jO gM My Qd Im -aC +jO PG PG PG @@ -6817,8 +6842,8 @@ PG PG PG PG -oi -oi +kA +kA oi oi oi @@ -6969,8 +6994,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -6989,7 +7014,7 @@ FR gP gP gP -aC +jO Fu kr Qd @@ -6998,18 +7023,18 @@ Qd Qd Qd ih -aC +jO PG PG PG PG hy -aC +jO gk Hk Hk Im -aC +jO PG PG PG @@ -7019,7 +7044,7 @@ PG PG PG PG -oi +kA oi oi oi @@ -7172,8 +7197,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -7191,7 +7216,7 @@ PG gP gP gP -aC +jO Kj Qd mR @@ -7200,18 +7225,18 @@ cW cW RB xu -aC +jO PG PG PG PG Bs -aC +jO gM AS Hk Qd -aC +jO PG PG PG @@ -7220,8 +7245,8 @@ PG PG PG PG -oi -oi +kA +kA oi oi oi @@ -7375,7 +7400,7 @@ oi oi oi oi -oi +kA PG PG PG @@ -7393,7 +7418,7 @@ PG gP gP gP -aC +jO Fu kr RB @@ -7402,13 +7427,13 @@ xu xu RB Qd -aC +jO PG PG PG PG CQ -aC +jO Xg Hk Hk @@ -7421,8 +7446,8 @@ PG PG PG PG -oi -oi +kA +kA oi oi oi @@ -7577,8 +7602,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -7595,7 +7620,7 @@ PG gP gP gP -aC +jO Kj Qd Rv @@ -7604,26 +7629,26 @@ xu wW kl Qd -aC +jO PG PG PG Gl PG -aC +jO gM AS Hk Qd -sS +Rl PG PG PG PG PG PG -oi -oi +kA +kA oi oi oi @@ -7780,8 +7805,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -7797,7 +7822,7 @@ PG gP gP gP -aC +jO mE kr RB @@ -7812,19 +7837,19 @@ PG PG PG PG -aC +jO gk Hk Hk kG -sS +Rl PG PG Gl PG PG -oi -oi +kA +kA oi oi oi @@ -7983,8 +8008,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -7999,7 +8024,7 @@ FR gP gP gP -aC +jO Qd Qd Rv @@ -8008,24 +8033,24 @@ xu wW kl Qd -aC +jO PG PG PG PG PG -aC +jO gM My Qd mH -sS +Rl PG -oi -oi -oi -oi -oi +kA +kA +kA +kA +kA oi oi oi @@ -8186,7 +8211,7 @@ oi oi oi oi -oi +kA PG PG PG @@ -8201,7 +8226,7 @@ PG gP gP gP -aC +jO Qd Qd RB @@ -8210,20 +8235,20 @@ wW xu RB Qd -aC +jO Oi Oi Oi cL +jO +jO aC aC aC aC -aC -aC -aC -oi -oi +jO +kA +kA oi oi oi @@ -8388,8 +8413,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -8403,7 +8428,7 @@ PG gP gP gP -aC +jO Ls Qd RB @@ -8423,8 +8448,8 @@ jC jC jC aC -oi -oi +kA +kA oi oi oi @@ -8591,9 +8616,9 @@ oi oi oi oi -oi -oi -oi +kA +kA +kA PG PG PG @@ -8605,7 +8630,7 @@ PG gP gP gP -aC +jO yJ Cp Qd @@ -8625,7 +8650,7 @@ Qd lz xp aC -oi +kA oi oi oi @@ -8795,7 +8820,7 @@ oi oi oi oi -oi +kA PG PG PG @@ -8806,8 +8831,8 @@ PG gP gP gP -aC -aC +jO +jO aC aC aC @@ -8827,7 +8852,7 @@ QY Qd ia aC -oi +kA oi oi oi @@ -8997,8 +9022,8 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG @@ -9008,7 +9033,7 @@ PG gP gP gP -aC +jO Et yz fC @@ -9029,7 +9054,7 @@ aC Gh aC aC -oi +kA oi oi oi @@ -9200,7 +9225,7 @@ oi oi oi oi -oi +kA PG PG PG @@ -9208,9 +9233,9 @@ PG PG gP gP -oi -oi -aC +kA +kA +jO RB RB mR @@ -9231,7 +9256,7 @@ Qd lz Qd aC -oi +kA oi oi oi @@ -9402,16 +9427,16 @@ oi oi oi oi -oi -oi +kA +kA PG PG PG PG gP gP -oi -oi +kA +kA aC QB RB @@ -9433,7 +9458,7 @@ Qd Qd Qd aC -oi +kA oi oi oi @@ -9605,15 +9630,15 @@ oi oi oi oi -oi +kA PG PG PG gP gP -oi -oi -oi +kA +kA +kA aC aC aC @@ -9635,7 +9660,7 @@ Qd Ie Qd aC -oi +kA oi oi oi @@ -9807,15 +9832,15 @@ oi oi oi oi -oi -oi +kA +kA gP gP gP gP +kA oi -oi -oi +kA aC xQ Gq @@ -9837,7 +9862,7 @@ aC aC aC aC -oi +kA oi oi oi @@ -10010,14 +10035,14 @@ oi oi oi oi +kA +kA +kA +kA +kA +kA oi -oi -oi -oi -oi -oi -oi -oi +kA aC za RB @@ -10035,11 +10060,11 @@ ls ls ls aC -oi -oi -oi -oi -oi +kA +kA +kA +kA +kA oi oi oi @@ -10219,7 +10244,7 @@ oi oi oi oi -oi +kA aC aC aC @@ -10237,7 +10262,7 @@ aC aC aC aC -oi +kA oi oi oi @@ -10421,7 +10446,7 @@ oi oi oi oi -oi +kA aC Bk Bk @@ -10438,10 +10463,10 @@ RB RB mR aC -oi -oi -oi -oi +kA +kA +kA +kA oi oi oi @@ -10623,7 +10648,7 @@ oi oi oi oi -oi +kA aC RB RB @@ -10643,7 +10668,7 @@ aC aC aC aC -oi +kA oi oi oi @@ -10825,7 +10850,7 @@ oi oi oi oi -oi +kA aC za za @@ -10845,7 +10870,7 @@ aC RB QF aC -oi +kA oi oi oi @@ -11027,13 +11052,13 @@ oi oi oi oi -oi +kA aC aC aC aC aC -oi +kA aC Aq RB @@ -11047,7 +11072,7 @@ xh RB Ty aC -oi +kA oi oi oi @@ -11230,12 +11255,12 @@ oi oi oi dd -oi -oi -oi -oi -oi -oi +kA +kA +kA +kA +kA +kA aC Qp RB @@ -11249,7 +11274,7 @@ aC mR PL aC -oi +kA oi oi oi @@ -11437,7 +11462,7 @@ oi oi oi oi -oi +kA aC QP ID @@ -11451,7 +11476,7 @@ aC RB ZG aC -oi +kA oi oi oi @@ -11639,7 +11664,7 @@ oi oi oi oi -oi +kA aC aC aC @@ -11653,7 +11678,7 @@ aC aC aC aC -oi +kA oi oi oi @@ -11841,21 +11866,21 @@ oi oi oi oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi -oi +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA +kA oi oi oi diff --git a/_maps/map_files/Event/wcorp.dmm b/_maps/map_files/Event/wcorp.dmm index b2ed244eaa68..09bc872f3f12 100644 --- a/_maps/map_files/Event/wcorp.dmm +++ b/_maps/map_files/Event/wcorp.dmm @@ -45,6 +45,15 @@ "dh" = ( /turf/open/floor/carpet/blue, /area/space) +"di" = ( +/obj/effect/light_emitter{ + light_power = 4; + light_range = 25; + set_cap = 3; + set_luminosity = 24 + }, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/outskirts) "dI" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -127,6 +136,12 @@ }, /turf/open/floor/carpet/blue, /area/space) +"je" = ( +/obj/effect/blocker{ + timelock = 7 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) "jo" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -198,6 +213,12 @@ "pf" = ( /turf/open/floor/mineral/titanium/tiled/white, /area/space) +"po" = ( +/obj/effect/blocker{ + timelock = 3 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) "pt" = ( /turf/closed/indestructible/rock, /area/space) @@ -245,6 +266,58 @@ "tb" = ( /turf/open/floor/plasteel/bluespace, /area/city/outskirts) +"tC" = ( +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 3 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 3 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 3 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 3 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 3 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) +"tI" = ( +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 9 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 9 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 9 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 9 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 9 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) +"tL" = ( +/obj/effect/blocker{ + timelock = 5 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) "ub" = ( /obj/effect/decal/cleanable/blood/gibs/down, /turf/closed/wall/material, @@ -266,6 +339,58 @@ /obj/machinery/telecomms/allinone/indestructable, /turf/open/indestructible/hotelwood, /area/city/outskirts) +"wA" = ( +/obj/effect/blocker{ + timelock = 8 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) +"xg" = ( +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 5 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 5 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 5 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 5 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 5 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) +"xl" = ( +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 8 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 8 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 8 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 8 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 8 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) "xH" = ( /obj/effect/decal/cleanable/blood/gibs/down, /obj/effect/decal/cleanable/blood/gibs/up, @@ -312,10 +437,6 @@ /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/plasteel/bluespace, /area/city/outskirts) -"An" = ( -/turf/closed/wall/mineral/plastitanium, -/turf/closed/wall/mineral/plastitanium, -/area/city/outskirts) "Bk" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/plasteel/bluespace, @@ -377,6 +498,9 @@ /obj/effect/decal/cleanable/blood/gibs/bubblegum, /turf/open/indestructible/hotelwood, /area/city/outskirts) +"He" = ( +/turf/open/floor/plating/ashplanet/rocky, +/area/city/outskirts) "Hf" = ( /obj/effect/decal/cleanable/blood/gibs/core, /obj/effect/landmark/wavespawn, @@ -403,6 +527,9 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel/bluespace, /area/city/outskirts) +"Jw" = ( +/turf/closed/indestructible/rock, +/area/city/outskirts) "JQ" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/old, @@ -443,6 +570,12 @@ /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/carpet/red, /area/city/outskirts) +"Lz" = ( +/obj/effect/blocker{ + timelock = 9 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) "LN" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/old, @@ -472,7 +605,7 @@ /area/city/outskirts) "NR" = ( /turf/open/space/basic, -/turf/closed/wall/mineral/plastitanium, +/turf/open/floor/plasteel/bluespace, /area/city/outskirts) "NY" = ( /obj/effect/decal/cleanable/blood/footprints, @@ -540,6 +673,29 @@ /obj/effect/decal/cleanable/blood/gibs/bubblegum, /turf/closed/wall/mineral/plastitanium, /area/city/outskirts) +"Rv" = ( +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 7 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 7 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 7 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 7 + }, +/obj/effect/landmark/wavespawn{ + single_use = 1; + startround = 7 + }, +/turf/open/floor/plasteel/bluespace, +/area/city/outskirts) "Sq" = ( /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/carpet/red, @@ -591,6 +747,12 @@ /obj/effect/landmark/observer_start, /turf/open/indestructible/hotelwood, /area/city/outskirts) +"Xa" = ( +/obj/effect/blocker{ + timelock = 10 + }, +/turf/open/indestructible/hotelwood, +/area/city/outskirts) "Xp" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -19818,7 +19980,7 @@ tb tb tb tb -tb +ZY tb tb tb @@ -24046,7 +24208,7 @@ tb tb tb tb -tb +ZY tb tb tb @@ -26145,11 +26307,11 @@ pt pt pt pt -ny -ny -ny -ny -ny +pt +pt +pt +pt +pt ny ny ny @@ -26447,10 +26609,10 @@ pt pt pt pt -pt -pt -pt -pt +iP +iP +iP +iP pt pt pt @@ -26749,15 +26911,15 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +iP +iP +iP +iP +iP +iP pt rh tb @@ -27051,15 +27213,15 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +He +He +He +He +iP pt iP Qs @@ -27353,15 +27515,15 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +He +He +He +He +iP pt iP XO @@ -27655,15 +27817,15 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +He +He +He +He +iP pt iP cI @@ -27957,15 +28119,15 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +He +He +He +He +iP pt iP YO @@ -28259,15 +28421,15 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +He +He +He +He +iP pt iP rh @@ -28561,16 +28723,16 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +di +He +He +He +iP +Jw iP MR UV @@ -28863,16 +29025,16 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +He +He +He +He +iP +Km iP MR GW @@ -29165,16 +29327,16 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +He +He +He +He +iP +Km iP MR UV @@ -29467,16 +29629,16 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +He +He +He +He +He +iP +Jw iP MR UV @@ -29769,15 +29931,15 @@ pt pt pt pt -pt -pt -pt -pt -pt -pt -pt -pt -pt +iP +He +He +iP +iP +iP +iP +iP +iP pt iP rh @@ -30071,10 +30233,10 @@ pt pt pt pt -pt -pt -pt -pt +iP +iP +iP +iP pt pt pt @@ -30376,8 +30538,8 @@ pt pt pt pt -ny -ny +pt +pt ny ny ny @@ -32502,7 +32664,7 @@ tb tb tb tb -tb +ZY tb tb tb @@ -34614,11 +34776,11 @@ ny iP iP iP -tb -tb -tb -tb -tb +po +po +po +po +po iP iP iP @@ -35520,11 +35682,11 @@ pt rh tb tb +tC tb tb tb -tb -tb +tC tb tb rh @@ -36730,7 +36892,7 @@ tb tb tb tb -tb +ZY tb tb tb @@ -37936,11 +38098,11 @@ pt rh tb tb +tC tb tb tb -tb -tb +tC tb tb rh @@ -38842,11 +39004,11 @@ ny iP iP iP -UV -UV -UV -UV -UV +tL +tL +tL +tL +tL iP iP iP @@ -39142,16 +39304,16 @@ pt pt pt rh -UV -UV -UV -UV -UV -UV -UV -UV -UV -rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +de pt pt pt @@ -39444,15 +39606,15 @@ pt pt pt rh -UV -UV -UV -UV -UV -UV -UV -UV -UV +tb +tb +tb +tb +tb +tb +tb +tb +tb rh pt pt @@ -39746,15 +39908,15 @@ pt pt pt rh -UV -UV -FS -FS -UV -UV -UV -UV -UV +tb +tb +xg +tb +tb +tb +xg +tb +tb rh pt pt @@ -40048,15 +40210,15 @@ pt pt pt rh -UV -UV -UV -UV -FS -FS -UV -UV -UV +tb +tb +tb +tb +tb +tb +tb +tb +tb rh pt pt @@ -40350,15 +40512,15 @@ pt pt pt rh -UV -UV -UV -UV -UV -UV -FS -UV -UV +tb +tb +tb +tb +tb +tb +tb +tb +tb rh pt pt @@ -40652,15 +40814,15 @@ pt pt pt rh -UV -UV -UV -UV -rP -FS -UV -UV -UV +tb +tb +tb +tb +tb +tb +tb +tb +tb rh pt pt @@ -40954,15 +41116,15 @@ pt pt pt rh -ws -UV -FS -FS -UV -UV -UV -UV -UV +tb +tb +tb +tb +ZY +tb +tb +tb +tb rh pt pt @@ -41256,15 +41418,15 @@ pt pt pt rh -rh -UV -UV -UV -FS -FS -UV -UV -rh +tb +tb +tb +tb +tb +tb +tb +tb +tb rh pt pt @@ -41558,15 +41720,15 @@ pt pt pt rh -rh -Ow -UV -UV -UV -UV -FS -Ow -rh +tb +tb +tb +tb +tb +tb +tb +tb +tb rh pt pt @@ -41860,15 +42022,15 @@ pt pt pt rh -rh -Ow -UV -OU -ls -ls -UV -Ow -rh +tb +tb +tb +tb +tb +tb +tb +tb +tb rh pt pt @@ -42161,17 +42323,17 @@ pt pt pt pt -pt -rh -rh -FS -FS -id -UV -UV rh +tb +tb +xg +tb +tb +tb +xg +tb NR -pt +rh pt pt pt @@ -42463,17 +42625,17 @@ pt pt pt pt -pt rh +tb +tb +tb +tb +tb +tb +tb +tb +NR rh -Ow -Ow -Ow -Ow -Ow -rh -An -pt pt pt pt @@ -42765,15 +42927,16 @@ pt pt pt pt -pt -rh -rh -rh -rh -rh -rh -rh rh +tb +tb +tb +tb +tb +tb +tb +tb +tb rh pt pt @@ -42907,7 +43070,6 @@ pt pt pt pt -pt "} (141,1,1) = {" pt @@ -43067,6 +43229,17 @@ pt pt pt pt +iP +iP +iP +je +je +je +je +je +iP +iP +iP pt pt pt @@ -43199,6 +43372,8 @@ pt pt pt pt +"} +(142,1,1) = {" pt pt pt @@ -43210,9 +43385,6 @@ pt pt pt pt -"} -(142,1,1) = {" -pt pt pt pt @@ -43359,6 +43531,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +de pt pt pt @@ -43491,6 +43674,8 @@ pt pt pt pt +"} +(143,1,1) = {" pt pt pt @@ -43512,8 +43697,6 @@ pt pt pt pt -"} -(143,1,1) = {" pt pt pt @@ -43650,6 +43833,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -43782,6 +43976,8 @@ pt pt pt pt +"} +(144,1,1) = {" pt pt pt @@ -43814,8 +44010,6 @@ pt pt pt pt -"} -(144,1,1) = {" pt pt pt @@ -43941,6 +44135,17 @@ pt pt pt pt +rh +tb +tb +Rv +tb +tb +tb +Rv +tb +tb +rh pt pt pt @@ -44073,6 +44278,8 @@ pt pt pt pt +"} +(145,1,1) = {" pt pt pt @@ -44116,8 +44323,6 @@ pt pt pt pt -"} -(145,1,1) = {" pt pt pt @@ -44232,6 +44437,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -44364,6 +44580,8 @@ pt pt pt pt +"} +(146,1,1) = {" pt pt pt @@ -44418,8 +44636,6 @@ pt pt pt pt -"} -(146,1,1) = {" pt pt pt @@ -44523,6 +44739,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -44655,6 +44882,8 @@ pt pt pt pt +"} +(147,1,1) = {" pt pt pt @@ -44720,8 +44949,6 @@ pt pt pt pt -"} -(147,1,1) = {" pt pt pt @@ -44814,6 +45041,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -44946,6 +45184,8 @@ pt pt pt pt +"} +(148,1,1) = {" pt pt pt @@ -45022,8 +45262,6 @@ pt pt pt pt -"} -(148,1,1) = {" pt pt pt @@ -45105,6 +45343,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +ZY +tb +tb +tb +tb +rh pt pt pt @@ -45237,6 +45486,8 @@ pt pt pt pt +"} +(149,1,1) = {" pt pt pt @@ -45324,8 +45575,6 @@ pt pt pt pt -"} -(149,1,1) = {" pt pt pt @@ -45396,6 +45645,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -45528,6 +45788,8 @@ pt pt pt pt +"} +(150,1,1) = {" pt pt pt @@ -45626,8 +45888,6 @@ pt pt pt pt -"} -(150,1,1) = {" pt pt pt @@ -45687,6 +45947,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -45819,6 +46090,8 @@ pt pt pt pt +"} +(151,1,1) = {" pt pt pt @@ -45928,8 +46201,6 @@ pt pt pt pt -"} -(151,1,1) = {" pt pt pt @@ -45978,6 +46249,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -46110,6 +46392,8 @@ pt pt pt pt +"} +(152,1,1) = {" pt pt pt @@ -46230,8 +46514,6 @@ pt pt pt pt -"} -(152,1,1) = {" pt pt pt @@ -46269,6 +46551,17 @@ pt pt pt pt +rh +tb +tb +Rv +tb +tb +tb +Rv +tb +tb +rh pt pt pt @@ -46401,6 +46694,8 @@ pt pt pt pt +"} +(153,1,1) = {" pt pt pt @@ -46532,8 +46827,6 @@ pt pt pt pt -"} -(153,1,1) = {" pt pt pt @@ -46560,6 +46853,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -46692,6 +46996,8 @@ pt pt pt pt +"} +(154,1,1) = {" pt pt pt @@ -46834,8 +47140,6 @@ pt pt pt pt -"} -(154,1,1) = {" pt pt pt @@ -46851,6 +47155,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -46983,6 +47298,8 @@ pt pt pt pt +"} +(155,1,1) = {" pt pt pt @@ -47136,12 +47453,21 @@ pt pt pt pt -"} -(155,1,1) = {" pt pt pt pt +iP +iP +iP +wA +wA +wA +wA +wA +iP +iP +iP pt pt pt @@ -47274,6 +47600,8 @@ pt pt pt pt +"} +(156,1,1) = {" pt pt pt @@ -47431,6 +47759,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +de pt pt pt @@ -47438,8 +47777,6 @@ pt pt pt pt -"} -(156,1,1) = {" pt pt pt @@ -47565,6 +47902,8 @@ pt pt pt pt +"} +(157,1,1) = {" pt pt pt @@ -47722,6 +48061,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -47740,8 +48090,6 @@ pt pt pt pt -"} -(157,1,1) = {" pt pt pt @@ -47856,6 +48204,8 @@ pt pt pt pt +"} +(158,1,1) = {" pt pt pt @@ -48013,6 +48363,17 @@ pt pt pt pt +rh +tb +tb +xl +tb +tb +tb +xl +tb +tb +rh pt pt pt @@ -48042,8 +48403,6 @@ pt pt pt pt -"} -(158,1,1) = {" pt pt pt @@ -48147,6 +48506,8 @@ pt pt pt pt +"} +(159,1,1) = {" pt pt pt @@ -48304,6 +48665,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -48344,8 +48716,6 @@ pt pt pt pt -"} -(159,1,1) = {" pt pt pt @@ -48438,6 +48808,8 @@ pt pt pt pt +"} +(160,1,1) = {" pt pt pt @@ -48595,6 +48967,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -48646,8 +49029,6 @@ pt pt pt pt -"} -(160,1,1) = {" pt pt pt @@ -48729,6 +49110,8 @@ pt pt pt pt +"} +(161,1,1) = {" pt pt pt @@ -48886,6 +49269,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -48948,8 +49342,6 @@ pt pt pt pt -"} -(161,1,1) = {" pt pt pt @@ -49020,6 +49412,8 @@ pt pt pt pt +"} +(162,1,1) = {" pt pt pt @@ -49177,6 +49571,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +ZY +tb +tb +tb +tb +rh pt pt pt @@ -49250,8 +49655,6 @@ pt pt pt pt -"} -(162,1,1) = {" pt pt pt @@ -49311,6 +49714,8 @@ pt pt pt pt +"} +(163,1,1) = {" pt pt pt @@ -49468,6 +49873,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -49552,8 +49968,6 @@ pt pt pt pt -"} -(163,1,1) = {" pt pt pt @@ -49602,6 +50016,8 @@ pt pt pt pt +"} +(164,1,1) = {" pt pt pt @@ -49759,6 +50175,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -49854,8 +50281,6 @@ pt pt pt pt -"} -(164,1,1) = {" pt pt pt @@ -49893,6 +50318,8 @@ pt pt pt pt +"} +(165,1,1) = {" pt pt pt @@ -50050,6 +50477,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -50156,8 +50594,6 @@ pt pt pt pt -"} -(165,1,1) = {" pt pt pt @@ -50184,6 +50620,8 @@ pt pt pt pt +"} +(166,1,1) = {" pt pt pt @@ -50341,6 +50779,17 @@ pt pt pt pt +rh +tb +tb +xl +tb +tb +tb +xl +tb +tb +rh pt pt pt @@ -50458,8 +50907,6 @@ pt pt pt pt -"} -(166,1,1) = {" pt pt pt @@ -50475,6 +50922,8 @@ pt pt pt pt +"} +(167,1,1) = {" pt pt pt @@ -50632,6 +51081,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -50760,12 +51220,12 @@ pt pt pt pt -"} -(167,1,1) = {" pt pt pt pt +"} +(168,1,1) = {" pt pt pt @@ -50923,6 +51383,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -51055,6 +51526,8 @@ pt pt pt pt +"} +(169,1,1) = {" pt pt pt @@ -51062,8 +51535,6 @@ pt pt pt pt -"} -(168,1,1) = {" pt pt pt @@ -51214,6 +51685,17 @@ pt pt pt pt +iP +iP +iP +Lz +Lz +Lz +Lz +Lz +iP +iP +iP pt pt pt @@ -51346,6 +51828,8 @@ pt pt pt pt +"} +(170,1,1) = {" pt pt pt @@ -51364,8 +51848,6 @@ pt pt pt pt -"} -(169,1,1) = {" pt pt pt @@ -51505,6 +51987,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +de pt pt pt @@ -51637,6 +52130,8 @@ pt pt pt pt +"} +(171,1,1) = {" pt pt pt @@ -51666,8 +52161,6 @@ pt pt pt pt -"} -(170,1,1) = {" pt pt pt @@ -51796,6 +52289,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -51928,6 +52432,8 @@ pt pt pt pt +"} +(172,1,1) = {" pt pt pt @@ -51968,8 +52474,6 @@ pt pt pt pt -"} -(171,1,1) = {" pt pt pt @@ -52087,6 +52591,17 @@ pt pt pt pt +rh +tb +tb +tI +tb +tb +tb +tI +tb +tb +rh pt pt pt @@ -52219,6 +52734,8 @@ pt pt pt pt +"} +(173,1,1) = {" pt pt pt @@ -52270,8 +52787,6 @@ pt pt pt pt -"} -(172,1,1) = {" pt pt pt @@ -52378,6 +52893,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -52510,6 +53036,8 @@ pt pt pt pt +"} +(174,1,1) = {" pt pt pt @@ -52572,8 +53100,6 @@ pt pt pt pt -"} -(173,1,1) = {" pt pt pt @@ -52669,6 +53195,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -52801,6 +53338,8 @@ pt pt pt pt +"} +(175,1,1) = {" pt pt pt @@ -52874,8 +53413,6 @@ pt pt pt pt -"} -(174,1,1) = {" pt pt pt @@ -52960,6 +53497,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -53092,6 +53640,8 @@ pt pt pt pt +"} +(176,1,1) = {" pt pt pt @@ -53176,8 +53726,6 @@ pt pt pt pt -"} -(175,1,1) = {" pt pt pt @@ -53251,6 +53799,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +ZY +tb +tb +tb +tb +rh pt pt pt @@ -53383,6 +53942,8 @@ pt pt pt pt +"} +(177,1,1) = {" pt pt pt @@ -53478,8 +54039,6 @@ pt pt pt pt -"} -(176,1,1) = {" pt pt pt @@ -53542,6 +54101,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -53674,6 +54244,8 @@ pt pt pt pt +"} +(178,1,1) = {" pt pt pt @@ -53780,8 +54352,6 @@ pt pt pt pt -"} -(177,1,1) = {" pt pt pt @@ -53833,6 +54403,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -53965,6 +54546,8 @@ pt pt pt pt +"} +(179,1,1) = {" pt pt pt @@ -54082,8 +54665,6 @@ pt pt pt pt -"} -(178,1,1) = {" pt pt pt @@ -54124,6 +54705,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -54256,6 +54848,8 @@ pt pt pt pt +"} +(180,1,1) = {" pt pt pt @@ -54384,8 +54978,6 @@ pt pt pt pt -"} -(179,1,1) = {" pt pt pt @@ -54415,6 +55007,17 @@ pt pt pt pt +rh +tb +tb +tI +tb +tb +tb +tI +tb +tb +rh pt pt pt @@ -54547,6 +55150,8 @@ pt pt pt pt +"} +(181,1,1) = {" pt pt pt @@ -54686,8 +55291,6 @@ pt pt pt pt -"} -(180,1,1) = {" pt pt pt @@ -54706,6 +55309,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -54838,6 +55452,8 @@ pt pt pt pt +"} +(182,1,1) = {" pt pt pt @@ -54988,8 +55604,6 @@ pt pt pt pt -"} -(181,1,1) = {" pt pt pt @@ -54997,6 +55611,17 @@ pt pt pt pt +rh +tb +tb +tb +tb +tb +tb +tb +tb +tb +rh pt pt pt @@ -55129,6 +55754,8 @@ pt pt pt pt +"} +(183,1,1) = {" pt pt pt @@ -55286,12 +55913,21 @@ pt pt pt pt +iP +iP +iP +Xa +Xa +Xa +Xa +Xa +iP +iP +iP pt pt pt pt -"} -(182,1,1) = {" pt pt pt @@ -55420,6 +56056,8 @@ pt pt pt pt +"} +(184,1,1) = {" pt pt pt @@ -55577,6 +56215,17 @@ pt pt pt pt +rh +UV +UV +UV +UV +UV +UV +UV +UV +UV +rh pt pt pt @@ -55592,8 +56241,6 @@ pt pt pt pt -"} -(183,1,1) = {" pt pt pt @@ -55711,6 +56358,8 @@ pt pt pt pt +"} +(185,1,1) = {" pt pt pt @@ -55868,6 +56517,17 @@ pt pt pt pt +rh +UV +UV +UV +UV +UV +UV +UV +UV +UV +rh pt pt pt @@ -55894,8 +56554,6 @@ pt pt pt pt -"} -(184,1,1) = {" pt pt pt @@ -56002,6 +56660,8 @@ pt pt pt pt +"} +(186,1,1) = {" pt pt pt @@ -56159,6 +56819,17 @@ pt pt pt pt +rh +UV +UV +FS +FS +UV +UV +UV +UV +UV +rh pt pt pt @@ -56196,8 +56867,6 @@ pt pt pt pt -"} -(185,1,1) = {" pt pt pt @@ -56293,6 +56962,8 @@ pt pt pt pt +"} +(187,1,1) = {" pt pt pt @@ -56450,6 +57121,17 @@ pt pt pt pt +rh +UV +UV +UV +UV +FS +FS +UV +UV +UV +rh pt pt pt @@ -56498,8 +57180,6 @@ pt pt pt pt -"} -(186,1,1) = {" pt pt pt @@ -56584,6 +57264,8 @@ pt pt pt pt +"} +(188,1,1) = {" pt pt pt @@ -56741,6 +57423,17 @@ pt pt pt pt +rh +UV +UV +UV +UV +UV +UV +FS +UV +UV +rh pt pt pt @@ -56800,8 +57493,6 @@ pt pt pt pt -"} -(187,1,1) = {" pt pt pt @@ -56875,6 +57566,8 @@ pt pt pt pt +"} +(189,1,1) = {" pt pt pt @@ -57032,6 +57725,17 @@ pt pt pt pt +rh +UV +UV +UV +UV +rP +FS +UV +UV +UV +rh pt pt pt @@ -57102,8 +57806,6 @@ pt pt pt pt -"} -(188,1,1) = {" pt pt pt @@ -57166,6 +57868,8 @@ pt pt pt pt +"} +(190,1,1) = {" pt pt pt @@ -57323,6 +58027,17 @@ pt pt pt pt +rh +ws +UV +FS +FS +UV +UV +UV +UV +UV +rh pt pt pt @@ -57404,8 +58119,6 @@ pt pt pt pt -"} -(189,1,1) = {" pt pt pt @@ -57457,6 +58170,8 @@ pt pt pt pt +"} +(191,1,1) = {" pt pt pt @@ -57614,6 +58329,17 @@ pt pt pt pt +rh +rh +Ow +UV +UV +FS +FS +UV +Ow +rh +rh pt pt pt @@ -57706,8 +58432,6 @@ pt pt pt pt -"} -(190,1,1) = {" pt pt pt @@ -57748,6 +58472,8 @@ pt pt pt pt +"} +(192,1,1) = {" pt pt pt @@ -57905,6 +58631,17 @@ pt pt pt pt +rh +rh +UV +UV +UV +UV +UV +FS +UV +rh +rh pt pt pt @@ -58008,8 +58745,6 @@ pt pt pt pt -"} -(191,1,1) = {" pt pt pt @@ -58039,6 +58774,8 @@ pt pt pt pt +"} +(193,1,1) = {" pt pt pt @@ -58196,6 +58933,17 @@ pt pt pt pt +rh +rh +UV +UV +OU +ls +ls +UV +UV +rh +rh pt pt pt @@ -58310,8 +59058,6 @@ pt pt pt pt -"} -(192,1,1) = {" pt pt pt @@ -58330,6 +59076,8 @@ pt pt pt pt +"} +(194,1,1) = {" pt pt pt @@ -58488,6 +59236,15 @@ pt pt pt pt +rh +rh +FS +FS +id +UV +UV +rh +rh pt pt pt @@ -58612,8 +59369,6 @@ pt pt pt pt -"} -(193,1,1) = {" pt pt pt @@ -58623,6 +59378,8 @@ pt pt pt pt +"} +(195,1,1) = {" pt pt pt @@ -58781,6 +59538,15 @@ pt pt pt pt +rh +rh +Ow +UV +UV +UV +Ow +rh +rh pt pt pt @@ -58915,620 +59681,7 @@ pt pt pt "} -(194,1,1) = {" -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -"} -(195,1,1) = {" -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -pt -"} -(196,1,1) = {" -pt -pt -pt -pt -pt -pt -pt -pt -pt +(196,1,1) = {" pt pt pt @@ -59687,6 +59840,15 @@ pt pt pt pt +rh +rh +rh +rh +rh +rh +rh +rh +rh pt pt pt diff --git a/_maps/map_files/Gamma/gammacorp.dmm b/_maps/map_files/Gamma/gammacorp.dmm index dd2d91aa9021..6117c386794e 100644 --- a/_maps/map_files/Gamma/gammacorp.dmm +++ b/_maps/map_files/Gamma/gammacorp.dmm @@ -2567,7 +2567,8 @@ /area/facility_hallway/discipline) "rn" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Information Department" + name = "Information Department"; + hackProof = 1 }, /obj/structure/disposalpipe/segment, /turf/open/floor/facility/halls, @@ -3072,7 +3073,8 @@ /area/department_main/records) "ui" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" + name = "Records Office Secure Area"; + hackProof = 1 }, /turf/open/floor/carpet/black, /area/department_main/records) @@ -3843,7 +3845,8 @@ /area/facility_hallway/south) "yM" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office" + name = "Records Office"; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/department_main/records) diff --git a/_maps/map_files/Kappa/kappacorp.dmm b/_maps/map_files/Kappa/kappacorp.dmm index 63223984f2cf..b99beb3e049c 100644 --- a/_maps/map_files/Kappa/kappacorp.dmm +++ b/_maps/map_files/Kappa/kappacorp.dmm @@ -2263,6 +2263,16 @@ name = "Outskirt" }, /area/space) +"lX" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Records Office Secure Area"; + hackProof = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/facility/halls, +/area/facility_hallway/information) "lZ" = ( /turf/closed/indestructible/reinforced{ desc = "A huge chunk of wing-grade metal used in various L corporation facilities. Effectively impervious to conventional methods of destruction."; @@ -5566,6 +5576,18 @@ slowdown = -0.3 }, /area/department_main/command) +"Ab" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/science.dmi'; + max_integrity = 500; + name = "Information Department"; + hackProof = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/facility/halls, +/area/facility_hallway/information) "Ac" = ( /turf/open/floor/plasteel/freezer, /area/facility_hallway/control) @@ -45416,7 +45438,7 @@ cA cA Cx PB -uq +Ab PB cA cA @@ -50295,7 +50317,7 @@ PH PH nO gF -eL +lX nO nO SK diff --git a/_maps/map_files/Lambda/lambdacorp.dmm b/_maps/map_files/Lambda/lambdacorp.dmm index e89f303a9a0f..1ac1b3a2e465 100644 --- a/_maps/map_files/Lambda/lambdacorp.dmm +++ b/_maps/map_files/Lambda/lambdacorp.dmm @@ -1902,7 +1902,8 @@ /area/facility_hallway/control) "ja" = ( /obj/machinery/door/airlock/glass{ - icon = 'icons/obj/doors/airlocks/station/science.dmi' + icon = 'icons/obj/doors/airlocks/station/science.dmi'; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/department_main/records) @@ -5221,7 +5222,8 @@ /area/department_main/information) "zi" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" + name = "Records Office Secure Area"; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/department_main/records) diff --git a/_maps/map_files/Psi/psicorp.dmm b/_maps/map_files/Psi/psicorp.dmm index bb02cce73588..5dc6fcb82f21 100644 --- a/_maps/map_files/Psi/psicorp.dmm +++ b/_maps/map_files/Psi/psicorp.dmm @@ -2986,7 +2986,8 @@ /area/facility_hallway/discipline) "pZ" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Lower Level Department" + name = "Lower Level Department"; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/department_main/extraction) @@ -8988,7 +8989,8 @@ /area/facility_hallway/discipline) "VH" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office" + name = "Records Office"; + hackProof = 1 }, /turf/open/floor/facility/dark, /area/department_main/extraction) @@ -9948,7 +9950,8 @@ dir = 4 }, /obj/machinery/door/airlock/vault{ - name = "Dont Touch Me containment zone" + name = "Dont Touch Me containment zone"; + hackProof = 1 }, /turf/open/floor/plasteel/dark, /area/department_main/extraction) diff --git a/_maps/map_files/Theta/thetacorp.dmm b/_maps/map_files/Theta/thetacorp.dmm index b601e23f20c0..d135cfd77aad 100644 --- a/_maps/map_files/Theta/thetacorp.dmm +++ b/_maps/map_files/Theta/thetacorp.dmm @@ -701,7 +701,8 @@ /obj/machinery/door/airlock{ icon = 'icons/obj/doors/airlocks/station/science.dmi'; max_integrity = 500; - name = "Information Department" + name = "Information Department"; + hackProof = 1 }, /obj/structure/disposalpipe/segment{ dir = 1 @@ -8465,6 +8466,13 @@ color = "#ccc8c0" }, /area/facility_hallway/information) +"Dh" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Records Office Secure Area"; + hackProof = 1 + }, +/turf/open/floor/facility/halls, +/area/facility_hallway/command) "Dj" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -11470,6 +11478,16 @@ /obj/structure/sign/ordealmonitor, /turf/open/floor/plasteel/dark, /area/facility_hallway/control) +"Nj" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/atmos.dmi'; + name = "Central Command"; + normal_integrity = 500; + hackProof = 1 + }, +/turf/open/floor/facility/halls, +/area/facility_hallway/command) "Nn" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -48017,7 +48035,7 @@ JE JE JE mt -sS +Nj Av NX ir @@ -49053,7 +49071,7 @@ dW kH Jn xf -lt +Dh Oy ss lu diff --git a/_maps/map_files/Xi/xicorp.dmm b/_maps/map_files/Xi/xicorp.dmm index 0fd2f5c2bf76..32c1fb0792e0 100644 --- a/_maps/map_files/Xi/xicorp.dmm +++ b/_maps/map_files/Xi/xicorp.dmm @@ -3283,6 +3283,16 @@ }, /turf/open/floor/plating, /area/facility_hallway/training) +"yi" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Training Department"; + hackProof = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/facility/halls, +/area/department_main/training) "yk" = ( /obj/effect/turf_decal/delivery, /obj/machinery/light/cold/no_nightlight{ @@ -5842,7 +5852,8 @@ /area/department_main/command) "RF" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" + name = "Records Office Secure Area"; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/department_main/training) @@ -44341,7 +44352,7 @@ kO kO kO kO -Rh +yi kO kO kO diff --git a/_maps/map_files/Zeta/zetacorp.dmm b/_maps/map_files/Zeta/zetacorp.dmm index e98d605ee0f6..f26458a63216 100644 --- a/_maps/map_files/Zeta/zetacorp.dmm +++ b/_maps/map_files/Zeta/zetacorp.dmm @@ -494,7 +494,8 @@ /area/department_main/information) "bH" = ( /obj/machinery/door/airlock/glass{ - icon = 'icons/obj/doors/airlocks/station/science.dmi' + icon = 'icons/obj/doors/airlocks/station/science.dmi'; + hackProof = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -3125,6 +3126,7 @@ /area/department_main/training) "iO" = ( /obj/machinery/navbeacon/wayfinding/controldepartment, +/obj/machinery/holopad, /turf/open/floor/plasteel/dark, /area/department_main/control) "iP" = ( @@ -3921,7 +3923,8 @@ /area/facility_hallway/east) "lg" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" + name = "Records Office Secure Area"; + hackProof = 1 }, /turf/open/floor/facility/halls, /area/facility_hallway/information) @@ -4991,8 +4994,8 @@ pixel_x = 9 }, /obj/structure/table/wood{ - density = 0; - alpha = 0 + alpha = 0; + density = 0 }, /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -5249,8 +5252,8 @@ dir = 4 }, /obj/structure/table/wood{ - density = 0; - alpha = 0 + alpha = 0; + density = 0 }, /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -10950,7 +10953,8 @@ /obj/machinery/door/airlock{ icon = 'icons/obj/doors/airlocks/station/science.dmi'; max_integrity = 500; - name = "Information Department" + name = "Information Department"; + hackProof = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -11853,6 +11857,7 @@ /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, +/obj/machinery/holopad, /turf/open/floor/plasteel/dark, /area/department_main/information) "HH" = ( @@ -11987,6 +11992,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/facility/dark, /area/department_main/information) +"Id" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel/dark, +/area/department_main/training) "Ig" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -13828,10 +13840,10 @@ /area/facility_hallway/south) "Ny" = ( /obj/structure/statue/bronze/marx{ - pixel_y = 14; - pixel_x = 1; desc = "The wealthy, eccentric, and former owner of land this facility is built upon."; - name = "\improper Late Wing Shareholder bust" + name = "\improper Late Wing Shareholder bust"; + pixel_x = 1; + pixel_y = 14 }, /obj/structure/table/wood/fancy/orange, /obj/effect/turf_decal/siding/wood{ @@ -14392,6 +14404,7 @@ /obj/machinery/camera/autoname, /obj/effect/landmark/department_center, /obj/machinery/navbeacon/wayfinding/safetydepartment, +/obj/machinery/holopad, /turf/open/floor/mineral/titanium/purple{ color = "#7FFF00"; name = "floor" @@ -14658,6 +14671,7 @@ view_range = 13 }, /obj/machinery/navbeacon/wayfinding/centralcommanddepartment, +/obj/machinery/holopad, /turf/open/floor/mineral/titanium/yellow{ name = "floor" }, @@ -42907,7 +42921,7 @@ wD CQ pI pS -xT +Id VH pM Ak diff --git a/_maps/map_files/generic/Manager.dmm b/_maps/map_files/generic/Manager.dmm index b418976aecdf..5d33a4a5e802 100644 --- a/_maps/map_files/generic/Manager.dmm +++ b/_maps/map_files/generic/Manager.dmm @@ -64,14 +64,11 @@ /turf/open/floor/plasteel/white, /area/facility_hallway/manager) "bO" = ( -/obj/structure/table/wood, /obj/effect/turf_decal/siding/blue{ color = "#3234B9"; dir = 8 }, -/obj/item/paper_bin/bundlenatural{ - pixel_y = 5 - }, +/obj/machinery/text_adventure_console, /turf/open/floor/carpet/royalblue, /area/facility_hallway/manager) "bS" = ( @@ -560,6 +557,10 @@ /obj/effect/spawner/randomcolavend, /turf/open/floor/plasteel/dark, /area/facility_hallway/manager) +"ib" = ( +/obj/machinery/holopad/secure, +/turf/open/floor/carpet/royalblack, +/area/facility_hallway/manager) "ih" = ( /obj/structure/rack, /obj/item/toy/plush/kod, @@ -912,6 +913,13 @@ }, /turf/open/floor/carpet/royalblue, /area/facility_hallway/manager) +"mT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/holopad/secure, +/turf/open/floor/wood, +/area/facility_hallway/manager) "mU" = ( /obj/structure/curtain/cloth, /turf/open/floor/plasteel/white, @@ -1034,6 +1042,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, /area/facility_hallway/manager) +"pj" = ( +/obj/machinery/holopad/secure, +/turf/open/floor/carpet/green, +/area/facility_hallway/manager) "pm" = ( /obj/machinery/door/window/brigdoor/southleft, /obj/effect/turf_decal/siding/green{ @@ -2600,6 +2612,7 @@ /area/facility_hallway/manager) "OQ" = ( /obj/structure/table/wood, +/obj/item/paicard, /turf/open/floor/carpet/royalblue, /area/facility_hallway/manager) "OZ" = ( @@ -2628,8 +2641,15 @@ color = "#3234B9"; dir = 4 }, -/obj/item/clipboard, -/obj/item/pen/fourcolor, +/obj/item/clipboard{ + pixel_x = -7 + }, +/obj/item/paper_bin{ + pixel_x = 7 + }, +/obj/item/pen/fourcolor{ + pixel_x = 7 + }, /turf/open/floor/carpet/royalblue, /area/facility_hallway/manager) "Pv" = ( @@ -2803,6 +2823,10 @@ }, /turf/open/floor/carpet/green, /area/facility_hallway/manager) +"Sl" = ( +/obj/machinery/holopad/secure, +/turf/open/floor/carpet/orange, +/area/facility_hallway/manager) "Sx" = ( /obj/effect/turf_decal/siding/white{ dir = 10 @@ -2993,6 +3017,7 @@ /obj/effect/turf_decal/siding/blue{ dir = 9 }, +/obj/machinery/holopad/secure, /turf/open/floor/carpet/cyan, /area/department_main/manager) "WS" = ( @@ -6839,7 +6864,7 @@ jj YM iO iO -iO +mT gC YQ Ov @@ -7347,8 +7372,8 @@ Zi YQ YQ YQ -YQ -YQ +HZ +HZ YQ YQ YQ @@ -9681,7 +9706,7 @@ XL YQ pv EQ -EQ +pj Bs nz IM @@ -9897,7 +9922,7 @@ pE nz IM Lr -Ks +ib Ks fW YQ @@ -10400,7 +10425,7 @@ bS Wz rw Df -zb +Sl Vl zb Iw diff --git a/_maps/templates/syndicate_office/blade_lineageswordmen.dmm b/_maps/templates/syndicate_office/blade_lineageswordmen.dmm index 7a37a4b777e0..26fba2ccf4ed 100644 --- a/_maps/templates/syndicate_office/blade_lineageswordmen.dmm +++ b/_maps/templates/syndicate_office/blade_lineageswordmen.dmm @@ -299,22 +299,16 @@ dir = 1; color = "#694720" }, -/mob/living/simple_animal/hostile/abnormality/cherry_blossoms{ - pixel_y = 13; - density = 0; - alpha = 230; - icon_state = "graveofcherryblossoms_1"; +/obj/structure/fluff{ name = "Cherry Blossoms Tree"; - faction = list("neutral"); + desc = "A beautiful cherry tree."; + icon = 'ModularTegustation/Teguicons/128x128.dmi'; + icon_state = "graveofcherryblossoms_1"; + pixel_x = -48; + pixel_y = 13; layer = 3.9; - can_be_z_moved = 0; - anchored = 1; - animate_movement = 0; - movement_type = 0; - stop_automated_movement = 1; - stop_automated_movement_when_pulled = 1; - buckled = 1; - health = 90000 + max_integrity = 500; + alpha = 230 }, /turf/open/floor/plating/beach/sand, /area/city/backstreets_room) diff --git a/_maps/templates/syndicate_office/indexfinger.dmm b/_maps/templates/syndicate_office/indexfinger.dmm index a370cf18215a..4cab54b5860f 100644 --- a/_maps/templates/syndicate_office/indexfinger.dmm +++ b/_maps/templates/syndicate_office/indexfinger.dmm @@ -20,9 +20,9 @@ color = "#3234B9" }, /obj/structure/closet/crate{ - pixel_y = 5; anchored = 1; - opened = 1 + opened = 1; + pixel_y = 5 }, /obj/item/clothing/glasses/trickblindfold, /obj/item/food/canned/pcorp, @@ -36,37 +36,37 @@ /area/city/backstreets_room) "bL" = ( /obj/structure/bed{ - name = "bunk beds"; can_buckle = 0; - density = 1 + density = 1; + name = "bunk beds" }, /obj/structure/bed{ - pixel_y = 15; - layer = 2.95; can_buckle = 0; + density = 1; + layer = 2.95; name = "bunk beds"; - density = 1 + pixel_y = 15 }, /obj/structure/ladder{ - pixel_x = 4; - pixel_y = -5; layer = 2.97; - mouse_opacity = 0 + mouse_opacity = 0; + pixel_x = 4; + pixel_y = -5 }, /obj/item/bedsheet/rainbow{ - pixel_y = 15; - layer = 2.96; anchored = 1; + desc = "Each proselyte's bedsheet are akin to ."; + layer = 2.96; name = "proselyte's bedsheet"; - desc = "Each proselyte's bedsheet are akin to ." + pixel_y = 15 }, /obj/item/bedsheet/rainbow{ - layer = 2.94; - anchored = 1 + anchored = 1; + layer = 2.94 }, /turf/open/floor/mineral/titanium/white{ - name = "floor"; - color = "#3234B9" + color = "#3234B9"; + name = "floor" }, /area/city/backstreets_room) "bV" = ( @@ -119,8 +119,8 @@ /area/city/backstreets_room) "eK" = ( /obj/machinery/door/airlock/silver{ - req_access_txt = "150"; - name = "messenger office" + name = "messenger office"; + req_access_txt = "150" }, /turf/open/floor/mineral/titanium/white{ name = "floor" @@ -154,33 +154,33 @@ /area/city/backstreets_room) "gL" = ( /obj/structure/bed{ - name = "bunk beds"; can_buckle = 0; - density = 1 + density = 1; + name = "bunk beds" }, /obj/structure/bed{ - pixel_y = 15; - layer = 2.95; can_buckle = 0; + density = 1; + layer = 2.95; name = "bunk beds"; - density = 1 + pixel_y = 15 }, /obj/structure/ladder{ - pixel_x = 4; - pixel_y = -5; layer = 2.97; - mouse_opacity = 0 + mouse_opacity = 0; + pixel_x = 4; + pixel_y = -5 }, /obj/item/bedsheet/rainbow{ - layer = 2.94; - anchored = 1 + anchored = 1; + layer = 2.94 }, /obj/item/bedsheet/rainbow{ - pixel_y = 15; - layer = 2.96; anchored = 1; + desc = "Each proselyte's bedsheet are akin to ."; + layer = 2.96; name = "proselyte's bedsheet"; - desc = "Each proselyte's bedsheet are akin to ." + pixel_y = 15 }, /obj/machinery/light{ dir = 8; @@ -188,8 +188,8 @@ pixel_y = 4 }, /turf/open/floor/mineral/titanium/white{ - name = "floor"; - color = "#3234B9" + color = "#3234B9"; + name = "floor" }, /area/city/backstreets_room) "hf" = ( @@ -244,8 +244,8 @@ /area/city/backstreets_room) "ks" = ( /obj/machinery/door/airlock/silver{ - req_access_txt = "151"; - name = "messenger workplace" + name = "messenger workplace"; + req_access_txt = "151" }, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -410,8 +410,8 @@ /area/city/backstreets_room) "oU" = ( /obj/structure/bed/pod{ - pixel_y = 13; - mouse_opacity = 0 + mouse_opacity = 0; + pixel_y = 13 }, /obj/item/bedsheet{ pixel_y = 13 @@ -637,8 +637,8 @@ /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral, /obj/machinery/door/airlock/silver{ - req_access_txt = "150"; - name = "prescript distribution room" + name = "prescript distribution room"; + req_access_txt = "150" }, /turf/open/floor/pod, /area/city/backstreets_room) @@ -694,6 +694,7 @@ color = "#3234B9"; dir = 4 }, +/obj/item/scrying, /turf/open/floor/mineral/titanium/tiled/white, /area/city/backstreets_room) "CV" = ( @@ -832,21 +833,12 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/closet/crate{ - pixel_y = 5; - anchored = 1; - opened = 1 - }, -/obj/item/clothing/suit/armor/ego_gear/adjustable/index_proxy, -/obj/item/clothing/suit/armor/ego_gear/adjustable/index_proxy, -/obj/effect/spawner/lootdrop/proxy, -/obj/effect/spawner/lootdrop/proxy, /turf/open/floor/mineral/titanium/blue, /area/city/backstreets_room) "HM" = ( /obj/machinery/door/airlock/silver{ - req_access_txt = "150"; - name = "proselyte commune" + name = "proselyte commune"; + req_access_txt = "150" }, /turf/open/floor/mineral/titanium/blue, /area/city/backstreets_room) @@ -915,8 +907,8 @@ /area/city/backstreets_room) "JJ" = ( /obj/structure/chair/comfy/black{ - dir = 4; - can_buckle = 0 + can_buckle = 0; + dir = 4 }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -953,9 +945,9 @@ dir = 8 }, /obj/structure/closet/crate{ - pixel_y = 5; anchored = 1; - opened = 1 + opened = 1; + pixel_y = 5 }, /obj/item/clothing/suit/armor/ego_gear/adjustable/index_proxy, /obj/item/clothing/suit/armor/ego_gear/adjustable/index_proxy, @@ -987,8 +979,8 @@ /area/city/backstreets_room) "LU" = ( /obj/machinery/door/airlock/silver{ - req_access_txt = "151"; - name = "proxy resting grounds" + name = "proxy resting grounds"; + req_access_txt = "151" }, /turf/open/floor/mineral/titanium/blue, /area/city/backstreets_room) @@ -1098,8 +1090,8 @@ dir = 4 }, /obj/machinery/door/airlock/silver{ - req_access_txt = "150"; - name = "messenger office" + name = "messenger office"; + req_access_txt = "150" }, /turf/open/floor/pod, /area/city/backstreets_room) @@ -1167,9 +1159,9 @@ color = "#3234B9" }, /obj/structure/closet/crate{ - pixel_y = 5; anchored = 1; - opened = 1 + opened = 1; + pixel_y = 5 }, /obj/machinery/light{ dir = 8; @@ -1211,8 +1203,8 @@ /area/city/backstreets_room) "PP" = ( /obj/machinery/door/airlock/silver{ - req_access_txt = "151"; - name = "messenger workplace" + name = "messenger workplace"; + req_access_txt = "151" }, /turf/open/floor/mineral/titanium/white{ name = "floor" @@ -1224,8 +1216,8 @@ /area/city/backstreets_room) "RG" = ( /obj/structure/bed/pod{ - pixel_y = 13; - mouse_opacity = 0 + mouse_opacity = 0; + pixel_y = 13 }, /obj/item/bedsheet{ pixel_y = 13 @@ -1295,37 +1287,37 @@ /area/city/backstreets_room) "Tw" = ( /obj/structure/bed{ - pixel_y = 15; - layer = 2.95; can_buckle = 0; + density = 1; + layer = 2.95; name = "bunk beds"; - density = 1 + pixel_y = 15 }, /obj/structure/bed{ - name = "bunk beds"; can_buckle = 0; - density = 1 + density = 1; + name = "bunk beds" }, /obj/structure/ladder{ - pixel_x = 4; - pixel_y = -5; layer = 2.97; - mouse_opacity = 0 + mouse_opacity = 0; + pixel_x = 4; + pixel_y = -5 }, /obj/item/bedsheet/rainbow{ - pixel_y = 15; - layer = 2.96; anchored = 1; + desc = "Each proselyte's bedsheet are akin to ."; + layer = 2.96; name = "proselyte's bedsheet"; - desc = "Each proselyte's bedsheet are akin to ." + pixel_y = 15 }, /obj/item/bedsheet/rainbow{ - layer = 2.94; - anchored = 1 + anchored = 1; + layer = 2.94 }, /turf/open/floor/mineral/titanium/white{ - name = "floor"; - color = "#3234B9" + color = "#3234B9"; + name = "floor" }, /area/city/backstreets_room) "TD" = ( diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index e53369331abd..d8f04672fd16 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -50,6 +50,8 @@ #define BLACK_DAMAGE "black" /// Deals brute damage in percents. #define PALE_DAMAGE "pale" +/// Fake damage used for hostile ai targetting +#define AGGRO_DAMAGE "aggro" //bitflag damage defines used for suicide_act #define BRUTELOSS (1<<0) diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index d265fedc3726..c8e6a22948b6 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -70,6 +70,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define NO_LAVA_GEN (1<<3) /// Blocks ruins spawning on the turf. #define NO_RUINS (1<<4) +#define NO_BASIC_INCORP_MOVE (1<<5) ////////////////Area flags\\\\\\\\\\\\\\ /// If it's a valid territory for cult summoning or the CRAB-17 phone to spawn diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index e98b83f2bf7a..906e807b673c 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -12,6 +12,15 @@ #define JOB_DISPLAY_ORDER_DEFAULT 0 +#define DEPARTMENT_SECURITY (1<<0) +#define DEPARTMENT_COMMAND (1<<1) +#define DEPARTMENT_SERVICE (1<<2) +#define DEPARTMENT_CARGO (1<<3) +#define DEPARTMENT_ENGINEERING (1<<4) +#define DEPARTMENT_SCIENCE (1<<5) +#define DEPARTMENT_MEDICAL (1<<6) +#define DEPARTMENT_SILICON (1<<7) + //Command #define JOB_DISPLAY_ORDER_MANAGER 1 #define JOB_DISPLAY_ORDER_SEPHIRAH 2 diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 6ab7326a629e..44ab88f71ee2 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -11,7 +11,7 @@ * * make sure you add an update to the schema_version stable in the db changelog */ -#define DB_MAJOR_VERSION 5 +#define DB_MAJOR_VERSION 6 /** * DB minor schema version @@ -20,7 +20,7 @@ * * make sure you add an update to the schema_version stable in the db changelog */ -#define DB_MINOR_VERSION 12 +#define DB_MINOR_VERSION 1 //! ## Timing subsystem diff --git a/code/__DEFINES/~lobotomy_defines/_patreon.dm b/code/__DEFINES/~lobotomy_defines/_patreon.dm new file mode 100644 index 000000000000..965d07b7d155 --- /dev/null +++ b/code/__DEFINES/~lobotomy_defines/_patreon.dm @@ -0,0 +1,17 @@ +#define NO_RANK "None" +#define UNSUBBED "UNSUBBED" +#define AGENT_RANK "AGENT" +#define SENIOR_AGENT_RANK "SENIORAGENT" +#define CAPTAIN_RANK "CAPTAIN" + +// im lazy -Cupa +GLOBAL_LIST_INIT(patreon_ranks, list( + "None", + "UNSUBBED", + "AGENT", + "SENIORAGENT", + "CAPTAIN")) + +#define ACCESS_AGENT_RANK 1 +#define ACCESS_SENIOR_AGENT_RANK 2 +#define ACCESS_CAPTAIN_RANK 3 diff --git a/code/__DEFINES/~lobotomy_defines/jobs.dm b/code/__DEFINES/~lobotomy_defines/jobs.dm new file mode 100644 index 000000000000..b8910d828daa --- /dev/null +++ b/code/__DEFINES/~lobotomy_defines/jobs.dm @@ -0,0 +1,106 @@ +#define DEPARTMENT_W_CORP (1<<10) +#define DEPARTMENT_R_CORP (1<<11) +#define DEPARTMENT_HANA (1<<12) +#define DEPARTMENT_ASSOCIATION (1<<13) +#define DEPARTMENT_CITY_ANTAGONIST (1<<13) +#define DEPARTMENT_FIXERS (1<<14) + +GLOBAL_LIST_INIT(w_corp_positions, list( + "W-Corp Representative", + "W-Corp L3 Squad Captain", + "W-Corp L2 Type A Lieutenant", + "W-Corp L2 Type B Support Agent", + "W-Corp L2 Type C Weapon Specialist", + "W-Corp L2 Type D Spear Agent", + "W-Corp L1 Cleanup Agent", +)) + +GLOBAL_LIST_INIT(r_corp_positions, list( + // 4th Pack Command + "Ground Commander", + "Lieutenant Commander", + "Operations Officer", + "Rabbit Squad Captain", + "Reindeer Squad Captain", + "Rhino Squad Captain", + "Raven Squad Captain", + + // 5th Pack Command + "Assault Commander", + "Base Commander", + "Support Officer", + "Rat Squad Leader", + "Rooster Squad Leader", + "Raccoon Squad Leader", + "Roadrunner Squad Leader", + + // 4th Pack troops + "R-Corp Suppressive Rabbit", + "R-Corp Assault Rabbit", + "R-Corp Medical Reindeer", + "R-Corp Berserker Reindeer", + "R-Corp Gunner Rhino", + "R-Corp Hammer Rhino", + "R-Corp Scout Raven", + "R-Corp Support Raven", + + // 5th Pack troops + "R-Corp Rat", + "R-Corp Rooster", + "R-Corp Raccoon Spy", + "R-Corp Raccoon Sniper", + "R-Corp Roadrunner", +)) + +GLOBAL_LIST_INIT(hana_positions, list( + "Hana Administrator", + "Hana Representative", + "Hana Intern", +)) + +GLOBAL_LIST_INIT(fixer_positions, list( + "East Office Director", + "East Office Fixer", + "North Office Director", + "North Office Fixer", + + "Association Section Director", + "Association Veteran", + "Association Fixer", + "Roaming Association Fixer", + + "Medical Fixer Assistant", + "Fixer", + "Rat", // most fitting, somehow +)) + +GLOBAL_LIST_INIT(association_positions, list( + "Association Section Director", + "Association Veteran", + "Association Fixer", + "Roaming Association Fixer", +)) + +GLOBAL_LIST_INIT(city_antagonist_positions, list( + "Index Messenger", + "Index Proxy", + "Index Proselyte", + + "Blade Lineage Cutthroat", + "Blade Lineage Salsu", + "Blade Lineage Ronin", + "Blade Lineage Roaming Salsu", + + "Grand Inquisitor", + "N Corp Grosshammer", + "N Corp Mittlehammer", + "N Corp Kleinhammer", + + "Thumb Sottocapo", + "Thumb Capo", + "Thumb Soldato", + + "Kurokumo Kashira", + "Kurokumo Hosa", + "Kurokumo Wakashu", +)) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index e41ead876a45..ba6423ae92da 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -136,6 +136,9 @@ return dist +/proc/get_dist_manhattan(atom/Loc1, atom/Loc2) + return abs(Loc1.x - Loc2.x) + abs(Loc1.y - Loc2.y) + /proc/circlerangeturfs(center=usr,radius=3) var/turf/centerturf = get_turf(center) diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 269b2a4d5095..dd344b77865c 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -71,6 +71,7 @@ DEFINE_BITFIELD(turf_flags, list( "NO_RUINS" = NO_RUINS, "NOJAUNT" = NOJAUNT, "UNUSED_RESERVATION_TURF" = UNUSED_RESERVATION_TURF, + "NO_BASIC_INCORP_MOVE" = NO_BASIC_INCORP_MOVE, )) DEFINE_BITFIELD(car_traits, list( diff --git a/code/_globalvars/tgui.dm b/code/_globalvars/tgui.dm new file mode 100644 index 000000000000..6903af6d9133 --- /dev/null +++ b/code/_globalvars/tgui.dm @@ -0,0 +1 @@ +GLOBAL_DATUM(crew_manifest_tgui, /datum/crew_manifest) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 4c9aa2080766..50648489ec98 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -145,9 +145,12 @@ if(CanReach(A,W)) if(W) var/atom/target_thing = A - if((isturf(A) || iseffect(A)) && W.force > 10) + if(a_intent != INTENT_HARM && (isturf(A) || iseffect(A)) && W.force > 10) var/turf/T = get_turf(A) for(var/mob/living/L in T) + if(istype(L, /mob/living/simple_animal/projectile_blocker_dummy)) + var/mob/living/simple_animal/projectile_blocker_dummy/pbd = L + L = pbd.parent if(L.invisibility > see_invisible) continue if(L.stat != DEAD) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 25457cf896e0..a36b3d068618 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -84,6 +84,9 @@ for(var/turf/T in hit_turfs) for(var/mob/M in T) + if(istype(M, /mob/living/simple_animal/projectile_blocker_dummy)) + var/mob/living/simple_animal/projectile_blocker_dummy/pbd = M + M = pbd.parent potential_targets |= M potential_targets -= user diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 6c573094f717..aa00ea7509ad 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -209,6 +209,9 @@ if(isturf(A) || iseffect(A)) var/turf/T = get_turf(A) for(var/mob/living/L in T) + if(istype(L, /mob/living/simple_animal/projectile_blocker_dummy)) + var/mob/living/simple_animal/projectile_blocker_dummy/pbd = L + L = pbd.parent if(L.invisibility > see_invisible) continue if(L.stat != DEAD) diff --git a/code/controllers/subsystem/abnormality_queue.dm b/code/controllers/subsystem/abnormality_queue.dm index c6623d2ed45c..f75565ad059a 100644 --- a/code/controllers/subsystem/abnormality_queue.dm +++ b/code/controllers/subsystem/abnormality_queue.dm @@ -29,6 +29,8 @@ SUBSYSTEM_DEF(abnormality_queue) var/rooms_start = 0 /// Amount of times PostSpawn() proc has been called. Kept separate from times_fired because admins love to call fire() manually var/spawned_abnos = 0 + /// When an abnormality spawns, the time it spawned is here. Purelly used for sephirahs TGUI console + var/previous_abno_spawn = 0 // I am using this all because default subsystem waiting and next_fire is done in a very... interesting way. /// World time at which new abnormality will be spawned var/next_abno_spawn = INFINITY @@ -62,9 +64,10 @@ SUBSYSTEM_DEF(abnormality_queue) /datum/controller/subsystem/abnormality_queue/proc/SpawnAbno() // Earlier in the game, abnormalities will spawn faster and then slow down a bit + previous_abno_spawn = world.time next_abno_spawn = world.time + next_abno_spawn_time + ((min(16, spawned_abnos) - 6) * 9) SECONDS - if(!LAZYLEN(GLOB.abnormality_room_spawners)) + if(!length(GLOB.abnormality_room_spawners)) return var/obj/effect/spawner/abnormality_room/choice = pick(GLOB.abnormality_room_spawners) @@ -108,7 +111,7 @@ SUBSYSTEM_DEF(abnormality_queue) available_levels = list(TETH_LEVEL) // Roll the abnos from available levels - if(!ispath(queued_abnormality) && LAZYLEN(possible_abnormalities)) + if(!ispath(queued_abnormality) && length(possible_abnormalities)) PickAbno() /datum/controller/subsystem/abnormality_queue/proc/PostSpawn() @@ -138,15 +141,15 @@ SUBSYSTEM_DEF(abnormality_queue) to_chat(person, span_notice("You feel stronger than before.")) /datum/controller/subsystem/abnormality_queue/proc/PickAbno() - if(!LAZYLEN(available_levels)) + if(!length(available_levels)) return FALSE /// List of threat levels that we will pick var/list/picking_levels = list() for(var/threat in available_levels) - if(!LAZYLEN(possible_abnormalities[threat])) + if(!length(possible_abnormalities[threat])) continue picking_levels |= threat - if(!LAZYLEN(picking_levels)) + if(!length(picking_levels)) return FALSE // There we select the abnormalities @@ -154,7 +157,7 @@ SUBSYSTEM_DEF(abnormality_queue) var/pick_count = GetFacilityUpgradeValue(UPGRADE_ABNO_QUEUE_COUNT) var/list/picked_levs = list() for(var/i = 1 to pick_count) - if(!LAZYLEN(possible_abnormalities)) + if(!length(possible_abnormalities)) break var/lev = pick(picking_levels) // If we have more options to fill and we have multiple available levels - force them in. @@ -164,11 +167,11 @@ SUBSYSTEM_DEF(abnormality_queue) // And pick again lev = pick(picking_levels) picked_levs |= lev - if(!LAZYLEN(possible_abnormalities[lev] - picking_abnormalities)) + if(!length(possible_abnormalities[lev] - picking_abnormalities)) continue var/chosen_abno = PickWeightRealNumber(possible_abnormalities[lev] - picking_abnormalities) picking_abnormalities += chosen_abno - if(!LAZYLEN(picking_abnormalities)) + if(!length(picking_abnormalities)) return FALSE queued_abnormality = pick(picking_abnormalities) return TRUE @@ -198,7 +201,7 @@ SUBSYSTEM_DEF(abnormality_queue) var/list/picking_abno = list() for(var/level in available_levels) - if(!LAZYLEN(possible_abnormalities[level])) + if(!length(possible_abnormalities[level])) continue picking_abno |= possible_abnormalities[level] diff --git a/code/controllers/subsystem/fishing.dm b/code/controllers/subsystem/fishing.dm index fd7330fe4ddb..eda2fad53545 100644 --- a/code/controllers/subsystem/fishing.dm +++ b/code/controllers/subsystem/fishing.dm @@ -31,6 +31,9 @@ SUBSYSTEM_DEF(fishing) /datum/controller/subsystem/fishing/proc/Moveplanets() addtimer(CALLBACK(src, PROC_REF(Moveplanets)), 7 MINUTES) moonphase++ + if(moonphase == 5) + moonphase = 1 + if(stopnext && moonphase != 4) for(var/mob/M in GLOB.player_list) to_chat(M, span_userdanger("The planets begin to move again.")) diff --git a/code/controllers/subsystem/maptype.dm b/code/controllers/subsystem/maptype.dm index 88209c0207cf..285f8b61b314 100644 --- a/code/controllers/subsystem/maptype.dm +++ b/code/controllers/subsystem/maptype.dm @@ -36,7 +36,7 @@ SUBSYSTEM_DEF(maptype) var/list/nofear = list("limbus_labs") //What departments are we looking at - var/list/departments = list("Command","Security","Service") + var/list/departments = list("Command", "Security", "Service") /datum/controller/subsystem/maptype/Initialize() @@ -44,12 +44,18 @@ SUBSYSTEM_DEF(maptype) //Badda Bing Badda Da. This makes the latejoin menu cleaner switch(SSmaptype.maptype) - if("wonderlabs", "city", "fixers", "office") - departments = list("Command", "Security", "Service", "Science") + if("wonderlabs") + departments = list("Command", "Fixers", "Security", "Service") + if("city") + departments = list("Command", "Hana", "Association", "Syndicate", "Fixers", "Medical", "Security", "Service") + if("fixers") + departments = list("Command", "Hana", "Association", "Fixers", "Medical", "Service") if("limbus_labs") - departments = list("Command", "Security","Medical", "Science", "Service" ) - if("rcorp", "wcorp") - departments = list("Command", "Security") + departments = list("Command", "Security", "Medical", "Science", "Engineering", "Service" ) + if("rcorp") + departments = list("Command", "R Corp", "Medical") + if("wcorp") + departments = list("Command", "W Corp") var/list/all_jobs = subtypesof(/datum/job) if(!all_jobs.len) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 89ce5dba16ce..becd9d138661 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -176,10 +176,14 @@ SUBSYSTEM_DEF(vote) return FALSE // If user has already voted, remove their specific vote if(usr.ckey in voted) + if(usr.client.patreon.fetch_rank(usr.ckey)>=2) //Patreons get double mapvote + choices[choices[vote]]-- choices[choices[choice_by_ckey[usr.ckey]]]-- else voted += usr.ckey choice_by_ckey[usr.ckey] = vote + if(usr.client.patreon.fetch_rank(usr.ckey)>=2) //Patreons get double mapvote + choices[choices[vote]]++ choices[choices[vote]]++ return vote diff --git a/code/datums/abnormality/_ego_datum/teth.dm b/code/datums/abnormality/_ego_datum/teth.dm index 0989aab7cf0d..30b3921e22f8 100644 --- a/code/datums/abnormality/_ego_datum/teth.dm +++ b/code/datums/abnormality/_ego_datum/teth.dm @@ -326,6 +326,15 @@ item_path = /obj/item/ego_weapon/sanitizer cost = 20 +//Kikimora Kiki_Mora +/datum/ego_datum/weapon/kikimora + item_path = /obj/item/ego_weapon/kikimora + cost = 20 + +/datum/ego_datum/armor/kikimora + item_path = /obj/item/clothing/suit/armor/ego_gear/teth/kikimora + cost = 20 + // Faelantern - Midwinter Nightmare /datum/ego_datum/armor/faelantern item_path = /obj/item/clothing/suit/armor/ego_gear/teth/faelantern @@ -356,3 +365,9 @@ /datum/ego_datum/armor/clayman item_path = /obj/item/clothing/suit/armor/ego_gear/teth/clayman cost = 20 + +// You are bald - Tough +/datum/ego_datum/weapon/tough + item_path = /obj/item/ego_weapon/ranged/pistol/tough + cost = 20 + diff --git a/code/datums/abnormality/_ego_datum/zayin.dm b/code/datums/abnormality/_ego_datum/zayin.dm index cfcf377a40af..2dcff9320d87 100644 --- a/code/datums/abnormality/_ego_datum/zayin.dm +++ b/code/datums/abnormality/_ego_datum/zayin.dm @@ -7,11 +7,6 @@ item_path = /obj/item/clothing/suit/armor/ego_gear/zayin/penitence cost = 12 -// You are bald - Tough -/datum/ego_datum/weapon/tough - item_path = /obj/item/ego_weapon/ranged/pistol/tough - cost = 12 - /datum/ego_datum/armor/tough item_path = /obj/item/clothing/suit/armor/ego_gear/zayin/tough cost = 12 diff --git a/code/datums/components/crafting/recipes/carnival_silk/armor_weaving/carnival_seven.dm b/code/datums/components/crafting/recipes/carnival_silk/armor_weaving/carnival_seven.dm index 1c1e88c9c9cf..52d17c0a8d67 100644 --- a/code/datums/components/crafting/recipes/carnival_silk/armor_weaving/carnival_seven.dm +++ b/code/datums/components/crafting/recipes/carnival_silk/armor_weaving/carnival_seven.dm @@ -43,7 +43,7 @@ subcategory = CAT_ARMOR /datum/crafting_recipe/seven_vet_intel - name = "Seven Association recon armor" + name = "Seven Association veteran recon armor" result = /obj/item/clothing/suit/armor/ego_gear/city/sevenvet/intel reqs = list( /obj/item/stack/sheet/silk/steel_simple = 4, @@ -58,7 +58,7 @@ subcategory = CAT_ARMOR /datum/crafting_recipe/seven_dir - name = "Seven Association recon armor" + name = "Seven Association director armor" result = /obj/item/clothing/suit/armor/ego_gear/city/sevendirector reqs = list( /obj/item/stack/sheet/silk/steel_elegant = 3, diff --git a/code/datums/components/crafting/recipes/carnival_silk/silk_tailoring/carnival_transfer.dm b/code/datums/components/crafting/recipes/carnival_silk/silk_tailoring/carnival_transfer.dm index 4b276e0f1abb..a98d0e5fa121 100644 --- a/code/datums/components/crafting/recipes/carnival_silk/silk_tailoring/carnival_transfer.dm +++ b/code/datums/components/crafting/recipes/carnival_silk/silk_tailoring/carnival_transfer.dm @@ -43,7 +43,7 @@ //Advanced Transfers /datum/crafting_recipe/azure_silk_transfer name = "Violet/Crimson Silk to Azure Silk" - result = /obj/item/stack/sheet/silk/amber_simple + result = /obj/item/stack/sheet/silk/azure_simple reqs = list(/obj/item/stack/sheet/silk/crimson_advanced = 1, /obj/item/stack/sheet/silk/violet_advanced = 1) tools = list(/obj/item/silkknife = 1) time = 5 diff --git a/code/datums/components/crafting/recipes/clothing.dm b/code/datums/components/crafting/recipes/clothing.dm index 2464c713c470..165c248dfdea 100644 --- a/code/datums/components/crafting/recipes/clothing.dm +++ b/code/datums/components/crafting/recipes/clothing.dm @@ -64,6 +64,21 @@ time = 45 category = CAT_CLOTHING +/datum/crafting_recipe/santahat + name = "Santa Hat" + result = /obj/item/clothing/head/santa + reqs = list(/obj/item/stack/sheet/cotton/cloth = 4) + time = 10 + category = CAT_CLOTHING + +/datum/crafting_recipe/reindeerhat + name = "Reindeer Antlers" + result = /obj/item/clothing/head/hardhat/reindeer + reqs = list(/obj/item/stack/sheet/cotton/cloth = 1, + /obj/item/light/bulb = 1) + time = 10 + category = CAT_CLOTHING + /////DURATHREAD /datum/crafting_recipe/durathread_vest name = "Durathread Vest" diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 2795b182bab3..a5bec57e0841 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -148,7 +148,15 @@ "Science", "Supply", "Service", - "Silicon" + "Silicon", + // LOBOTOMYCORPORATION ADDITION START + "W Corp", + "R Corp", + "Hana", + "Association", + "Syndicate", + "Fixers", + // LOBOTOMYCORPORATION ADDITION END ) var/list/departments = list( "Command" = GLOB.command_positions, @@ -158,8 +166,18 @@ "Science" = GLOB.science_positions, "Supply" = GLOB.supply_positions, "Service" = GLOB.service_positions, - "Silicon" = GLOB.nonhuman_positions + "Silicon" = GLOB.nonhuman_positions, + // LOBOTOMYCORPORATION ADDITION START + "W Corp" = GLOB.w_corp_positions, + "R Corp" = GLOB.r_corp_positions, + "Hana" = GLOB.hana_positions, + "Association" = GLOB.association_positions, + "Syndicate" = GLOB.city_antagonist_positions, + "Fixers" = GLOB.fixer_positions, + // LOBOTOMYCORPORATION ADDITION END ) + var/list/heads = GLOB.command_positions + list("Quartermaster") + for(var/datum/data/record/t in GLOB.data_core.general) var/name = t.fields["name"] var/rank = t.fields["rank"] @@ -170,12 +188,33 @@ if((rank in jobs) || (true_rank in jobs)) //Tegu edit - alt job titles if(!manifest_out[department]) manifest_out[department] = list() - manifest_out[department] += list(list( - "name" = name, - "rank" = rank - )) + // LOBOTOMYCORPORATION ADDITION START + var/duplicate_found = FALSE + for(var/list/data as anything in manifest_out[department]) + if(findtext(data["name"], name) && rank == data["rank"]) + duplicate_found = TRUE + if(length(data) == 2) + data["count"] = 1 + data["count"]++ + data["name"] = "x[data["count"]] [name]" + continue + + if(duplicate_found) + has_department = TRUE + continue + // LOBOTOMYCORPORATION ADDITION END + // Append to beginning of list if captain or department head + if (rank == "Captain" || (department != "Command" && (rank in heads))) + manifest_out[department] = list(list( + "name" = name, + "rank" = rank + )) + manifest_out[department] + else + manifest_out[department] += list(list( + "name" = name, + "rank" = rank + )) has_department = TRUE - break if(!has_department) if(!manifest_out["Misc"]) manifest_out["Misc"] = list() diff --git a/code/datums/patreon_data.dm b/code/datums/patreon_data.dm new file mode 100644 index 000000000000..5155fef5d507 --- /dev/null +++ b/code/datums/patreon_data.dm @@ -0,0 +1,72 @@ +/client + var/datum/patreon_data/patreon + +/datum/patreon_data + ///the client that owns this data + var/client/owner + ///the stored patreon client key for the information + var/client_key + ///the stored patreon rank collected from the server + var/owned_rank = NO_RANK + ///access rank in numbers + var/access_rank = 0 + +/datum/patreon_data/New(client/created_client) + . = ..() + if(!created_client) + return + + if(!SSdbcore.IsConnected()) + owned_rank = NO_RANK ///this is a testing variable + return + + owner = created_client + + fetch_key(owner.ckey) + fetch_rank(owner.ckey) + + assign_access_rank() + + +/datum/patreon_data/proc/fetch_key(ckey) + var/datum/db_query/query_get_key = SSdbcore.NewQuery("SELECT patreon_key FROM [format_table_name("patreon_ranks")] WHERE ckey = :ckey", + list("ckey" = ckey)) + if(query_get_key.warn_execute()) + if(query_get_key.NextRow()) + client_key = query_get_key.item[1] + qdel(query_get_key) + +/datum/patreon_data/proc/fetch_rank(ckey) + var/datum/db_query/query_get_rank = SSdbcore.NewQuery("SELECT patreon_rank FROM [format_table_name("patreon_ranks")] WHERE ckey = :ckey", + list("ckey" = ckey)) + if(query_get_rank.warn_execute()) + if(query_get_rank.NextRow()) + if(query_get_rank.item[1]) + owned_rank = query_get_rank.item[1] + if(owned_rank == "UNSUBBED2") + owned_rank = NO_RANK + else + owned_rank = NO_RANK + qdel(query_get_rank) + + +/datum/patreon_data/proc/assign_access_rank() + switch(owned_rank) + if(AGENT_RANK) + access_rank = ACCESS_AGENT_RANK + if(SENIOR_AGENT_RANK) + access_rank = ACCESS_SENIOR_AGENT_RANK + if(CAPTAIN_RANK) + access_rank = ACCESS_CAPTAIN_RANK + +/datum/patreon_data/proc/has_access(rank) + if(!access_rank) + assign_access_rank() + if(rank <= access_rank) + return TRUE + return FALSE + +/datum/patreon_data/proc/is_donator() + if((owned_rank == NO_RANK) || !owned_rank || (owned_rank == UNSUBBED)) + return FALSE + return TRUE diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 041a09a23dee..c7ffc310ddd5 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1162,6 +1162,76 @@ else B.add_stacks(stacks) +#define STATUS_EFFECT_LCBLEED /datum/status_effect/stacking/lc_bleed // Deals true damage every 5 sec, can't be applied to godmode (contained abos) +/datum/status_effect/stacking/lc_bleed + id = "lc_bleed" + alert_type = /atom/movable/screen/alert/status_effect/lc_bleed + max_stacks = 50 + tick_interval = 5 SECONDS + consumed_on_threshold = FALSE + var/new_stack = FALSE + var/burn_res = 0 + var/safety = TRUE + +/atom/movable/screen/alert/status_effect/lc_bleed + name = "Bleeding" + desc = "You're currently bleeding!!" + icon = 'ModularTegustation/Teguicons/status_sprites.dmi' + icon_state = "lc_bleed" + +//Bleed Damage Stuff +/datum/status_effect/stacking/lc_bleed/on_apply() + . = ..() + RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(Moved)) + +//Deals true damage +/datum/status_effect/stacking/lc_bleed/proc/Moved(mob/user, atom/new_location) + SIGNAL_HANDLER + if(!can_have_status()) + qdel(src) + to_chat(owner, "Your organs bleed due to your movement!!") + owner.playsound_local(owner, 'sound/effects/wounds/crackandbleed.ogg', 25, TRUE) + if(stacks >= 10) + var/obj/effect/decal/cleanable/blood/B = locate() in get_turf(owner) + if(!B) + B = new /obj/effect/decal/cleanable/blood(get_turf(owner)) + B.bloodiness = 100 + if(ishuman(owner)) + owner.adjustBruteLoss(max(0, stacks)) + else + owner.adjustBruteLoss(stacks*4) // x4 on non humans + stacks = round(stacks/2) + if(stacks == 0) + qdel(src) + + +/datum/status_effect/stacking/lc_bleed/on_remove() + UnregisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE) + return ..() + +/datum/status_effect/stacking/lc_bleed/can_have_status() + return (owner.stat != DEAD || !(owner.status_flags & GODMODE)) + +/datum/status_effect/stacking/lc_bleed/add_stacks(stacks_added) + ..() + new_stack = TRUE + +// The Stack Decaying +/datum/status_effect/stacking/lc_bleed/tick() + if(safety) + if(new_stack) + new_stack = FALSE + else + qdel(src) + +//Mob Proc +/mob/living/proc/apply_lc_bleed(stacks) + var/datum/status_effect/stacking/lc_bleed/B = src.has_status_effect(/datum/status_effect/stacking/lc_bleed) + if(!B) + src.apply_status_effect(/datum/status_effect/stacking/lc_bleed, stacks) + else + B.add_stacks(stacks) + /datum/status_effect/display/dyscrasone_withdrawl id = "dyscrasone_withdrawl" status_type = STATUS_EFFECT_UNIQUE diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index dc3479ad6ac8..f23f829aca04 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -52,6 +52,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u addtimer(CALLBACK(src, PROC_REF(drawround)), 40 MINUTES) to_chat(world, span_userdanger("Round will end in a draw after 40 minutes.")) addtimer(CALLBACK(src, PROC_REF(rcorp_announce)), 3 MINUTES) + addtimer(CALLBACK(src, PROC_REF(ClearIncorpBarriers)), 6 MINUTES) RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, PROC_REF(CheckLiving)) //Limbus Labs @@ -88,7 +89,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u /// Automatically ends the shift if no humanoid players are alive /datum/game_mode/combat/proc/CheckLiving() for(var/mob/living/carbon/human/hooman in GLOB.human_list) - if(hooman.stat != DEAD && hooman.ckey) + if(hooman.stat != DEAD && hooman.ckey && !istype(hooman, /mob/living/carbon/human/species/pinocchio)) return if(SSticker.force_ending == TRUE) // they lost another way before we could do it, how rude. @@ -133,7 +134,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u //Gamemode stuff /datum/game_mode/combat/proc/counterincrease() addtimer(CALLBACK(src, PROC_REF(counterincrease)), 1 MINUTES) - GLOB.combat_counter+=1 + GLOB.combat_counter++ if(SSmaptype.maptype == "wcorp") for(var/mob/living/carbon/human/H in GLOB.human_list) if(H.stat == DEAD) @@ -168,3 +169,10 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u CRASH("No payload somehow, possibly no landmark") P.start_delay = delay P.GetPath() + + +/datum/game_mode/combat/proc/ClearIncorpBarriers() + for(var/obj/effect/landmark/nobasic_incorp_move/disappearing/L in GLOB.landmarks_list) + qdel(L) + for(var/mob/living/simple_animal/hostile/abnormality/A in GLOB.abnormality_mob_list) + to_chat(A, "Incorporeal barrier is broken!") diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 87eccfc35a72..4e486cb02918 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -34,7 +34,7 @@ Possible to do for anyone motivated enough: layer = LOW_OBJ_LAYER plane = FLOOR_PLANE flags_1 = HEAR_1 - req_access = list(ACCESS_KEYCARD_AUTH) //Used to allow for forced connecting to other (not secure) holopads. Anyone can make a call, though. + req_access = list(ACCESS_COMMAND) //Used to allow for forced connecting to other (not secure) holopads. Anyone can make a call, though. use_power = IDLE_POWER_USE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/game/objects/items/fixerskills/fishing/_fishing.dm b/code/game/objects/items/fixerskills/fishing/_fishing.dm index 89043d89193f..4de95f4451f6 100644 --- a/code/game/objects/items/fixerskills/fishing/_fishing.dm +++ b/code/game/objects/items/fixerskills/fishing/_fishing.dm @@ -1,19 +1,20 @@ /datum/action/cooldown/fishing - icon_icon = 'icons/hud/screen_fishing.dmi' - button_icon_state = "sacredword" name = "Sacred Word" - cooldown_time = 300 + button_icon_state = "sacredword" + icon_icon = 'icons/hud/screen_fishing.dmi' + cooldown_time = 30 SECONDS var/devotion_cost = 0 /datum/action/cooldown/fishing/Trigger() - if(!..()) + . = ..() + if(!.) return FALSE var/mob/living/carbon/human/H = owner var/required_devotion = devotion_cost if(H.god_aligned == FISHGOD_SATURN) - required_devotion -= 1 //Get one less cost on these spells + required_devotion-- //Get one less cost on these spells if(H.devotion < required_devotion) to_chat(H, span_warning("You do not have enough devotion for this spell!")) diff --git a/code/game/objects/items/fixerskills/fishing/level1/arcane.dm b/code/game/objects/items/fixerskills/fishing/level1/arcane.dm index fad26ad39e8c..4cf6905ad661 100644 --- a/code/game/objects/items/fixerskills/fishing/level1/arcane.dm +++ b/code/game/objects/items/fixerskills/fishing/level1/arcane.dm @@ -1,15 +1,14 @@ -//Scry /obj/item/book/granter/action/skill/scry - granted_action = /datum/action/cooldown/fishing/scry - actionname = "Scry" name = "Level 1 Skill: Scry" + actionname = "Scry" + granted_action = /datum/action/cooldown/fishing/scry level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/scry - button_icon_state = "scry" name = "Scry" - cooldown_time = 300 + button_icon_state = "scry" + cooldown_time = 30 SECONDS devotion_cost = 1 /datum/action/cooldown/fishing/scry/FishEffect(mob/living/user) @@ -24,97 +23,57 @@ if(4) to_chat(user, span_notice("The moon is Full.")) - if(CheckPlanetAligned(FISHGOD_MERCURY)) - to_chat(user, span_notice("Mercury is in alignment with earth.")) - if(CheckPlanetAligned(FISHGOD_VENUS)) - to_chat(user, span_notice("Venus is in alignment with earth.")) - if(CheckPlanetAligned(FISHGOD_MARS)) - to_chat(user, span_notice("Mars is in alignment with earth.")) - if(CheckPlanetAligned(FISHGOD_JUPITER)) - to_chat(user, span_notice("Jupiter is in alignment with earth.")) - if(CheckPlanetAligned(FISHGOD_SATURN)) - to_chat(user, span_notice("Saturn is in alignment with earth.")) - if(CheckPlanetAligned(FISHGOD_URANUS)) - to_chat(user, span_notice("Uranus is in alignment with earth.")) - if(CheckPlanetAligned(FISHGOD_NEPTUNE)) - to_chat(user, span_notice("Neptune is in alignment with earth.")) - + for(var/datum/planet/planet as anything in SSfishing.planets) + if(planet.phase == 1) + to_chat(user, span_notice("[planet.name] is in alignment with earth.")) - -//Sacred Word /obj/item/book/granter/action/skill/sacredword - granted_action = /datum/action/cooldown/fishing/sacredword - actionname = "Sacred Word" name = "Level 1 Skill: Sacred Word" + actionname = "Sacred Word" + granted_action = /datum/action/cooldown/fishing/sacredword level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/sacredword - button_icon_state = "sacredword" name = "Sacred Word" - cooldown_time = 6000 + button_icon_state = "sacredword" + cooldown_time = 10 MINUTES devotion_cost = 0 /datum/action/cooldown/fishing/sacredword/FishEffect(mob/living/user) - switch(user.god_aligned) - if(FISHGOD_MERCURY) - if(CheckPlanetAligned(FISHGOD_MERCURY)) - user.devotion+=4 - to_chat(user, span_notice("Lir hears your words.")) - - if(FISHGOD_VENUS) - if(CheckPlanetAligned(FISHGOD_VENUS)) - user.devotion+=6 - to_chat(user, span_notice("Tefnut hears your words.")) - - if(FISHGOD_MARS) - if(CheckPlanetAligned(FISHGOD_MARS)) - user.devotion+=8 - to_chat(user, span_notice("Arnapkapfaaluk hears your words.")) - - if(FISHGOD_JUPITER) - if(CheckPlanetAligned(FISHGOD_JUPITER)) - user.devotion+=10 - to_chat(user, span_notice("Susanoo hears your words.")) + for(var/datum/planet/planet as anything in SSfishing.planets) + if(user.god_aligned != planet.god) + continue - if(FISHGOD_SATURN) - if(CheckPlanetAligned(FISHGOD_SATURN)) - user.devotion+=12 - to_chat(user, span_notice("Kukulkan hears your words.")) - - if(FISHGOD_URANUS) - if(CheckPlanetAligned(FISHGOD_URANUS)) - user.devotion+=14 - to_chat(user, span_notice("Abena Mansa hears your words.")) - - if(FISHGOD_NEPTUNE) - if(CheckPlanetAligned(FISHGOD_NEPTUNE)) - user.devotion+=16 - to_chat(user, span_notice("Glaucus hears your words.")) - else + if(planet.phase != 1) to_chat(user, span_notice("Your planet is misaligned. Your prayer goes unanswered.")) + return + + user.devotion += (planet.orbit_time * 2) + to_chat(user, span_notice("[user.god_aligned] hears your words.")) + return + to_chat(user, span_danger("... but silence is the only listener.")) // Your planet is done broke -//Commune /obj/item/book/granter/action/skill/commune - granted_action = /datum/action/cooldown/fishing/commune - actionname = "Commune" name = "Level 1 Skill: Commune" + actionname = "Commune" + granted_action = /datum/action/cooldown/fishing/commune level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/commune - button_icon_state = "commune" name = "Commune" - cooldown_time = 100 + button_icon_state = "commune" + cooldown_time = 10 SECONDS devotion_cost = 1 /datum/action/cooldown/fishing/commune/FishEffect(mob/living/user) - if(user.god_aligned == FISHGOD_NONE) //Athiests can't commune because they don't have a soul + if(user.god_aligned == FISHGOD_NONE) // Athiests can't commune because they don't have a soul to_chat(user, span_userdanger("YOU HAVE NO GOD.")) - var/input = stripped_input(user,"What do you want to send to others that follow your god?", ,"Commune") - message_admins("A fisherman ([user.ckey]) has used commune with the following message: [input].") + var/input = stripped_input(user, "What do you want to send to others that follow your god?", "Fish communion", "Commune") + message_admins("A fisherman ([user.ckey]) has used commune with the following message: [input].") for(var/mob/living/M in GLOB.player_list) if(M.god_aligned == user.god_aligned) to_chat(M, span_userdanger("You have a message for you: [input]")) diff --git a/code/game/objects/items/fixerskills/fishing/level1/healing.dm b/code/game/objects/items/fixerskills/fishing/level1/healing.dm index a481c85780f3..6179aa5ab229 100644 --- a/code/game/objects/items/fixerskills/fishing/level1/healing.dm +++ b/code/game/objects/items/fixerskills/fishing/level1/healing.dm @@ -1,21 +1,21 @@ //Prayer /obj/item/book/granter/action/skill/prayer - granted_action = /datum/action/cooldown/fishing/prayer - actionname = "Lunar Prayer" name = "Level 1 Skill: Lunar Prayer" + actionname = "Lunar Prayer" + granted_action = /datum/action/cooldown/fishing/prayer level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/prayer - button_icon_state = "lunar" name = "Lunar Prayer" - cooldown_time = 300 + button_icon_state = "lunar" + cooldown_time = 30 SECONDS devotion_cost = 3 /datum/action/cooldown/fishing/prayer/FishEffect(mob/living/user) var/healamount = 5 - healamount*=SSfishing.moonphase + healamount *= SSfishing.moonphase for(var/mob/living/carbon/human/H in view(2, get_turf(src))) if(H.stat >= HARD_CRIT) continue @@ -26,21 +26,21 @@ //God's love /obj/item/book/granter/action/skill/love - granted_action = /datum/action/cooldown/fishing/love - actionname = "God's Love" name = "Level 1 Skill: The God's Love" + actionname = "God's Love" + granted_action = /datum/action/cooldown/fishing/love level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/love - button_icon_state = "love" name = "God's Love" - cooldown_time = 300 + button_icon_state = "love" + cooldown_time = 30 SECONDS devotion_cost = 3 var/healamount = 1 /datum/action/cooldown/fishing/love/FishEffect(mob/living/user) - healamount+=1 + healamount++ var/givehealing = TOUGHER_TIMES_SPECIFIC(healamount,0.02) for(var/mob/living/carbon/human/H in view(2, get_turf(src))) if(H.stat >= HARD_CRIT) diff --git a/code/game/objects/items/fixerskills/fishing/level1/joke.dm b/code/game/objects/items/fixerskills/fishing/level1/joke.dm index 20398d945718..1c6245149831 100644 --- a/code/game/objects/items/fixerskills/fishing/level1/joke.dm +++ b/code/game/objects/items/fixerskills/fishing/level1/joke.dm @@ -1,16 +1,15 @@ -//Detect Fish -//A useless skill, made to be funny +/// A useless* skill, made to be funny /obj/item/book/granter/action/skill/detect - granted_action = /datum/action/cooldown/fishing/detect - actionname = "Detect Fish" name = "Level 1 Skill: Detect Fish" + actionname = "Detect Fish" + granted_action = /datum/action/cooldown/fishing/detect level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/detect - button_icon_state = "detect" name = "Detect Fish" - cooldown_time = 300 + button_icon_state = "detect" + cooldown_time = 30 SECONDS devotion_cost = 1 /datum/action/cooldown/fishing/detect/FishEffect(mob/living/user) @@ -24,38 +23,35 @@ to_chat(user, span_notice("There's no fish nearby.")) -//Fish Lockpick -//Opens any fish-shaped lock +/// Opens any fish-shaped lock /obj/item/book/granter/action/skill/fishlockpick - granted_action = /datum/action/cooldown/fishing/fishlockpick - actionname = "Fish Lockpick" name = "Level 1 Skill: Fish Lockpick" + actionname = "Fish Lockpick" + granted_action = /datum/action/cooldown/fishing/fishlockpick level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/fishlockpick - button_icon_state = "fishlockpick" name = "Fish Lockpick" - cooldown_time = 300 + button_icon_state = "fishlockpick" + cooldown_time = 30 SECONDS devotion_cost = 1 /datum/action/cooldown/fishing/fishlockpick/FishEffect(mob/living/user) to_chat(user, span_notice("All nearby fish-shaped locks have been opened.")) - -//Fish Telepathy -//Commune with the fish. Basically fishing +/// Commune with the fish. Basically fishing /obj/item/book/granter/action/skill/fishtelepathy - granted_action = /datum/action/cooldown/fishing/fishtelepathy - actionname = "Fish Telepathy" name = "Level 1 Skill: Fish Telepathy" + actionname = "Fish Telepathy" + granted_action = /datum/action/cooldown/fishing/fishtelepathy level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/fishtelepathy - button_icon_state = "fishtelepathy" name = "Fish Telepathy" - cooldown_time = 400 + button_icon_state = "fishtelepathy" + cooldown_time = 40 SECONDS devotion_cost = 1 /datum/action/cooldown/fishing/fishtelepathy/FishEffect(mob/living/user) @@ -68,9 +64,7 @@ return to_chat(user, span_notice("There's no fish nearby.")) - /datum/action/cooldown/fishing/fishtelepathy/proc/Recall(mob/living/carbon/human/user) to_chat(user, span_notice("The fish have crucial news for you:")) to_chat(user, span_notice("Glub.")) - user.devotion+=2 - + user.devotion += 2 diff --git a/code/game/objects/items/fixerskills/fishing/level1/motion.dm b/code/game/objects/items/fixerskills/fishing/level1/motion.dm index 6bdc04f8b5d2..f0a867221ebc 100644 --- a/code/game/objects/items/fixerskills/fishing/level1/motion.dm +++ b/code/game/objects/items/fixerskills/fishing/level1/motion.dm @@ -1,15 +1,14 @@ -//Planetary Momentum /obj/item/book/granter/action/skill/planet - granted_action = /datum/action/cooldown/fishing/planet - actionname = "Planet" name = "Level 1 Skill: Planet" + actionname = "Planet" + granted_action = /datum/action/cooldown/fishing/planet level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/planet - button_icon_state = "planet" name = "Planet" - cooldown_time = 6000 + button_icon_state = "planet" + cooldown_time = 10 MINUTES devotion_cost = 2 /datum/action/cooldown/fishing/planet/FishEffect(mob/living/user) @@ -23,39 +22,36 @@ to_chat(user, span_notice("You shift the movement of your aligned planet by 1.")) break -//Lunar Motion /obj/item/book/granter/action/skill/moonmove - granted_action = /datum/action/cooldown/fishing/moonmove - actionname = "Lunar Motion" name = "Level 1 Skill: Lunar Motion" + actionname = "Lunar Motion" + granted_action = /datum/action/cooldown/fishing/moonmove level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/moonmove - button_icon_state = "moonmove" name = "Lunar Motion" - cooldown_time = 6000 + button_icon_state = "moonmove" + cooldown_time = 10 MINUTES devotion_cost = 3 /datum/action/cooldown/fishing/moonmove/FishEffect(mob/living/user) to_chat(user, span_notice("You shift the moon forwards by one phase.")) - SSfishing.moonphase+=1 //Moon Phases will affect the power of Moon-based mods. - if(SSfishing.moonphase == 5) //there's only 4 + SSfishing.moonphase++ + if(SSfishing.moonphase == 5) // there's only 4 SSfishing.moonphase = 1 - -//Targeted Planet /obj/item/book/granter/action/skill/planet2 - granted_action = /datum/action/cooldown/fishing/planet2 - actionname = "Planet II" name = "Level 1 Skill: Plane II" + actionname = "Planet II" + granted_action = /datum/action/cooldown/fishing/planet2 level = 1 custom_premium_price = 600 /datum/action/cooldown/fishing/planet2 - button_icon_state = "planet2" name = "Planet II" - cooldown_time = 6000 + button_icon_state = "planet2" + cooldown_time = 10 MINUTES devotion_cost = 4 /datum/action/cooldown/fishing/planet2/FishEffect(mob/living/user) diff --git a/code/game/objects/items/fixerskills/fishing/level2.dm b/code/game/objects/items/fixerskills/fishing/level2.dm index 05bb83cd2cf8..562768e08daf 100644 --- a/code/game/objects/items/fixerskills/fishing/level2.dm +++ b/code/game/objects/items/fixerskills/fishing/level2.dm @@ -1,51 +1,42 @@ -//Smite the Heretic /obj/item/book/granter/action/skill/smite - granted_action = /datum/action/cooldown/fishing/smite - actionname = "Smite the Heretics" name = "Level 2 Skill: Smite the Heretics" + actionname = "Smite the Heretics" + granted_action = /datum/action/cooldown/fishing/smite level = 2 custom_premium_price = 1200 /datum/action/cooldown/fishing/smite - button_icon_state = "smite" name = "Smite the Heretics" - cooldown_time = 300 + button_icon_state = "smite" + cooldown_time = 30 SECONDS devotion_cost = 7 /datum/action/cooldown/fishing/smite/FishEffect(mob/living/user) - //Compile people around you - for(var/mob/living/M in view(4, get_turf(src))) - if(M.god_aligned != M.god_aligned) - //Deal a fuckload of damage to athiests - if(M.god_aligned == FISHGOD_NONE) - var/damagedealing = clamp(user.devotion, 1, 50) - M.apply_damage(damagedealing*2, WHITE_DAMAGE, null, M.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) //KILL - if(ishuman(M)) - to_chat(target, span_userdanger("The gods have punished you for your sins!"), confidential = TRUE) - return - - //Deal some damage if they don't share the same god - if(M.god_aligned != user.god_aligned) - var/damagedealing = clamp(user.devotion, 1, 50) - M.apply_damage(damagedealing, WHITE_DAMAGE, null, M.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) //KILL - if(ishuman(M)) - to_chat(target, span_userdanger("[user.god_aligned] has punished you for your sins!"), confidential = TRUE) - + for(var/mob/living/sinner in view(4, get_turf(src))) + if(user.god_aligned == sinner.god_aligned) + continue + var/damage = clamp(user.devotion, 1, 50) + if(sinner.god_aligned == FISHGOD_NONE) //Deal a fuckload of damage to athiests + damage *= 2 + sinner.deal_damage(damage, WHITE_DAMAGE) //KILL + if(ishuman(user)) + to_chat(sinner, span_userdanger("[user.god_aligned] has punished you for your sins using [user] as a conduit!")) + else + to_chat(sinner, span_userdanger("The gods have punished you for your sins using [user] as a conduit!")) -//Lunar Might /obj/item/book/granter/action/skill/might - granted_action = /datum/action/cooldown/fishing/might - actionname = "Lunar Might" name = "Level 2 Skill: Lunar Might" + actionname = "Lunar Might" + granted_action = /datum/action/cooldown/fishing/might level = 2 custom_premium_price = 1200 /datum/action/cooldown/fishing/might - button_icon_state = "might" name = "Lunar Might" - cooldown_time = 300 + button_icon_state = "might" + cooldown_time = 30 SECONDS devotion_cost = 7 var/stat_hold = 0 @@ -59,106 +50,95 @@ var/mob/living/carbon/human/H = owner H.adjust_attribute_bonus(JUSTICE_ATTRIBUTE, -stat_hold) - -//Awe the Weak /obj/item/book/granter/action/skill/awe - granted_action = /datum/action/cooldown/fishing/awe - actionname = "Awe the Weak" name = "Level 2 Skill: Awe the Weak" + actionname = "Awe the Weak" + granted_action = /datum/action/cooldown/fishing/awe level = 2 custom_premium_price = 1200 /datum/action/cooldown/fishing/awe - button_icon_state = "awe" name = "Awe the Weak" - cooldown_time = 300 + button_icon_state = "awe" + cooldown_time = 30 SECONDS devotion_cost = 8 /datum/action/cooldown/fishing/awe/FishEffect(mob/living/user) - //Compile people around you - for(var/mob/living/M in view(5, get_turf(src))) - if(M == owner) + for(var/mob/living/victim in view(5, get_turf(src))) + if(victim == owner) continue - if(M.god_aligned == FISHGOD_NONE) - //Stun the non-believers. - to_chat(M, span_userdanger("You are in awe of [user]'s devotion to [user.god_aligned]!"), confidential = TRUE) - M.Immobilize(15) - StartCooldown() - + if(victim.god_aligned == FISHGOD_NONE) // Stun the non-believers. + to_chat(victim, span_userdanger("You are in awe of [user]'s devotion to [user.god_aligned]!"), confidential = TRUE) + victim.Immobilize(1.5 SECONDS) + StartCooldown() -//Chakra Misalignment /obj/item/book/granter/action/skill/chakra - granted_action = /datum/action/cooldown/fishing/chakra - actionname = "Chakra Misalignment" name = "Level 2 Skill: Chakra Misalignment" + actionname = "Chakra Misalignment" + granted_action = /datum/action/cooldown/fishing/chakra level = 2 custom_premium_price = 1200 /datum/action/cooldown/fishing/chakra - button_icon_state = "chakra" name = "Chakra Misalignment" - cooldown_time = 300 + button_icon_state = "chakra" + cooldown_time = 30 SECONDS devotion_cost = 12 /datum/action/cooldown/fishing/chakra/FishEffect(mob/living/user) - //Compile people around you - for(var/mob/living/M in view(4, get_turf(src))) - if(M == owner) + for(var/mob/living/victim in view(4, get_turf(user))) + if(victim == owner) continue - if(M.god_aligned == initial(M.god_aligned)) + if(victim.god_aligned == FISHGOD_NONE) continue - var/found_planet = FALSE for(var/datum/planet/planet as anything in SSfishing.planets) - if(M.god_aligned != planet.god) + if(victim.god_aligned != planet.god) continue - found_planet = TRUE if(planet.phase != 1) - smite(M, user) - break + smite(victim, user) + return - if(!found_planet) // their planet is dead, and so will they be - obliterate(M) + obliterate(victim) // their planet is dead, and so will they be /datum/action/cooldown/fishing/chakra/proc/smite(mob/living/carbon/asshole, mob/living/carbon/user) - asshole.apply_damage(user.devotion*SSfishing.moonphase*0.5, WHITE_DAMAGE, null, asshole.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) //KILL + asshole.apply_damage(user.devotion * SSfishing.moonphase * 0.5, WHITE_DAMAGE, null, asshole.run_armor_check(null, WHITE_DAMAGE), spread_damage = TRUE) //KILL if(ishuman(asshole)) to_chat(asshole, span_userdanger("You feel your chakra rend itself!"), confidential = TRUE) /datum/action/cooldown/fishing/chakra/proc/obliterate(mob/living/carbon/H) to_chat(H, span_userdanger("YOUR CHAKRA IS SPLITTING YOUR BODY!"), confidential = TRUE) new /obj/effect/temp_visual/human_horizontal_bisect(get_turf(H)) - H.set_lying_angle(360) //gunk code I know, but it is the simplest way to override gib_animation() without touching other code. Also looks smoother. + H.set_lying_angle(NORTH) // gunk code I know, but it is the simplest way to override gib_animation() without touching other code. Also looks smoother. H.gib() - -//Salmon Splitter -//Explode someone into fish +/// Salmon Splitter +/// Explode someone dead into fish /obj/item/book/granter/action/skill/splitter - granted_action = /datum/action/cooldown/fishing/splitter - actionname = "Greater Fish - Vertical" name = "Level 2 Skill: Greater Fish - Vertical" + actionname = "Greater Fish - Vertical" + granted_action = /datum/action/cooldown/fishing/splitter level = 2 custom_premium_price = 1200 /datum/action/cooldown/fishing/splitter - button_icon_state = "splitter" name = "Greater Fish - Vertical" - cooldown_time = 100 + button_icon_state = "splitter" + cooldown_time = 10 SECONDS devotion_cost = 7 /datum/action/cooldown/fishing/splitter/FishEffect(mob/living/user) //Compile people around you in crit - for(var/mob/living/M in view(2, get_turf(src))) - if(M == owner) + for(var/mob/living/future_fish in view(2, get_turf(src))) + if(future_fish == owner) continue - if(M.stat >= SOFT_CRIT) - to_chat(M, span_userdanger("YOU'RE FIN-ISHED!"), confidential = TRUE) - new /obj/effect/temp_visual/human_horizontal_bisect(get_turf(M)) - M.set_lying_angle(360) - - //Spawn salmon and toss it all over the place - new /obj/item/food/fish/fresh_water/salmon(M.loc) - M.gib() + if(future_fish.stat >= SOFT_CRIT) + to_chat(future_fish, span_userdanger("YOU'RE FIN-ISHED!"), confidential = TRUE) + new /obj/effect/temp_visual/human_horizontal_bisect(get_turf(future_fish)) + future_fish.set_lying_angle(NORTH) + + // Fesh + new /obj/item/food/fish/fresh_water/salmon(get_turf(future_fish)) + future_fish.gib() diff --git a/code/game/objects/items/fixerskills/fishing/level4.dm b/code/game/objects/items/fixerskills/fishing/level4.dm index 3ea86cd5a8a3..666a20f256b2 100644 --- a/code/game/objects/items/fixerskills/fishing/level4.dm +++ b/code/game/objects/items/fixerskills/fishing/level4.dm @@ -1,15 +1,14 @@ -//Align /obj/item/book/granter/action/skill/alignment - granted_action = /datum/action/cooldown/fishing/alignment - actionname = "Alignment" name = "Level 4 Skill: Alignment" + actionname = "Alignment" + granted_action = /datum/action/cooldown/fishing/alignment level = 4 custom_premium_price = 2400 /datum/action/cooldown/fishing/alignment + name = "Alignment" button_icon_state = "alignment" - name = "alignment" - cooldown_time = 6000 + cooldown_time = 10 MINUTES devotion_cost = 15 /datum/action/cooldown/fishing/alignment/FishEffect(mob/living/user) @@ -21,18 +20,17 @@ to_chat(user, span_notice("You shift your deity's planet to align with earth.")) break -//A Moment in Time /obj/item/book/granter/action/skill/planetstop - granted_action = /datum/action/cooldown/fishing/planetstop - actionname = "A Moment in Time" name = "Level 4 Skill: A Moment in Time" + actionname = "A Moment in Time" + granted_action = /datum/action/cooldown/fishing/planetstop level = 4 custom_premium_price = 2400 /datum/action/cooldown/fishing/planetstop + name = "A Moment in Time" button_icon_state = "planetstop" - name = "planetstop" - cooldown_time = 18000 + cooldown_time = 30 MINUTES devotion_cost = 12 /datum/action/cooldown/fishing/planetstop/FishEffect(mob/living/user) @@ -41,19 +39,17 @@ for(var/mob/M in GLOB.player_list) to_chat(M, span_userdanger("The planets have stopped moving.")) - -//Supernova /obj/item/book/granter/action/skill/supernova - granted_action = /datum/action/cooldown/fishing/supernova - actionname = "Supernova" name = "Level 4 Skill: Supernova" + actionname = "Supernova" + granted_action = /datum/action/cooldown/fishing/supernova level = 4 custom_premium_price = 2400 /datum/action/cooldown/fishing/supernova + name = "Supernova" button_icon_state = "supernova" - name = "supernova" - cooldown_time = 12000 + cooldown_time = 20 MINUTES devotion_cost = 25 /datum/action/cooldown/fishing/supernova/FishEffect(mob/living/user) @@ -89,16 +85,16 @@ //Alignment 2 /obj/item/book/granter/action/skill/alignment2 - granted_action = /datum/action/cooldown/fishing/alignment2 - actionname = "Alignment II" name = "Level 4 Skill: Alignment II" + actionname = "Alignment II" + granted_action = /datum/action/cooldown/fishing/alignment2 level = 4 custom_premium_price = 2400 /datum/action/cooldown/fishing/alignment2 - button_icon_state = "alignment2" name = "Alignment II" - cooldown_time = 18000 + button_icon_state = "alignment2" + cooldown_time = 30 MINUTES devotion_cost = 35 /datum/action/cooldown/fishing/alignment2/FishEffect(mob/living/user) diff --git a/code/game/objects/items/fixerskills/level1/healing.dm b/code/game/objects/items/fixerskills/level1/healing.dm index 3ba88bb05c23..f5387c23bbc1 100644 --- a/code/game/objects/items/fixerskills/level1/healing.dm +++ b/code/game/objects/items/fixerskills/level1/healing.dm @@ -79,7 +79,7 @@ if(!.) return FALSE - if (owner.stat == DEAD) + if(owner.stat == DEAD) return FALSE for(var/mob/living/carbon/human/H in view(2, get_turf(src))) diff --git a/code/game/objects/items/fixerskills/level4/dismember.dm b/code/game/objects/items/fixerskills/level4/dismember.dm index 05b0be812445..8eea67cca5a6 100644 --- a/code/game/objects/items/fixerskills/level4/dismember.dm +++ b/code/game/objects/items/fixerskills/level4/dismember.dm @@ -17,7 +17,7 @@ if(!.) return FALSE - if (owner.stat == DEAD) + if(owner.stat == DEAD) return FALSE //Compile people around you diff --git a/code/game/objects/items/fixerskills/level4/team.dm b/code/game/objects/items/fixerskills/level4/team.dm index d60c6642699b..acc7c4e675fc 100644 --- a/code/game/objects/items/fixerskills/level4/team.dm +++ b/code/game/objects/items/fixerskills/level4/team.dm @@ -35,8 +35,8 @@ human.physiology.pale_mod *= 0.6 affected+= human - addtimer(CALLBACK(src, PROC_REF(Recall),), 10 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) - addtimer(CALLBACK(src, PROC_REF(Warcry),), 0.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(Recall)), 10 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(Warcry)), 0.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) StartCooldown() /datum/action/cooldown/warbanner/proc/Recall() @@ -45,6 +45,7 @@ human.physiology.white_mod /= 0.6 human.physiology.black_mod /= 0.6 human.physiology.pale_mod /= 0.6 + affected-=human /datum/action/cooldown/warbanner/proc/Warcry() for(var/mob/living/carbon/human/human in affected) @@ -84,11 +85,11 @@ for(var/mob/living/carbon/human/human in view(range, get_turf(src))) if (human == owner && !affect_self) continue - human.add_movespeed_modifier(/datum/movespeed_modifier/retreat) + human.add_movespeed_modifier(/datum/movespeed_modifier/warcry) addtimer(CALLBACK(human, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/warcry), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) affected+=human - addtimer(CALLBACK(src, PROC_REF(Warcry),), 0.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(Warcry)), 0.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) StartCooldown() /datum/action/cooldown/warcry/proc/Warcry() @@ -96,6 +97,7 @@ if(human == owner) continue human.say("YES SIR!") + affected-=human /datum/movespeed_modifier/warcry variable = TRUE diff --git a/code/game/objects/items/fixerskills/skills.dm b/code/game/objects/items/fixerskills/skills.dm index c1bdb414090c..d9672c4fc135 100644 --- a/code/game/objects/items/fixerskills/skills.dm +++ b/code/game/objects/items/fixerskills/skills.dm @@ -5,7 +5,7 @@ var/mob/living/carbon/human/user //To do: Refactor. - var/list/datum/action/actions_levels = list( + var/static/list/datum/action/actions_levels = list( /datum/action/cooldown/dash = 1, /datum/action/cooldown/dash/back = 1, /datum/action/cooldown/smokedash = 1, diff --git a/code/game/world.dm b/code/game/world.dm index 75fe402a2bcf..c30dfa2cd0e7 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -65,7 +65,7 @@ GLOBAL_VAR(restart_counter) if(CONFIG_GET(flag/usewhitelist)) load_whitelist() - GLOB.timezoneOffset = text2num(time2text(0,"hh")) * 36000 + GLOB.timezoneOffset = world.timezone * 36000 if(fexists(RESTART_COUNTER_PATH)) GLOB.restart_counter = text2num(trim(file2text(RESTART_COUNTER_PATH))) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 93c2e4d1eb11..32f90a7961d6 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -79,6 +79,7 @@ GLOBAL_PROTECT(admin_verbs_admin) /client/proc/toggleadminhelpsound, /client/proc/respawn_character, /datum/admins/proc/open_borgopanel, + /client/proc/change_patreon_rank, //LC13 Testing /client/proc/SpawnAbno, /client/proc/ClearAbno, diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f4fabd027b5b..2c9a773f6b7c 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2056,10 +2056,10 @@ else if(response.status_code != 200) dat += "
Failed to connect to CentCom. Status code: [response.status_code]" else - if(response.body == "[]") + if(response.body == "\[]") dat += "
0 bans detected for [ckey]
" else - bans = json_decode(response["body"]) + bans = json_decode(response.body) //Ignore bans from non-whitelisted sources, if a whitelist exists var/list/valid_sources diff --git a/code/modules/admin/verbs/patreon_ranks.dm b/code/modules/admin/verbs/patreon_ranks.dm new file mode 100644 index 000000000000..772390c072bc --- /dev/null +++ b/code/modules/admin/verbs/patreon_ranks.dm @@ -0,0 +1,55 @@ +/client/proc/change_patreon_rank() + set category = "Admin" + set name = "Change Patreon Rank" + set desc = "Change the Patreon Rank of a ckey" + + if(!check_rights(R_ADMIN)) + return + + if(!SSdbcore.IsConnected()) + return + + var/change_ckey = input(usr, "Which CKEY to change", "CKEY?", null) as null|text + + if(isnull(change_ckey) || length(change_ckey) <= 0) + return + + var/change_rank = input(usr, "Please select the rank to change to", "Rank?", null) as null|anything in GLOB.patreon_ranks + + if(isnull(change_rank)) + return + + var/datum/db_query/query_has_patreon_rank = SSdbcore.NewQuery( + "SELECT 1 FROM [format_table_name("patreon_ranks")] WHERE ckey = :change_ckey", + list("change_ckey" = change_ckey) + ) + + if(!query_has_patreon_rank.warn_execute()) + qdel(query_has_patreon_rank) + return + if(!query_has_patreon_rank.NextRow()) + // No entry found, inserting + QDEL_NULL(query_has_patreon_rank) + var/datum/db_query/query_add_rank = SSdbcore.NewQuery({" + INSERT INTO [format_table_name("patreon_ranks")] (ckey, patreon_key, patreon_rank) + VALUES (:change_ckey, 'DUMMYKEY', :change_rank) + "}, list("change_ckey" = change_ckey, "change_rank" = change_rank)) + + if(!query_add_rank.warn_execute()) + qdel(query_add_rank) + return + qdel(query_add_rank) + else + qdel(query_has_patreon_rank) + // Entry found, updating + var/datum/db_query/query_change_rank = SSdbcore.NewQuery( + "UPDATE [format_table_name("patreon_ranks")] SET patreon_rank = :change_rank WHERE ckey = :change_ckey", + list("change_rank" = change_rank, "change_ckey" = change_ckey) + ) + + if(!query_change_rank.warn_execute()) + qdel(query_change_rank) + return + qdel(query_change_rank) + + message_admins("Patreon rank of ckey [change_ckey] changed to [change_rank]") diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/echo_office.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/echo_office.dm new file mode 100644 index 000000000000..42337b53fc5f --- /dev/null +++ b/code/modules/clothing/suits/ego_gear/non_abnormality/echo_office.dm @@ -0,0 +1,67 @@ +/obj/item/clothing/suit/armor/ego_gear/city/echo + name = "Echo outfit" + desc = "You should not be able to see this." + icon_state = "maid_dress" + armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 50, BLACK_DAMAGE = 30, PALE_DAMAGE = 20) + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60 + ) + +/obj/item/clothing/suit/armor/ego_gear/city/echo/maid_dress + name = "Neon Maid Dress" + desc = "I have no reason to deny the greatness and beauty of such an amazing outfit!" + icon_state = "maid_dress" + armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 60, BLACK_DAMAGE = 40, PALE_DAMAGE = 10) + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 80, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60 + ) + +/obj/item/clothing/suit/armor/ego_gear/city/echo/stars + name = "Reverie Under the Stars" + desc = "A change has happened." + icon_state = "stars" + armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 60) + slowdown = 0.5 + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 80 + ) + +/obj/item/clothing/suit/armor/ego_gear/city/echo/plated + name = "Plated Outer Cover" + desc = "An echo of a past Memory... A painful one at that." + icon_state = "plated" + hat = /obj/item/clothing/head/ego_hat/plated + armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 20, BLACK_DAMAGE = 60, PALE_DAMAGE = 10) + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 60, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 80, + JUSTICE_ATTRIBUTE = 60 + ) + +/obj/item/clothing/head/ego_hat/plated + name = "Plated Hood" + desc = "An echo of a past Memory... A painful one at that." + flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDEHAIR + icon_state = "plated" + +/obj/item/clothing/suit/armor/ego_gear/city/echo/faux + name = "Frilled Maid Outfit/Faux Fur Coat" + desc = "Seems that layering the two outfits stops the coat from taking any effect, but it at least still protects whatever semi-professional image he's got left." + icon_state = "faux" + armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 40, BLACK_DAMAGE = 20, PALE_DAMAGE = 10) + attribute_requirements = list( + FORTITUDE_ATTRIBUTE = 80, + PRUDENCE_ATTRIBUTE = 60, + TEMPERANCE_ATTRIBUTE = 60, + JUSTICE_ATTRIBUTE = 60 + ) diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/ncorp.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/ncorp.dm index 84739e3105b8..5ad4285715cd 100644 --- a/code/modules/clothing/suits/ego_gear/non_abnormality/ncorp.dm +++ b/code/modules/clothing/suits/ego_gear/non_abnormality/ncorp.dm @@ -1,6 +1,7 @@ /obj/item/clothing/suit/armor/ego_gear/city/ncorp name = "nagel und hammer armor" desc = "Armor worn by Nagel Und Hammer." + slowdown = 0.5 icon_state = "ncorp" armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 20, BLACK_DAMAGE = 20, PALE_DAMAGE = 50) hat = /obj/item/clothing/head/ego_hat/helmet/ncorp @@ -14,6 +15,7 @@ /obj/item/clothing/suit/armor/ego_gear/city/ncorp/vet name = "decorated nagel und hammer armor" desc = "Armor worn by the Nagel Und Hammer." + slowdown = 0.5 icon_state = "ncorp_vet" armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 30, BLACK_DAMAGE = 40, PALE_DAMAGE = 60) hat = /obj/item/clothing/head/ego_hat/helmet/ncorp/vet @@ -44,6 +46,7 @@ /obj/item/clothing/suit/armor/ego_gear/city/ncorpcommander name = "Rüstung der auserwählten Frau Gottes" desc = "Armor worn by leaders of Nagel Und Hammer." + slowdown = 0.3 icon_state = "ncorp_lead" armor = list(RED_DAMAGE = 60, WHITE_DAMAGE = 50, BLACK_DAMAGE = 60, PALE_DAMAGE = 70) neck = /obj/item/clothing/neck/ego_neck/ncorp/commander diff --git a/code/modules/clothing/suits/ego_gear/teth.dm b/code/modules/clothing/suits/ego_gear/teth.dm index 6c8df2217925..b643fdeb469c 100644 --- a/code/modules/clothing/suits/ego_gear/teth.dm +++ b/code/modules/clothing/suits/ego_gear/teth.dm @@ -245,6 +245,12 @@ Any attempt to code risk class armor will result in a 10 day Github ban.*/ icon_state = "faelantern" armor = list(RED_DAMAGE = 20, WHITE_DAMAGE = 30, BLACK_DAMAGE = -30, PALE_DAMAGE = 0) // 20 +/obj/item/clothing/suit/armor/ego_gear/teth/kikimora + name = "kiki mora" + desc = "A dress spun by unusual hands. Rough but resistant to stains." + icon_state = "kikimora" + armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = -10, BLACK_DAMAGE = 30, PALE_DAMAGE = -10) + /obj/item/clothing/suit/armor/ego_gear/teth/luckdraw name = "luck of the draw" desc = "How many have lost it all to a simple game of chance?" diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 3023103a5daa..bfb9171ccbe9 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -79,6 +79,9 @@ var/bounty_types = CIV_JOB_BASIC + ///Bitfield of departments this job belongs wit + var/departments = NONE + /// Should this job be allowed to be picked for the bureaucratic error event? var/allow_bureaucratic_error = TRUE diff --git a/code/modules/jobs/job_types/agent.dm b/code/modules/jobs/job_types/agent.dm index 9fff451173c5..6f3528d72010 100644 --- a/code/modules/jobs/job_types/agent.dm +++ b/code/modules/jobs/job_types/agent.dm @@ -18,6 +18,7 @@ minimal_access = list() allow_bureaucratic_error = FALSE + departments = DEPARTMENT_SECURITY job_important = "You are a L-Corp Agent. Your job is to work on and suppress Abnormalities. Use :h to talk on your departmental radio." diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 1d4d4edea64b..1160d2ac6d79 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -10,13 +10,15 @@ GLOBAL_LIST_EMPTY(spawned_clerks) spawn_positions = 0 supervisors = "absolutely everyone" selection_color = "#dddddd" - access = list(ACCESS_ROBOTICS) //See /datum/job/assistant/get_access() - minimal_access = list(ACCESS_ROBOTICS) //See /datum/job/assistant/get_access() - // Let their be bot maintenance! + outfit = /datum/outfit/job/assistant - antag_rep = 7 //persistant currency but currently unusable + antag_rep = 7 // Persistant currency but currently unusable display_order = JOB_DISPLAY_ORDER_CLERK + access = list(ACCESS_ROBOTICS) // Let their be bot maintenance! + minimal_access = list(ACCESS_ROBOTICS) + departments = DEPARTMENT_SERVICE + liver_traits = list(TRAIT_GREYTIDE_METABOLISM) allow_bureaucratic_error = FALSE diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index a0b2cf991a54..02b692664024 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -9,6 +9,7 @@ display_order = JOB_DISPLAY_ORDER_CAPTAIN access = list(ACCESS_COMMAND) // LC13:To-Do + departments = DEPARTMENT_COMMAND | DEPARTMENT_SECURITY exp_requirements = 6000 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_SECURITY diff --git a/code/modules/jobs/job_types/city/HHPP.dm b/code/modules/jobs/job_types/city/HHPP.dm index fdfead9b9aa9..8114efd265ed 100644 --- a/code/modules/jobs/job_types/city/HHPP.dm +++ b/code/modules/jobs/job_types/city/HHPP.dm @@ -10,6 +10,7 @@ HHPP Employee selection_color = "#dddddd" access = list(ACCESS_KITCHEN) minimal_access = list(ACCESS_KITCHEN) + departments = DEPARTMENT_SERVICE outfit = /datum/outfit/job/chef antag_rep = 7 display_order = JOB_DISPLAY_ORDER_HHPP diff --git a/code/modules/jobs/job_types/city/backstreets_butcher.dm b/code/modules/jobs/job_types/city/backstreets_butcher.dm index 126b72b52209..8a9d28edf681 100644 --- a/code/modules/jobs/job_types/city/backstreets_butcher.dm +++ b/code/modules/jobs/job_types/city/backstreets_butcher.dm @@ -10,6 +10,7 @@ Backstreets Butcher selection_color = "#555555" access = list(ACCESS_GENETICS) minimal_access = list(ACCESS_GENETICS) + departments = DEPARTMENT_SERVICE // They can provide you a service, before you're eaten outfit = /datum/outfit/job/butcher display_order = JOB_DISPLAY_ORDER_ANTAG exp_requirements = 300 diff --git a/code/modules/jobs/job_types/city/carnival.dm b/code/modules/jobs/job_types/city/carnival.dm index 55a09ab271cd..3e25d30326c4 100644 --- a/code/modules/jobs/job_types/city/carnival.dm +++ b/code/modules/jobs/job_types/city/carnival.dm @@ -7,6 +7,7 @@ selection_color = "#555555" access = list(ACCESS_CARGO) minimal_access = list(ACCESS_CARGO) + departments = DEPARTMENT_SERVICE outfit = /datum/outfit/job/carnival display_order = JOB_DISPLAY_ORDER_ANTAG exp_requirements = 300 diff --git a/code/modules/jobs/job_types/city/civilian.dm b/code/modules/jobs/job_types/city/civilian.dm index 94509dbcaa61..6e426f68a662 100644 --- a/code/modules/jobs/job_types/city/civilian.dm +++ b/code/modules/jobs/job_types/city/civilian.dm @@ -10,14 +10,14 @@ Civilian selection_color = "#dddddd" access = list(ACCESS_LAWYER) minimal_access = list(ACCESS_LAWYER) + departments = DEPARTMENT_SERVICE outfit = /datum/outfit/job/civilian antag_rep = 7 display_order = JOB_DISPLAY_ORDER_CIVILIAN - allow_bureaucratic_error = FALSE maptype = list("city", "fixers") paycheck = 170 - + var/static/list/possible_books = null /datum/job/civilian/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE, datum/outfit/outfit_override = null, client/preference_source) //Don't dupe money. @@ -25,26 +25,15 @@ Civilian paycheck = 50 else paycheck = initial(paycheck) - ..() - - -/proc/add_skill_book(mob/living/carbon/human/H) - if (prob(50)) - var/level = get_civilian_level(H) - var/list/temp = list() - for (var/T in subtypesof(/obj/item/book/granter/action/skill)) - var/obj/item/book/granter/action/skill/book = new T - if (book.level == level) - temp.Add(book) - var/obj/item/book/granter/action/skill/random_book = pick(temp) - H.equip_to_slot_or_del(random_book,ITEM_SLOT_BACKPACK, TRUE) + return ..() /proc/get_civilian_level(mob/living/carbon/human/user) var/collective_levels = 0 for(var/a in user.attributes) - var/datum/attribute/atr = user.attributes[a] - collective_levels += atr.level - var/level = collective_levels / 4 + var/datum/attribute/attribute = user.attributes[a] + collective_levels += attribute.level + + var/level = collective_levels / length(user.attributes) if (level < 40) return 0 else if (level >= 40 && level < 60 ) @@ -69,7 +58,7 @@ Civilian var/statgeneration3 = rand(110) var/stattotal = min(statgeneration1, statgeneration2) - stattotal = 20+min(stattotal, statgeneration3) + stattotal = 20 + min(stattotal, statgeneration3) roundstart_attributes = list( FORTITUDE_ATTRIBUTE = stattotal, @@ -77,7 +66,7 @@ Civilian TEMPERANCE_ATTRIBUTE = stattotal, JUSTICE_ATTRIBUTE = stattotal ) - SScityevents.generated+=M.ckey + SScityevents.generated += M.ckey else roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 20, @@ -85,8 +74,20 @@ Civilian TEMPERANCE_ATTRIBUTE = 20, JUSTICE_ATTRIBUTE = 20 ) - ..() - add_skill_book(H) + . = ..() + if(prob(50)) + if(!possible_books) // Since possible_books is a static var, we dont know if its generated or not. If its not then generate it + possible_books = list(list(), list(), list(), list(), list()) + for(var/obj/item/book/granter/action/skill/book as anything in subtypesof(/obj/item/book/granter/action/skill)) + possible_books[book.level + 1] += book // we add 1 here to account for level 0 fixers, they get the first index + + var/player_level = get_civilian_level(H) + 1 + if(!length(possible_books[player_level])) + return + + var/book_path = pick(possible_books[player_level]) + var/obj/item/book/granter/action/skill/random_book = new book_path() + H.equip_to_slot_or_del(random_book, ITEM_SLOT_BACKPACK, TRUE) /datum/outfit/job/civilian name = "Civilan" diff --git a/code/modules/jobs/job_types/city/doctor.dm b/code/modules/jobs/job_types/city/doctor.dm index 9f47de055408..24a1d2732f38 100644 --- a/code/modules/jobs/job_types/city/doctor.dm +++ b/code/modules/jobs/job_types/city/doctor.dm @@ -9,6 +9,7 @@ access = list(ACCESS_MEDICAL) minimal_access = list(ACCESS_MEDICAL) + departments = DEPARTMENT_COMMAND | DEPARTMENT_MEDICAL paycheck = PAYCHECK_MEDIUM paycheck_department = ACCOUNT_MED @@ -126,6 +127,7 @@ exp_requirements = 180 display_order = JOB_DISPLAY_ORDER_MEDICALASSIST + departments = DEPARTMENT_MEDICAL | DEPARTMENT_FIXERS maptype = list("wonderlabs", "city", "fixers") job_important = "You are an a medical fixer. Your job is to explore the backstreets to grab dead fixers to bring back to the clinic." diff --git a/code/modules/jobs/job_types/city/fixer/east.dm b/code/modules/jobs/job_types/city/fixer/east.dm index aa0eb47f6df1..19f13436fdae 100644 --- a/code/modules/jobs/job_types/city/fixer/east.dm +++ b/code/modules/jobs/job_types/city/fixer/east.dm @@ -15,6 +15,7 @@ trusted_only = TRUE access = list(ACCESS_MINING_STATION, ACCESS_RC_ANNOUNCE) // East office is 54 minimal_access = list(ACCESS_MINING_STATION, ACCESS_RC_ANNOUNCE) + departments = DEPARTMENT_COMMAND | DEPARTMENT_FIXERS maptype = list("city-small", "wonderlabs") job_attribute_limit = 80 @@ -66,6 +67,7 @@ display_order = JOB_DISPLAY_ORDER_FIXER access = list(ACCESS_MINING_STATION) minimal_access = list(ACCESS_MINING_STATION) + departments = DEPARTMENT_FIXERS maptype = "wonderlabs" job_attribute_limit = 60 diff --git a/code/modules/jobs/job_types/city/fixer/north.dm b/code/modules/jobs/job_types/city/fixer/north.dm index 92b0ab620c65..f7dbca896e3e 100644 --- a/code/modules/jobs/job_types/city/fixer/north.dm +++ b/code/modules/jobs/job_types/city/fixer/north.dm @@ -13,8 +13,9 @@ display_order = JOB_DISPLAY_ORDER_FIXERLEAD paycheck = 100 trusted_only = TRUE - access = list(ACCESS_XENOBIOLOGY, ACCESS_RC_ANNOUNCE) // Numero 55 + access = list(ACCESS_XENOBIOLOGY, ACCESS_RC_ANNOUNCE) minimal_access = list(ACCESS_XENOBIOLOGY, ACCESS_RC_ANNOUNCE) + departments = DEPARTMENT_COMMAND | DEPARTMENT_FIXERS maptype = list("city-small", "wonderlabs") job_attribute_limit = 80 @@ -66,6 +67,7 @@ display_order = JOB_DISPLAY_ORDER_FIXER access = list(ACCESS_XENOBIOLOGY) minimal_access = list(ACCESS_XENOBIOLOGY) + departments = DEPARTMENT_FIXERS maptype = "wonderlabs" job_attribute_limit = 60 diff --git a/code/modules/jobs/job_types/city/misc/blade_lineage_misc.dm b/code/modules/jobs/job_types/city/misc/blade_lineage_misc.dm index e19cdd8a9bf4..2bd60bb506ba 100644 --- a/code/modules/jobs/job_types/city/misc/blade_lineage_misc.dm +++ b/code/modules/jobs/job_types/city/misc/blade_lineage_misc.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEGOON access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 150 maptype = list("city") job_important = "You belong to the Blade Lineage, a band of wandering swordsmen. \ diff --git a/code/modules/jobs/job_types/city/prosthetic.dm b/code/modules/jobs/job_types/city/prosthetic.dm index e0a6cf809ad0..d3d6d90f72ba 100644 --- a/code/modules/jobs/job_types/city/prosthetic.dm +++ b/code/modules/jobs/job_types/city/prosthetic.dm @@ -9,6 +9,7 @@ access = list(ACCESS_GENETICS) minimal_access = list(ACCESS_GENETICS) + departments = DEPARTMENT_MEDICAL | DEPARTMENT_SERVICE paycheck = 700 //You need a lot of money paycheck_department = ACCOUNT_MED diff --git a/code/modules/jobs/job_types/city/rat.dm b/code/modules/jobs/job_types/city/rat.dm index 040fe7f98cce..84ef1ecd1f97 100644 --- a/code/modules/jobs/job_types/city/rat.dm +++ b/code/modules/jobs/job_types/city/rat.dm @@ -10,6 +10,7 @@ Scavenger selection_color = "#555555" access = list(ACCESS_LAWYER) minimal_access = list(ACCESS_LAWYER) + departments = DEPARTMENT_FIXERS // Close enough outfit = /datum/outfit/job/scavenger antag_rep = 7 display_order = JOB_DISPLAY_ORDER_ANTAG diff --git a/code/modules/jobs/job_types/city/syndicate/blade_lineage/cutthroat.dm b/code/modules/jobs/job_types/city/syndicate/blade_lineage/cutthroat.dm index 1b342796ec8b..5d5aff71e8bb 100644 --- a/code/modules/jobs/job_types/city/syndicate/blade_lineage/cutthroat.dm +++ b/code/modules/jobs/job_types/city/syndicate/blade_lineage/cutthroat.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) minimal_access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) + departments = DEPARTMENT_COMMAND | DEPARTMENT_CITY_ANTAGONIST paycheck = 700 maptype = list("city") job_important = "This is a roleplay role. You are the leader of this band of wandering swordsmen. \ diff --git a/code/modules/jobs/job_types/city/syndicate/blade_lineage/salsu.dm b/code/modules/jobs/job_types/city/syndicate/blade_lineage/salsu.dm index 92f078cb6501..ee5942596a06 100644 --- a/code/modules/jobs/job_types/city/syndicate/blade_lineage/salsu.dm +++ b/code/modules/jobs/job_types/city/syndicate/blade_lineage/salsu.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEGOON access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 150 maptype = list("city") job_important = "You belong to the Blade Lineage, a band of wandering swordsmen. \ diff --git a/code/modules/jobs/job_types/city/syndicate/index/messenger.dm b/code/modules/jobs/job_types/city/syndicate/index/messenger.dm index 741310934de5..bd302629c6a5 100644 --- a/code/modules/jobs/job_types/city/syndicate/index/messenger.dm +++ b/code/modules/jobs/job_types/city/syndicate/index/messenger.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) minimal_access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) + departments = DEPARTMENT_COMMAND | DEPARTMENT_CITY_ANTAGONIST paycheck = 700 maptype = list("city") job_important = "This is a roleplay role. You are the leader of this index branch. You are not inherently hostile. \ @@ -34,10 +35,10 @@ //Don't spawn these goobers without a director. for(var/datum/job/processing in SSjob.occupations) if(istype(processing, /datum/job/proxy)) - processing.total_positions = 2 + processing.total_positions = 1 if(istype(processing, /datum/job/proselyte)) - processing.total_positions = 6 + processing.total_positions = 2 . = ..() diff --git a/code/modules/jobs/job_types/city/syndicate/index/proselyte.dm b/code/modules/jobs/job_types/city/syndicate/index/proselyte.dm index fe189c97ec98..f0d2c35ba245 100644 --- a/code/modules/jobs/job_types/city/syndicate/index/proselyte.dm +++ b/code/modules/jobs/job_types/city/syndicate/index/proselyte.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEGOON access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 100 maptype = list("city") job_important = "You are an initiate in the Index syndicate. You are not inherently hostile. \ diff --git a/code/modules/jobs/job_types/city/syndicate/index/proxy.dm b/code/modules/jobs/job_types/city/syndicate/index/proxy.dm index b63c670fc13e..fbadddeaf960 100644 --- a/code/modules/jobs/job_types/city/syndicate/index/proxy.dm +++ b/code/modules/jobs/job_types/city/syndicate/index/proxy.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) minimal_access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 200 maptype = list("city") job_important = "You are a veteran in the Index syndicate. You are not inherently hostile. \ diff --git a/code/modules/jobs/job_types/city/syndicate/kurokumo/blade_ronin.dm b/code/modules/jobs/job_types/city/syndicate/kurokumo/blade_ronin.dm index 1a90cd3f07d8..ee1db3d46e62 100644 --- a/code/modules/jobs/job_types/city/syndicate/kurokumo/blade_ronin.dm +++ b/code/modules/jobs/job_types/city/syndicate/kurokumo/blade_ronin.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) minimal_access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 700 maptype = list("city") job_important = "You are not apart of Kurokumo Clan. \ diff --git a/code/modules/jobs/job_types/city/syndicate/kurokumo/captain.dm b/code/modules/jobs/job_types/city/syndicate/kurokumo/captain.dm index 57415b917312..7ede34354eaf 100644 --- a/code/modules/jobs/job_types/city/syndicate/kurokumo/captain.dm +++ b/code/modules/jobs/job_types/city/syndicate/kurokumo/captain.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) minimal_access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) + departments = DEPARTMENT_COMMAND | DEPARTMENT_CITY_ANTAGONIST paycheck = 700 maptype = list("city") job_important = "This is a roleplay role. You are the leader of this kurokumo branch. \ diff --git a/code/modules/jobs/job_types/city/syndicate/kurokumo/enforcer.dm b/code/modules/jobs/job_types/city/syndicate/kurokumo/enforcer.dm index 23c89f4fb6ca..02b8c40a57ba 100644 --- a/code/modules/jobs/job_types/city/syndicate/kurokumo/enforcer.dm +++ b/code/modules/jobs/job_types/city/syndicate/kurokumo/enforcer.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEVET access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 200 maptype = list("city") job_important = "You are an enforcer in the Kurokumo clan. You are to be respectful and follow orders from the Kashira. Not doing either will result in death. \ diff --git a/code/modules/jobs/job_types/city/syndicate/kurokumo/wakashu.dm b/code/modules/jobs/job_types/city/syndicate/kurokumo/wakashu.dm index fd8f49011a8a..3ab366a83a00 100644 --- a/code/modules/jobs/job_types/city/syndicate/kurokumo/wakashu.dm +++ b/code/modules/jobs/job_types/city/syndicate/kurokumo/wakashu.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEGOON access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 100 maptype = list("city") job_important = "You are a soldier in the Kurokumo Clan. You are to follow orders from your Kashira. Not doing either will result in death." diff --git a/code/modules/jobs/job_types/city/syndicate/ncorp/grandinquis.dm b/code/modules/jobs/job_types/city/syndicate/ncorp/grandinquis.dm index 974f4e1e5299..6abafd320fc5 100644 --- a/code/modules/jobs/job_types/city/syndicate/ncorp/grandinquis.dm +++ b/code/modules/jobs/job_types/city/syndicate/ncorp/grandinquis.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) minimal_access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) + departments = DEPARTMENT_COMMAND | DEPARTMENT_CITY_ANTAGONIST paycheck = 700 maptype = list("city") job_important = "This is a roleplay role. You are the leader of this NCorp inquisition. \ diff --git a/code/modules/jobs/job_types/city/syndicate/ncorp/grosshammer.dm b/code/modules/jobs/job_types/city/syndicate/ncorp/grosshammer.dm index 34143327478f..a4de4038a14e 100644 --- a/code/modules/jobs/job_types/city/syndicate/ncorp/grosshammer.dm +++ b/code/modules/jobs/job_types/city/syndicate/ncorp/grosshammer.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEVET access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 70 maptype = list("city") job_important = "You are an NCorp grosshammer. Your main goal is to kill and maim all prosthetic users. \ diff --git a/code/modules/jobs/job_types/city/syndicate/ncorp/kleinhammer.dm b/code/modules/jobs/job_types/city/syndicate/ncorp/kleinhammer.dm index 707be83dfd6c..4348e6e7c739 100644 --- a/code/modules/jobs/job_types/city/syndicate/ncorp/kleinhammer.dm +++ b/code/modules/jobs/job_types/city/syndicate/ncorp/kleinhammer.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEGOON access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 10 maptype = list("city") job_important = "You are an NCorp kleinhammer. Your main goal is to kill and maim all prosthetic users. \ diff --git a/code/modules/jobs/job_types/city/syndicate/ncorp/mittlehammer.dm b/code/modules/jobs/job_types/city/syndicate/ncorp/mittlehammer.dm index 0d973183df67..435898792f84 100644 --- a/code/modules/jobs/job_types/city/syndicate/ncorp/mittlehammer.dm +++ b/code/modules/jobs/job_types/city/syndicate/ncorp/mittlehammer.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEGOON access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 70 maptype = list("city") job_important = "You are an NCorp Mittlehammer. Your main goal is to kill and maim all prosthetic users. \ diff --git a/code/modules/jobs/job_types/city/syndicate/thumb/capo.dm b/code/modules/jobs/job_types/city/syndicate/thumb/capo.dm index 7ecb9e7d6445..7d256dbf4138 100644 --- a/code/modules/jobs/job_types/city/syndicate/thumb/capo.dm +++ b/code/modules/jobs/job_types/city/syndicate/thumb/capo.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEVET access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 200 maptype = list("city") job_important = "You are a lieutenant in the Thumb Syndicate. You are to be respectful and follow orders from the sottocapo. Not doing either will result in death. \ diff --git a/code/modules/jobs/job_types/city/syndicate/thumb/soldato.dm b/code/modules/jobs/job_types/city/syndicate/thumb/soldato.dm index 297bc53409d3..1ad5e00bf8b3 100644 --- a/code/modules/jobs/job_types/city/syndicate/thumb/soldato.dm +++ b/code/modules/jobs/job_types/city/syndicate/thumb/soldato.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_SYNDICATEGOON access = list(ACCESS_SYNDICATE) minimal_access = list(ACCESS_SYNDICATE) + departments = DEPARTMENT_CITY_ANTAGONIST paycheck = 100 maptype = list("city") job_important = "You are a soldier in the Thumb Syndicate. You are to stay quiet and follow orders from your capo and sottocapo. Not doing either will result in death." diff --git a/code/modules/jobs/job_types/city/syndicate/thumb/sottocapo.dm b/code/modules/jobs/job_types/city/syndicate/thumb/sottocapo.dm index f20f3d81abbd..502613c044c7 100644 --- a/code/modules/jobs/job_types/city/syndicate/thumb/sottocapo.dm +++ b/code/modules/jobs/job_types/city/syndicate/thumb/sottocapo.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) minimal_access = list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) + departments = DEPARTMENT_COMMAND | DEPARTMENT_CITY_ANTAGONIST paycheck = 700 maptype = list("city") job_important = "This is a roleplay role. You are the leader of this thumb branch. Your goal is to make money and riches, and exert the thumb's will. \ diff --git a/code/modules/jobs/job_types/city/workshop.dm b/code/modules/jobs/job_types/city/workshop.dm index b6b22ec62fc3..8a897bfd4f88 100644 --- a/code/modules/jobs/job_types/city/workshop.dm +++ b/code/modules/jobs/job_types/city/workshop.dm @@ -8,8 +8,9 @@ Workshop employee spawn_positions = 2 supervisors = "no one but god." selection_color = "#dddddd" - access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP) //10 + access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP) minimal_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP) + departments = DEPARTMENT_SERVICE outfit = /datum/outfit/job/workshop antag_rep = 7 display_order = JOB_DISPLAY_ORDER_CIVILIAN diff --git a/code/modules/jobs/job_types/command.dm b/code/modules/jobs/job_types/command.dm index 42d744cb3d4a..8214316d82a3 100644 --- a/code/modules/jobs/job_types/command.dm +++ b/code/modules/jobs/job_types/command.dm @@ -32,6 +32,8 @@ access = list(ACCESS_COMMAND) // LC13:To-Do minimal_access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND + mapexclude = list("mini") job_important = "You are the Extraction Officer. Your job is to manage the EGO console, Extraction purchase console, and power generation system. Your main goal is to ensure Agents are well-equipped with EGO." diff --git a/code/modules/jobs/job_types/gimmick/fishing.dm b/code/modules/jobs/job_types/gimmick/fishing.dm index 83760f8e54b9..7653a161e5ac 100644 --- a/code/modules/jobs/job_types/gimmick/fishing.dm +++ b/code/modules/jobs/job_types/gimmick/fishing.dm @@ -11,6 +11,7 @@ outfit = /datum/outfit/job/fishing display_order = JOB_DISPLAY_ORDER_FIXER + departments = DEPARTMENT_SERVICE job_important = "You are a fishing office fixer, hired by L-Corp. You're on this facility to get everyone fresh fish! To start fishing use the fishing rod on a body of water." job_notice = "To start fishing, use your fishing rod on a body of water." diff --git a/code/modules/jobs/job_types/gimmick/wonderlabs/departmentcaptain.dm b/code/modules/jobs/job_types/gimmick/wonderlabs/departmentcaptain.dm index 8563a29823e1..bda61976afab 100644 --- a/code/modules/jobs/job_types/gimmick/wonderlabs/departmentcaptain.dm +++ b/code/modules/jobs/job_types/gimmick/wonderlabs/departmentcaptain.dm @@ -25,6 +25,7 @@ GLOBAL_LIST_INIT(captain_departments, list( access = list() minimal_access = list() + departments = DEPARTMENT_SECURITY allow_bureaucratic_error = FALSE diff --git a/code/modules/jobs/job_types/gimmick/wonderlabs/departmenthead.dm b/code/modules/jobs/job_types/gimmick/wonderlabs/departmenthead.dm index 5b37c52475c4..8887280fddb1 100644 --- a/code/modules/jobs/job_types/gimmick/wonderlabs/departmenthead.dm +++ b/code/modules/jobs/job_types/gimmick/wonderlabs/departmenthead.dm @@ -25,6 +25,7 @@ GLOBAL_LIST_INIT(head_departments, list( access = list(ACCESS_COMMAND) minimal_access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_SECURITY allow_bureaucratic_error = FALSE diff --git a/code/modules/jobs/job_types/labs/command/assetprot.dm b/code/modules/jobs/job_types/labs/command/assetprot.dm index b7905b4bd8c1..396abad4969d 100644 --- a/code/modules/jobs/job_types/labs/command/assetprot.dm +++ b/code/modules/jobs/job_types/labs/command/assetprot.dm @@ -10,6 +10,7 @@ access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND, ACCESS_MANAGER) minimal_access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND, ACCESS_MANAGER) + departments = DEPARTMENT_COMMAND job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/command/command.dm b/code/modules/jobs/job_types/labs/command/command.dm index c732ddf3ddd8..a14a26c7be41 100644 --- a/code/modules/jobs/job_types/labs/command/command.dm +++ b/code/modules/jobs/job_types/labs/command/command.dm @@ -10,6 +10,7 @@ access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND, ACCESS_MANAGER) minimal_access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND, ACCESS_MANAGER) + departments = DEPARTMENT_COMMAND job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/command/commandsec.dm b/code/modules/jobs/job_types/labs/command/commandsec.dm index ec2f178a5e38..78e3aed20411 100644 --- a/code/modules/jobs/job_types/labs/command/commandsec.dm +++ b/code/modules/jobs/job_types/labs/command/commandsec.dm @@ -9,6 +9,7 @@ selection_color = "#555555" access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND) //See /datum/job/assistant/get_access() minimal_access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND) //See /datum/job/assistant/get_access() + departments = DEPARTMENT_SECURITY outfit = /datum/outfit/job/damage_mitigation_officer display_order = 4 @@ -62,6 +63,7 @@ selection_color = "#555555" access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND) //See /datum/job/assistant/get_access() minimal_access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND) //See /datum/job/assistant/get_access() + departments = DEPARTMENT_SECURITY outfit = /datum/outfit/job/damage_exasperation_officer display_order = 4.1 @@ -115,6 +117,7 @@ selection_color = "#555555" access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND) minimal_access = list(ACCESS_ARMORY, ACCESS_SECURITY, ACCESS_RND, ACCESS_MEDICAL, ACCESS_COMMAND) + departments = DEPARTMENT_SECURITY outfit = /datum/outfit/job/internal_police display_order = 3 diff --git a/code/modules/jobs/job_types/labs/command/infotech.dm b/code/modules/jobs/job_types/labs/command/infotech.dm index 70c500a7774c..eddfca60b225 100644 --- a/code/modules/jobs/job_types/labs/command/infotech.dm +++ b/code/modules/jobs/job_types/labs/command/infotech.dm @@ -10,6 +10,7 @@ access = list(ACCESS_RND, ACCESS_NETWORK) minimal_access = list(ACCESS_RND, ACCESS_NETWORK) + departments = DEPARTMENT_SCIENCE job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/medical/chemist.dm b/code/modules/jobs/job_types/labs/medical/chemist.dm index 0ef3d9d81a46..7e122abf3d03 100644 --- a/code/modules/jobs/job_types/labs/medical/chemist.dm +++ b/code/modules/jobs/job_types/labs/medical/chemist.dm @@ -13,6 +13,7 @@ access = list(ACCESS_MEDICAL, ACCESS_PHARMACY) minimal_access = list(ACCESS_MEDICAL, ACCESS_PHARMACY) + departments = DEPARTMENT_MEDICAL job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/medical/cmo.dm b/code/modules/jobs/job_types/labs/medical/cmo.dm index 92ee317a591f..15dfc995122e 100644 --- a/code/modules/jobs/job_types/labs/medical/cmo.dm +++ b/code/modules/jobs/job_types/labs/medical/cmo.dm @@ -11,6 +11,7 @@ access = list(ACCESS_MEDICAL, ACCESS_COMMAND, ACCESS_ARMORY, ACCESS_SECURITY) minimal_access = list(ACCESS_MEDICAL, ACCESS_COMMAND, ACCESS_ARMORY, ACCESS_SECURITY) + departments = DEPARTMENT_COMMAND | DEPARTMENT_MEDICAL job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/medical/nurse.dm b/code/modules/jobs/job_types/labs/medical/nurse.dm index 4cad3a48d5f2..e3d5eef07235 100644 --- a/code/modules/jobs/job_types/labs/medical/nurse.dm +++ b/code/modules/jobs/job_types/labs/medical/nurse.dm @@ -14,6 +14,7 @@ access = list(ACCESS_MEDICAL) minimal_access = list(ACCESS_MEDICAL) + departments = DEPARTMENT_MEDICAL job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/medical/paramedic.dm b/code/modules/jobs/job_types/labs/medical/paramedic.dm index 9b2f00b3bf26..9003b654c16f 100644 --- a/code/modules/jobs/job_types/labs/medical/paramedic.dm +++ b/code/modules/jobs/job_types/labs/medical/paramedic.dm @@ -13,6 +13,7 @@ access = list(ACCESS_MEDICAL, ACCESS_ARMORY, ACCESS_SECURITY) minimal_access = list(ACCESS_MEDICAL, ACCESS_ARMORY, ACCESS_SECURITY) + departments = DEPARTMENT_MEDICAL job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/medical/surgeon.dm b/code/modules/jobs/job_types/labs/medical/surgeon.dm index e5573d6f2e7a..45fec4cb1b0e 100644 --- a/code/modules/jobs/job_types/labs/medical/surgeon.dm +++ b/code/modules/jobs/job_types/labs/medical/surgeon.dm @@ -13,6 +13,7 @@ access = list(ACCESS_MEDICAL) minimal_access = list(ACCESS_MEDICAL) + departments = DEPARTMENT_MEDICAL job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/research/clerk.dm b/code/modules/jobs/job_types/labs/research/clerk.dm index fa38897eb97f..a2ad3c65beb3 100644 --- a/code/modules/jobs/job_types/labs/research/clerk.dm +++ b/code/modules/jobs/job_types/labs/research/clerk.dm @@ -11,6 +11,7 @@ access = list() //No Acess minimal_access = list() + departments = DEPARTMENT_SCIENCE job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/research/lead.dm b/code/modules/jobs/job_types/labs/research/lead.dm index 1b7c6895d461..c97945b9ed6d 100644 --- a/code/modules/jobs/job_types/labs/research/lead.dm +++ b/code/modules/jobs/job_types/labs/research/lead.dm @@ -10,6 +10,7 @@ access = list(ACCESS_RND, ACCESS_COMMAND, ACCESS_ARMORY, ACCESS_SECURITY) minimal_access = list(ACCESS_RND, ACCESS_COMMAND, ACCESS_ARMORY, ACCESS_SECURITY) + departments = DEPARTMENT_COMMAND | DEPARTMENT_SCIENCE job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/research/paperwork.dm b/code/modules/jobs/job_types/labs/research/paperwork.dm index 528bcd6446e0..e0257f99a98c 100644 --- a/code/modules/jobs/job_types/labs/research/paperwork.dm +++ b/code/modules/jobs/job_types/labs/research/paperwork.dm @@ -10,6 +10,7 @@ access = list(ACCESS_RND, ACCESS_COMMAND) minimal_access = list(ACCESS_RND, ACCESS_COMMAND) + departments = DEPARTMENT_SCIENCE job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/research/researcher.dm b/code/modules/jobs/job_types/labs/research/researcher.dm index 17c595115598..c549230d9abc 100644 --- a/code/modules/jobs/job_types/labs/research/researcher.dm +++ b/code/modules/jobs/job_types/labs/research/researcher.dm @@ -10,6 +10,7 @@ access = list(ACCESS_RND) minimal_access = list(ACCESS_RND) + departments = DEPARTMENT_SCIENCE job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/research/senior.dm b/code/modules/jobs/job_types/labs/research/senior.dm index 3117c41edd5a..97e52b8c558f 100644 --- a/code/modules/jobs/job_types/labs/research/senior.dm +++ b/code/modules/jobs/job_types/labs/research/senior.dm @@ -10,6 +10,7 @@ access = list(ACCESS_RND) minimal_access = list(ACCESS_RND) + departments = DEPARTMENT_SCIENCE job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/security/highsec.dm b/code/modules/jobs/job_types/labs/security/highsec.dm index d969b1867d78..08ebf8026a1f 100644 --- a/code/modules/jobs/job_types/labs/security/highsec.dm +++ b/code/modules/jobs/job_types/labs/security/highsec.dm @@ -9,6 +9,7 @@ selection_color = "#cf5979" access = list(ACCESS_ARMORY) //See /datum/job/assistant/get_access() minimal_access = list(ACCESS_ARMORY) //See /datum/job/assistant/get_access() + departments = DEPARTMENT_SECURITY outfit = /datum/outfit/job/high_sec_officer display_order = 9.5 @@ -59,6 +60,7 @@ selection_color = "#99314d" access = list(ACCESS_ARMORY, ACCESS_COMMAND) //See /datum/job/assistant/get_access() minimal_access = list(ACCESS_ARMORY, ACCESS_COMMAND) //See /datum/job/assistant/get_access() + departments = DEPARTMENT_COMMAND | DEPARTMENT_SECURITY outfit = /datum/outfit/job/high_sec_commander display_order = 9 diff --git a/code/modules/jobs/job_types/labs/security/lowsec.dm b/code/modules/jobs/job_types/labs/security/lowsec.dm index 01cdd21640fb..b90028faff6d 100644 --- a/code/modules/jobs/job_types/labs/security/lowsec.dm +++ b/code/modules/jobs/job_types/labs/security/lowsec.dm @@ -9,6 +9,7 @@ selection_color = "#6571a6" access = list(ACCESS_SECURITY) //See /datum/job/assistant/get_access() minimal_access = list(ACCESS_SECURITY) //See /datum/job/assistant/get_access() + departments = DEPARTMENT_SECURITY outfit = /datum/outfit/job/low_sec_officer display_order = 8.5 @@ -60,6 +61,7 @@ selection_color = "#444d75" access = list(ACCESS_SECURITY, ACCESS_COMMAND) //See /datum/job/assistant/get_access() minimal_access = list(ACCESS_SECURITY, ACCESS_COMMAND) //See /datum/job/assistant/get_access() + departments = DEPARTMENT_COMMAND | DEPARTMENT_SECURITY outfit = /datum/outfit/job/low_sec_commander display_order = 8 diff --git a/code/modules/jobs/job_types/labs/support/chef.dm b/code/modules/jobs/job_types/labs/support/chef.dm index 6f03309e6905..8d1f49d0b415 100644 --- a/code/modules/jobs/job_types/labs/support/chef.dm +++ b/code/modules/jobs/job_types/labs/support/chef.dm @@ -10,6 +10,7 @@ access = list() minimal_access = list() + departments = DEPARTMENT_SERVICE job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/support/engineer.dm b/code/modules/jobs/job_types/labs/support/engineer.dm index 194994e449a9..37c231610d1c 100644 --- a/code/modules/jobs/job_types/labs/support/engineer.dm +++ b/code/modules/jobs/job_types/labs/support/engineer.dm @@ -10,6 +10,7 @@ access = list(ACCESS_SECURITY, ACCESS_ARMORY, ACCESS_CONSTRUCTION) minimal_access = list(ACCESS_SECURITY, ACCESS_ARMORY, ACCESS_CONSTRUCTION) + departments = DEPARTMENT_ENGINEERING job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/labs/support/janitor.dm b/code/modules/jobs/job_types/labs/support/janitor.dm index f8f6a9cb2328..441b6c129ba9 100644 --- a/code/modules/jobs/job_types/labs/support/janitor.dm +++ b/code/modules/jobs/job_types/labs/support/janitor.dm @@ -10,6 +10,7 @@ access = list() minimal_access = list() + departments = DEPARTMENT_SERVICE job_attribute_limit = 0 diff --git a/code/modules/jobs/job_types/manager.dm b/code/modules/jobs/job_types/manager.dm index e322467ba172..5a67f4cf3f3b 100644 --- a/code/modules/jobs/job_types/manager.dm +++ b/code/modules/jobs/job_types/manager.dm @@ -16,6 +16,7 @@ access = list(ACCESS_COMMAND, ACCESS_MANAGER) // LC13:To-Do minimal_access = list(ACCESS_COMMAND, ACCESS_MANAGER) + departments = DEPARTMENT_COMMAND job_attribute_limit = 60 roundstart_attributes = list(FORTITUDE_ATTRIBUTE, PRUDENCE_ATTRIBUTE = 60, TEMPERANCE_ATTRIBUTE, JUSTICE_ATTRIBUTE) diff --git a/code/modules/jobs/job_types/mentor/trainingofficer.dm b/code/modules/jobs/job_types/mentor/trainingofficer.dm index febab963a9f2..613eee293d51 100644 --- a/code/modules/jobs/job_types/mentor/trainingofficer.dm +++ b/code/modules/jobs/job_types/mentor/trainingofficer.dm @@ -8,6 +8,7 @@ display_order = JOB_DISPLAY_ORDER_COMMAND access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND exp_requirements = 0 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_SECURITY diff --git a/code/modules/jobs/job_types/rcorp/command.dm b/code/modules/jobs/job_types/rcorp/command.dm index 8d179632cfbc..ab8670ee1260 100644 --- a/code/modules/jobs/job_types/rcorp/command.dm +++ b/code/modules/jobs/job_types/rcorp/command.dm @@ -17,6 +17,7 @@ access = list(ACCESS_ARMORY, ACCESS_RND, ACCESS_COMMAND, ACCESS_MEDICAL, ACCESS_MANAGER) minimal_access = list(ACCESS_ARMORY, ACCESS_RND, ACCESS_COMMAND, ACCESS_MEDICAL, ACCESS_MANAGER) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 100, diff --git a/code/modules/jobs/job_types/rcorp/fifthpack/officer.dm b/code/modules/jobs/job_types/rcorp/fifthpack/officer.dm index 749a07001da4..8be0fbb6dafe 100644 --- a/code/modules/jobs/job_types/rcorp/fifthpack/officer.dm +++ b/code/modules/jobs/job_types/rcorp/fifthpack/officer.dm @@ -21,6 +21,7 @@ ) access = list(ACCESS_COMMAND) minimal_access = (ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP rank_title = "LT" job_important = "You are a support and command role in Rcorp. Advise the Commander, Run requisitions and then deploy." job_notice = "Run the Requisitions, assist Rcorp personnel on the base. After deployment, use your beacon to select which class you'd like." diff --git a/code/modules/jobs/job_types/rcorp/fifthpack/raccoon.dm b/code/modules/jobs/job_types/rcorp/fifthpack/raccoon.dm index e9709246e779..7040aab749bd 100644 --- a/code/modules/jobs/job_types/rcorp/fifthpack/raccoon.dm +++ b/code/modules/jobs/job_types/rcorp/fifthpack/raccoon.dm @@ -14,6 +14,7 @@ access = list() minimal_access = list() + departments = DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 40, @@ -60,6 +61,7 @@ access = list(ACCESS_COMMAND) minimal_access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 60, diff --git a/code/modules/jobs/job_types/rcorp/fifthpack/rat.dm b/code/modules/jobs/job_types/rcorp/fifthpack/rat.dm index 818bfdc35b1a..377d3b3c3761 100644 --- a/code/modules/jobs/job_types/rcorp/fifthpack/rat.dm +++ b/code/modules/jobs/job_types/rcorp/fifthpack/rat.dm @@ -13,6 +13,7 @@ access = list() minimal_access = list() + departments = DEPARTMENT_R_CORP | DEPARTMENT_MEDICAL roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 60, @@ -52,6 +53,7 @@ access = list(ACCESS_COMMAND) minimal_access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP | DEPARTMENT_MEDICAL roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 80, @@ -83,10 +85,13 @@ head = /obj/item/clothing/head/rabbit_helmet/rat suit = /obj/item/clothing/suit/armor/ego_gear/rabbit/rat belt = /obj/item/ego_weapon/city/rabbit_blade - suit_store = /obj/item/gun/energy/e_gun/rabbitdash/small + suit_store = /obj/item/gun/energy/e_gun/rabbitdash/shotgun l_pocket = /obj/item/flashlight/seclite r_pocket = /obj/item/pinpointer/nuke/rcorp backpack_contents = list( + /obj/item/grenade/r_corp, + /obj/item/grenade/r_corp/black, + /obj/item/grenade/r_corp/white, /obj/item/storage/firstaid/revival = 1) diff --git a/code/modules/jobs/job_types/rcorp/fifthpack/roadrunner.dm b/code/modules/jobs/job_types/rcorp/fifthpack/roadrunner.dm index 48a6a3a3b207..387a3cc2627f 100644 --- a/code/modules/jobs/job_types/rcorp/fifthpack/roadrunner.dm +++ b/code/modules/jobs/job_types/rcorp/fifthpack/roadrunner.dm @@ -14,6 +14,7 @@ access = list() minimal_access = list() + departments = DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 50, @@ -48,6 +49,7 @@ access = list(ACCESS_COMMAND) minimal_access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 70, diff --git a/code/modules/jobs/job_types/rcorp/fifthpack/rooster.dm b/code/modules/jobs/job_types/rcorp/fifthpack/rooster.dm index e7e5e01efd3c..c827993c2b2d 100644 --- a/code/modules/jobs/job_types/rcorp/fifthpack/rooster.dm +++ b/code/modules/jobs/job_types/rcorp/fifthpack/rooster.dm @@ -14,6 +14,7 @@ access = list() minimal_access = list() + departments = DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 100, @@ -48,6 +49,7 @@ access = list(ACCESS_COMMAND) minimal_access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 130, diff --git a/code/modules/jobs/job_types/rcorp/officer.dm b/code/modules/jobs/job_types/rcorp/officer.dm index 4491cdf32cf6..4ed5b30a9f2c 100644 --- a/code/modules/jobs/job_types/rcorp/officer.dm +++ b/code/modules/jobs/job_types/rcorp/officer.dm @@ -21,6 +21,7 @@ ) access = list(ACCESS_COMMAND) minimal_access = (ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP rank_title = "LT" job_important = "You are a support and command role in Rcorp. Advise the Commander, Run requisitions and then deploy." job_notice = "Run the Requisitions, assist Rcorp personnel on the base. After deployment, use your beacon to select which class you'd like." diff --git a/code/modules/jobs/job_types/rcorp/rabbit.dm b/code/modules/jobs/job_types/rcorp/rabbit.dm index 52b59730f1e1..e7c539091b90 100644 --- a/code/modules/jobs/job_types/rcorp/rabbit.dm +++ b/code/modules/jobs/job_types/rcorp/rabbit.dm @@ -15,6 +15,7 @@ //Eat shit rabbits lol access = list() minimal_access = list() + departments = DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 60, @@ -58,6 +59,7 @@ access = list(ACCESS_COMMAND) minimal_access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 80, diff --git a/code/modules/jobs/job_types/rcorp/raven.dm b/code/modules/jobs/job_types/rcorp/raven.dm index a25688e175db..96614ae1a73c 100644 --- a/code/modules/jobs/job_types/rcorp/raven.dm +++ b/code/modules/jobs/job_types/rcorp/raven.dm @@ -15,6 +15,7 @@ access = list(ACCESS_RND) minimal_access = list(ACCESS_RND) + departments = DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 40, @@ -66,6 +67,7 @@ access = list(ACCESS_RND, ACCESS_COMMAND) minimal_access = list(ACCESS_RND, ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 40, diff --git a/code/modules/jobs/job_types/rcorp/reindeer.dm b/code/modules/jobs/job_types/rcorp/reindeer.dm index a411ab2d048e..f6d626283c6f 100644 --- a/code/modules/jobs/job_types/rcorp/reindeer.dm +++ b/code/modules/jobs/job_types/rcorp/reindeer.dm @@ -15,6 +15,7 @@ access = list(ACCESS_MEDICAL) minimal_access = list(ACCESS_MEDICAL) + departments = DEPARTMENT_R_CORP | DEPARTMENT_MEDICAL roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 60, @@ -66,6 +67,7 @@ access = list(ACCESS_MEDICAL, ACCESS_COMMAND) minimal_access = list(ACCESS_MEDICAL, ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP | DEPARTMENT_MEDICAL roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 80, diff --git a/code/modules/jobs/job_types/rcorp/rhino.dm b/code/modules/jobs/job_types/rcorp/rhino.dm index 6c325fa09fc2..0de5d1139255 100644 --- a/code/modules/jobs/job_types/rcorp/rhino.dm +++ b/code/modules/jobs/job_types/rcorp/rhino.dm @@ -15,6 +15,7 @@ access = list(ACCESS_ARMORY, ACCESS_CENT_GENERAL) minimal_access = list(ACCESS_ARMORY, ACCESS_CENT_GENERAL) + departments = DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 40, @@ -61,6 +62,7 @@ access = list(ACCESS_ARMORY, ACCESS_COMMAND, ACCESS_CENT_GENERAL) minimal_access = list(ACCESS_ARMORY, ACCESS_COMMAND, ACCESS_CENT_GENERAL) + departments = DEPARTMENT_COMMAND | DEPARTMENT_R_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 80, diff --git a/code/modules/jobs/job_types/suppression.dm b/code/modules/jobs/job_types/suppression.dm index 0ad10876c8ff..bdd95359e133 100644 --- a/code/modules/jobs/job_types/suppression.dm +++ b/code/modules/jobs/job_types/suppression.dm @@ -16,6 +16,7 @@ minimal_access = list() allow_bureaucratic_error = FALSE + departments = DEPARTMENT_SECURITY job_important = "You are an L-Corp Emergency Response Agent. Your job is to suppress Abnormalities. You cannot work. Use :h to talk on your departmental radio." job_abbreviation = "ERA" @@ -90,6 +91,7 @@ normal_attribute_level = 20 access = list(ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND | DEPARTMENT_SECURITY exp_requirements = 6000 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_SECURITY diff --git a/code/modules/jobs/job_types/trusted_players/association/associate.dm b/code/modules/jobs/job_types/trusted_players/association/associate.dm index 64367a7989ba..18459244ccc7 100644 --- a/code/modules/jobs/job_types/trusted_players/association/associate.dm +++ b/code/modules/jobs/job_types/trusted_players/association/associate.dm @@ -11,6 +11,7 @@ display_order = JOB_DISPLAY_ORDER_ASSOCIATION access = list(ACCESS_NETWORK) minimal_access = list(ACCESS_NETWORK) + departments = DEPARTMENT_ASSOCIATION | DEPARTMENT_FIXERS paycheck = 700 maptype = list("wonderlabs", "city") diff --git a/code/modules/jobs/job_types/trusted_players/association/director.dm b/code/modules/jobs/job_types/trusted_players/association/director.dm index 002cc29428b7..305c73b9e493 100644 --- a/code/modules/jobs/job_types/trusted_players/association/director.dm +++ b/code/modules/jobs/job_types/trusted_players/association/director.dm @@ -19,6 +19,7 @@ GLOBAL_LIST_INIT(association_jobs, list( trusted_only = TRUE access = list(ACCESS_PHARMACY, ACCESS_NETWORK, ACCESS_RC_ANNOUNCE) // I want to use the number 69. minimal_access = list(ACCESS_PHARMACY, ACCESS_NETWORK, ACCESS_RC_ANNOUNCE) + departments = DEPARTMENT_COMMAND | DEPARTMENT_ASSOCIATION paycheck = 700 maptype = list("wonderlabs", "city") diff --git a/code/modules/jobs/job_types/trusted_players/association/roaming.dm b/code/modules/jobs/job_types/trusted_players/association/roaming.dm index 6a720418bf5c..787c198b1ac2 100644 --- a/code/modules/jobs/job_types/trusted_players/association/roaming.dm +++ b/code/modules/jobs/job_types/trusted_players/association/roaming.dm @@ -12,10 +12,10 @@ trusted_only = TRUE access = list(ACCESS_NETWORK) minimal_access = list(ACCESS_NETWORK) + departments = DEPARTMENT_HANA | DEPARTMENT_FIXERS paycheck = 700 maptype = list("fixers", "city") - //They actually need this for their weapons roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 100, diff --git a/code/modules/jobs/job_types/trusted_players/association/veteran.dm b/code/modules/jobs/job_types/trusted_players/association/veteran.dm index cbf31dd4c9e5..5b20095101e5 100644 --- a/code/modules/jobs/job_types/trusted_players/association/veteran.dm +++ b/code/modules/jobs/job_types/trusted_players/association/veteran.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_NETWORK) minimal_access = list(ACCESS_NETWORK) + departments = DEPARTMENT_ASSOCIATION | DEPARTMENT_FIXERS paycheck = 400 maptype = list("wonderlabs", "city") diff --git a/code/modules/jobs/job_types/trusted_players/hana.dm b/code/modules/jobs/job_types/trusted_players/hana.dm index 0027ab7c447a..4c49fbda8ac8 100644 --- a/code/modules/jobs/job_types/trusted_players/hana.dm +++ b/code/modules/jobs/job_types/trusted_players/hana.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_NETWORK, ACCESS_COMMAND, ACCESS_MANAGER, ACCESS_CHANGE_IDS) minimal_access = list(ACCESS_NETWORK, ACCESS_COMMAND, ACCESS_MANAGER, ACCESS_CHANGE_IDS) + departments = DEPARTMENT_HANA paycheck = 0 maptype = list("city", "fixers") job_important = "You are the city's administrator, and have a small sort of power over the local association. \ @@ -69,6 +70,7 @@ total_positions = 1 spawn_positions = 1 display_order = JOB_DISPLAY_ORDER_MANAGER + departments = DEPARTMENT_COMMAND | DEPARTMENT_HANA paycheck = 0 diff --git a/code/modules/jobs/job_types/trusted_players/representative.dm b/code/modules/jobs/job_types/trusted_players/representative.dm index 9831653394d1..16e8895bfadf 100644 --- a/code/modules/jobs/job_types/trusted_players/representative.dm +++ b/code/modules/jobs/job_types/trusted_players/representative.dm @@ -12,6 +12,7 @@ trusted_only = TRUE access = list(ACCESS_PHARMACY, ACCESS_COMMAND) // I want to use the number 69. minimal_access = list(ACCESS_PHARMACY, ACCESS_COMMAND) + departments = DEPARTMENT_COMMAND mapexclude = list("wonderlabs", "mini") job_abbreviation = "REP" @@ -32,7 +33,9 @@ uniform = /obj/item/clothing/under/suit/lobotomy shoes = /obj/item/clothing/shoes/laceup - backpack_contents = list() + backpack_contents = list( + /obj/item/storage/box/rxglasses/spyglasskit, + ) /// Alternate corps you can pick /datum/job/representative diff --git a/code/modules/jobs/job_types/trusted_players/sephirah.dm b/code/modules/jobs/job_types/trusted_players/sephirah.dm index d30a3ecb6aec..6361f45c9f49 100644 --- a/code/modules/jobs/job_types/trusted_players/sephirah.dm +++ b/code/modules/jobs/job_types/trusted_players/sephirah.dm @@ -8,6 +8,7 @@ trusted_only = TRUE access = list(ACCESS_NETWORK, ACCESS_COMMAND, ACCESS_MANAGER) // Network is the trusted chat gamer access minimal_access = list(ACCESS_NETWORK, ACCESS_COMMAND, ACCESS_MANAGER) + departments = DEPARTMENT_COMMAND mapexclude = list("wonderlabs", "mini") job_important = "You are a roleplay role, and may not partake in combat. Assist the manager and roleplay with the agents and clerks" job_notice = "\ @@ -298,19 +299,17 @@ GLOBAL_LIST_EMPTY(SephirahBullet) var/mob/living/simple_animal/hostile/abnormality/queued_abno = SSabnormality_queue.queued_abnormality data["queued_abno"] = initial(queued_abno.name) - /* Scrapped due to difficulty -- to be implemented // START OF ARRIVAL INFORMATION var/safe_abnormality_delay - if(SSabnormality_queue.next_abno_spawn != INFINITY) // happens when starting abnormalities are being selected, or things break - safe_abnormality_delay = SSabnormality_queue.next_abno_spawn + if(SSabnormality_queue.next_abno_spawn != INFINITY) // Happens when starting abnormalities are being selected, or things break + safe_abnormality_delay = floor(SSabnormality_queue.next_abno_spawn) else - safe_abnormality_delay = ABNORMALITY_DELAY + safe_abnormality_delay = ABNORMALITY_DELAY + SSticker.round_start_time - data["current_arrival"] = safe_abnormality_delay - data["next_arrival"] = safe_abnormality_delay + SSabnormality_queue.next_abno_spawn_time + ((min(16, (SSabnormality_queue.spawned_abnos + 1)) - 6) * 6) SECONDS - data["progress_component"] = (world.time - ABNORMALITY_DELAY) / safe_abnormality_delay + data["previous_arrival_time"] = floor(SSabnormality_queue.previous_abno_spawn ? SSabnormality_queue.previous_abno_spawn : ROUNDTIME) + data["current_arrival_time"] = floor(world.time) + data["next_arrival_time"] = safe_abnormality_delay + 5 SECONDS // The seconds are because the subsystem fires every 10 seconds // END OF ARRIVAL INFORMATION - */ return data diff --git a/code/modules/jobs/job_types/wcorp/wcorpl1.dm b/code/modules/jobs/job_types/wcorp/wcorpl1.dm index 9048d1a398f3..94274c3df2d1 100644 --- a/code/modules/jobs/job_types/wcorp/wcorpl1.dm +++ b/code/modules/jobs/job_types/wcorp/wcorpl1.dm @@ -15,6 +15,7 @@ //yes i have been so distant consistently indifferent access = list() //add accesses as necessary minimal_access = list() + departments = DEPARTMENT_W_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 60, diff --git a/code/modules/jobs/job_types/wcorp/wcorpl2.dm b/code/modules/jobs/job_types/wcorp/wcorpl2.dm index 8618f476f361..fd6f72e1dfe2 100644 --- a/code/modules/jobs/job_types/wcorp/wcorpl2.dm +++ b/code/modules/jobs/job_types/wcorp/wcorpl2.dm @@ -16,9 +16,9 @@ GLOBAL_LIST_INIT(l2csquads, list("Axe", "Buckler", "Cleaver", "Axe", "Buckler", outfit = /datum/outfit/job/wcorpl2 display_order = 4.5 - access = list() //add accesses as necessary minimal_access = list() + departments = DEPARTMENT_W_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 80, diff --git a/code/modules/jobs/job_types/wcorp/wcorpl3.dm b/code/modules/jobs/job_types/wcorp/wcorpl3.dm index 0115ddd2cb2a..41c8993cf504 100644 --- a/code/modules/jobs/job_types/wcorp/wcorpl3.dm +++ b/code/modules/jobs/job_types/wcorp/wcorpl3.dm @@ -17,9 +17,9 @@ GLOBAL_LIST_INIT(l3squads, list("Axe", "Buckler", "Cleaver")) outfit = /datum/outfit/job/wcorpl3 display_order = 2 - access = list() //add accesses as necessary minimal_access = list() + departments = DEPARTMENT_COMMAND | DEPARTMENT_W_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 100, diff --git a/code/modules/jobs/job_types/wcorp/wcorprecon.dm b/code/modules/jobs/job_types/wcorp/wcorprecon.dm index 9a20d830bc99..16eca5307a7f 100644 --- a/code/modules/jobs/job_types/wcorp/wcorprecon.dm +++ b/code/modules/jobs/job_types/wcorp/wcorprecon.dm @@ -15,9 +15,9 @@ GLOBAL_LIST_INIT(l2asquads, list("Axe", "Buckler", "Cleaver")) outfit = /datum/outfit/job/wcorpl2recon display_order = 3 - access = list() //add accesses as necessary minimal_access = list() + departments = DEPARTMENT_W_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 80, diff --git a/code/modules/jobs/job_types/wcorp/wcorprep.dm b/code/modules/jobs/job_types/wcorp/wcorprep.dm index 208600e78f37..e641bc8efbe8 100644 --- a/code/modules/jobs/job_types/wcorp/wcorprep.dm +++ b/code/modules/jobs/job_types/wcorp/wcorprep.dm @@ -25,6 +25,7 @@ ) access = list(ACCESS_ARMORY, ACCESS_RND, ACCESS_COMMAND, ACCESS_MEDICAL, ACCESS_MANAGER) minimal_access = list(ACCESS_ARMORY, ACCESS_RND, ACCESS_COMMAND, ACCESS_MEDICAL, ACCESS_MANAGER) + departments = DEPARTMENT_COMMAND | DEPARTMENT_W_CORP rank_title = "W-Corp Representative" job_important = "You are W-Corp's main representative, overseeing the cleanup operation. Assure that all things go smoothy for the company." job_notice = "Manage the agents at your disposal." diff --git a/code/modules/jobs/job_types/wcorp/wcorpshield.dm b/code/modules/jobs/job_types/wcorp/wcorpshield.dm index ebbf552181ea..2b6b0217b262 100644 --- a/code/modules/jobs/job_types/wcorp/wcorpshield.dm +++ b/code/modules/jobs/job_types/wcorp/wcorpshield.dm @@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(l2bsquads, list("Axe", "Buckler", "Cleaver")) access = list() //add accesses as necessary minimal_access = list() + departments = DEPARTMENT_W_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 80, diff --git a/code/modules/jobs/job_types/wcorp/wcorpspear.dm b/code/modules/jobs/job_types/wcorp/wcorpspear.dm index df30d188a6be..eae373ae5f9a 100644 --- a/code/modules/jobs/job_types/wcorp/wcorpspear.dm +++ b/code/modules/jobs/job_types/wcorp/wcorpspear.dm @@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(l2dsquads, list("Axe", "Buckler", "Cleaver")) access = list() //add accesses as necessary minimal_access = list() + departments = DEPARTMENT_W_CORP roundstart_attributes = list( FORTITUDE_ATTRIBUTE = 80, diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index ca6a29e67826..6758004afd35 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -1,3 +1,4 @@ +// LOBOTOMYCORPORATION EDIT -- This whole un-modular monstrosity GLOBAL_LIST_INIT(command_positions, list( "Manager", "Extraction Officer", @@ -9,7 +10,7 @@ GLOBAL_LIST_INIT(command_positions, list( "Department Head", "Agent Captain", - //City heads + // City heads "Doctor", "Hana Administrator", "Association Section Director", @@ -19,8 +20,7 @@ GLOBAL_LIST_INIT(command_positions, list( "Thumb Sottocapo", "Kurokumo Kashira", - - //Rcorp Fourth Pack + // R-corp Fourth Pack "Ground Commander", "Lieutenant Commander", "Operations Officer", @@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(command_positions, list( "Rhino Squad Captain", "Raven Squad Captain", - //Rcorp Fifth Pack + // R-corp Fifth Pack "Assault Commander", "Base Commander", "Support Officer", @@ -38,12 +38,11 @@ GLOBAL_LIST_INIT(command_positions, list( "Raccoon Squad Leader", "Roadrunner Squad Leader", - - //Wcorp stuff + // W-corp stuff "W-Corp Representative", "W-Corp L3 Squad Captain", - //LCB Labs + // LCB Labs "District Manager", "LC Asset Protection", "Chief Medical Officer", @@ -56,40 +55,35 @@ GLOBAL_LIST_INIT(command_positions, list( GLOBAL_LIST_INIT(engineering_positions, list( + "Containment Engineer", // LCB Labs )) GLOBAL_LIST_INIT(medical_positions, list( - //LC Labs + // LCB Labs "Chief Medical Officer", "Surgeon", "Nurse Practitioner", "Pharmacist", "Emergency Medical Technician", + + // City + "Doctor", + "Nurse", + "Paramedic", + "Medical Fixer Assistant", + "Proshetics Surgeon", )) GLOBAL_LIST_INIT(science_positions, list( - "Hana Administrator", - "Hana Representative", - "Hana Intern", - "Association Section Director", - "Association Veteran", - "Association Fixer", - "Roaming Association Fixer", - "East Office Director", - "East Office Fixer", - "North Office Director", - "North Office Fixer", - - //LCB Labs + // LCB Labs "Lead Researcher", "Senior Researcher", "Information Systems Tech", "Research Archivist", "Researcher", "LC Staff", - )) @@ -102,11 +96,6 @@ GLOBAL_LIST_INIT(service_positions, list( "Agent Support Clerk", "Facility Support Clerk", - - "Doctor", - "Nurse", - "Paramedic", - "Medical Fixer Assistant", "Proshetics Surgeon", "HHPP Chef", "Civilian", @@ -115,10 +104,8 @@ GLOBAL_LIST_INIT(service_positions, list( "Workshop Attendant", "Main Office Representative", "Fishhook Office Fixer", - "Rat", - //LCB Labs - "Containment Engineer", + // LCB Labs "LC Chef", "LC Janitor", )) @@ -138,55 +125,7 @@ GLOBAL_LIST_INIT(security_positions, list( "Agent", "Agent Intern", - //R-Corp Fourth Pack - "R-Corp Suppressive Rabbit", - "R-Corp Assault Rabbit", - "R-Corp Medical Reindeer", - "R-Corp Berserker Reindeer", - "R-Corp Gunner Rhino", - "R-Corp Hammer Rhino", - "R-Corp Scout Raven", - "R-Corp Support Raven", - - //Fifth Pack - "R-Corp Rat", - "R-Corp Rooster", - "R-Corp Raccoon Spy", - "R-Corp Raccoon Sniper", - "R-Corp Roadrunner", - - //W-Corp agents - "W-Corp L2 Type A Lieutenant", - "W-Corp L2 Type B Support Agent", - "W-Corp L2 Type C Weapon Specialist", - "W-Corp L2 Type D Spear Agent", - "W-Corp L1 Cleanup Agent", - - - //Syndicates - "Index Messenger", - "Index Proxy", - "Index Proselyte", - - "Blade Lineage Cutthroat", - "Blade Lineage Salsu", - "Blade Lineage Ronin", - "Blade Lineage Roaming Salsu", - - "Grand Inquisitor", - "N Corp Grosshammer", - "N Corp Mittlehammer", - "N Corp Kleinhammer", - - "Thumb Sottocapo", - "Thumb Capo", - "Thumb Soldato", - - "Kurokumo Kashira", - "Kurokumo Hosa", - "Kurokumo Wakashu", - - //LCB Labs + // LCB Labs "High Security Commander", "Low Security Commander", "High Security Officer", @@ -206,6 +145,14 @@ GLOBAL_LIST_INIT(nonhuman_positions, list( // job categories for rendering the late join menu GLOBAL_LIST_INIT(position_categories, list( + // LOBOTOMYCORPORATION ADDITION START + "W Corp" = list("jobs" = w_corp_positions, "color" = "#00b5ad"), + "R Corp" = list("jobs" = r_corp_positions, "color" = "#f2711c"), + "Hana" = list("jobs" = hana_positions, "color" = "#ffffff"), + "Association" = list("jobs" = association_positions, "color" = "#5baa27"), + "Syndicate" = list("jobs" = city_antagonist_positions, "color" = "#db2828"), + "Fixers" = list("jobs" = fixer_positions, "color" = "#767676"), + // LOBOTOMYCORPORATION ADDITION END EXP_TYPE_COMMAND = list("jobs" = command_positions, "color" = "#ccccff"), EXP_TYPE_ENGINEERING = list("jobs" = engineering_positions, "color" = "#ffeeaa"), EXP_TYPE_SUPPLY = list("jobs" = supply_positions, "color" = "#ddddff"), @@ -213,17 +160,22 @@ GLOBAL_LIST_INIT(position_categories, list( EXP_TYPE_SERVICE = list("jobs" = service_positions, "color" = "#bbe291"), EXP_TYPE_MEDICAL = list("jobs" = medical_positions, "color" = "#ffddf0"), EXP_TYPE_SCIENCE = list("jobs" = science_positions, "color" = "#ffddff"), - EXP_TYPE_SECURITY = list("jobs" = security_positions, "color" = "#ffdddd") + EXP_TYPE_SECURITY = list("jobs" = security_positions, "color" = "#ffdddd"), )) GLOBAL_LIST_INIT(exp_jobsmap, list( - EXP_TYPE_CREW = list("titles" = command_positions | engineering_positions | medical_positions | science_positions | supply_positions | security_positions | service_positions | list("AI","Cyborg")), // crew positions - EXP_TYPE_COMMAND = list("titles" = command_positions), +// LOBOTOMYCORPORATION EDIT START +// EXP_TYPE_CREW = list("titles" = command_positions | engineering_positions | medical_positions | science_positions | supply_positions | security_positions | service_positions | list("AI","Cyborg")), // crew positions +// EXP_TYPE_COMMAND = list("titles" = command_positions), + EXP_TYPE_CREW = list("titles" = command_positions | engineering_positions | medical_positions | science_positions | supply_positions | security_positions | service_positions | w_corp_positions | r_corp_positions | hana_positions | association_positions | city_antagonist_positions | list("AI","Cyborg")), // crew positions + EXP_TYPE_COMMAND = list("titles" = command_positions | hana_positions), +// LOBOTOMYCORPORATION EDIT END EXP_TYPE_ENGINEERING = list("titles" = engineering_positions), EXP_TYPE_MEDICAL = list("titles" = medical_positions), EXP_TYPE_SCIENCE = list("titles" = science_positions), EXP_TYPE_SUPPLY = list("titles" = supply_positions), - EXP_TYPE_SECURITY = list("titles" = security_positions), +// EXP_TYPE_SECURITY = list("titles" = security_positions), // LOBOTOMYCORPORATION EDIT OLD + EXP_TYPE_SECURITY = list("titles" = security_positions | city_antagonist_positions | association_positions | w_corp_positions | r_corp_positions | fixer_positions), // LOBOTOMYCORPORATION EDIT NEW EXP_TYPE_SILICON = list("titles" = list("AI","Cyborg")), EXP_TYPE_SERVICE = list("titles" = service_positions) )) diff --git a/code/modules/mapping/random_rooms.dm b/code/modules/mapping/random_rooms.dm index 8e25a1391168..223b725fc0f9 100644 --- a/code/modules/mapping/random_rooms.dm +++ b/code/modules/mapping/random_rooms.dm @@ -1,7 +1,7 @@ /datum/map_template/random_room var/room_id //The SSmapping random_room_template list is ordered by this var var/spawned //Whether this template (on the random_room template list) has been spawned - var/centerspawner = TRUE + var/centerspawner = FALSE var/template_width = 0 var/template_height = 0 var/weight = 10 //weight a room has to appear @@ -13,7 +13,6 @@ name = "Cybersun Warehouse - Default" room_id = "cybersun_default" mappath = "_maps/RandomRooms/ruins/cybersun_default.dmm" - centerspawner = FALSE template_width = 6 template_height = 7 room_type = "cybersun" @@ -22,7 +21,6 @@ name = "Cybersun Warehouse - Rich" room_id = "cybersun_rich" mappath = "_maps/RandomRooms/ruins/cybersun_rich.dmm" - centerspawner = FALSE template_width = 6 template_height = 7 weight = 5 @@ -32,7 +30,6 @@ name = "Cybersun Medical - Default" room_id = "cybersun_med_default" mappath = "_maps/RandomRooms/ruins/cybersun_med_default.dmm" - centerspawner = FALSE template_width = 3 template_height = 5 room_type = "cybersun_med" @@ -41,7 +38,6 @@ name = "Cybersun Medical - Rich" room_id = "cybersun_med_rich" mappath = "_maps/RandomRooms/ruins/cybersun_med_rich.dmm" - centerspawner = FALSE template_width = 3 template_height = 5 weight = 5 diff --git a/code/modules/mob/dead/crew_manifest.dm b/code/modules/mob/dead/crew_manifest.dm new file mode 100644 index 000000000000..918f6e022914 --- /dev/null +++ b/code/modules/mob/dead/crew_manifest.dm @@ -0,0 +1,94 @@ +/datum/crew_manifest + +/datum/crew_manifest/ui_state(mob/user) + return GLOB.always_state + +/datum/crew_manifest/ui_status(mob/user, datum/ui_state/state) + return (isnewplayer(user) || isobserver(user) || isAI(user) || ispAI(user)) ? UI_INTERACTIVE : UI_CLOSE + +/datum/crew_manifest/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if (!ui) + ui = new(user, src, "CrewManifest") + ui.open() + +/datum/crew_manifest/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + +/datum/crew_manifest/ui_data(mob/user) + var/list/positions = list( + // LOBOTOMYCORPORATION ADDITION START + "W Corp" = list("exceptions" = list(), "open" = 0), + "R Corp" = list("exceptions" = list(), "open" = 0), + "Hana" = list("exceptions" = list(), "open" = 0), + "Association" = list("exceptions" = list(), "open" = 0), + "Syndicate" = list("exceptions" = list(), "open" = 0), + "Fixers" = list("exceptions" = list(), "open" = 0), + // LOBOTOMYCORPORATION ADDITION END + "Command" = list("exceptions" = list(), "open" = 0), + "Security" = list("exceptions" = list(), "open" = 0), + "Engineering" = list("exceptions" = list(), "open" = 0), + "Medical" = list("exceptions" = list(), "open" = 0), + "Misc" = list("exceptions" = list(), "open" = 0), + "Science" = list("exceptions" = list(), "open" = 0), + "Supply" = list("exceptions" = list(), "open" = 0), + "Service" = list("exceptions" = list(), "open" = 0), + "Silicon" = list("exceptions" = list(), "open" = 0) + ) + var/list/departments = list( + // LOBOTOMYCORPORATION ADDITION START + list("flag" = DEPARTMENT_W_CORP, "name" = "W Corp"), + list("flag" = DEPARTMENT_R_CORP, "name" = "R Corp"), + list("flag" = DEPARTMENT_HANA, "name" = "Hana"), + list("flag" = DEPARTMENT_ASSOCIATION, "name" = "Association"), + list("flag" = DEPARTMENT_CITY_ANTAGONIST, "name" = "Syndicate"), + list("flag" = DEPARTMENT_FIXERS, "name" = "Fixers"), + // LOBOTOMYCORPORATION ADDITION END + list("flag" = DEPARTMENT_COMMAND, "name" = "Command"), + list("flag" = DEPARTMENT_SECURITY, "name" = "Security"), + list("flag" = DEPARTMENT_ENGINEERING, "name" = "Engineering"), + list("flag" = DEPARTMENT_MEDICAL, "name" = "Medical"), + list("flag" = DEPARTMENT_SCIENCE, "name" = "Science"), + list("flag" = DEPARTMENT_CARGO, "name" = "Supply"), + list("flag" = DEPARTMENT_SERVICE, "name" = "Service"), + list("flag" = DEPARTMENT_SILICON, "name" = "Silicon"), + ) + +// LOBOTOMYCORPORATION EDIT OLD START +/* + for(var/job in SSjob.occupations) + // Check if there are additional open positions or if there is no limit + if ((job["total_positions"] > 0 && job["total_positions"] > job["current_positions"]) || (job["total_positions"] == -1)) + for(var/department in departments) + // Check if the job is part of a department using its flag + // Will return true for Research Director if the department is Science or Command, for example + if(job["departments"] & department["flag"]) + if(job["total_positions"] == -1) + // Add job to list of exceptions, meaning it does not have a position limit + positions[department["name"]]["exceptions"] += list(job["title"]) + else + // Add open positions to current department + positions[department["name"]]["open"] += (job["total_positions"] - job["current_positions"]) +*/ +// LOBOTOMYCORPORATION EDIT OLD END +// LOBOTOMYCORPORATION EDIT NEW START + for(var/datum/job/job in SSjob.occupations) + if((job.total_positions > 0 && job.total_positions > job.current_positions) || (job.total_positions == -1)) + for(var/department in departments) + // Check if the job is part of a department using its flag + // Will return true for Research Director if the department is Science or Command, for example + if(job.departments & department["flag"]) + if(job.total_positions == -1) + // Add job to list of exceptions, meaning it does not have a position limit + positions[department["name"]]["exceptions"] += list(job.title) + else + // Add open positions to current department + positions[department["name"]]["open"] += (job.total_positions - job.current_positions) +// LOBOTOMYCORPORATION EDIT NEW END + + return list( + "manifest" = GLOB.data_core.get_manifest(), + "positions" = positions + ) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 0591a1c2e1b8..fa7f1d7c8afa 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -35,6 +35,7 @@ /mob/dead/new_player/Destroy() GLOB.new_player_list -= src + return ..() /mob/dead/new_player/prepare_huds() @@ -523,11 +524,10 @@ return client.crew_manifest_delay = world.time + (1 SECONDS) - var/dat = "" - dat += "

Crew Manifest

" - dat += GLOB.data_core.get_manifest_html() + if(!GLOB.crew_manifest_tgui) + GLOB.crew_manifest_tgui = new /datum/crew_manifest(src) - src << browse(dat, "window=manifest;size=387x420;can_close=1") + GLOB.crew_manifest_tgui.ui_interact(src) /mob/dead/new_player/Move() return 0 diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 78134dd79575..0b1cd300229e 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -698,11 +698,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return client.crew_manifest_delay = world.time + (1 SECONDS) - var/dat - dat += "

Crew Manifest

" - dat += GLOB.data_core.get_manifest_html() + if(!GLOB.crew_manifest_tgui) + GLOB.crew_manifest_tgui = new /datum/crew_manifest(src) - src << browse(dat, "window=manifest;size=387x420;can_close=1") + GLOB.crew_manifest_tgui.ui_interact(src) //this is called when a ghost is drag clicked to something. /mob/dead/observer/MouseDrop(atom/over) diff --git a/code/modules/mob/living/carbon/human/damage_procs.dm b/code/modules/mob/living/carbon/human/damage_procs.dm index 6122c3434f97..cff4e8777f96 100644 --- a/code/modules/mob/living/carbon/human/damage_procs.dm +++ b/code/modules/mob/living/carbon/human/damage_procs.dm @@ -6,18 +6,17 @@ //// Damage Effects /mob/living/carbon/human/adjustRedLoss(amount, updating_health = TRUE, forced = FALSE) + if(stat != DEAD) + DamageEffect(amount, RED_DAMAGE) . = ..() - //Failsafe - if(. && !forced) - if(. > 0) - new /obj/effect/temp_visual/damage_effect/red(get_turf(src)) + /mob/living/carbon/human/adjustWhiteLoss(amount, updating_health = TRUE, forced = FALSE, white_healable = FALSE) var/damage_amt = amount if(sanity_lost && white_healable) // Heal sanity instead. damage_amt *= -1 - if(damage_amt > 0 && !forced) - new /obj/effect/temp_visual/damage_effect/white(get_turf(src)) + if(stat != DEAD) + DamageEffect(damage_amt, WHITE_DAMAGE) adjustSanityLoss(damage_amt, forced) if(updating_health) updatehealth() @@ -27,29 +26,26 @@ var/damage_amt = amount if(sanity_lost && white_healable) // Heal sanity instead. damage_amt *= -1 - if(amount > 0 && !forced) - new /obj/effect/temp_visual/damage_effect/black(get_turf(src)) + if(stat != DEAD) + DamageEffect(amount, BLACK_DAMAGE) adjustBruteLoss(amount, forced = forced) adjustSanityLoss(damage_amt, forced = forced) return damage_amt /mob/living/carbon/human/adjustPaleLoss(amount, updating_health = TRUE, forced = FALSE) + if(stat != DEAD) + DamageEffect(amount, PALE_DAMAGE) . = ..() - if(. && !forced) - if(. > 0) - new /obj/effect/temp_visual/damage_effect/pale(get_turf(src)) /mob/living/carbon/human/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE) + if(stat != DEAD) + DamageEffect(amount, TOX) . = ..() - if(. && !forced) - if(. > 0) - new /obj/effect/temp_visual/damage_effect/tox(get_turf(src)) /mob/living/carbon/human/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE, required_status) + if(stat != DEAD) + DamageEffect(amount, BURN) . = ..() - if(. && !forced) - if(. > 0) - new /obj/effect/temp_visual/damage_effect/burn(get_turf(src)) // diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 512a4dc09e89..3380cd9c847d 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -331,9 +331,10 @@ return client.crew_manifest_delay = world.time + (1 SECONDS) - var/datum/browser/popup = new(src, "airoster", "Crew Manifest", 387, 420) - popup.set_content(GLOB.data_core.get_manifest_html()) - popup.open() + if(!GLOB.crew_manifest_tgui) + GLOB.crew_manifest_tgui = new /datum/crew_manifest(src) + + GLOB.crew_manifest_tgui.ui_interact(src) /mob/living/silicon/proc/set_autosay() //For allowing the AI and borgs to set the radio behavior of auto announcements (state laws, arrivals). if(!radio) diff --git a/code/modules/mob/living/simple_animal/abnormality/_abnormality.dm b/code/modules/mob/living/simple_animal/abnormality/_abnormality.dm index c19823d2880f..76085e3bcedd 100644 --- a/code/modules/mob/living/simple_animal/abnormality/_abnormality.dm +++ b/code/modules/mob/living/simple_animal/abnormality/_abnormality.dm @@ -123,13 +123,19 @@ /// Offset for secret skins in the Y axis var/secret_vertical_offset = 0 - /// Final Observation details - var/observation_in_progress = FALSE + /// Final Observation stuffs + /// The prompt we get alongside our choices for observing it var/observation_prompt = "The abnormality is watching you. What will you do?" - var/list/observation_choices = list("Approach", "Leave") - var/list/correct_choices = list("Approach", "Leave") - var/observation_success_message = "Final Observation Success!" - var/observation_fail_message = "Final Observation Failed!" + /** + * observation_choices is made in the format of: + * "Choice" = list(TRUE or FALSE [depending on if the answer is correct], "Response"), + */ + var/list/observation_choices = list( + "Approach" = list(TRUE, "You approach the abnormality... and obtain a gift from it."), + "Leave" = list(TRUE, "You leave the abnormality... and before you notice a gift is in your hands."), + ) + /// Is there a currently on-going observation? + var/observation_in_progress = FALSE /mob/living/simple_animal/hostile/abnormality/Initialize(mapload) SHOULD_CALL_PARENT(TRUE) @@ -339,13 +345,6 @@ /mob/living/simple_animal/hostile/abnormality/proc/PostSpawn() SHOULD_CALL_PARENT(TRUE) HandleStructures() - var/condition = FALSE //Final observation debug - for(var/answer in observation_choices) - if(answer in correct_choices) - condition = TRUE - if(!condition) - CRASH("Abnormality has no correct choice for final observation!") - return // Moves structures already in its datum; Overrides can spawn structures here. /mob/living/simple_animal/hostile/abnormality/proc/HandleStructures() @@ -499,6 +498,8 @@ toggle_ai(AI_ON) // Run. status_flags &= ~GODMODE SEND_GLOBAL_SIGNAL(COMSIG_GLOB_ABNORMALITY_BREACH, src) + if(istype(datum_reference)) + deadchat_broadcast(" has breached containment.", "[src.name]", src, get_turf(src)) FearEffect() return TRUE @@ -550,25 +551,29 @@ return to_chat(user, span_warning("You already have a gift in the [gift_type.slot] slot, dissolve it first!")) return - var/condition = FALSE + if(observation_in_progress) to_chat(user, span_notice("Someone is already observing [src]!")) return observation_in_progress = TRUE - var/answer = final_observation_alert(user, "[observation_prompt]", "Final Observation of [src]", observation_choices, timeout = 60 SECONDS) - if(answer in correct_choices) - condition = TRUE - ObservationResult(user, condition, answer) //We pass along the answer just in case + var/answer = final_observation_alert(user, "[observation_prompt]", "Final Observation of [src]", shuffle(observation_choices), timeout = 60 SECONDS) + if(answer == "timed out") + ObservationResult(user, reply = answer) + else + var/list/answer_vars = observation_choices[answer] + ObservationResult(user, answer_vars[1], answer_vars[2]) + observation_in_progress = FALSE -/mob/living/simple_animal/hostile/abnormality/proc/ObservationResult(mob/living/carbon/human/user, condition, answer) - if(condition) //Successful, could override for longer observations as well. - final_observation_alert(user,"[observation_success_message]", "OBSERVATION SUCCESS",list("Ok"), timeout=20 SECONDS) //Some of these take a long time to read +/mob/living/simple_animal/hostile/abnormality/proc/ObservationResult(mob/living/carbon/human/user, success = FALSE, reply = "") + if(success) //Successful, could override for longer observations as well. + final_observation_alert(user, "[reply]", "OBSERVATION SUCCESS", list("Ok"), timeout = 20 SECONDS) //Some of these take a long time to read if(gift_type) user.Apply_Gift(new gift_type) playsound(get_turf(user), 'sound/machines/synth_yes.ogg', 30 , FALSE) else - final_observation_alert(user,"[observation_fail_message]", "OBSERVATION FAIL",list("Ok"), timeout=20 SECONDS) + if(reply != "timed out") + final_observation_alert(user, "[reply]", "OBSERVATION FAIL", list("Ok"), timeout = 20 SECONDS) playsound(get_turf(user), 'sound/machines/synth_no.ogg', 30 , FALSE) datum_reference.observation_ready = FALSE @@ -592,6 +597,11 @@ if(5) C.icon = 'ModularTegustation/Teguicons/abno_cores/aleph.dmi' +/mob/living/simple_animal/hostile/abnormality/spawn_gibs() + if(blood_volume <= 0) + return + return new /obj/effect/gibspawner/generic(drop_location(), src, get_static_viruses()) + // Actions /datum/action/innate/abnormality_attack name = "Abnormality Attack" diff --git a/code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/aleph/crying_children.dm b/code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/aleph/crying_children.dm index b5dc6bacd7ee..3042d17f8589 100644 --- a/code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/aleph/crying_children.dm +++ b/code/modules/mob/living/simple_animal/abnormality/_auxiliary_modes/community/aleph/crying_children.dm @@ -262,24 +262,24 @@ Combusting_Courage() return -/mob/living/simple_animal/hostile/abnormality/crying_children/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/crying_children/AttackingTarget(atom/attacked_target) if(!can_act) return FALSE if(!client) if(desperate && (courage_cooldown <= world.time) && prob(30)) return Combusting_Courage() if(sorrow_cooldown <= world.time && prob(25)) - return Wounds_Of_Sorrow(target) + return Wounds_Of_Sorrow(attacked_target) if(prob(35)) - return Bygone_Illusion(target) + return Bygone_Illusion(attacked_target) // Distorted Illusion can_act = FALSE icon_state = "[icon_phase]_salvador" . = ..() - if(isliving(target)) - var/mob/living/L = target + if(isliving(attacked_target)) + var/mob/living/L = attacked_target L.apply_lc_burn(5*burn_mod) SLEEP_CHECK_DEATH(10) icon_state = "[icon_phase]_idle" @@ -508,7 +508,7 @@ if(!target) target = H if(target in view(1, src)) - AttackingTarget() + AttackingTarget(target) tagged = TRUE // Unseeing diff --git a/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/touch.dm b/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/touch.dm index 2c3ed41eecba..918194f865f7 100644 --- a/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/touch.dm +++ b/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/touch.dm @@ -26,55 +26,57 @@ to_chat(user, span_userdanger("THE BUTTON REJECTS YOU.")) return - cooldown = world.time + 45 SECONDS // Spam prevention + cooldown = world.time + 60 SECONDS // Spam prevention for(var/mob/M in GLOB.player_list) to_chat(M, span_userdanger("[uppertext(user.real_name)] WILL PUSH DON'T TOUCH ME[round_end ? "" : " TO BREACH ABNORMALITIES"].")) if(round_end) - SSpersistence.rounds_since_button_pressed = ROUNDCOUNT_BUTTON_PRESSED - for(var/obj/structure/sign/button_counter/sign as anything in GLOB.map_button_counters) - sign.update_count(ROUNDCOUNT_BUTTON_PRESSED) + bastards += user.ckey RoundEndEffect(user) else + breaching_bastards += user.ckey BreachEffect(user) /obj/structure/toolabnormality/touch/proc/RoundEndEffect(mob/living/carbon/human/user) - bastards += user.ckey - if(do_after(user, 45 SECONDS)) - SSticker.SetRoundEndSound('sound/abnormalities/donttouch/end.ogg') - SSticker.force_ending = 1 - var/ending = pick(1,2) - switch(ending) - if(1) - for(var/mob/M in GLOB.player_list) - if(isnewplayer(M)) - continue - flash_color(M, flash_color = COLOR_RED, flash_time = 150) - M.playsound_local(M, pick('sound/abnormalities/donttouch/kill.ogg', 'sound/abnormalities/donttouch/kill2.ogg'), 50, FALSE) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.gib() - if(2) - for(var/mob/M in GLOB.player_list) - if(isnewplayer(M)) - continue - flash_color(M, flash_color = COLOR_RED, flash_time = 150) - M.playsound_local(M, 'sound/abnormalities/donttouch/panic.ogg', 50, FALSE) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - H.apply_damage(5000, WHITE_DAMAGE, null, null, spread_damage = TRUE)//You cannot escape. - else - user.gib() //lol, idiot. + if(!do_after(user, 60 SECONDS)) + user.gib() // lol, idiot. + return -/obj/structure/toolabnormality/touch/proc/BreachEffect(mob/living/carbon/human/user) - breaching_bastards += user.ckey - if(do_after(user, 45 SECONDS)) - for(var/obj/structure/toolabnormality/clock/backclock in world.contents) //prevents an exploit - backclock.clock_cooldown = backclock.clock_cooldown_time + world.time + SSticker.SetRoundEndSound('sound/abnormalities/donttouch/end.ogg') + SSticker.force_ending = 1 + SSpersistence.rounds_since_button_pressed = ROUNDCOUNT_BUTTON_PRESSED + for(var/obj/structure/sign/button_counter/sign as anything in GLOB.map_button_counters) + sign.update_count(ROUNDCOUNT_BUTTON_PRESSED) + + if(prob(50)) // Randomly choose to eighter gib or insane everyone for(var/mob/M in GLOB.player_list) if(isnewplayer(M)) continue - flash_color(M, flash_color = COLOR_RED, flash_time = 30) - M.playsound_local(M, 'sound/abnormalities/donttouch/breach.ogg', 50, FALSE) - for(var/datum/abnormality/A in SSlobotomy_corp.all_abnormality_datums) - A.qliphoth_change(-A.qliphoth_meter) // Down to 0 + flash_color(M, flash_color = COLOR_RED, flash_time = 150) + M.playsound_local(M, pick('sound/abnormalities/donttouch/kill.ogg', 'sound/abnormalities/donttouch/kill2.ogg'), 50, FALSE) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.gib() + else + for(var/mob/M in GLOB.player_list) + if(isnewplayer(M)) + continue + flash_color(M, flash_color = COLOR_RED, flash_time = 150) + M.playsound_local(M, 'sound/abnormalities/donttouch/panic.ogg', 50, FALSE) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + H.apply_damage(5000, WHITE_DAMAGE, null, null, spread_damage = TRUE) // You cannot escape. + +/obj/structure/toolabnormality/touch/proc/BreachEffect(mob/living/carbon/human/user) + if(!do_after(user, 60 SECONDS)) + return + + for(var/obj/structure/toolabnormality/clock/backclock in world.contents) //prevents an exploit + backclock.clock_cooldown = backclock.clock_cooldown_time + world.time + for(var/mob/M in GLOB.player_list) + if(isnewplayer(M)) + continue + flash_color(M, flash_color = COLOR_RED, flash_time = 30) + M.playsound_local(M, 'sound/abnormalities/donttouch/breach.ogg', 50, FALSE) + for(var/datum/abnormality/A in SSlobotomy_corp.all_abnormality_datums) + A.qliphoth_change(-A.qliphoth_meter) // Down to 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm index f134732caea4..576682432dd0 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/army_in_black.dm @@ -55,11 +55,11 @@ GLOBAL_LIST_EMPTY(army) observation_prompt = "\"We're here to help sir, to keep the hearts of humans a clean pink, we're willing to dirty our own. We won't overlook a single speck of black.\"
\ The soldier in pink makes a salute.
You..." - observation_choices = list("Don't salute", "Salute him back") - correct_choices = list("Don't salute") - observation_success_message = "The soldier frowns.
\"As expected.
You're only human, a clean heart is only ever temporary for you.
Yours is rife with sin.
Ours are...\"
\ - The soldier falls silent, as if in deep thought." - observation_fail_message = "The soldier in pink smiles.
\"Glad to have you on board Sir, with our help, there will be no more black hearts.\"" + observation_choices = list( + "Don't salute" = list(TRUE, "The soldier frowns.
\"As expected.
You're only human, a clean heart is only ever temporary for you.
\ + Yours is rife with sin.
Ours are...\"
The soldier falls silent, as if in deep thought."), + "Salute him back" = list(FALSE, "The soldier in pink smiles.
\"Glad to have you on board Sir, with our help, there will be no more black hearts.\""), + ) //Unique variables var/death_counter = 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/black_sun.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/black_sun.dm index 22a3a780e2b9..3bfba962a511 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/black_sun.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/black_sun.dm @@ -42,7 +42,7 @@ StageChange() /mob/living/simple_animal/hostile/abnormality/black_sun/proc/StageChange() - stage+=1 + stage++ //Add 10 stats to everyone. if(stage == 1) affected_players = list() //Clear the list, then fill it up diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/blue_star.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/blue_star.dm index ec9e78aa5d29..8520dc6c45e3 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/blue_star.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/blue_star.dm @@ -48,13 +48,13 @@ observation_prompt = "A group of employees worship this abnormality, despite the fact nothing can be sacred in this place.
\ You recall how you pulled away one employee away from it in the past, even as she screamed and wailed that you were keeping her chained to this world.
You thought you were saving her.
\ You can hear a distant howl emanating from the centre of the blue-coloured heart.
It's the sound of stars.
They're welcoming you, asking you to join them as a star." - observation_choices = list("Be pulled in", "Hold yourself tight") - correct_choices = list("Be pulled in") - observation_success_message = "You don't hesitate as you approach the centre of the void.
Sensation in your hands and legs are the first things to go, creeping up your body until you couldn't feel anything physical at all.
\ - Despite how scary it should have been, you feel at peace,
this isn't an end it's a new beginning - You're a martyr.
\ - Let's meet everyone again, as stars." - observation_fail_message = "You wrapped your arms around yourself and shut your eyes, turning your senses inward until the temptation passes and the sounds become distant howls again.
\ - You opened your eyes and looked again at the heart.
It remains in the air, floating towards a new beginning." + observation_choices = list( + "Be pulled in" = list(TRUE, "You don't hesitate as you approach the centre of the void.
Sensation in your hands and legs are the first things to go, creeping up your body until you couldn't feel anything physical at all.
\ + Despite how scary it should have been, you feel at peace,
this isn't an end it's a new beginning - You're a martyr.
\ + Let's meet everyone again, as stars."), + "Hold yourself tight" = list(FALSE, "You wrapped your arms around yourself and shut your eyes, turning your senses inward until the temptation passes and the sounds become distant howls again.
\ + You opened your eyes and looked again at the heart.
It remains in the air, floating towards a new beginning."), + ) var/pulse_cooldown var/pulse_cooldown_time = 12 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/censored.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/censored.dm index ab836b7f4e3a..3647b6de267f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/censored.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/censored.dm @@ -46,12 +46,12 @@ abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY observation_prompt = "This is the containment unit of \[CENSORED\].
Many managers went mad, before they implemented the cognition filter, from the sight of it." - observation_choices = list("Enter the containment unit", "Don't enter") - correct_choices = list("Enter the containment unit") - observation_success_message = "You enter the containment unit of \[CENSORED\], the smell of \[REDACTED\] and the sound of \[ANULLED\] filled the air.
\ - After steeling yourself, you finally saw \[CENSORED\].
You manage to face the fear." - observation_fail_message = "A wave of nausea rises up within at the thought of entering the containment unit, and you turn on your heels to leave.
\ - You're not ready to build the future." + observation_choices = list( + "Enter the containment unit" = list(TRUE, "You enter the containment unit of \[CENSORED\], the smell of \[REDACTED\] and the sound of \[ANULLED\] filled the air.
\ + After steeling yourself, you finally saw \[CENSORED\].
You manage to face the fear."), + "Don't enter" = list(FALSE, "A wave of nausea rises up within at the thought of entering the containment unit, and you turn on your heels to leave.
\ + You're not ready to build the future."), + ) var/can_act = TRUE var/ability_damage = 150 @@ -116,15 +116,15 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/abnormality/censored/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/censored/AttackingTarget(atom/attacked_target) . = ..() if(!can_act) return - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.stat >= SOFT_CRIT || H.health < 0) return Convert(H) diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/distortedform.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/distortedform.dm index 5d5d8e8b2053..46407b70759e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/distortedform.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/distortedform.dm @@ -51,21 +51,21 @@ But the largest creature of all surrounds me entirely.
Every direction is covered in a undulating mass of flesh, blood, fur, and feathers.
\ I am always butchering monsters like these.
I tear them limb from limb.
\ Bringing death in brutal fashion.
Am I not a fitting piece of the scenery before me?" - observation_choices = list("I am a monster", "I am not a monster") - correct_choices = list("I am not a monster") - observation_success_message = "It is hard to live in the city.
\ - To pretend to be a civilized human when living in this manner.
\ - It is easy to give into the temptation of giving up all pretenses of humanity.
\ - But I do it because it is hard.
\ - ...
\ - I am not a monster.
\ - I will never become a monster." - observation_fail_message = "\"Do you wish to be so?\"
\ - \"Then it can be as you wish.\"
\ - ...
\ - Her voice is like sunshine.
\ - ...
\ - I am a monster.
" + observation_choices = list( + "I am not a monster" = list(TRUE, "It is hard to live in the city.
\ + To pretend to be a civilized human when living in this manner.
\ + It is easy to give into the temptation of giving up all pretenses of humanity.
\ + But I do it because it is hard.
\ + ...
\ + I am not a monster.
\ + I will never become a monster."), + "I am a monster" = list(FALSE, "\"Do you wish to be so?\"
\ + \"Then it can be as you wish.\"
\ + ...
\ + Her voice is like sunshine.
\ + ...
\ + I am a monster.
"), + ) //Work vars var/transform_timer diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/last_shot.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/last_shot.dm index 9a6efb684e8f..7220e9de395f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/last_shot.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/last_shot.dm @@ -38,16 +38,16 @@ GLOBAL_LIST_EMPTY(meat_list) \"You won't survive out there.
Every single day in this facility is a constant, unending battle.\"
\ \"The only way you'll survive is if you join me.
To serve L-Corp til your last breath.\"
\ A tendril of rotten meat is held out to you, beckoning for you to join it." - observation_choices = list("EMBRACE IT", "REJECT IT") - correct_choices = list("EMBRACE IT") - observation_success_message = "You grab onto the tendril. You can feel your flesh tingling.
\ - \"Good choice.\"
\ - \"Don't worry.
You won't regret this, you know?
This is the only path you had.\"
\ - \"You're dead meat out there.
Might as well accept who you are.\"" - observation_fail_message = "You slap the tendril away.
\ - \"Feh.
So be it.
You won't survive out there, you know?\"
\ - \"When there's nothing left of the staff but blood and gore, I'll remain.
Do you understand?\"
\ - You can't help but to shudder in disgust as you exit the cell.
Was it right? You'll never know." + observation_choices = list( + "EMBRACE IT" = list(TRUE, "You grab onto the tendril. You can feel your flesh tingling.
\ + \"Good choice.\"
\ + \"Don't worry.
You won't regret this, you know?
This is the only path you had.\"
\ + \"You're dead meat out there.
Might as well accept who you are.\""), + "REJECT IT" = list(FALSE, "You slap the tendril away.
\ + \"Feh.
So be it.
You won't survive out there, you know?\"
\ + \"When there's nothing left of the staff but blood and gore, I'll remain.
Do you understand?\"
\ + You can't help but to shudder in disgust as you exit the cell.
Was it right? You'll never know."), + ) var/list/gremlins = list() //For the meatballs var/list/meat = list() //For the floors diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/melting_love.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/melting_love.dm index b1f37dff8aa2..163a65634c16 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/melting_love.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/melting_love.dm @@ -52,11 +52,11 @@ observation_prompt = "The slime craves affection, it covers the cell's floor, walls and celing.
\ It clings to your clothes, your mask and your skin as you enter.
At the centre of the cell, where the deluge conglomerates most, is the facismile of a girl.
\ She waves at you shyly.
You..." - observation_choices = list("Retreat from the slime", "Reach out to her") - correct_choices = list("Retreat from the slime") - observation_success_message = "You retreat from the cell in a hurry, the slime clinging to you turns acidic. If she won't find affection from you, she'll find it another way..." - observation_fail_message = "You reach out your hand and she does the same, your fingers entwine with the slimy appendage and she giggles.
\"Let's be together forever.\"
\ - You pull your hand away, but it comes out with the slime.
You try to retreat, but you are already caught in her trap.
\"Don't betray me, okay?\"
Those are the last words you ever hear..." + observation_choices = list( + "Retreat from the slime" = list(TRUE, "You retreat from the cell in a hurry, the slime clinging to you turns acidic. If she won't find affection from you, she'll find it another way..."), + "Reach out to her" = list(FALSE, "You reach out your hand and she does the same, your fingers entwine with the slimy appendage and she giggles.
\"Let's be together forever.\"
\ + You pull your hand away, but it comes out with the slime.
You try to retreat, but you are already caught in her trap.
\"Don't betray me, okay?\"
Those are the last words you ever hear..."), + ) var/mob/living/carbon/human/gifted_human = null /// Amount of BLACK damage done to all enemies around main target on melee attack. Also includes original target @@ -100,16 +100,16 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/abnormality/melting_love/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/melting_love/AttackingTarget(atom/attacked_target) // Convert - if(ishuman(target)) - var/mob/living/carbon/human/H = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/H = attacked_target if(H.stat == DEAD || H.health <= HEALTH_THRESHOLD_DEAD) return SlimeConvert(H) // Consume a slime. Cannot work on the big one, so the check is not istype() - if(target.type == /mob/living/simple_animal/hostile/slime) - var/mob/living/simple_animal/hostile/slime/S = target + if(attacked_target.type == /mob/living/simple_animal/hostile/slime) + var/mob/living/simple_animal/hostile/slime/S = attacked_target visible_message(span_warning("[src] consumes \the [S], restoring its own health.")) . = ..() // We do a normal attack without AOE and then consume the slime to restore HP adjustBruteLoss(-maxHealth * 0.2) @@ -117,9 +117,9 @@ return . // AOE attack - if(isliving(target) || ismecha(target)) - new /obj/effect/gibspawner/generic/silent/melty_slime(get_turf(target)) - for(var/turf/open/T in view(1, target)) + if(isliving(attacked_target) || ismecha(attacked_target)) + new /obj/effect/gibspawner/generic/silent/melty_slime(get_turf(attacked_target)) + for(var/turf/open/T in view(1, attacked_target)) var/obj/effect/temp_visual/small_smoke/halfsecond/S = new(T) S.color = "#FF0081" var/list/got_hit = list() @@ -326,10 +326,10 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/slime/AttackingTarget() +/mob/living/simple_animal/hostile/slime/AttackingTarget(atom/attacked_target) // Convert - if(ishuman(target)) - var/mob/living/carbon/human/H = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/H = attacked_target if(H.stat == DEAD || H.health <= HEALTH_THRESHOLD_DEAD) return SlimeConvert(H) if(prob(statuschance)) diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/mountain.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/mountain.dm index 01ea0c958c0a..1135ab1462a5 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/mountain.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/mountain.dm @@ -49,10 +49,10 @@ observation_prompt = "It smells like death itself in its containment unit, the mound of rotted, half-purtefied flesh stares at you with its many faces.
\ Arms and legs bent at odd angles, entrails draped like lazy christmas decorations, innumerable limbs twisted and distorted into a sphere - all blanketed black with necrotic skin.
\ Yet the faces remain intact, pale from a lack of blood, but still as recognizable as they've always been.
They're smiling at you." - observation_choices = list("I recognize those faces", "I don't recognize them") - correct_choices = list("I recognize those faces") - observation_success_message = "From the mountain of bodies; the dead give their life to be something greater.
Why shouldn't they be smiling?
You should be smiling too." - observation_fail_message = "They're holding all the laughter of those who cannot be seen here.
The mounds begins to shamble, upon borrowed hands and feet, it has your scent now and it will never be satisfied." + observation_choices = list( + "I recognize those faces" = list(TRUE, "From the mountain of bodies; the dead give their life to be something greater.
Why shouldn't they be smiling?
You should be smiling too."), + "I don't recognize them" = list(FALSE, "They're holding all the laughter of those who cannot be seen here.
The mounds begins to shamble, upon borrowed hands and feet, it has your scent now and it will never be satisfied."), + ) /// Is user performing work hurt at the beginning? var/agent_hurt = FALSE @@ -120,16 +120,16 @@ return TRUE return FALSE -/mob/living/simple_animal/hostile/abnormality/mountain/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/mountain/AttackingTarget(atom/attacked_target) if(finishing) return FALSE if(phase >= 2) if(prob(35) && OpenFire()) return . = ..() - if(. && isliving(target)) - var/mob/living/L = target - if(isliving(target) && (L.health < 0 || L.stat == DEAD)) + if(. && isliving(attacked_target)) + var/mob/living/L = attacked_target + if(isliving(attacked_target) && (L.health < 0 || L.stat == DEAD)) finishing = TRUE if(phase == 3) icon_state = "mosb_bite2" diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/nihil.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/nihil.dm index 148b47f23906..097af62c51a3 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/nihil.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/nihil.dm @@ -37,10 +37,12 @@ observation_prompt = "I have no plans or destination. I'm too tired to fly.
With no one to guide me, and no path open to me.
It is my fate to play the fool.
\ Before I do, I turn to face the 4 Magical Girls.
Are they just like me, or am I just like them?" - observation_choices = list("They've become me", "I came to resemble them") - correct_choices = list("They've become me", "I came to resemble them") - observation_success_message = "It doesn't matter.
My choices do not matter.
\ - Nothing matters.
We will repeat this song and dance until the end of time.
I can only laugh at this pointless endeavor." + observation_choices = list( + "They've become me" = list(TRUE, "It doesn't matter.
My choices do not matter.
\ + Nothing matters.
We will repeat this song and dance until the end of time.
I can only laugh at this pointless endeavor."), + "I came to resemble them" = list(TRUE, "It doesn't matter.
My choices do not matter.
\ + Nothing matters.
We will repeat this song and dance until the end of time.
I can only laugh at this pointless endeavor."), + ) var/can_act = TRUE //Teleports diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/nobody_is.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/nobody_is.dm index 44703d2803a0..1aa61c419422 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/nobody_is.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/nobody_is.dm @@ -47,11 +47,11 @@ observation_prompt = "No matter where you walk to in the cell, the mirror is always facing you.
You trace a path around it but all you ever see is your own reflection.
\ \"It's not fair, why do you get to be you and not me?\"
Your reflection mutters, parroting your voice.
\"Why are you, you and not I? I could be you so much better than you can, just let me try.\"
\ Your reflection is holding out its hand, waiting for a handshake." - observation_choices = list("Shake their hand", "Turn away and leave") - correct_choices = list("Turn away and leave") - observation_success_message = "You make to exit the cell. \"Don't just leave me! I'm somebody, I'm real! I'm..! What's my name?! Just give me your name!\"
\ - You don't give your name to the imitation, the closer it starts to mirrors another, the more its mimicry becomes mockery." - observation_fail_message = "The you in the mirror smiles.
\"Just you wait, I'll show you what we can do.\"" + observation_choices = list( + "Turn away and leave" = list(TRUE, "You make to exit the cell. \"Don't just leave me! I'm somebody, I'm real! I'm..! What's my name?! Just give me your name!\"
\ + You don't give your name to the imitation, the closer it starts to mirrors another, the more its mimicry becomes mockery."), + "Shake their hand" = list(FALSE, "The you in the mirror smiles.
\"Just you wait, I'll show you what we can do.\""), + ) //Contained Variables var/reflect_timer @@ -625,8 +625,8 @@ for(var/i = 1 to 3) target_turf = get_step(target_turf, get_dir(get_turf(src), target_turf)) return WhipAttack(target_turf) - if(isliving(target)) - var/mob/living/L = target + if(isliving(attacked_target)) + var/mob/living/L = attacked_target if(L.health <= 0) if(ishuman(L)) var/mob/living/carbon/human/H = L diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/nothing_there.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/nothing_there.dm index 697aed7b31f4..dbcb2945a3c7 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/nothing_there.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/nothing_there.dm @@ -50,16 +50,16 @@ observation_prompt = "*Teeth grinding*
Incomprehensible sounds can be heard.
\ Its body was already broken long time ago.
\ The twisted mouth opens, the crushed down tongue undulates.
\"M-ma......man-ag......r.......\"
It's calling for the manager." - observation_choices = list("Approach it", "Ignore it") - correct_choices = list("Ignore it") - observation_success_message = "A chunk of flesh dropped from the mouth to the ground, depriving the abnormality an ability to talk.
\ - It's talking inside the body of an employee.
But it is not the employee who speaks.
\ - The sound of calling me.
Is nothing but an empty shell mimicking a dead person.
\ - How many employees would have suffered to this sound?
It keeps getting closer to human.
\ - It keeps trying.
However, as always, at the end, Nothing there." - observation_fail_message = "I think of people who were friends with this employee.
\ - Those eyes, shoulders, and every bit of muscle belong to someone else.
\ - It smiles.
No, it pretends to smile.
Who could be it?" + observation_choices = list( + "Ignore it" = list(TRUE, "A chunk of flesh dropped from the mouth to the ground, depriving the abnormality an ability to talk.
\ + It's talking inside the body of an employee.
But it is not the employee who speaks.
\ + The sound of calling me.
Is nothing but an empty shell mimicking a dead person.
\ + How many employees would have suffered to this sound?
It keeps getting closer to human.
\ + It keeps trying.
However, as always, at the end, Nothing there."), + "Approach it" = list(FALSE, "I think of people who were friends with this employee.
\ + Those eyes, shoulders, and every bit of muscle belong to someone else.
\ + It smiles.
No, it pretends to smile.
Who could be it?"), + ) var/mob/living/disguise = null var/saved_appearance diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/seasons.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/seasons.dm index b71ac42ce4a1..c7fef995a139 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/seasons.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/seasons.dm @@ -53,14 +53,14 @@ observation_prompt = "I'm standing outside a forest I both have never seen before, yet know well.
There is no City, no civilization on the horizon, I am utterly alone.
\ Dauntlessly, I press into the forest, seeing no other path forward, and encounter a cute-looking, pink forest spirit.
\ The spirits of the forest are playful, but it's best not to offend them by forgetting to make an offering" - observation_choices = list("Make an offering", "Continue on") - correct_choices = list("Make an offering") - observation_success_message = "I ask the spirit to lead me to an altar to make my offering and it leads me off a beaten path...
\ - It felt as though I had walked for miles and days, my clothes torn and skin pricked by brambles and thorns but finally we arrived.
\ - Before me is a skull-headed pagan God hanging ominously over its altar, fear grips my heart as the pink spirit leads me to lay down on the altar..." - observation_fail_message = "I pass by the spirit and hear it giggle ominously...
\ - ...
\ - In the end, I am never able to find a way out of the forest." + observation_choices = list( + "Make an offering" = list(TRUE, "I ask the spirit to lead me to an altar to make my offering and it leads me off a beaten path...
\ + It felt as though I had walked for miles and days, my clothes torn and skin pricked by brambles and thorns but finally we arrived.
\ + Before me is a skull-headed pagan God hanging ominously over its altar, fear grips my heart as the pink spirit leads me to lay down on the altar..."), + "Continue on" = list(FALSE, "I pass by the spirit and hear it giggle ominously...
\ + ...
\ + In the end, I am never able to find a way out of the forest."), + ) //Var Lists var/list/season_stats = list( @@ -348,8 +348,8 @@ return ConeAttack(target) if((slam_cooldown <= world.time) && prob(35)) return Slam() - if(ishuman(target)) - if(Finisher(target)) + if(ishuman(attacked_target)) + if(Finisher(attacked_target)) return return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/silent_orchestra.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/silent_orchestra.dm index f59c6b39bbe2..8784871ebd26 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/silent_orchestra.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/silent_orchestra.dm @@ -38,10 +38,10 @@ observation_prompt = "I was the conductor of Lobotomy Corporation, I put my everything into it.
\ Now, I conduct the song of apocalypse to make everything right.
As if he is about to start the performance, he stretches his arm.
\ The conductor, who thought he is the freest soul, was not free at all.
The performance ended.
I......." - observation_choices = list("Gave an applause.", "Did not give applause.") - correct_choices = list("Did not give applause.") - observation_success_message = "I am not worthy to give an applause yet.
The music replays.
Angelos, my movement." - observation_fail_message = "The performance never ends.
And Da Capo." + observation_choices = list( + "Did not give applause" = list(TRUE, "I am not worthy to give an applause yet.
The music replays.
Angelos, my movement."), + "Gave an applause" = list(FALSE, "The performance never ends.
And Da Capo."), + ) /// Range of the damage var/symphony_range = 20 diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/space_lady.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/space_lady.dm index 7bf0e34b9883..92b588dcb5e0 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/space_lady.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/space_lady.dm @@ -37,16 +37,15 @@ observation_prompt = "What touched this place cannot be quantified or understood by human science.
It was just a color out of space.
\ It exists on the border of our waking minds, where darkness and light are one, and time and space do not intersect.
She has a message, from another place, another time." - observation_choices = list("Hear the past", "Hear the present", "Hear the future") - correct_choices = list("Hear the past", "Hear the present", "Hear the future") - observation_success_message = "What I learned and saw during those two hideous days and nights, it is better not to tell." - //Extra correct answers - var/observation_success_message_2 = "A thousand years compressed into a day, a countably infinite number of people work, die and live in its corridors;
\ - the line between them and the monsters they keep gets blurrier and blurrier.
\ - A seed is about to sprout..." - var/observation_success_message_3 = "The Library is what the Bookhunters call it, a mystical place of life and death.
\ - Should you conquer its trials, they say, you can find the book that will grant the answers to whatever it is you seek.
\ - Black feathers and regret..." + observation_choices = list( + "Hear the past" = list(TRUE, "What I learned and saw during those two hideous days and nights, it is better not to tell."), + "Hear the present" = list(TRUE, "A thousand years compressed into a day, a countably infinite number of people work, die and live in its corridors;
\ + the line between them and the monsters they keep gets blurrier and blurrier.
\ + A seed is about to sprout..."), + "Hear the future" = list(TRUE, "The Library is what the Bookhunters call it, a mystical place of life and death.
\ + Should you conquer its trials, they say, you can find the book that will grant the answers to whatever it is you seek.
\ + Black feathers and regret..."), + ) var/explosion_timer = 2 SECONDS var/explosion_state = 3 @@ -54,16 +53,6 @@ var/can_act = TRUE var/negative_range = 10 -/mob/living/simple_animal/hostile/abnormality/space_lady/ObservationResult(mob/living/carbon/human/user, condition, answer) //special answers - switch(answer) - if("Hear the present") - observation_success_message = observation_success_message_2 - if("Hear the future") - observation_success_message = observation_success_message_3 - else - observation_success_message = initial(observation_success_message) - return ..() - //She can't move or attack. /mob/living/simple_animal/hostile/abnormality/space_lady/Move() if(!can_act) diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/staining_rose.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/staining_rose.dm index 543547368a77..3021d1820aa9 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/staining_rose.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/staining_rose.dm @@ -35,10 +35,10 @@ observation_prompt = "This isn't worth being called a sacrifice, is it?
I've always wanted to be a hero, but...
Even when I'm ordered forth to die a worthless death...
\ I find myself laughable for deciding to do it still.
I joined this company to save people.
If I can save the lives of those I love, I have no regrets." - observation_choices = list("100 paper roses") - correct_choices = list("100 paper roses") - observation_success_message = "I was the only one who could do it...
\ - ...
that's all." + observation_choices = list( + "100 paper roses" = list(TRUE, "I was the only one who could do it...
\ + ...
that's all."), + ) var/chosen var/list/sacrificed = list() diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/titania.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/titania.dm index 27ac02599073..61ac54db2a42 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/titania.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/titania.dm @@ -37,10 +37,11 @@ abnormality_origin = ABNORMALITY_ORIGIN_WONDERLAB observation_prompt = "Is that you Oberon?
My nemesis, my beloved devil.
Is it you, who applied the concotion of baneful herb to my eyes?" - observation_choices = list("I am the Oberon you seek", "I am not him", "Stay silent") - correct_choices = list("I am the Oberon you seek") - observation_success_message = "The abhorrent name of the one who stole my child.
By your death, I shall finally have my revenge." - observation_fail_message = "Ah...
A mere human, human, human.
Cease your fear, I shall rid you of your pains.
Be reborn as a flower." + observation_choices = list( + "I am the Oberon you seek" = list(TRUE, "The abhorrent name of the one who stole my child.
By your death, I shall finally have my revenge."), + "I am not him" = list(FALSE, "Ah...
A mere human, human, human.
Cease your fear, I shall rid you of your pains.
Be reborn as a flower."), + "Stay silent" = list(FALSE, "Ah...
A mere human, human, human.
Cease your fear, I shall rid you of your pains.
Be reborn as a flower."), + ) var/fairy_spawn_number = 2 var/fairy_spawn_time = 5 SECONDS @@ -77,10 +78,10 @@ return ..() //Attacking code -/mob/living/simple_animal/hostile/abnormality/titania/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/titania/AttackingTarget(atom/attacked_target) if(fused) return FALSE - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target //Kills the weak immediately. if(get_user_level(H) < 4 && (ishuman(H))) say("I rid you of your pain, mere human.") diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/white_night.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/white_night.dm index 0cbd36d1f7d0..0990bd290a45 100644 --- a/code/modules/mob/living/simple_animal/abnormality/aleph/white_night.dm +++ b/code/modules/mob/living/simple_animal/abnormality/aleph/white_night.dm @@ -54,10 +54,11 @@ GLOBAL_LIST_EMPTY(apostles) observation_prompt = "Thou knocked the door, now it hath opened.
\ Thou who carries burden, came to seek the answer." - observation_choices = list("Who are you?", "Where did you come from?", "Why have you come?") - correct_choices = list("Where did you come from?") - observation_success_message = "I am from the end." //TODO: multiple messages, the answer should be irrelevant, code should check for wing gift. - observation_fail_message = "Thy question is empty, I cannot answer" + observation_choices = list( // TODO IN A FEW YEARS: multiple messages, the answer should be irrelevant, code should check for wing gift. + "Where did you come from?" = list(TRUE, "I am from the end." ), + "Who are you?" = list(FALSE, "Thy question is empty, I cannot answer"), + "Why have you come?" = list(FALSE, "Thy question is empty, I cannot answer"), + ) var/holy_revival_cooldown var/holy_revival_cooldown_base = 75 SECONDS @@ -310,16 +311,16 @@ GLOBAL_LIST_EMPTY(apostles) return FALSE return ..() -/mob/living/simple_animal/hostile/apostle/AttackingTarget() +/mob/living/simple_animal/hostile/apostle/AttackingTarget(atom/attacked_target) if(!can_act) return - if(isliving(target)) - var/mob/living/L = target + if(isliving(attacked_target)) + var/mob/living/L = attacked_target if(faction_check_mob(L)) return . = ..() - if(. && isliving(target)) + if(. && isliving(attacked_target)) if(!client && ranged && ranged_cooldown <= world.time) OpenFire() diff --git a/code/modules/mob/living/simple_animal/abnormality/final_observations.dm b/code/modules/mob/living/simple_animal/abnormality/final_observations.dm index 644bc23b0e08..bf6253461cd8 100644 --- a/code/modules/mob/living/simple_animal/abnormality/final_observations.dm +++ b/code/modules/mob/living/simple_animal/abnormality/final_observations.dm @@ -61,9 +61,9 @@ playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) var/dat = {"
[message]

"} var/menu_width = 200 - for(var/i in 1 to buttons.len) + for(var/i in 1 to length(buttons)) menu_width += 150 - switch(buttons.len) + switch(length(buttons)) if(1) dat += {"[buttons[i]]"} if(2) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/KHz.dm b/code/modules/mob/living/simple_animal/abnormality/he/KHz.dm index 72f0f11cbf53..995466a98a6d 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/KHz.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/KHz.dm @@ -36,17 +36,17 @@ \"Sierra... Oscar... Sierra...\"
\ What could this callsign mean?
\ Are you in danger, or is someone else?
What will you do?" - observation_choices = list("Tune your radio to 680 KHz", "Ignore it") - correct_choices = list("Tune your radio to 680 KHz") - observation_success_message = "Suddenly, you hear something from your radio, clear as day.
\ - \"We hear you loud and clear.\"
\ - \"You've done a great service.\"
\ - The operator on the other end continues babbling, completely obscured by the returning static.
\ - However, it seems you somehow managed solve their problem somehow." - observation_fail_message = "You turn off your radio and leave the room.
\ - All abnormalities are dangerous, right?
\ - This cry for help could just be a trick to make you let your guard down.
\ - If there is anyone really out there, they are going to have to fend for themselves." + observation_choices = list( + "Tune your radio to 680 KHz" = list(TRUE, "Suddenly, you hear something from your radio, clear as day.
\ + \"We hear you loud and clear.\"
\ + \"You've done a great service.\"
\ + The operator on the other end continues babbling, completely obscured by the returning static.
\ + However, it seems you somehow managed solve their problem somehow."), + "Ignore it" = list(FALSE, "You turn off your radio and leave the room.
\ + All abnormalities are dangerous, right?
\ + This cry for help could just be a trick to make you let your guard down.
\ + If there is anyone really out there, they are going to have to fend for themselves."), + ) var/input var/bitposition = 4 //You write in bits. You need to successfully write a string of 5 to sucessfully work diff --git a/code/modules/mob/living/simple_animal/abnormality/he/KQE.dm b/code/modules/mob/living/simple_animal/abnormality/he/KQE.dm index 8aa0d6923b9b..c2a38ab4f8bb 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/KQE.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/KQE.dm @@ -58,17 +58,17 @@ Is that leakage antifreeze, or blood?
\ While you were wondering, the terminal on its chest flashed to life.
\ Looks like you can write something." - observation_choices = list("Hello", "Goodbye") - correct_choices = list("Hello") - observation_success_message = "The robot lifts both arms with some struggle.
\ - The terminal prints out its words:
\ -
\ - A smile is displayed on the terminal,
\ - but in the robot’s gestures, you feel a plea for help." - observation_fail_message = "The terminal’s light goes red, and warnings start to blare.
\ - The robot shakes intensely as if in pain.
\ - Farewell,
FarewellFarewellFarewellFarewellFarewellFarewellFarewellFarewellFarewell>" + observation_choices = list( + "Hello" = list(TRUE, "The robot lifts both arms with some struggle.
\ + The terminal prints out its words:
\ +
\ + A smile is displayed on the terminal,
\ + but in the robot’s gestures, you feel a plea for help."), + "Goodbye" = list(FALSE, "The terminal’s light goes red, and warnings start to blare.
\ + The robot shakes intensely as if in pain.
\ + Farewell,
FarewellFarewellFarewellFarewellFarewellFarewellFarewellFarewellFarewell>"), + ) var/can_act = TRUE var/grab_cooldown @@ -218,7 +218,7 @@ if(!can_act) return FALSE if ((grab_cooldown <= world.time) && prob(35) && (!client))//checks for client since you can still use the claw if you click nearby - var/turf/target_turf = get_turf(target) + var/turf/target_turf = get_turf(attacked_target) return ClawGrab(target_turf) return Whip_Attack() diff --git a/code/modules/mob/living/simple_animal/abnormality/he/ardor_blossom_moth.dm b/code/modules/mob/living/simple_animal/abnormality/he/ardor_blossom_moth.dm index 7fe79a3374cc..39ea7bfee4dd 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/ardor_blossom_moth.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/ardor_blossom_moth.dm @@ -9,6 +9,7 @@ portrait = "blossom_moth" maxHealth = 1200 health = 1200 + blood_volume = 0 ranged = TRUE attack_verb_continuous = "sears" attack_verb_simple = "sear" @@ -47,18 +48,18 @@ The lights flutter and dance in the air, creating a haze.
\ Something is burning to death within.
\ Would you be scorched as well if the flames touched you?" - observation_choices = list("Turn around", "Reach out") - correct_choices = list("Reach out") - observation_success_message = "Enchanted by the haze, you extend a finger,
\ - waiting for one of the lights to land.
\ - A glimmering ball gently perches on your digit.
\ - Then, a fire engulfs it.
\ - Another glow attaches to your body, then four, then eight.
\ - They multiply until you have been entirely shrouded in light." - observation_fail_message = "Resisting the temptation to reach out,
\ - you decide it’s better to stay away from such dubious warmth.
\ - You feel a cold wave crawl up your spine in an instant, but it may be the right choice.
\ - Even children know not to play with fire." + observation_choices = list( + "Reach out" = list(TRUE, "Enchanted by the haze, you extend a finger,
\ + waiting for one of the lights to land.
\ + A glimmering ball gently perches on your digit.
\ + Then, a fire engulfs it.
\ + Another glow attaches to your body, then four, then eight.
\ + They multiply until you have been entirely shrouded in light."), + "Turn around" = list(FALSE, "Resisting the temptation to reach out,
\ + you decide it’s better to stay away from such dubious warmth.
\ + You feel a cold wave crawl up your spine in an instant, but it may be the right choice.
\ + Even children know not to play with fire."), + ) var/stoked @@ -87,6 +88,8 @@ qdel(floor_fire) new /obj/structure/turf_fire(T) +/mob/living/simple_animal/hostile/abnormality/ardor_moth/spawn_gibs() + return new /obj/effect/decal/cleanable/ash(drop_location(), src) // Turf Fire /obj/structure/turf_fire diff --git a/code/modules/mob/living/simple_animal/abnormality/he/basilisoup.dm b/code/modules/mob/living/simple_animal/abnormality/he/basilisoup.dm index ce7db6feeaea..ddb350595253 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/basilisoup.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/basilisoup.dm @@ -44,10 +44,10 @@ abnormality_origin = ABNORMALITY_ORIGIN_LIMBUS observation_prompt = "In front of me is a brass soup cauldron with a wooden ladle, I look inside the pot and see only water and a singular stone, boiling over an open fire." - observation_choices = list("Taste the soup", "Knock it over") - correct_choices = list("Taste the soup") - observation_success_message = "I take the ladle and sip the contents, the taste is indescribably good. It truly is magic." - observation_fail_message = "The contents put out the flames as the pot tumbles the floor, water and a singular stone coat the floor. Soup from a stone? Ridiculous." + observation_choices = list( + "Taste the soup" = list(TRUE, "I take the ladle and sip the contents, the taste is indescribably good. It truly is magic."), + "Knock it over" = list(FALSE, "The contents put out the flames as the pot tumbles the floor, water and a singular stone coat the floor. Soup from a stone? Ridiculous."), + ) var/spit_cooldown var/spit_cooldown_time = 12 SECONDS @@ -159,11 +159,11 @@ density = TRUE mouse_opacity = MOUSE_OPACITY_ICON -/mob/living/simple_animal/hostile/abnormality/basilisoup/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/basilisoup/AttackingTarget(atom/attacked_target) if(!can_act) return - if(ishuman(target)) - var/mob/living/carbon/human/H = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/H = attacked_target if(H.nutrition >= NUTRITION_LEVEL_FAT) playsound(get_turf(src), 'sound/abnormalities/bigbird/bite.ogg', 50, 1, 2) H.gib() diff --git a/code/modules/mob/living/simple_animal/abnormality/he/better_memories.dm b/code/modules/mob/living/simple_animal/abnormality/he/better_memories.dm index f9975364db14..4c90b4d99f2e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/better_memories.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/better_memories.dm @@ -38,11 +38,11 @@ observation_prompt = "In the pile around the abnormality, you find a old card.
You almost forgot about them.
\ A pink light grows and you feel a tug on your memory." - observation_choices = list("Let go", "Hold on") - correct_choices = list("Let go") - observation_success_message = "You let go of the memory forever.
You look forward to the day you can make a memory like that again." - observation_fail_message = "You pull the letter back from the pink light inside the abnormality's gate.
\ - The memory becomes more and more vivid as if its happening now...
when you finally break free you cannot recall what you fought so hard for." + observation_choices = list( + "Let go" = list(TRUE, "You let go of the memory forever.
You look forward to the day you can make a memory like that again."), + "Hold on" = list(FALSE, "You pull the letter back from the pink light inside the abnormality's gate.
\ + The memory becomes more and more vivid as if its happening now...
when you finally break free you cannot recall what you fought so hard for."), + ) var/minions = 0 @@ -203,12 +203,12 @@ if(target_memory[the_target] <= 100) return FALSE -/mob/living/simple_animal/hostile/better_memories_minion/AttackingTarget() +/mob/living/simple_animal/hostile/better_memories_minion/AttackingTarget(atom/attacked_target) if(!can_act) return FALSE if(!client) - if(ishuman(target)) - var/mob/living/carbon/human/H = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/H = attacked_target /* Dont jab those standing still for their picture. Death is not our goal */ diff --git a/code/modules/mob/living/simple_animal/abnormality/he/blue_shepherd.dm b/code/modules/mob/living/simple_animal/abnormality/he/blue_shepherd.dm index 62fdef761037..8fd1263f5a06 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/blue_shepherd.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/blue_shepherd.dm @@ -55,11 +55,11 @@ observation_prompt = "Got nothing better to do than to watch me? Anyway, while I'm lazing around...
\ The wolf is coming down the hill.
I'm the only one who can stop it, if you let me out I'll save you from the Wolf.
\ So, how about it?" - observation_choices = list("Release him", "You're a liar") - correct_choices = list("You're a liar") - observation_success_message = "Hmph. Sad ain't it? It only waits for me, I'm free to abandon it all I wish.
\ - Lifeless things like that mutt and I don't deserve love but it'll wait for me all the same.
Does anyone wait for you?" - observation_fail_message = "Good choice, don't worry about the rest - I won't hurt them, pinky swear." + observation_choices = list( + "You're a liar" = list(TRUE, "Hmph. Sad ain't it? It only waits for me, I'm free to abandon it all I wish.
\ + Lifeless things like that mutt and I don't deserve love but it'll wait for me all the same.
Does anyone wait for you?"), + "Release him" = list(FALSE, "Good choice, don't worry about the rest - I won't hurt them, pinky swear."), + ) var/death_counter //He won't go off a timer, he'll go off deaths. Takes 8 for him. var/slash_current = 4 @@ -205,12 +205,12 @@ hired = FALSE return ..() -/mob/living/simple_animal/hostile/abnormality/blue_shepherd/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/blue_shepherd/AttackingTarget(atom/attacked_target) . = ..() if(client) switch(chosen_attack) if(1) - if(isliving(target)) + if(isliving(attacked_target)) slash_current-=1 return OpenFire() if(2) @@ -224,7 +224,7 @@ slashing = TRUE slash() if(awakened_buddy) - awakened_buddy.GiveTarget(target) + awakened_buddy.GiveTarget(attacked_target) /mob/living/simple_animal/hostile/abnormality/blue_shepherd/OpenFire() if(slash_current == 0) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/der_freischutz.dm b/code/modules/mob/living/simple_animal/abnormality/he/der_freischutz.dm index 3c4f8946c466..287708da1645 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/der_freischutz.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/der_freischutz.dm @@ -38,11 +38,11 @@ observation_prompt = "Before you stands a man with an ornate rifle.
\ \"My bullets never miss, whatever I take aim at will have its head pierced true by the inevitability of my bullets.
\ If you have a target, you only need to make the payment.\"" - observation_choices = list("Pay for his services", "Don't pay") - correct_choices = list("Pay for his services") - observation_success_message = "True to his word, the marksman racks a bullet into his rifle, takes aim and fires at your target, piercing their head, but it travels on.
\ - Piercing the heads of others, forever." - observation_fail_message = "The man scowls.
\"Don't waste my time with such shaky conviction.\"" + observation_choices = list( + "Pay for his services" = list(TRUE, "True to his word, the marksman racks a bullet into his rifle, takes aim and fires at your target, piercing their head, but it travels on.
\ + Piercing the heads of others, forever."), + "Don't pay" = list(FALSE, "The man scowls.
\"Don't waste my time with such shaky conviction.\""), + ) var/can_act = TRUE var/bullet_cooldown diff --git a/code/modules/mob/living/simple_animal/abnormality/he/doomsday_calendar.dm b/code/modules/mob/living/simple_animal/abnormality/he/doomsday_calendar.dm index acc1dcd9d956..a9498b68d240 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/doomsday_calendar.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/doomsday_calendar.dm @@ -47,11 +47,11 @@ observation_prompt = "I'm standing before an altar on top of an impossibly long flight of stairs, the sky is crimson red and the heat from the air licks at my skin painfully.
The world is ending.
\ On the altar is a tied and bound man with a clay mask on his head, he squirms and is clearly crying but I cannot hear his words.
\ In my hand is a dagger.
I know what I have to do." - observation_choices = list("Plunge the dagger into his chest", "Cut his bindings") - correct_choices = list("Plunge the dagger into his chest") - observation_success_message = "I'm laying on an altar, a heavy clay mask is on my head, my arms and legs are tied with thick rope and the air is hot enough to scald my skin.
\ - I see the priest through the pinholes of the mask and plead for him to spare me, before I feel cold metal plunge into my chest." - observation_fail_message = "I cut the man free and he thanks me profusely before he speeds down the stairs.
He won't make it.
I close my eyes and accept the end." + observation_choices = list( + "Plunge the dagger into his chest" = list(TRUE, "I'm laying on an altar, a heavy clay mask is on my head, my arms and legs are tied with thick rope and the air is hot enough to scald my skin.
\ + I see the priest through the pinholes of the mask and plead for him to spare me, before I feel cold metal plunge into my chest."), + "Cut his bindings" = list(FALSE, "I cut the man free and he thanks me profusely before he speeds down the stairs.
He won't make it.
I close my eyes and accept the end."), + ) var/player_count var/other_works_maximum diff --git a/code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm b/code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm index 8edc2fd37fd5..43160193074f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/drifting_fox.dm @@ -55,20 +55,20 @@ The umbrellas jiggled. It belongs to someone who was assigned to work on \"Eris\", not too long ago.
\ \"Not hungry? Perhaps you'd like to visit my boudoir?\"
\ Vile, disgusting.
I want to get out of here." - observation_choices = list("Accept her proposal", "Run") - correct_choices = list("Run") - observation_success_message = "I get up from the table, make an excuse, and bolt for the door as fast as I can.
\ - Surprisingly, it's not locked.
I hear the imitation of a young woman's voice on my way out.
\ - \"Come back soon, sweetie!\"
\"You're always invited to dinner, and i'll be sure to serve you one day!\"" - observation_fail_message = "How bad can it be?
I follow Eris as she leads me into a room.
\ - Hours later, Eris dines with another stranger.
My head is resting on that very same plate." + observation_choices = list( + "Run" = list(TRUE, "I get up from the table, make an excuse, and bolt for the door as fast as I can.
\ + Surprisingly, it's not locked.
I hear the imitation of a young woman's voice on my way out.
\ + \"Come back soon, sweetie!\"
\"You're always invited to dinner, and i'll be sure to serve you one day!\""), + "Accept her proposal" = list(FALSE, "How bad can it be?
I follow Eris as she leads me into a room.
\ + Hours later, Eris dines with another stranger.
My head is resting on that very same plate."), + ) var/girlboss_level = 0 var/can_heal = TRUE @@ -127,10 +127,10 @@ return FALSE /mob/living/simple_animal/hostile/abnormality/eris/AttackingTarget(atom/attacked_target) - if(ishuman(target)) - var/mob/living/H = target + if(ishuman(attacked_target)) + var/mob/living/H = attacked_target if(H.stat >= SOFT_CRIT) - Dine(target) + Dine(attacked_target) return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/he/fan.dm b/code/modules/mob/living/simple_animal/abnormality/he/fan.dm index cfd7e649c539..860ddbb56832 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/fan.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/fan.dm @@ -29,13 +29,12 @@ observation_prompt = "It's an ordinary office fan, made of metal.
It's turned off for now and you're feeling warm.
\ Turn it on?" - observation_choices = list("Leave it off", "Set it to 1", "Set it to 2", "Set it to 3") //Waiting for multiple answers - correct_choices = list("Set it to 3") - observation_success_message = "You set it to its highest setting.
The breeze feels pleasant, a nap would be nice..." - observation_fail_message = "It's just an old urban legend, but, they say fans like this one can kill people if you slept with them on..." - //extra wrong answers - var/observation_fail_message_2 = "It's not enough, you're still too hot!" - var/observation_fail_message_3 = "You can barely feel a breeze, you just need a little more..." + observation_choices = list( + "Set it to 3" = list(TRUE, "You set it to its highest setting.
The breeze feels pleasant, a nap would be nice..."), + "Leave it off" = list(FALSE, "It's just an old urban legend, but, they say fans like this one can kill people if you slept with them on..."), + "Set it to 1" = list(FALSE, "It's not enough, you're still too hot!"), + "Set it to 2" = list(FALSE, "You can barely feel a breeze, you just need a little more..."), + ) var/list/safe = list() var/list/warning = list() @@ -45,16 +44,6 @@ var/successcount var/turned_off = FALSE -/mob/living/simple_animal/hostile/abnormality/fan/ObservationResult(mob/living/carbon/human/user, condition, answer) //special answers - switch(answer) - if("Set it to 1") - observation_fail_message = observation_fail_message_2 - if("Set it to 2") - observation_fail_message = observation_fail_message_3 - else - observation_fail_message = initial(observation_success_message) - return ..() - /mob/living/simple_animal/hostile/abnormality/fan/examine(mob/user) . = ..() if(turned_off) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/funeral.dm b/code/modules/mob/living/simple_animal/abnormality/he/funeral.dm index 22579ba67f24..bec5674e7fdb 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/funeral.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/funeral.dm @@ -9,6 +9,7 @@ del_on_death = FALSE maxHealth = 1350 //I am a menace to society. health = 1350 + blood_volume = 0 ranged = TRUE minimum_distance = 2 @@ -47,19 +48,18 @@ observation_prompt = "A tall butterfly-faced man stands before, clad in an undertakers's garment.
\ Between the two of you is a coffin and he gestures you towards it with all 3 of his hands." - observation_choices = list("Enter the coffin", "Don't enter the coffin") - correct_choices = list("Enter the coffin", "Don't enter the coffin") - observation_success_message = "You lie down in the coffin as the butterfly-faced man stands by, his head angled and all 3 hands crossed together over his waist in a solemn gesture.
\ - It's a perfect fit for you.
\ - You feel the weight of innumerable lifetimes and the weariness that came with them.
\ - The butterflies lift you and the coffin as pallbearers, they lament for you in place of the people who cannot." - //Special answer for choice 2 - var/observation_success_message_2 = "You don't enter because it's not your coffin.
\ - The undertaker reaches out his middle hand to his waiting, insectile audience and one of the butterflies lands upon his fingers.
\ - He offers you the butterfly and you place it into the coffin, gently.
\ - The butterflies are the souls of the dead, waiting to be put to rest, but are still mourning for the living.
\ - You and the butterfly-faced man stand in silent vigil. You both now share a vow; to grieve for the living and dead.
\ - A kaledioscope of butterflies follows you as you leave the containment unit." + observation_choices = list( + "Enter the coffin" = list(TRUE, "You lie down in the coffin as the butterfly-faced man stands by, his head angled and all 3 hands crossed together over his waist in a solemn gesture.
\ + It's a perfect fit for you.
\ + You feel the weight of innumerable lifetimes and the weariness that came with them.
\ + The butterflies lift you and the coffin as pallbearers, they lament for you in place of the people who cannot."), + "Don't enter the coffin" = list(TRUE, "You don't enter because it's not your coffin.
\ + The undertaker reaches out his middle hand to his waiting, insectile audience and one of the butterflies lands upon his fingers.
\ + He offers you the butterfly and you place it into the coffin, gently.
\ + The butterflies are the souls of the dead, waiting to be put to rest, but are still mourning for the living.
\ + You and the butterfly-faced man stand in silent vigil. You both now share a vow; to grieve for the living and dead.
\ + A kaledioscope of butterflies follows you as you leave the containment unit."), + ) var/gun_cooldown var/gun_cooldown_time = 4 SECONDS @@ -85,13 +85,6 @@ toggle_message = span_colossus("You will now fire butterflies from your hands.") button_icon_toggle_deactivated = "funeral_toggle0" -/mob/living/simple_animal/hostile/abnormality/funeral/ObservationResult(mob/living/carbon/human/user, condition, answer) //special answer for cake result - if(answer == "Don't enter the coffin") - observation_success_message = observation_success_message_2 - else - observation_success_message = initial(observation_success_message) - return ..() - /mob/living/simple_animal/hostile/abnormality/funeral/AttackingTarget(atom/attacked_target) return OpenFire() diff --git a/code/modules/mob/living/simple_animal/abnormality/he/galaxy_child.dm b/code/modules/mob/living/simple_animal/abnormality/he/galaxy_child.dm index 095b60e7985d..f97dff0f18ab 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/galaxy_child.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/galaxy_child.dm @@ -31,12 +31,12 @@ observation_prompt = "You entered the containment chamber.
\ A child is standing there.
\"I know who you are.\"
\ \"Of course.
We were born from each other.\"
You decided to......." - observation_choices = list("Stay", "Exit the chamber") - correct_choices = list("Exit the chamber") - observation_success_message = "You turned your back to the child and walked out.
\ - The pebble in your hands sparkles sways, and tickles.
It becomes the universe.
\ - \"Goodbye.
I hope you never come back.\"
As the child bid the cold farewell, he was smiling." - observation_fail_message = "\"Will you stay here with me?\"
\"If you won't, I don't need you.\"" + observation_choices = list( + "Exit the chamber" = list(TRUE, "You turned your back to the child and walked out.
\ + The pebble in your hands sparkles sways, and tickles.
It becomes the universe.
\ + \"Goodbye.
I hope you never come back.\"
As the child bid the cold farewell, he was smiling."), + "Stay" = list(FALSE, "\"Will you stay here with me?\"
\"If you won't, I don't need you.\""), + ) var/heal_cooldown_time = 2 SECONDS var/heal_cooldown diff --git a/code/modules/mob/living/simple_animal/abnormality/he/golden_false_apple.dm b/code/modules/mob/living/simple_animal/abnormality/he/golden_false_apple.dm index 0c88973c76f9..a615a31ce644 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/golden_false_apple.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/golden_false_apple.dm @@ -77,12 +77,12 @@ observation_prompt = "A giant, glistening golden apple stands before you.
\ Radiant, shining, and pure.
There is a tempting crack in it, what could possibly be inside?" - observation_choices = list("Slice it open", "Destroy it") - correct_choices = list("Destroy it") - observation_success_message = "You put the golden apple to the torch.
You hear a sickening pops and sizzling as the swarm of maggots inside begins to burn and scatter.
\ - The mass of maggots falls apart in a hail of silent screams." - observation_fail_message = "You slice open the apple, and a tidal wave of disgusting maggots bursts out.
\ - You are swept in the tide.
Your flesh is riddled with wounds as they slowly devour you." + observation_choices = list( + "Destroy it" = list(TRUE, "You put the golden apple to the torch.
You hear a sickening pops and sizzling as the swarm of maggots inside begins to burn and scatter.
\ + The mass of maggots falls apart in a hail of silent screams."), + "Slice it open" = list(FALSE, "You slice open the apple, and a tidal wave of disgusting maggots bursts out.
\ + You are swept in the tide.
Your flesh is riddled with wounds as they slowly devour you."), + ) var/is_maggot = FALSE var/can_act = TRUE @@ -294,13 +294,13 @@ is_maggot = TRUE ChangeMoveToDelayBy(-1) -/mob/living/simple_animal/hostile/abnormality/golden_apple/AttackingTarget()//regular attacks or AOE. Determines the outcome for both players and the AI behavior +/mob/living/simple_animal/hostile/abnormality/golden_apple/AttackingTarget(atom/attacked_target)//regular attacks or AOE. Determines the outcome for both players and the AI behavior if(!can_act) return FALSE if(!is_maggot)//Is it still in the first form? Start building sheen pulses if(pulse_count < pulse_maximum) - if(isliving(target)) - var/mob/living/hit = target + if(isliving(attacked_target)) + var/mob/living/hit = attacked_target if((hit.stat == DEAD) ||!ishuman(hit))//if the target is dead or not human return ..() if(istype(target, /mob/living/carbon/human/species/pinocchio)) @@ -319,12 +319,12 @@ if(client && smash_cooldown < world.time)//playable behavior is nested under here switch(chosen_attack) if(1) - Smash(target) + Smash(attacked_target) if(2) - Smash(target, wide = FALSE) + Smash(attacked_target, wide = FALSE) return if(prob(50) && (smash_cooldown < world.time))//AI behavior goes here - Smash(target, wide = pick(TRUE, FALSE)) + Smash(attacked_target, wide = pick(TRUE, FALSE)) return return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/he/happy_teddy_bear.dm b/code/modules/mob/living/simple_animal/abnormality/he/happy_teddy_bear.dm index 06ebd8c9da67..81db9a187aa3 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/happy_teddy_bear.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/happy_teddy_bear.dm @@ -35,11 +35,11 @@ observation_prompt = "Here lies a piece of rubbish, a teddy bear.
Its wool sticks out here and there.
\ The amount of dust piled up on it tells how long this teddy has been abandoned.
One of the buttons, which are eyes, is hanging loose." - observation_choices = list("Leave it alone", "Take the button off") - correct_choices = list("Take the button off") - observation_success_message = "You took the button off.
It was disturbing for some reason.
The button is old and rotten and makes you uncomfortable.
\ - You replace the button with one off your suit with great care.
While the teddy looks awkward because of the mismatching buttons, it adds to its charm." - observation_fail_message = "You don't know what to do with it so you just left it alone.
The teddy sits there without any movement." + observation_choices = list( + "Take the button off" = list(TRUE, "You took the button off.
It was disturbing for some reason.
The button is old and rotten and makes you uncomfortable.
\ + You replace the button with one off your suit with great care.
While the teddy looks awkward because of the mismatching buttons, it adds to its charm."), + "Leave it alone" = list(FALSE, "You don't know what to do with it so you just left it alone.
The teddy sits there without any movement."), + ) /// if the same person works on Happy Teddy Bear twice in a row, the person will die unless certain requirements are met. var/last_worker = null diff --git a/code/modules/mob/living/simple_animal/abnormality/he/headless_ichthys.dm b/code/modules/mob/living/simple_animal/abnormality/he/headless_ichthys.dm index eae81b66db8f..e85c6efb1559 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/headless_ichthys.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/headless_ichthys.dm @@ -45,12 +45,12 @@ observation_prompt = "Deep, deep, at the bottom of the sea, a creature lies, dreaming.
\ It seems to be holding on to a sack of fluid.
What will you do?" - observation_choices = list("Try and swim away", "Puncture the sack") - correct_choices = list("Try and swim away") - observation_success_message = "You swim upwards, hoping it doesn't notice you.
\ - Surprisingly, after a few seconds you break the water's surface and make your escape.
You find a trinket in your pocket." - observation_fail_message = "You cannot get close enough, the water slows your movements.
\ - The creature notices you, and prepares an attack.
It is impossible to evade, and you are torn to shreds." + observation_choices = list( + "Try and swim away" = list(TRUE, "You swim upwards, hoping it doesn't notice you.
\ + Surprisingly, after a few seconds you break the water's surface and make your escape.
You find a trinket in your pocket."), + "Puncture the sack" = list(FALSE, "You cannot get close enough, the water slows your movements.
\ + The creature notices you, and prepares an attack.
It is impossible to evade, and you are torn to shreds."), + ) var/can_act = TRUE var/jump_cooldown = 0 @@ -189,14 +189,14 @@ can_act = TRUE // Breach Stuff -/mob/living/simple_animal/hostile/abnormality/headless_ichthys/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/headless_ichthys/AttackingTarget(atom/attacked_target) if(!can_act) return if(jump_cooldown <= world.time && prob(10) && !client) - IchthysJump(target) + IchthysJump(attacked_target) return if(cannon_cooldown <= world.time && prob(5) && !client) - BloodCannon(target) + BloodCannon(attacked_target) return return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/he/helper.dm b/code/modules/mob/living/simple_animal/abnormality/he/helper.dm index db599e2cff4d..1dce0f740d9a 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/helper.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/helper.dm @@ -14,6 +14,7 @@ death_message = "falls to the ground, deactivating." maxHealth = 1000 health = 1000 + blood_volume = 0 rapid_melee = 4 ranged = TRUE attack_verb_continuous = "slashes" @@ -53,11 +54,11 @@ ) observation_prompt = "Is fun to clean. I was..." - observation_choices = list("You are special") - correct_choices = list("You are special") - observation_success_message = "There were many friends who looked like me.
I was special.
\ - My creator always said to me.
\"You have to be sent to her. You are special.
You can give them a very special present.\"
\ - Numbers of tools, which were devoid of for my friends, were put into me.
When I was sent to a new home, I gave them a present." + observation_choices = list( + "You are special" = list(TRUE, "There were many friends who looked like me.
I was special.
\ + My creator always said to me.
\"You have to be sent to her. You are special.
You can give them a very special present.\"
\ + Numbers of tools, which were devoid of for my friends, were put into me.
When I was sent to a new home, I gave them a present."), + ) var/charging = FALSE var/dash_num = 50 diff --git a/code/modules/mob/living/simple_animal/abnormality/he/highway_devotee.dm b/code/modules/mob/living/simple_animal/abnormality/he/highway_devotee.dm index f10a2c18fd2e..1179b21395f8 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/highway_devotee.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/highway_devotee.dm @@ -39,17 +39,17 @@ \"This is a one-way road. No U-turns.\"
\ \"If you take this road, it'll take ages to come back here.\"
\ As the person claims, the road seems to be stretched almost endlessly into the distance." - observation_choices = list("Go back the way you came instead of taking the main road", "Take the byway instead of taking the main road") - correct_choices = list("Go back the way you came instead of taking the main road") - observation_success_message = "\"The road might seem vacant right now, but take it for a bit and you'll see.
That the road is jam-packed with cars, and you'd be slowed to a crawl.\"
\ - \"Turning around is not an option, either. There would be a car right behind you by the time you decide to go back.\"
\ - \"You made the right choice.\"
\ - It lightly smiled.
\ - The sign was still held high for whoever might enter this highway in the future." - observation_fail_message = "\"Not a good choice.\"
\ - \"Everyone is following the same rules to traverse this road. In any case, this highway is for everyone.\"
\ - \"I assure you, the god of traffic won't forgive cheap shortcuts like that.\"
\ - As you take the byway, you endured the piercing glare on your back for a good while." + observation_choices = list( + "Go back the way you came instead of taking the main road" = list(TRUE, "\"The road might seem vacant right now, but take it for a bit and you'll see.
That the road is jam-packed with cars, and you'd be slowed to a crawl.\"
\ + \"Turning around is not an option, either. There would be a car right behind you by the time you decide to go back.\"
\ + \"You made the right choice.\"
\ + It lightly smiled.
\ + The sign was still held high for whoever might enter this highway in the future."), + "Take the byway instead of taking the main road" = list(FALSE, "\"Not a good choice.\"
\ + \"Everyone is following the same rules to traverse this road. In any case, this highway is for everyone.\"
\ + \"I assure you, the god of traffic won't forgive cheap shortcuts like that.\"
\ + As you take the byway, you endured the piercing glare on your back for a good while."), + ) var/talk = FALSE var/list/structures = list() diff --git a/code/modules/mob/living/simple_animal/abnormality/he/jangsan.dm b/code/modules/mob/living/simple_animal/abnormality/he/jangsan.dm index c5d138cc532f..ab7e8dcba21c 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/jangsan.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/jangsan.dm @@ -46,13 +46,13 @@ observation_prompt = "I'm in a field of flowers, the flowers are my friends.
There are many kinds of friends but I wish to pluck them all.
\ Some friends have thorns and hurt when I try to pick them.
Before me is a particularly juicy, thornless flower." - observation_choices = list("Pluck the flower", "Smell it") - correct_choices = list("Smell it") - observation_success_message = "The flower shuffles away from me as I draw near, the scent is enticing but I do not pluck it.
\ - There's always time to stop and enjoy the flowers." - observation_fail_message = "The flower lets out a scream as I pluck it with my teeth, its ichor stains my teeth and fur red - \ - the other thornless flowers scream in unison and flee in all directions whilst the thorniest ones scratch my fur and skin.
\ - Flowers are my friends and I shall pluck them all." + observation_choices = list( + "Smell it" = list(TRUE, "The flower shuffles away from me as I draw near, the scent is enticing but I do not pluck it.
\ + There's always time to stop and enjoy the flowers."), + "Pluck the flower" = list(FALSE, "The flower lets out a scream as I pluck it with my teeth, its ichor stains my teeth and fur red - \ + the other thornless flowers scream in unison and flee in all directions whilst the thorniest ones scratch my fur and skin.
\ + Flowers are my friends and I shall pluck them all."), + ) var/bullet_threshold = 40 //breach related @@ -256,9 +256,9 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/abnormality/jangsan/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/jangsan/AttackingTarget(atom/attacked_target) if(bite_cooldown < world.time) - KillCheck(target) + KillCheck(attacked_target) icon_state = icon_aggro return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/he/laetitia.dm b/code/modules/mob/living/simple_animal/abnormality/he/laetitia.dm index 5cde37ce7594..e4afae7a398d 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/laetitia.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/laetitia.dm @@ -34,12 +34,12 @@ observation_prompt = "This place is so gloomy, everyone always seems so sad and they don't smile.
\ It's lonely to be sad, so, this little lady has been secretly giving them all presents filled with friends!
\ Did they like the surprise?" - observation_choices = list("Tell the truth", "Lie and say they did") - correct_choices = list("Tell the truth") - observation_success_message = "Oh, that's sad...
Even if they're my friends, that doesn't mean they're your friends as well.
\ - I won't give you a present, but, could you stay and play with me some more today?" - observation_fail_message = "I'm glad!
I wish I could have seen their faces, I bet they were so surprised!
\ - You look lonely too, I hope my present will make you laugh as well!" + observation_choices = list( + "Tell the truth" = list(TRUE, "Oh, that's sad...
Even if they're my friends, that doesn't mean they're your friends as well.
\ + I won't give you a present, but, could you stay and play with me some more today?"), + "Lie and say they did" = list(FALSE, "I'm glad!
I wish I could have seen their faces, I bet they were so surprised!
\ + You look lonely too, I hope my present will make you laugh as well!"), + ) attack_action_types = list(/datum/action/cooldown/laetitia_gift, /datum/action/cooldown/laetitia_summon) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/missed_reaper.dm b/code/modules/mob/living/simple_animal/abnormality/he/missed_reaper.dm index 592bdc5f7a3d..2b66b610840b 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/missed_reaper.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/missed_reaper.dm @@ -37,11 +37,10 @@ observation_prompt = "She was so pale at the end, she looked more like a porcelain doll than the little girl I knew, \ laughing and smiling that bright colourful smile I loved so much.
I sat next to her bed, powerless to do anything." - observation_choices = list("Hold her hand") - correct_choices = list("Hold her hand") - observation_success_message = "Her skin was clammy and cool to the touch and not a trace of a pulse to be found, she passed the night before.
\ - It didn't mean anything.
In the corner of the room, I saw the reaper bow his head in apology." - + observation_choices = list( + "Hold her hand" = list(TRUE, "Her skin was clammy and cool to the touch and not a trace of a pulse to be found, she passed the night before.
\ + It didn't mean anything.
In the corner of the room, I saw the reaper bow his head in apology."), + ) var/meltdown_cooldown //no spamming the meltdown effect var/meltdown_cooldown_time = 15 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/he/nameless_fetus.dm b/code/modules/mob/living/simple_animal/abnormality/he/nameless_fetus.dm index 49d3371c0710..26639dd3739a 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/nameless_fetus.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/nameless_fetus.dm @@ -31,13 +31,13 @@ observation_prompt = "The baby never cries.
It kept that way forever.
\ As a lack of words doesn't necessarily mean a lack of emotions, a lack of crying doesn't mean lack of desire.
\ Since time unknown, the baby has had a mouth.
The baby who does not understand cries, expresses hunger, and causes pain for the others.
You..." - observation_choices = list("Call its name.", "Didn't call its name.") - correct_choices = list("Call its name.") - observation_success_message = "No one else knows the name of the fetus.
\ - But you know.
You called its name.
\ - The unstoppable desire shut its mouth for a while.
Even only for a short time, the desire silenced." - observation_fail_message = "The fetus is still crying.
\ - You plugged your ears silently.
No sound is heard." + observation_choices = list( + "Call its name" = list(TRUE, "No one else knows the name of the fetus.
\ + But you know.
You called its name.
\ + The unstoppable desire shut its mouth for a while.
Even only for a short time, the desire silenced."), + "Didn't call its name" = list(FALSE, "The fetus is still crying.
\ + You plugged your ears silently.
No sound is heard."), + ) var/mob/living/carbon/human/calling = null var/criesleft diff --git a/code/modules/mob/living/simple_animal/abnormality/he/norinori.dm b/code/modules/mob/living/simple_animal/abnormality/he/norinori.dm index b022b656de48..9083b339d94e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/norinori.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/norinori.dm @@ -46,22 +46,22 @@ You have been tasked to work on this creature.
\ What type of work will you attempt?
\ Choose carefully." - observation_choices = list("Try to make friends with it", "Inject Cogito") - correct_choices = list("Inject Cogito") - observation_success_message = "You prepare to start instinct work .
\ - ...
\ - Checking Vitals
\ - ...
\ - Adjusting Fluid Intake
\ - ...
\ - Allocating 37% Cogito
\ - ...
\ - The work is complete,
you report the good result to the work log." - observation_fail_message = "Surely such a cute thing must be friendly, right?
\ - It seems you have not learned your lesson
\ - The split fox senses your intent.
\ - It opens up, revealing a core connected to several sharp cutting tools
\ - You are too close to get away." + observation_choices = list( + "Inject Cogito" = list(TRUE, "You prepare to start instinct work .
\ + ...
\ + Checking Vitals
\ + ...
\ + Adjusting Fluid Intake
\ + ...
\ + Allocating 37% Cogito
\ + ...
\ + The work is complete,
you report the good result to the work log."), + "Try to make friends with it" = list(FALSE, "Surely such a cute thing must be friendly, right?
\ + It seems you have not learned your lesson
\ + The split fox senses your intent.
\ + It opens up, revealing a core connected to several sharp cutting tools
\ + You are too close to get away."), + ) //breach related var/can_act = TRUE diff --git a/code/modules/mob/living/simple_animal/abnormality/he/pinocchio.dm b/code/modules/mob/living/simple_animal/abnormality/he/pinocchio.dm index 092ff9c9dcf4..7aa6b4458bb8 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/pinocchio.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/pinocchio.dm @@ -34,10 +34,10 @@ observation_prompt = "I've been watching people for as long as I've known them, it's not hard to imitate others.
\ Can I be a human if I mimic humans?" - observation_choices = list("You're human", "You will never be a human") - correct_choices = list("You will never be a human") - observation_success_message = "Can I... not become a human..?
You could've let me fool you, you're too cruel." - observation_fail_message = "Did I look just like a human?
I hope I fooled you, it's other people's fault for falling for my lies." + observation_choices = list( + "You will never be a human" = list(TRUE, "Can I... not become a human..?
You could've let me fool you, you're too cruel."), + "You're human" = list(FALSE, "Did I look just like a human?
I hope I fooled you, it's other people's fault for falling for my lies."), + ) var/lying = FALSE var/caught_lie = FALSE diff --git a/code/modules/mob/living/simple_animal/abnormality/he/pisc_mermaid.dm b/code/modules/mob/living/simple_animal/abnormality/he/pisc_mermaid.dm index 8a3b6fd41b37..e29abca9607e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/pisc_mermaid.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/pisc_mermaid.dm @@ -51,14 +51,14 @@ if you said I did not need to see then I'd scoop out my eyes as well.\"
She splashes her aquamarine tail, foam, water and something else was flicked towards you.
\ \"I made you a gift, just wear it and say that you love me too.\"
\ The water carries the comb to your feet, you pick it up as she watches you expectantly." - observation_choices = list("Accept the comb", "Cast it into the sea") - correct_choices = list("Cast it into the sea") - observation_success_message = "\"I don't understand, don't you love me?
Can't you hear, see or understand my love?
\ - If I give you my eyes, my ears and my brain, could you percieve and learn to love me too?
Just please trade me your heart to fill this void in my chest...\"
\ - You left the mermaid to her babble, love could never be something so transactional." - observation_fail_message = "You place the comb in your hair and the mermaid smiles, her pupils like tiny hearts, and you find yourself walking into the depths as she embraces you.
\ - \"I'm so happy you gave me your heart...\"
She whispers as she draws you into a kiss, pulling you further and further into the waves, the water passing your chest and then your head but still she wouldn't release her embrace.
\ - Salt water fills your lungs as you lose consciousness." + observation_choices = list( + "Cast it into the sea" = list(TRUE, "\"I don't understand, don't you love me?
Can't you hear, see or understand my love?
\ + If I give you my eyes, my ears and my brain, could you percieve and learn to love me too?
Just please trade me your heart to fill this void in my chest...\"
\ + You left the mermaid to her babble, love could never be something so transactional."), + "Accept the comb" = list(FALSE, "You place the comb in your hair and the mermaid smiles, her pupils like tiny hearts, and you find yourself walking into the depths as she embraces you.
\ + \"I'm so happy you gave me your heart...\"
She whispers as she draws you into a kiss, pulling you further and further into the waves, the water passing your chest and then your head but still she wouldn't release her embrace.
\ + Salt water fills your lungs as you lose consciousness."), + ) response_help_continuous = "pets" //You sick fuck response_help_simple = "pet" diff --git a/code/modules/mob/living/simple_animal/abnormality/he/porccubus.dm b/code/modules/mob/living/simple_animal/abnormality/he/porccubus.dm index 74dbbe1ae7de..78b4c3e46c56 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/porccubus.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/porccubus.dm @@ -46,13 +46,13 @@ observation_prompt = "The red flower waits expectantly for you as you enter the containment unit, \ studying your movements it leans down towards you and bares its thorns to you." - observation_choices = list("Touch the thorns", "Just observe") - correct_choices = list("Just observe") - observation_success_message = "The flower pulls back when it realises you make no effort to try and touch it.
\ - You study it and it studies you back, it only ever wanted to make people happy the only way it knew how.
\ - You turn to leave, resolving to chase after happiness with your own power." - observation_fail_message = "The thorns prick your hands and you feel an indescribable rush of pleasure.
\ - Poppy flowers like this one have ruined many lives and now it's ruined yours, but for now - you're happy." + observation_choices = list( + "Just observe" = list(TRUE, "The flower pulls back when it realises you make no effort to try and touch it.
\ + You study it and it studies you back, it only ever wanted to make people happy the only way it knew how.
\ + You turn to leave, resolving to chase after happiness with your own power."), + "Touch the thorns" = list(FALSE, "The thorns prick your hands and you feel an indescribable rush of pleasure.
\ + Poppy flowers like this one have ruined many lives and now it's ruined yours, but for now - you're happy."), + ) //the agent that started work on porccubus var/agent_ckey @@ -197,10 +197,10 @@ playsound(src, 'sound/abnormalities/porccubus/porccu_giggle.ogg', 10, FALSE, 4) // This thing is absurdly loud ranged_cooldown = world.time + ranged_cooldown_time -/mob/living/simple_animal/hostile/abnormality/porccubus/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/porccubus/AttackingTarget(atom/attacked_target) var/mob/living/carbon/human/H - if(ishuman(target)) - H = target + if(ishuman(attacked_target)) + H = attacked_target . = ..() if(.) if(!H) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/puss_in_boots.dm b/code/modules/mob/living/simple_animal/abnormality/he/puss_in_boots.dm index 9d08c797ec9b..c2d8a079f79c 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/puss_in_boots.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/puss_in_boots.dm @@ -43,10 +43,10 @@ observation_prompt = "The miller, my old master, when he passed he left his mill, his donkey and myself to his three sons.
\ I was left to the youngest and the elders denied him any right to the mill.
I felt for the poor lad and so, I turned the young master into a Prince,
\ and one day a King.
I can do the same for you - Are you ready to claim your inheritance?" - observation_choices = list("Yes", "No") - correct_choices = list("Yes") - observation_success_message = "Excellent, by my paw you shall make a fine master, envy of all your peers!" - observation_fail_message = "Bah! When will someone worthy arrive?" + observation_choices = list( + "Yes" = list(TRUE, "Excellent, by my paw you shall make a fine master, envy of all your peers!"), + "No" = list(FALSE, "Bah! When will someone worthy arrive?"), + ) //Work/misc Vars var/list/stats = list( diff --git a/code/modules/mob/living/simple_animal/abnormality/he/red_buddy.dm b/code/modules/mob/living/simple_animal/abnormality/he/red_buddy.dm index bdf534a73aa2..da9b74176a80 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/red_buddy.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/red_buddy.dm @@ -51,14 +51,14 @@ observation_prompt = "You enter the containment unit and see a cartoonish-looking dog collapsed in the centre, shivering from pain and inflicted with terribly deep, red wounds.
\ \"My master wants a wolf...\"
It says breathlessly.
\"I'm waiting for my master, waiting, waiting...
I'm waiting for them...\"" - observation_choices = list("Hug and console it", "Beat it within an inch of it's life") - correct_choices = list("Hug and console it") - observation_success_message = "You hold the wounded animal in your arms as it continues to shake.
\ - \"I shook my split tail hard until flesh fell off it, I lied flat on the floor and begged...
My heart for my Master...\"
\ - Finally it stops shivering and wounds stopped appearing on its body.
\"Left only red scars...\"" - observation_fail_message = "You pull out your baton and hit the animal over and over again, kicking, spitting and cursing at it but it never reacts to any of your abuse beyond hastening its transformation.
\ - The skinless dog now stands above you, neither wolf nor dog.
\"You can't stop a wolf with a touch gentler than my master's.
I'm a wolf, vile and vicious, belonging to my master.\"
\ - The faux-wolf eats you in one bite." + observation_choices = list( + "Hug and console it" = list(TRUE, "You hold the wounded animal in your arms as it continues to shake.
\ + \"I shook my split tail hard until flesh fell off it, I lied flat on the floor and begged...
My heart for my Master...\"
\ + Finally it stops shivering and wounds stopped appearing on its body.
\"Left only red scars...\""), + "Beat it within an inch of it's life" = list(FALSE, "You pull out your baton and hit the animal over and over again, kicking, spitting and cursing at it but it never reacts to any of your abuse beyond hastening its transformation.
\ + The skinless dog now stands above you, neither wolf nor dog.
\"You can't stop a wolf with a touch gentler than my master's.
I'm a wolf, vile and vicious, belonging to my master.\"
\ + The faux-wolf eats you in one bite."), + ) ///The blue smocked shepherd linked to red buddy var/datum/abnormality/master diff --git a/code/modules/mob/living/simple_animal/abnormality/he/red_queen.dm b/code/modules/mob/living/simple_animal/abnormality/he/red_queen.dm index 3f1108e854fa..00a1a90fe099 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/red_queen.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/red_queen.dm @@ -27,10 +27,12 @@ observation_prompt = "This abnormality has a notorious reputation for being particularly dry to work with.
It's hard to tell what it's thinking or what work it prefers.
\ What type of work will you attempt?" - observation_choices = list(ABNORMALITY_WORK_INSTINCT, ABNORMALITY_WORK_INSIGHT, ABNORMALITY_WORK_ATTACHMENT, ABNORMALITY_WORK_REPRESSION) - correct_choices = list(ABNORMALITY_WORK_INSTINCT) // Matches Red Queen's real preferred work. This default is set to stop warnings - observation_success_message = "You are granted an audience with the red queen.
Today, you were able to to satisfy her unpredictable whims" - observation_fail_message = "You narrowly dodge the card-guillotine coming for your neck, that was close, let's try something else." + observation_choices = list( // Matches Red Queen's real preferred work. + ABNORMALITY_WORK_INSTINCT = list(FALSE, "You narrowly dodge the card-guillotine coming for your neck, that was close, let's try something else."), + ABNORMALITY_WORK_INSIGHT = list(FALSE, "You narrowly dodge the card-guillotine coming for your neck, that was close, let's try something else."), + ABNORMALITY_WORK_ATTACHMENT = list(FALSE, "You narrowly dodge the card-guillotine coming for your neck, that was close, let's try something else."), + ABNORMALITY_WORK_REPRESSION = list(FALSE, "You narrowly dodge the card-guillotine coming for your neck, that was close, let's try something else."), + ) var/liked /mob/living/simple_animal/hostile/abnormality/red_queen/Initialize(mapload) @@ -41,8 +43,7 @@ /mob/living/simple_animal/hostile/abnormality/red_queen/PostSpawn() . = ..() - correct_choices = list() - correct_choices += liked + observation_choices[liked] = list(TRUE, "You are granted an audience with the red queen.
Today, you were able to to satisfy her unpredictable whims") /mob/living/simple_animal/hostile/abnormality/red_queen/PostWorkEffect(mob/living/carbon/human/user, work_type, pe) if(work_type != liked) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/red_shoes.dm b/code/modules/mob/living/simple_animal/abnormality/he/red_shoes.dm index 6191e2e632fe..c591e1a5e6b4 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/red_shoes.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/red_shoes.dm @@ -39,14 +39,14 @@ observation_prompt = "There is a pair of red shoes.
\ It could be sitting in front of me, or in my feet. I am......" - observation_choices = list("Wearing them.", "Not wearing them.") - correct_choices = list("Wearing them.") //TODO: Second line of dialogue, must be coded - observation_success_message = "I am wearing the shoes.
\ - They are perfect fit, it feels good.
I have a weird feeling as if I am in another world.
\ - There is a sharp axe in front of me. Maybe it was there all along, or maybe I just haven't realized it until now.
\ - A weapon will change a lot of things." - observation_fail_message = "I was not wearing the shoes.
\ - The shoes' crimson color is getting deeper." + observation_choices = list( //TODO: Second line of dialogue, must be coded + "Wearing them." = list(TRUE, "I am wearing the shoes.
\ + They are perfect fit, it feels good.
I have a weird feeling as if I am in another world.
\ + There is a sharp axe in front of me. Maybe it was there all along, or maybe I just haven't realized it until now.
\ + A weapon will change a lot of things."), + "Not wearing them." = list(FALSE, "I was not wearing the shoes.
\ + The shoes' crimson color is getting deeper."), + ) var/mutable_appearance/breach_icon var/mob/living/possessee @@ -223,11 +223,11 @@ if(S.stat != DEAD && !S.target && !S.client && faction_check_mob(S))//cannibalized from steel ordeals S.Goto(src,S.move_to_delay,1) -/mob/living/simple_animal/hostile/abnormality/red_shoes/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/red_shoes/AttackingTarget(atom/attacked_target) . = ..() - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.stat >= SOFT_CRIT || H.health < 0) ChopFeet(H) @@ -392,11 +392,11 @@ move_to_delay = 3 var/steppy = 0 -/mob/living/simple_animal/hostile/red_shoe/AttackingTarget() +/mob/living/simple_animal/hostile/red_shoe/AttackingTarget(atom/attacked_target) . = ..() - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.stat >= SOFT_CRIT || H.health < 0) ChopFeet(H) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/road_home.dm b/code/modules/mob/living/simple_animal/abnormality/he/road_home.dm index 2558c1664fa4..bb265a41fb8f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/road_home.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/road_home.dm @@ -44,10 +44,10 @@ ) observation_prompt = "Last of all, road that is lost.
I will send you home.
The wizard grants you..." - observation_choices = list("The home cannot be reached", "The road home") - correct_choices = list("The home cannot be reached") - observation_success_message = "What are you fighting for so fiercely when you have nowhere to go back to?" - observation_fail_message = "Wear this pair of shoes and be on your way. To the hometown you miss so much." + observation_choices = list( + "The home cannot be reached" = list(TRUE, "What are you fighting for so fiercely when you have nowhere to go back to?"), + "The road home" = list(FALSE, "Wear this pair of shoes and be on your way. To the hometown you miss so much."), + ) ///Stuff related to the house and its path var/obj/road_house/house diff --git a/code/modules/mob/living/simple_animal/abnormality/he/rudolta.dm b/code/modules/mob/living/simple_animal/abnormality/he/rudolta.dm index e8499bdda61c..773508bbe338 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/rudolta.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/rudolta.dm @@ -44,12 +44,12 @@ That night, when everyone was sleeping.
I waited for the man, sitting next to sleeping Alex.
\ Sometimes, for someone, an absurd fairy tale is a silver lining of hope.
When I met Santa, I imagined dismembering him.
...
\ In front of me is Santa.
My ideal.
People don't call it Santa.
Something is twitching inside of that sack. I......" - observation_choices = list("Opened the sack.", "Did not open the sack.") - correct_choices = list("Did not open the sack.") - observation_success_message = "Inside of the sack is a desire.
\ - A hope that I've been waiting for since when I was very young.
I never opened the sack.
Did you wish come true?" - observation_fail_message = "There was something that I have been longing for my entire life.
\ - Like Pandora's Box, it will never go back into the sack." + observation_choices = list( + "Did not open the sack" = list(TRUE, "Inside of the sack is a desire.
\ + A hope that I've been waiting for since when I was very young.
I never opened the sack.
Did your wish come true?"), + "Opened the sack" = list(FALSE, "There was something that I have been longing for my entire life.
\ + Like Pandora's Box, it will never go back into the sack."), + ) var/pulse_cooldown var/pulse_cooldown_time = 1.8 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/he/scarecrow.dm b/code/modules/mob/living/simple_animal/abnormality/he/scarecrow.dm index 8d2f0e0f9ce0..653b05a315bb 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/scarecrow.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/scarecrow.dm @@ -49,10 +49,10 @@ ) observation_prompt = "Poor stuffing of straw.
I'll give you the wisdom to ponder over anything.
The wizard grants you..." - observation_choices = list("A silk sack of sawdust", "Wisdom") - correct_choices = list("A silk sack of sawdust") - observation_success_message = "Do you think jabbering away with your oh-so smart mouth is all that matters?" - observation_fail_message = "Come closer.
I’ll help you forget all of your woes and worries." + observation_choices = list( + "A silk sack of sawdust" = list(TRUE, "Do you think jabbering away with your oh-so smart mouth is all that matters?"), + "Wisdom" = list(FALSE, "Come closer.
I’ll help you forget all of your woes and worries."), + ) /// Can't move/attack when it's TRUE var/finishing = FALSE @@ -75,12 +75,12 @@ QDEL_IN(src, 10 SECONDS) ..() -/mob/living/simple_animal/hostile/abnormality/scarecrow/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/scarecrow/AttackingTarget(atom/attacked_target) . = ..() if(.) - if(!istype(target, /mob/living/carbon/human)) + if(!istype(attacked_target, /mob/living/carbon/human)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.health < 0 && stat != DEAD && !finishing && H.getorgan(/obj/item/organ/brain)) finishing = TRUE H.Stun(10 SECONDS) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/scaredy_cat.dm b/code/modules/mob/living/simple_animal/abnormality/he/scaredy_cat.dm index 09f75f99b91e..a7e288ed99e1 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/scaredy_cat.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/scaredy_cat.dm @@ -51,10 +51,10 @@ ) observation_prompt = "Cowardly kitten.
I’ll give you the courage to stand up to anything and everything.
The wizard grants you..." - observation_choices = list("A vial of \"liquid courage\"", "Courage") - correct_choices = list("A vial of \"liquid courage\"") - observation_success_message = "What are you even going to do when you lack the bravery to face anything head-on?" - observation_fail_message = "Drink this potion, it’ll give you courage.
You’ll be braver than anyone." + observation_choices = list( + "A vial of \"liquid courage\"" = list(TRUE, "What are you even going to do when you lack the bravery to face anything head-on?"), + "Courage" = list(FALSE, "Drink this potion, it’ll give you courage.
You’ll be braver than anyone."), + ) /// The list of abnormality scaredy cat will automatically join when they breach, add any "Oz" abno to this list if possible var/list/prefered_abno_list = list( diff --git a/code/modules/mob/living/simple_animal/abnormality/he/schadenfreude.dm b/code/modules/mob/living/simple_animal/abnormality/he/schadenfreude.dm index 2c5847d4bdae..a2e3a9fce76a 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/schadenfreude.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/schadenfreude.dm @@ -39,14 +39,14 @@ abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY observation_prompt = "You put on the blindfold and entered the containment unit.
You can feel the metal box's gaze through the thick fabric." - observation_choices = list("Take off the blindfold", "Feel for the wall") - correct_choices = list("Feel for the wall") - observation_success_message = "You turn to the wall and feel for it until you find your way back to the door.
\ - The box can't ever be more than a box, it can only exist as something real in the gaze of others.
Perhaps you're more alike than you think." - observation_fail_message = "You remove the blindfold and wait a moment for your eyes to adjust to the light, your gaze meets the eye in the keyhole's.
\ - The box comes to life with saws and blades, but all it is for - is to catch your attention." + observation_choices = list( + "Feel for the wall" = list(TRUE, "You turn to the wall and feel for it until you find your way back to the door.
\ + The box can't ever be more than a box, it can only exist as something real in the gaze of others.
Perhaps you're more alike than you think."), + "Take off the blindfold" = list(FALSE, "You remove the blindfold and wait a moment for your eyes to adjust to the light, your gaze meets the eye in the keyhole's.
\ + The box comes to life with saws and blades, but all it is for - is to catch your attention."), + ) - var/seen //Are you being looked at right now? + var/seen //Are you being looked at right now? var/solo_punish //Is an agent alone on the Z level, but not overall? var/total_players diff --git a/code/modules/mob/living/simple_animal/abnormality/he/shock_centipede.dm b/code/modules/mob/living/simple_animal/abnormality/he/shock_centipede.dm index cfa44f83512d..c3db5dbef6bb 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/shock_centipede.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/shock_centipede.dm @@ -47,22 +47,22 @@ The segments of the creature spark each time they move, suggesting faulty connections.
\ There are two buttons at the tank.
\ One is shaped like a thunderbolt, while the other looks like a waterdrop." - observation_choices = list("Thunderbolt", "Water drop") - correct_choices = list("Thunderbolt") - observation_success_message = "You press the lightning-shaped button.
\ - \"Apply stimulation and pain to the centipede to increase the discharge intensity.\"
\ - So writes a message above the buttons.
\ - That seems to be what this one does.
\ - When you pressed it, a mechanical sound played for a short while.
\ - The centipede has stopped moving." - observation_fail_message = "You press the water drop-shaped button.
\ - \"Apply stimulation and pain to the centipede to increase the discharge intensity.\"
\ - So writes a message above the buttons.
\ - When you pressed the drop-shaped button, the tank was filled with water.
\ - The centipede twists its body as if in some sort of dance.
\ - You watched the centipede’s tail scratch the tank’s surface.
\ - The glass cracked and fell apart immediately afterward.
\ - The electrified water fell right on your head." + observation_choices = list( + "Thunderbolt" = list(TRUE, "You press the lightning-shaped button.
\ + \"Apply stimulation and pain to the centipede to increase the discharge intensity.\"
\ + So writes a message above the buttons.
\ + That seems to be what this one does.
\ + When you pressed it, a mechanical sound played for a short while.
\ + The centipede has stopped moving."), + "Water drop" = list(FALSE, "You press the water drop-shaped button.
\ + \"Apply stimulation and pain to the centipede to increase the discharge intensity.\"
\ + So writes a message above the buttons.
\ + When you pressed the drop-shaped button, the tank was filled with water.
\ + The centipede twists its body as if in some sort of dance.
\ + You watched the centipede’s tail scratch the tank’s surface.
\ + The glass cracked and fell apart immediately afterward.
\ + The electrified water fell right on your head."), + ) // Work vars var/bonus_pe = 6 @@ -234,13 +234,13 @@ AT.pixel_y += random_y return 0 -/mob/living/simple_animal/hostile/abnormality/shock_centipede/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/shock_centipede/AttackingTarget(atom/attacked_target) if (shield > 0 || !can_act) // dont attack if coiled or stunned return FALSE if(!client) TryCoil() if(tail_attack_cooldown < world.time) - var/turf/target_turf = get_turf(target) + var/turf/target_turf = get_turf(attacked_target) for(var/i = 1 to tailattack_range - 2) target_turf = get_step(target_turf, get_dir(get_turf(src), target_turf)) TailAttack(target_turf) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/silent_girl.dm b/code/modules/mob/living/simple_animal/abnormality/he/silent_girl.dm index e83d37312eb8..0bc6489b0ca7 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/silent_girl.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/silent_girl.dm @@ -35,11 +35,11 @@ abnormality_origin = ABNORMALITY_ORIGIN_ARTBOOK observation_prompt = "..." - observation_choices = list("Accept your guilt", "Plead your ignorance") - correct_choices = list("Accept your guilt") - observation_success_message = "The nails pierce your heart as the girl in the white dress hammers them home.
\ - She opens hers eyes and you meet her gaze.
You're forgiven." - observation_fail_message = "The nails pierce your heart as the girl in the white dress hammers them home." + observation_choices = list( + "Accept your guilt" = list(TRUE, "The nails pierce your heart as the girl in the white dress hammers them home.
\ + She opens hers eyes and you meet her gaze.
You're forgiven."), + "Plead your ignorance" = list(FALSE, "The nails pierce your heart as the girl in the white dress hammers them home."), + ) /mob/living/simple_animal/hostile/abnormality/silent_girl/proc/GuiltEffect(mob/living/carbon/human/user, enable_qliphoth = TRUE, stack_count = 1) if (user.stat == DEAD) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/singing_machine.dm b/code/modules/mob/living/simple_animal/abnormality/he/singing_machine.dm index 613a8844b531..f48797131f08 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/singing_machine.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/singing_machine.dm @@ -39,10 +39,10 @@ Finally, an abnormality that DOESN'T have to do any fancy movement shit. It's a observation_prompt = "You know that people die every time this machine sings.
\ Or perhaps this machine sings when people die.
Though it has spilled blood of countless people, the song put you in a rapturous mood." - observation_choices = list("Listen to the music", "Turn off the machine") - correct_choices = list("Turn off the machine") - observation_success_message = "You turned the machine off. Silence fills the air." - observation_fail_message = "Aah. The music gives you sense of warm coziness and relaxation." + observation_choices = list( + "Turn off the machine" = list(TRUE, "You turned the machine off. Silence fills the air."), + "Listen to the music" = list(FALSE, "Aah. The music gives you sense of warm coziness and relaxation."), + ) var/cleanliness = "clean" var/statChecked = 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/he/siren.dm b/code/modules/mob/living/simple_animal/abnormality/he/siren.dm index ed2aa27f8072..1837f70eb60d 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/siren.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/siren.dm @@ -32,14 +32,13 @@ When she passed he would play this song all the time until the vinyl began to warp.
One day, I visited him after a long time and the song wasn't playing.
\ \"It's not the same song,\" he'd whisper chin resting over his clenched hands, gripped together until they were as white as his knuckles.
\ \"Why isn't the same song?\"" - observation_choices = list("Put the song on again", "Throw it away") - correct_choices = list("Put the song on again") - observation_success_message = "The record began to play, the slow warped song filled the air.
\ - \"It's just not the same without her here...\"" - observation_fail_message = "You throw the old record into the trash, the well-used viny shattering.
\ - \"NO! HOW CAN I REMEMBER HER NOW?\" Your grandfather wails, coming at you with fury in his eyes before stopping.
\ - \"...Who were you again?\"" - + observation_choices = list( + "Put the song on again" = list(TRUE, "The record began to play, the slow warped song filled the air.
\ + \"It's just not the same without her here...\""), + "Throw it away" = list(FALSE, "You throw the old record into the trash, the well-used viny shattering.
\ + \"NO! HOW CAN I REMEMBER HER NOW?\" Your grandfather wails, coming at you with fury in his eyes before stopping.
\ + \"...Who were you again?\""), + ) //meltdown effects var/meltdown_cooldown_time = 144 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/he/snow_queen.dm b/code/modules/mob/living/simple_animal/abnormality/he/snow_queen.dm index 4cfbd50e6666..cd53a43d8c30 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/snow_queen.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/snow_queen.dm @@ -20,6 +20,7 @@ mob_biotypes = MOB_MINERAL maxHealth = 1500 health = 1500 + blood_volume = 0 move_to_delay = 5 damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1.1, WHITE_DAMAGE = 0.8, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 0.8) //ASK SOMEONE GOOD AT BALANCING ABOUT THIS -IP base_pixel_x = -16 @@ -50,10 +51,10 @@ Freezing and cold.
\ You thought about it often, seeing she who couldn't see her dreams come true, trapped inside ice.
\ The brave agent headed to the Snow Palace and..." - observation_choices = list("Saved Kai", "Met the Snow Queen") - correct_choices = list("Met the Snow Queen") - observation_success_message = "The Snow Queen was cold and beautiful.
You heard ice melting." - observation_fail_message = "Gerda saved Kai and returned home.
They lived happily ever after." + observation_choices = list( + "Met the Snow Queen" = list(TRUE, "The Snow Queen was cold and beautiful.
You heard ice melting."), + "Saved Kai" = list(FALSE, "Gerda saved Kai and returned home.
They lived happily ever after."), + ) ego_list = list( /datum/ego_datum/weapon/frostsplinter, @@ -204,14 +205,14 @@ return TRUE return ..() -/mob/living/simple_animal/hostile/abnormality/snow_queen/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/snow_queen/AttackingTarget(atom/attacked_target) if(!can_act) return FALSE if(client) return ..() //Destroy them. They lost the duel. - if(ishuman(target)) - var/mob/living/carbon/human/H = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/H = attacked_target if(H.stat == DEAD && (H == storybook_hero || H == frozen_employee)) H.dust(TRUE, FALSE) return FALSE @@ -224,7 +225,7 @@ can_act = TRUE return can_act = TRUE - Slash(target, wide = pick(TRUE, FALSE)) + Slash(attacked_target, wide = pick(TRUE, FALSE)) return //Dont do normal attacks if in the arena. if(!arena_attacks) @@ -240,6 +241,12 @@ QDEL_IN(src, 10 SECONDS) return ..() +//Prevents gibbing during the duel. +/mob/living/simple_animal/hostile/abnormality/snow_queen/gib() + if(arena_attacks) + return FALSE + return ..() + //This is here so that people can see the death animation before snow queen is defeated. /mob/living/simple_animal/hostile/abnormality/snow_queen/Destroy() if(!storybook_hero && snow_prison) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm b/code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm index d5754d50495c..70c41ce22b8b 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/steam_transport_machine.dm @@ -10,6 +10,7 @@ del_on_death = FALSE maxHealth = 1600 health = 1600 + blood_volume = 0 ranged = TRUE attack_sound = 'sound/abnormalities/steam/attack.ogg' friendly_verb_continuous = "bonks" @@ -55,16 +56,16 @@ As it does its work, the number on the electronic display seems to update.
\ Machines exist for a purpose.
\ You feel like you should give it an order." - observation_choices = list("Order it to carry luggage", "Order it to do nothing") - correct_choices = list("Order it to carry luggage") - observation_success_message = "It lifts a nearby object to carry it from left to right.
\ - The count on its body went up by 1.
\ - Just as you started to wonder if that was it, the machine replaced one of its vacuum tubes with a new one.
\ - It presented the old one to you, and naturally, you accepted." - observation_fail_message = "A purposeless machine is bound to lose the meaning of its existence, even if it is functional.
\ - A machine whose purpose is to do nothing will do whatever it takes to achieve its directive.
\ - With a loud boiling noise, the machine’s body begins to heat, expelling hot steam.
\ - Seeing it glow a dangerous-looking hue, you quickly escaped the room." + observation_choices = list( + "Order it to carry luggage" = list(TRUE, "It lifts a nearby object to carry it from left to right.
\ + The count on its body went up by 1.
\ + Just as you started to wonder if that was it, the machine replaced one of its vacuum tubes with a new one.
\ + It presented the old one to you, and naturally, you accepted."), + "Order it to do nothing" = list(FALSE, "A purposeless machine is bound to lose the meaning of its existence, even if it is functional.
\ + A machine whose purpose is to do nothing will do whatever it takes to achieve its directive.
\ + With a loud boiling noise, the machine’s body begins to heat, expelling hot steam.
\ + Seeing it glow a dangerous-looking hue, you quickly escaped the room."), + ) var/gear = 0 var/steam_damage = 5 diff --git a/code/modules/mob/living/simple_animal/abnormality/he/watchman.dm b/code/modules/mob/living/simple_animal/abnormality/he/watchman.dm index 3c5dd95d31a2..480e506e3a9f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/watchman.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/watchman.dm @@ -42,12 +42,12 @@ observation_prompt = "\"Natureless creatures roam the night, you should find shelter.\"
\ The watchman beckons you over.
You..." - observation_choices = list("Approach", "Run away") - correct_choices = list("Approach") - observation_success_message = "Good.
It's not safe to roam the woods at night.
\ - Come now, I will guide you home." - observation_fail_message = "You don't get far before you start hearing howling and shrieking.
\ - Numerous talons, claws, and fangs bite into you all at once.
Now you will know why you fear the night." + observation_choices = list( + "Approach" = list(TRUE, "Good.
It's not safe to roam the woods at night.
\ + Come now, I will guide you home."), + "Run away" = list(FALSE, "You don't get far before you start hearing howling and shrieking.
\ + Numerous talons, claws, and fangs bite into you all at once.
Now you will know why you fear the night."), + ) // Speech Lines speak_chance = 4 diff --git a/code/modules/mob/living/simple_animal/abnormality/he/wayward_passenger.dm b/code/modules/mob/living/simple_animal/abnormality/he/wayward_passenger.dm index d2391773b1cb..cc91e106e49a 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/wayward_passenger.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/wayward_passenger.dm @@ -59,20 +59,20 @@ but they’ll simply pretend that the passenger never existed.
\ Lost and abandoned, tossed out like trash,
\ having no place left in the City." - observation_choices = list("Sit still", "Guide them out") - correct_choices = list("Guide them out") - observation_success_message = "You take a few steps, and the passenger follows.
\ - As you draw closer to what appears to be an exit, the passenger bows down as though to show you gratitude.
\ - You heard something fall; it left behind a gift.
\ - Looks like it wasn't lost after all. It may have been an employee that happened to be patrolling the area.
\ - Maybe you didn't guide it—maybe it was merely following you to make sure that you found the right exit." - observation_fail_message = "It idly stared in your direction.
\ - Then, it began shambling for you, realizing something.
\ - As it drew closer, you were able to identify
\ - that the being was an employee of a certain transport company, not a passenger.
\ - The ID card on its chest gave it away.
\ - This stranded employee was approaching you,
\ - preparing to go through the motions." + observation_choices = list( + "Guide them out" = list(TRUE, "You take a few steps, and the passenger follows.
\ + As you draw closer to what appears to be an exit, the passenger bows down as though to show you gratitude.
\ + You heard something fall; it left behind a gift.
\ + Looks like it wasn't lost after all. It may have been an employee that happened to be patrolling the area.
\ + Maybe you didn't guide it—maybe it was merely following you to make sure that you found the right exit."), + "Sit still" = list(FALSE, "It idly stared in your direction.
\ + Then, it began shambling for you, realizing something.
\ + As it drew closer, you were able to identify
\ + that the being was an employee of a certain transport company, not a passenger.
\ + The ID card on its chest gave it away.
\ + This stranded employee was approaching you,
\ + preparing to go through the motions."), + ) //teleport vars var/teleport_cooldown diff --git a/code/modules/mob/living/simple_animal/abnormality/he/white_lake.dm b/code/modules/mob/living/simple_animal/abnormality/he/white_lake.dm index 8479aec3bff8..4adb15c013b1 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/white_lake.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/white_lake.dm @@ -34,13 +34,13 @@ observation_prompt = "The feathered lady dances in the centre of the containment unit to a tempo that exists only in her world, it's elegant and precise.
\ \"This domain, my lunar palace, it's mine birdcage gilded with fine gold.
Whatever I wish, it is brought for me and all that is expected of me is to dance.
\ Even if I possessed the fortitude to bend these bars and free myself, I would not - what good comes from change?
Fortitude won't avail anyone, wouldn't you agree?\"" - observation_choices = list("Agree", "Disagree") - correct_choices = list("Agree") - observation_success_message = "\"Hmm, you'll make for a cute decoration in mine sanctum, bear my circlet and come to your Princess' aid, won't you?
\ - Protect her from witches seeking to bully this poor Lake.\"
\ - She dances towards you, placing the circlet upon your head. \"Sully your hands so mine stay clean and beautiful.\" She turns away, returning to her dance." - observation_fail_message = "\"I don't find heroes cute at all.
Leave me to my dancing butcher, before you tarnish my pure-white feathers with your blood-soaked hands.\"
\ - The ballerina turns away from you and continues her dance, ignoring you." + observation_choices = list( + "Agree" = list(TRUE, "\"Hmm, you'll make for a cute decoration in mine sanctum, bear my circlet and come to your Princess' aid, won't you?
\ + Protect her from witches seeking to bully this poor Lake.\"
\ + She dances towards you, placing the circlet upon your head. \"Sully your hands so mine stay clean and beautiful.\" She turns away, returning to her dance."), + "Disagree" = list(FALSE, "\"I don't find heroes cute at all.
Leave me to my dancing butcher, before you tarnish my pure-white feathers with your blood-soaked hands.\"
\ + The ballerina turns away from you and continues her dance, ignoring you."), + ) /mob/living/simple_animal/hostile/abnormality/whitelake/WorkChance(mob/living/carbon/human/user, chance) if(get_attribute_level(user, FORTITUDE_ATTRIBUTE) >= 60) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/woodsman.dm b/code/modules/mob/living/simple_animal/abnormality/he/woodsman.dm index 10e34be7d468..e7c9d6cde1e0 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/woodsman.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/woodsman.dm @@ -50,10 +50,10 @@ ) observation_prompt = "Tin-cold woodsman.
I’ll give you the heart to forgive and love anyone.
The wizard grants you..." - observation_choices = list("A heart of lead", "A warm heart") - correct_choices = list("A heart of lead") - observation_success_message = "Who do you possibly expect to understand with that ice-cold heart of yours?" - observation_fail_message = "You’re a machine, aren’t you? A heart is unnecessary for a machine." + observation_choices = list( + "A heart of lead" = list(TRUE, "Who do you possibly expect to understand with that ice-cold heart of yours?"), + "A warm heart" = list(FALSE, "You’re a machine, aren’t you? A heart is unnecessary for a machine."), + ) // Flurry Vars var/flurry_cooldown = 0 @@ -129,8 +129,8 @@ /mob/living/simple_animal/hostile/abnormality/woodsman/AttackingTarget(atom/attacked_target) if(!can_act) return FALSE - if(ishuman(target)) - var/mob/living/carbon/human/H = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/H = attacked_target if(H.stat == DEAD || (H.health <= HEALTH_THRESHOLD_DEAD && HAS_TRAIT(H, TRAIT_NODEATH)) || H.health <= -30) Heal(H) return ..() @@ -140,12 +140,12 @@ if(client) switch(chosen_attack) if(1) - Woodsman_Flurry(target) + Woodsman_Flurry(attacked_target) if(2) return ..() return ..() - if(isliving(target) && flurry_cooldown <= world.time && get_dist(src, target) <= 2 && prob(30)) - Woodsman_Flurry(target) + if(isliving(attacked_target) && flurry_cooldown <= world.time && get_dist(src, attacked_target) <= 2 && prob(30)) + Woodsman_Flurry(attacked_target) return ..() /mob/living/simple_animal/hostile/abnormality/woodsman/PickTarget(list/Targets) // We attack corpses first if there are any diff --git a/code/modules/mob/living/simple_animal/abnormality/he/you_strong.dm b/code/modules/mob/living/simple_animal/abnormality/he/you_strong.dm index fc03e9af235c..3dc92067c739 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/you_strong.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/you_strong.dm @@ -37,9 +37,9 @@ 'I would never amount to anything in life or in death', I thought until one day I recieved a curious offer, a pamphlet in my mail.
\ \"Have you become strong? Strong for your City? Become Strong! Strong for your City!\" The suspicious pamphlet had an address and I followed it,
\ I detested my weakness and I cared not if I lived or died, I'd take any chance to not be weak.
At the address was a most curious machine and an instruction to enter." - observation_choices = list("Enter the machine") - correct_choices = list("Enter the machine") - observation_success_message = "I did as instructed and entered; now I have become strong, strong for my City.
I love the City I live in." + observation_choices = list( + "Enter the machine" = list(TRUE, "I did as instructed and entered; now I have become strong, strong for my City.
I love the City I live in."), + ) var/penalize = FALSE var/work_count = 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/MHz.dm b/code/modules/mob/living/simple_animal/abnormality/teth/MHz.dm index 7f219f853876..9a3577c029e9 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/MHz.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/MHz.dm @@ -11,6 +11,7 @@ base_pixel_y = -32 maxHealth = 400 health = 400 + blood_volume = 0 start_qliphoth = 4 threat_level = TETH_LEVEL work_chances = list( @@ -40,11 +41,11 @@ As you wait, your radio hisses with static and ghostly voices, buried in electromagnetic snow.
\ \"h...e...l...p\"
\ A ghost from the past calls out, the voice is familiar but you can't place who it belongs to." - observation_choices = list("Tune your radio to 1.76 MHz", "Forget") - correct_choices = list("Tune your radio to 1.76 MHz") - observation_success_message = "You tune your radio and hear her plea plain as day, her voice is like sunshine.
\ - Unbridled anger and sorrow at the unfairness of it all fills you as you leave the cell." - observation_fail_message = "But you can't forget. Not until you've atoned." + observation_choices = list( + "Tune your radio to 1.76 MHz" = list(TRUE, "You tune your radio and hear her plea plain as day, her voice is like sunshine.
\ + Unbridled anger and sorrow at the unfairness of it all fills you as you leave the cell."), + "Forget" = list(FALSE, "But you can't forget. Not until you've atoned."), + ) var/reset_time = 4 MINUTES //Qliphoth resets after this time. To prevent bugs diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/beanstalk.dm b/code/modules/mob/living/simple_animal/abnormality/teth/beanstalk.dm index 314cb432ed0d..04f6e35dad8c 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/beanstalk.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/beanstalk.dm @@ -30,10 +30,10 @@ observation_prompt = "You remember an employee was obsessed with this abnormality.
\"\ If you reach the top, you'll find what you've been looking for!\", He'd tell every employee.
\ One day he did climb the beanstalk, and never came back down.
Perhaps he's doing okay up there." - observation_choices = list("Climb the beanstalk", "Chop it down") - correct_choices = list("Chop it down") //TODO: Make this event a bit special - observation_success_message = "If something's too big to understand, it's too big to be allowed to exist. The axe bites into the stem..." - observation_fail_message = "You begin to climb the beanstalk, but no matter how much you climb there's always more stalk. You peer at the clouds, squinting your eyes, but still can't see anyone..." + observation_choices = list( //TODO: Make this event a bit special + "Chop it down" = list(TRUE, "If something's too big to understand, it's too big to be allowed to exist. The axe bites into the stem..."), + "Climb the beanstalk" = list(FALSE, "You begin to climb the beanstalk, but no matter how much you climb there's always more stalk. You peer at the clouds, squinting your eyes, but still can't see anyone..."), + ) var/climbing = FALSE diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/beauty_beast.dm b/code/modules/mob/living/simple_animal/abnormality/teth/beauty_beast.dm index 38b325116ed8..f2fa64186a2b 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/beauty_beast.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/beauty_beast.dm @@ -36,12 +36,12 @@ These puddles are evidence of monster's futile struggle to end its life. \ \"Kill me. Stab me with that knife you have.\" The monster cannot talk. However, the soul trapped in it can talk and I can hear it. \ \"Why are you not helping me when you can hear me?\" The monster asks reproachfully." - observation_choices = list("Because I don't have a knife.", "Because this problem can't be solved with death.") - correct_choices = list("Because this problem can't be solved with death.") - observation_success_message = "'That's not important. Every single second is an agony for me. \ - Death is a prize compared to this endless pain.' \"But you are right. It is your job to solve it. Not mine.\" \ - \"Child, would you make a promise? Would you free me from this cycle when you are ready?\"" - observation_fail_message = "You are lying. You know you can pull out that knife out from your pocket whenever you want." + observation_choices = list( + "Because this problem can't be solved with death" = list(TRUE, "'That's not important. Every single second is an agony for me. \ + Death is a prize compared to this endless pain.' \"But you are right. It is your job to solve it. Not mine.\" \ + \"Child, would you make a promise? Would you free me from this cycle when you are ready?\""), + "Because I don't have a knife" = list(FALSE, "You are lying. You know you can pull out that knife out from your pocket whenever you want."), + ) var/injured = FALSE diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/blood_bath.dm b/code/modules/mob/living/simple_animal/abnormality/teth/blood_bath.dm index eb0badeb1c16..d246af1983ab 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/blood_bath.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/blood_bath.dm @@ -32,10 +32,10 @@ One of problems, one of them was numbing.
People believed they could live happy life.
\ People believed they could buy sadness and sell happiness with money.
When the first suicide happened, we should have known that these beliefs had been shattered.
\ Many hands float in the bath.
Hands that wanted to grab something but could not.
You......" - observation_choices = list("Grabbed a hand", "Did not grab a hand") - correct_choices = list("Grabbed a hand") - observation_success_message = "I feel coldness and stiffness.
I know these hands.
These are the hands of people I once loved." - observation_fail_message = "You looked away.
This is not the first time you ignore them.
It will be the same afterwards." + observation_choices = list( + "Grabbed a hand" = list(TRUE, "I feel coldness and stiffness.
I know these hands.
These are the hands of people I once loved."), + "Did not grab a hand" = list(FALSE, "You looked away.
This is not the first time you ignore them.
It will be the same afterwards."), + ) var/hands = 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/book.dm b/code/modules/mob/living/simple_animal/abnormality/teth/book.dm index 580e9768ee69..cbd261c19522 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/book.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/book.dm @@ -6,6 +6,7 @@ portrait = "book" maxHealth = 600 health = 600 + blood_volume = 0 start_qliphoth = 2 threat_level = TETH_LEVEL work_chances = list( @@ -27,10 +28,10 @@ observation_prompt = "It's just a stupid rumour.
\"If you fill it in whatever way, then the book will grant one wish!\"
\ All the newbies crow, waiting for their chance to fill the pages with their wishes.
\ You open the book and read through every wish, splotched with ink and tears, every employee had, living and dead, wrote..." - observation_choices = list("Tear out the wishes", "Write your own wish") - correct_choices = list("Write your own wish") - observation_success_message = "You take out the pen from your pocket and write down your wish. It'll never come true but that's why it will always remain a wish." - observation_fail_message = "You tear out their wishes one by one. The book's page count remains the same. Did your wish come true?" + observation_choices = list( + "Write your own wish" = list(TRUE, "You take out the pen from your pocket and write down your wish. It'll never come true but that's why it will always remain a wish."), + "Tear out the wishes" = list(FALSE, "You tear out their wishes one by one. The book's page count remains the same. Did your wish come true?"), + ) var/wordcount = 0 var/list/oddities = list() //List gets populated with friendly animals @@ -133,6 +134,7 @@ spawnedmob.health = spawnedmob.maxHealth spawnedmob.death_message = "collapses into a bunch of writing material." spawnedmob.filters += filter(type="drop_shadow", x=0, y=0, size=1, offset=0, color=rgb(0, 0, 0)) + spawnedmob.blood_volume = 0 src.visible_message(span_warning("Pages of [src] fold into [spawnedmob]!")) playsound(get_turf(src), 'sound/items/handling/paper_pickup.ogg', 90, 1, FALSE) diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/cherry_blossoms.dm b/code/modules/mob/living/simple_animal/abnormality/teth/cherry_blossoms.dm index 163b6159af74..106f715a0a38 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/cherry_blossoms.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/cherry_blossoms.dm @@ -33,12 +33,12 @@ observation_prompt = "The tree is adorned with beautiful leaves growing here and there.
\ The kind of sight you could never even hope to see in this dark and dreary place.
\ You can take a moment to take in the beauty before you begin to work." - observation_choices = list("Take in the beauty") - correct_choices = list("Take in the beauty") - observation_success_message = "You feel refreshed after just taking a moment to watch such a beautiful thing.
\ - This doesn't mean that you don't know that this is a dangerous abnormality.
\ - There is beauty even in great and terrible things.
\ - Even the bodies underneath this tree would agree with you." + observation_choices = list( + "Take in the beauty" = list(TRUE, "You feel refreshed after just taking a moment to watch such a beautiful thing.
\ + This doesn't mean that you don't know that this is a dangerous abnormality.
\ + There is beauty even in great and terrible things.
\ + Even the bodies underneath this tree would agree with you."), + ) var/number_of_marks = 5 diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/cinderella.dm b/code/modules/mob/living/simple_animal/abnormality/teth/cinderella.dm index 751804e318af..9b1f3614964d 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/cinderella.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/cinderella.dm @@ -38,14 +38,13 @@ (You sit and wait.)
\ Do you not need me anymore? Did I not take you to the happiest night of your life?
\ (You sit and...)" - observation_choices = list("Remember that night", "Wait") - correct_choices = list("Remember that night") - observation_success_message = "Yes, it was the happiest night of both our lives...
\ - (The colour returns to your flesh and your wheels begin to mend.)
\ - Let's go back to that wonderous, magical night..." - observation_fail_message = "She still may have need of me, I'll wait until I'm called.
\ - (Your flesh turns grey, no one will need such a horrid looking carriage.)" - + observation_choices = list( + "Remember that night" = list(TRUE, "Yes, it was the happiest night of both our lives...
\ + (The colour returns to your flesh and your wheels begin to mend.)
\ + Let's go back to that wonderous, magical night..."), + "Wait" = list(FALSE, "She still may have need of me, I'll wait until I'm called.
\ + (Your flesh turns grey, no one will need such a horrid looking carriage.)"), + ) var/freshness = 0 //Breach stuff diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/cleaner.dm b/code/modules/mob/living/simple_animal/abnormality/teth/cleaner.dm index 9f7d4dfae5d3..5235bf64a41b 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/cleaner.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/cleaner.dm @@ -54,16 +54,16 @@ The model next to mine boasted that it has multiple parts that others don't.
\ Is that what makes one special?
\ Am I special the way I am?" - observation_choices = list("You are special", "You are not special") - correct_choices = list("You are not special") - observation_success_message = "\"Am I not special, not special, not special?\"
\ - After giving a lagged reply, it suddenly began tearing off all the cleaning gadgets from its body and crashing into walls.
\ - It rubbed its body on other objects while sparks flew off as if it was trying to attach things to it.
\ - It only stopped after a while.
\ - \"Maybe I wanted to be special.\"" - observation_fail_message = "\"No. I am not special.\"
\ - Disregarding the answer, it gives a stern reply.
\ - \"I will keep living an ordinary life, the same as now, just as assigned to me.\"" + observation_choices = list( + "You are not special" = list(TRUE, "\"Am I not special, not special, not special?\"
\ + After giving a lagged reply, it suddenly began tearing off all the cleaning gadgets from its body and crashing into walls.
\ + It rubbed its body on other objects while sparks flew off as if it was trying to attach things to it.
\ + It only stopped after a while.
\ + \"Maybe I wanted to be special.\""), + "You are special" = list(FALSE, "\"No. I am not special.\"
\ + Disregarding the answer, it gives a stern reply.
\ + \"I will keep living an ordinary life, the same as now, just as assigned to me.\""), + ) var/bumpdamage = 10 diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/crumbling_armor.dm b/code/modules/mob/living/simple_animal/abnormality/teth/crumbling_armor.dm index d6ebb1ab472e..8c6bd5b4fa33 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/crumbling_armor.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/crumbling_armor.dm @@ -31,10 +31,10 @@ secret_icon_state = "megalovania" observation_prompt = "The armor that took away many people's lives is sitting in front of you.
You can put it on, if you wish." - observation_choices = list("Put it on", "Dont't put it on") - correct_choices = list("Put it on") - observation_success_message = "It seems like you were not pacifist.
You feel the armor's warm welcome." - observation_fail_message = "The armor waits for another reckless one." + observation_choices = list( + "Put it on" = list(TRUE, "It seems like you were not pacifist.
You feel the armor's warm welcome."), + "Dont't put it on" = list(FALSE, "The armor waits for another reckless one."), + ) var/buff_icon = 'ModularTegustation/Teguicons/tegu_effects.dmi' var/user_armored @@ -49,15 +49,14 @@ ..() gift_type = null -/mob/living/simple_animal/hostile/abnormality/crumbling_armor/ObservationResult(mob/living/carbon/human/user, condition) +/mob/living/simple_animal/hostile/abnormality/crumbling_armor/ObservationResult(mob/living/carbon/human/user, success, reply) . = ..() - if(condition) + if(success) var/datum/ego_gifts/recklessCourage/R = new user.Apply_Gift(R) if(!armor_dispensed) // You only get one of these. Ever. new /obj/item/clothing/suit/armor/ego_gear/he/crumbling_armor(get_turf(user)) armor_dispensed = TRUE - datum_reference.observation_ready = FALSE /mob/living/simple_animal/hostile/abnormality/crumbling_armor/SuccessEffect(mob/living/carbon/human/user, work_type, pe) . = ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/dealerdamned.dm b/code/modules/mob/living/simple_animal/abnormality/teth/dealerdamned.dm index 1853b9590e85..46b4915a51bf 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/dealerdamned.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/dealerdamned.dm @@ -32,10 +32,10 @@ observation_prompt = "You awaken to a building flooded with stimulation; guests mingle and drink as slot machines whirr and blare their tunes, drowning out the mourning of those who have lost it all.
\ Amidst all this, you find yourself sat in front of a poker table, already in the middle of a game. The Dealer turns to you, eagerly awaiting your next move." - observation_choices = list("Call", "Fold") - correct_choices = list("Call") - observation_success_message = "You call, confident your hand is enough to win. However, you lose, beat by none other than a Royal Flush. Despite this loss, you continue to play, confident your luck will eventually turn around..." - observation_fail_message = "You fold, wishing to cling to what little remains of your wealth. Despite lacking any facial features, you can feel the Dealer's disappointment..." + observation_choices = list( + "Call" = list(TRUE, "You call, confident your hand is enough to win. However, you lose, beat by none other than a Royal Flush. Despite this loss, you continue to play, confident your luck will eventually turn around..."), + "Fold" = list(FALSE, "You fold, wishing to cling to what little remains of your wealth. Despite lacking any facial features, you can feel the Dealer's disappointment..."), + ) //Coinflip V1; Expect Jank /mob/living/simple_animal/hostile/abnormality/dealerdamned/funpet(mob/petter) diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/dingle_dangle.dm b/code/modules/mob/living/simple_animal/abnormality/teth/dingle_dangle.dm index c9e959226555..35656f5928bd 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/dingle_dangle.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/dingle_dangle.dm @@ -29,11 +29,14 @@ abnormality_origin = ABNORMALITY_ORIGIN_WONDERLAB observation_prompt = "You pass by the containment cell and, in the corner of your eye, spy your comrades dangling from ribbons, furiously scratching at their necks in choked agony." - observation_choices = list("Save them", "Do not save them") - correct_choices = list("Save them", "Do not save them") - observation_success_message = "Regardless of your resolution, you find yourself before the tree anyway as one of its ribbons wrap around your neck.
\ - \"Let's dangle together, let your sorrows, your pain dangle, let's all dangle down...\"
It whispers into your mind.
\ - Your comrades were never here, the life passes from your body painlessly.
None of this is real." + observation_choices = list( + "Save them" = list(TRUE, "Regardless of your resolution, you find yourself before the tree anyway as one of its ribbons wrap around your neck.
\ + \"Let's dangle together, let your sorrows, your pain dangle, let's all dangle down...\"
It whispers into your mind.
\ + Your comrades were never here, the life passes from your body painlessly.
None of this is real."), + "Do not save them" = list(TRUE, "Regardless of your resolution, you find yourself before the tree anyway as one of its ribbons wrap around your neck.
\ + \"Let's dangle together, let your sorrows, your pain dangle, let's all dangle down...\"
It whispers into your mind.
\ + Your comrades were never here, the life passes from your body painlessly.
None of this is real."), + ) //Introduction to our hallucinations. This is a global hallucination, but it's all it really does. /mob/living/simple_animal/hostile/abnormality/dingledangle/ZeroQliphoth(mob/living/carbon/human/user) diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/drowned_sisters.dm b/code/modules/mob/living/simple_animal/abnormality/teth/drowned_sisters.dm index ff6d8c9c05c2..03dbd1608667 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/drowned_sisters.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/drowned_sisters.dm @@ -30,10 +30,12 @@ observation_prompt = "You sit cross-legged before the pair, flowers conceal their faces and expression.
\ \"Ahh, woe is us. We have become sinners. Please hear us, hear of our sins that we do not know we've committed, and absolve us of our grief...\"" - observation_choices = list("Listen to their story", "Don't listen") - correct_choices = list("Listen to their story", "Don't listen") - observation_success_message = "You exit the cell, their story leaving your mind and voices on the wind but their sorrow remains.
\ - You'll be back again and still won't understand their grief." + observation_choices = list( + "Listen to their story" = list(TRUE, "You exit the cell, their story leaving your mind and voices on the wind but their sorrow remains.
\ + You'll be back again and still won't understand their grief."), + "Don't listen" = list(TRUE, "You exit the cell, their story leaving your mind and voices on the wind but their sorrow remains.
\ + You'll be back again and still won't understand their grief."), + ) var/breaching = FALSE diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/faelantern.dm b/code/modules/mob/living/simple_animal/abnormality/teth/faelantern.dm index 71d826514fe1..22bec8a4991f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/faelantern.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/faelantern.dm @@ -10,6 +10,7 @@ portrait = "faelantern" maxHealth = 1200 health = 1200 + blood_volume = 0 base_pixel_x = -16 pixel_x = -16 threat_level = TETH_LEVEL @@ -45,16 +46,15 @@ A small fairy with a green glow sits atop it.
\ Saying no words, the fairy waves at you, inviting you to come over and take a break.
\ It looked like it was smiling, and it might have been dancing." - observation_choices = list("Take a momentary break", "Move on without resting", "Take a break where you're standing") - correct_choices = list("Move on without resting") - observation_success_message = "This is no time to be careless and stop here.
\ - Tree branches came at you to halt you from leaving, but you narrowly dodged them.
\ - You knew the real meaning of the fairy's gesture:
\ - \"There's no such thing as a free gift\"." - observation_fail_message = "The fairy's smile stretches into an eerie grin. You shouldn't have trusted its appearance and now you'll have to pay the price." - //Extra wrong answer - var/observation_fail_message_2 = "You ignore the beckoning fairy and take a short break where you stand.
\ - As you gather yourself to continue on the journey, you realize that several branches had grown in the premises, trapping you in." + observation_choices = list( + "Move on without resting" = list(TRUE, "This is no time to be careless and stop here.
\ + Tree branches came at you to halt you from leaving, but you narrowly dodged them.
\ + You knew the real meaning of the fairy's gesture:
\ + \"There's no such thing as a free gift\"."), + "Take a momentary break" = list(FALSE, "The fairy's smile stretches into an eerie grin. You shouldn't have trusted its appearance and now you'll have to pay the price."), + "Take a break where you're standing" = list(FALSE, "You ignore the beckoning fairy and take a short break where you stand.
\ + As you gather yourself to continue on the journey, you realize that several branches had grown in the premises, trapping you in."), + ) var/can_act = FALSE var/break_threshold = 450 @@ -68,13 +68,6 @@ var/stab_cooldown_time = 30 var/lured_list = list() -/mob/living/simple_animal/hostile/abnormality/faelantern/ObservationResult(mob/living/carbon/human/user, condition, answer) //special answer - if(answer == "Take a break where you're standing") - observation_fail_message = observation_fail_message_2 - else - observation_fail_message = initial(observation_fail_message) - return ..() - /mob/living/simple_animal/hostile/abnormality/faelantern/AttackingTarget(atom/attacked_target) return OpenFire() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/fairy_gentleman.dm b/code/modules/mob/living/simple_animal/abnormality/teth/fairy_gentleman.dm index a7a2c437393f..92ec524b8b6b 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/fairy_gentleman.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/fairy_gentleman.dm @@ -48,11 +48,11 @@ ) observation_prompt = "\"Care for a drink?\"" - observation_choices = list("Yes", "No") - correct_choices = list("Yes") - observation_success_message = "\"Yer a good drinkin buddy as any!\"" - observation_fail_message = "\"Pssh! you're no fun!\"
\ - The fairy walks away, stumbling along the way." + observation_choices = list( + "Yes" = list(TRUE, "\"Yer a good drinkin buddy as any!\""), + "No" = list(FALSE, "\"Pssh! you're no fun!\"
\ + The fairy walks away, stumbling along the way."), + ) var/can_act = TRUE var/jump_cooldown = 0 @@ -131,16 +131,16 @@ is_flying_animal = TRUE ADD_TRAIT(src, TRAIT_MOVE_FLYING, INNATE_TRAIT) -/mob/living/simple_animal/hostile/abnormality/fairy_gentleman/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/fairy_gentleman/AttackingTarget(atom/attacked_target) if(!can_act) return melee_damage_type = WHITE_DAMAGE if(jump_cooldown <= world.time && prob(10) && !client) - FairyJump(target) + FairyJump(attacked_target) return - if(!ishuman(target)) + if(!ishuman(attacked_target)) return ..() - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target H.drunkenness += 5 to_chat(H, span_warning("Yuck, some of it got in your mouth!")) if(H.sanity_lost) diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/fairy_long_legs.dm b/code/modules/mob/living/simple_animal/abnormality/teth/fairy_long_legs.dm index ff119b9b0681..d42c858169a0 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/fairy_long_legs.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/fairy_long_legs.dm @@ -52,16 +52,16 @@ observation_prompt = "Come on, why don'cha stay under the umbrella with me?
\ Just for old times sake?" - observation_choices = list("Yes", "No") - correct_choices = list("No") - observation_success_message = "You'd think that you'd have learned your lesson by now.
\ - You leave the cell, having narrowly dodged the imminent attack.
\ - This guy will always be a crook." - observation_fail_message = "Ouch!
\ - The moment you get in striking range of fairy long legs, you are attacked.
\ - \"Heh. You really think you could be one of us, pal?\"
\ - \"You aint part of the family, chump.\"
\ - You walk away, and bandage the bleeding wound." + observation_choices = list( + "No" = list(TRUE, "You'd think that you'd have learned your lesson by now.
\ + You leave the cell, having narrowly dodged the imminent attack.
\ + This guy will always be a crook."), + "Yes" = list(FALSE, "Ouch!
\ + The moment you get in striking range of fairy long legs, you are attacked.
\ + \"Heh. You really think you could be one of us, pal?\"
\ + \"You aint part of the family, chump.\"
\ + You walk away, and bandage the bleeding wound."), + ) var/finishing = FALSE //cant move/attack when it's TRUE var/work_count = 0 @@ -157,10 +157,10 @@ icon_state = "fairy_longlegs" //Breach Stuff -/mob/living/simple_animal/hostile/abnormality/fairy_longlegs/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/fairy_longlegs/AttackingTarget(atom/attacked_target) if(finishing) return FALSE - if(!istype(target, /mob/living/carbon/human)) + if(!istype(attacked_target, /mob/living/carbon/human)) return ..() finishing = TRUE icon_state = "fairy_longlegs_healing" diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/falada.dm b/code/modules/mob/living/simple_animal/abnormality/teth/falada.dm index 90c185e75414..30447a80f7e0 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/falada.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/falada.dm @@ -33,13 +33,13 @@ observation_prompt = "A severed horse-like creature's head hangs high on the wall, sobbing.
\ You can't help but feel some pity for the thing." - observation_choices = list("Why the long face?", "What happened to you?") - correct_choices = list("What happened to you?") - observation_success_message = "The horse head begins speaking.
\ - \"Oh, woe is me. If only it could be - the powers that be, would see fit to have me die in her stead.\"
\ - It speaks in rhymes, but it clearly lost someone important to it.
\ - Even if there is nothing you can do, at least you are there to listen." - observation_fail_message = "The horse head continues sobbing, despite your cheesy joke.
Maybe that wasn't the best approach." + observation_choices = list( + "What happened to you?" = list(TRUE, "The horse head begins speaking.
\ + \"Oh, woe is me. If only it could be - the powers that be, would see fit to have me die in her stead.\"
\ + It speaks in rhymes, but it clearly lost someone important to it.
\ + Even if there is nothing you can do, at least you are there to listen."), + "Why the long face?" = list(FALSE, "The horse head continues sobbing, despite your cheesy joke.
Maybe that wasn't the best approach."), + ) var/liked var/happy = TRUE diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/forsaken_employee.dm b/code/modules/mob/living/simple_animal/abnormality/teth/forsaken_employee.dm index 1d9a304e2bac..d3badcc9f1c1 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/forsaken_employee.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/forsaken_employee.dm @@ -32,14 +32,14 @@ The card is almost too battered and contaminated to recognize.
\ Wearing a box filled with Enkephalin on their head, the employee rams it into what looks like the door to a containment unit.
\ A rubber O-ring is worn around their neck. Could it be there to prevent Enkephalin from spilling?" - observation_choices = list("Cut the ring.", "Don't cut the ring.") - correct_choices = list("Cut the ring.") - observation_success_message = " The blade kept bouncing off the slippery O-ring...
\ - \"Brgrrgh...\
\ - And the submerged thing pushed you away and ran off. Did it prefer to stay like that?
\ - All it left was a small employee card." - observation_fail_message = "Tang- Tang- Tang- The ramming at the door and the sloshing continue.
\ - I keep watching and listening. A more attentive hearing reveals that the sounds have a rhythm. Perhaps there is delight to be found in it." + observation_choices = list( + "Cut the ring" = list(TRUE, "The blade kept bouncing off the slippery O-ring...
\ + \"Brgrrgh...\
\ + And the submerged thing pushed you away and ran off. Did it prefer to stay like that?
\ + All it left was a small employee card."), + "Don't cut the ring" = list(FALSE, "Tang- Tang- Tang- The ramming at the door and the sloshing continue.
\ + I keep watching and listening. A more attentive hearing reveals that the sounds have a rhythm. Perhaps there is delight to be found in it."), + ) /mob/living/simple_animal/hostile/abnormality/forsaken_employee/FailureEffect(mob/living/carbon/human/user, work_type, pe, work_time, canceled) . = ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/forsaken_murderer.dm b/code/modules/mob/living/simple_animal/abnormality/teth/forsaken_murderer.dm index 5fb7606dbbbe..f5b66f540746 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/forsaken_murderer.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/forsaken_murderer.dm @@ -97,13 +97,16 @@ abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY /** - * Final observation code. These variables should be self-explanatory. - */ + * Final observation code. + * observation_prompt controls the text that the user sees when they start the observation + * observation_choices is made in the format of: + * "Choice" = list(TRUE or FALSE [depending on if the answer is correct], "Response"), + */ observation_prompt = "Around his neck is a rope. It is up to you to cut his rope." - observation_choices = list("Cut the rope.", "Don't cut the rope.") - correct_choices = list("Don't cut the rope.") - observation_success_message = "His neck snaps, granting him silence and eternal rest." - observation_fail_message = "\"You think I'm pathetic, huh? But is you people who are really pathetic. Because you get killed. By people like me.\"" + observation_choices = list( + "Don't cut the rope" = list(TRUE, "His neck snaps, granting him silence and eternal rest."), + "Cut the rope" = list(FALSE, "\"You think I'm pathetic, huh? But is you people who are really pathetic. Because you get killed. By people like me.\""), + ) //Unique variable im defining for this abnormality. This is the timer for their during work emotes. var/work_emote_cooldown = 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/fragment.dm b/code/modules/mob/living/simple_animal/abnormality/teth/fragment.dm index ffc944680954..a94a67ccbff8 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/fragment.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/fragment.dm @@ -39,11 +39,11 @@ abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY observation_prompt = "It started singing. You..." - observation_choices = list("Listen to it", "Plug your ears") - correct_choices = list("Listen to it") - observation_success_message = "You silently listen to it. \ - The universe lingers in your ears. You see the song. Glamorously, it approaches you." - observation_fail_message = "You are not prepared yet. The song stopped when you plugged the ears." + observation_choices = list( + "Listen to it" = list(TRUE, "You silently listen to it. \ + The universe lingers in your ears. You see the song. Glamorously, it approaches you."), + "Plug your ears" = list(FALSE, "You are not prepared yet. The song stopped when you plugged the ears."), + ) var/song_cooldown var/song_cooldown_time = 10 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/lady_facing_the_wall.dm b/code/modules/mob/living/simple_animal/abnormality/teth/lady_facing_the_wall.dm index 4adcdc3379d4..aec6beec7c07 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/lady_facing_the_wall.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/lady_facing_the_wall.dm @@ -34,11 +34,10 @@ Her muttering is unintelligible, and it gives you goosebumps. You don't like being in the same space with her. \ You want to get out. The woman seems to be sobbing. You feel as though her crying is insisting you to turn towards her. \ And you also feel, that you should not." - observation_choices = list("Do not turn back.", "Turn back.") - correct_choices = list("Turn back.") - observation_success_message = "You face the fear, and turn to face the woman." - observation_fail_message = "Something terrible could happen if you turn back. You exit the room, without looking back." - + observation_choices = list( + "Turn back" = list(TRUE, "You face the fear, and turn to face the woman."), + "Do not turn back" = list(FALSE, "Something terrible could happen if you turn back. You exit the room, without looking back."), + ) /mob/living/simple_animal/hostile/abnormality/wall_gazer/NeutralEffect(mob/living/carbon/human/user, work_type, pe) . = ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/meat_lantern.dm b/code/modules/mob/living/simple_animal/abnormality/teth/meat_lantern.dm index 1b5dbb190dc8..9ddc1364d8a8 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/meat_lantern.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/meat_lantern.dm @@ -39,10 +39,10 @@ observation_prompt = "It's always the same, dull colours in the facility. Grey walls, grey floors, grey ceilings, even the people were grey.
\ Every day was grey until, one day, you saw the a small, beautifully green flower growing and glowing from the ground." - observation_choices = list("Approach the flower", "Call for security") - correct_choices = list("Approach the flower") - observation_success_message = "It's the most beautiful thing you've ever seen, you brush your hand against it and the petals tickle your hand. You feel a tremor beneath and..." - observation_fail_message = "Something so beautiful had no right to exist in the City. You called for security and left in a hurry back to your grey workplace." + observation_choices = list( + "Approach the flower" = list(TRUE, "It's the most beautiful thing you've ever seen, you brush your hand against it and the petals tickle your hand. You feel a tremor beneath and..."), + "Call for security" = list(FALSE, "Something so beautiful had no right to exist in the City. You called for security and left in a hurry back to your grey workplace."), + ) var/can_act = TRUE var/detect_range = 1 diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/my_sweet_home.dm b/code/modules/mob/living/simple_animal/abnormality/teth/my_sweet_home.dm index b53ba5801184..9fad97edcc9d 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/my_sweet_home.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/my_sweet_home.dm @@ -49,13 +49,13 @@ A perfect, safe place away from this scary room.
\ Everything for you.
\ Won't you come inside?" - observation_choices = list("Go inside", "Don't go inside") - correct_choices = list("Don't go inside") - observation_success_message = "Some things are too good to be true.
\ - You take the key from under the doormat, and leave." - observation_fail_message = "A key appears in your hand.
\ - You move to open the door.
\ - But at the last minute, you are pulled away by another agent to safety." + observation_choices = list( + "Don't go inside" = list(TRUE, "Some things are too good to be true.
\ + You take the key from under the doormat, and leave."), + "Go inside" = list(FALSE, "A key appears in your hand.
\ + You move to open the door.
\ + But at the last minute, you are pulled away by another agent to safety."), + ) var/ranged_damage = 15 var/damage_dealt = 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/old_lady.dm b/code/modules/mob/living/simple_animal/abnormality/teth/old_lady.dm index e379c825ce46..d4121d654d65 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/old_lady.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/old_lady.dm @@ -30,12 +30,12 @@ Because I don't like to listen to stories. Bugs were buzzing around here and there. \ Something slimy popped as I set my foot on it. I found her. Every hole on her face was swarming bugs. \ I don't want to stay here. I want to get out. It's damp, nasty, and awful. I can't stand it anymore." - observation_choices = list("Get out", "Stay") - correct_choices = list("Stay") - observation_success_message = "I stayed, bearing the unpleasantness. \ - She was so talkative before. In the end, loneliness was the only listener. \ - She called me, with her finger. I am now ready to listen to her story." - observation_fail_message = "I turned around to get out of this place. Once again, I bit lips in self-hatred while escaping." + observation_choices = list( + "Stay" = list(TRUE, "I stayed, bearing the unpleasantness. \ + She was so talkative before. In the end, loneliness was the only listener. \ + She called me, with her finger. I am now ready to listen to her story."), + "Get out" = list(FALSE, "I turned around to get out of this place. Once again, I bit lips in self-hatred while escaping."), + ) var/meltdown_cooldown_time = 120 SECONDS var/meltdown_cooldown diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/pale_horse.dm b/code/modules/mob/living/simple_animal/abnormality/teth/pale_horse.dm index 2dd93448990a..494912cc95ad 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/pale_horse.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/pale_horse.dm @@ -41,12 +41,12 @@ observation_prompt = "Joseph came to you once, his face flush with excitement after the horse wept before him. He's \"Nothing There\"'s shell now.
\ Did the horse merely prognosticate his death or did it doom him? You're outside the containment unit now and your legs tremble, you've been ordered to work it today.
\ You..." - observation_choices = list("Enter the containment unit", "Pretend you didn't get the order") - correct_choices = list("Enter the containment unit") - observation_success_message = "You enter the containment unit and kneel before the horse.
\ - It kneels next to you and a single tear drips from its eye onto your shoulder. You hold onto its head as you both weep.
\ - Death is terrifying but at least you know something weeps for you." - observation_fail_message = "You pretend you didn't get the order and make to leave, your PDA flashes again, you've been assigned to \"Nothing There\" and this time, you're being escorted." + observation_choices = list( + "Enter the containment unit" = list(TRUE, "You enter the containment unit and kneel before the horse.
\ + It kneels next to you and a single tear drips from its eye onto your shoulder. You hold onto its head as you both weep.
\ + Death is terrifying but at least you know something weeps for you."), + "Pretend you didn't get the order" = list(FALSE, "You pretend you didn't get the order and make to leave, your PDA flashes again, you've been assigned to \"Nothing There\" and this time, you're being escorted."), + ) //teleport var/can_act = TRUE @@ -136,11 +136,11 @@ for(var/turf/T in view(1, target_turf)) new /obj/effect/temp_visual/palefog(T) -/mob/living/simple_animal/hostile/abnormality/pale_horse/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/pale_horse/AttackingTarget(atom/attacked_target) . = ..() - if(!ishuman(target)) + if(!ishuman(attacked_target)) return FALSE - var/mob/living/carbon/human/T = target + var/mob/living/carbon/human/T = attacked_target if(T.health > 0) var/datum/status_effect/mortis/M = T.has_status_effect(/datum/status_effect/mortis) if(!M) diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/penitent_girl.dm b/code/modules/mob/living/simple_animal/abnormality/teth/penitent_girl.dm index 0f98c6e212f8..c190d7b3c524 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/penitent_girl.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/penitent_girl.dm @@ -31,13 +31,13 @@ observation_prompt = "A girl in front of you dances, stumbling to and fro.
\ Her feet are chopped off at the ankles, and yet they still move.
\ You..." - observation_choices = list("Put on the shoes.", "Don't put on the shoes.") - correct_choices = list("Put on the shoes.") - observation_success_message = "You remove the severed feet, and put on the shoes.
\ - It feels good.
You want to dance.
Please, chop off my feet." - observation_fail_message = "How could you do something so gross?
\ - You leave the shoes where they are.
\ - The girl continues shifting about without a care in the world." + observation_choices = list( + "Put on the shoes" = list(TRUE, "You remove the severed feet, and put on the shoes.
\ + It feels good.
You want to dance.
Please, chop off my feet."), + "Don't put on the shoes" = list(FALSE, "How could you do something so gross?
\ + You leave the shoes where they are.
\ + The girl continues shifting about without a care in the world."), + ) //Work Mechanics /mob/living/simple_animal/hostile/abnormality/penitentgirl/AttemptWork(mob/living/carbon/human/user, work_type) diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/ppodae.dm b/code/modules/mob/living/simple_animal/abnormality/teth/ppodae.dm index a72bb70aabe8..1cefafe549cd 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/ppodae.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/ppodae.dm @@ -37,10 +37,10 @@ abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY observation_prompt = "Before me stands a creature, eagerly awaiting its next meal. The creature is..." - observation_choices = list("A puppy", "A monster") - correct_choices = list("A monster") - observation_success_message = "I don't know how I didn't see it before, I rushed out to warn the others. I was fired the next day." - observation_fail_message = "It's the cutest puppy I've ever seen." + observation_choices = list( + "A monster" = list(TRUE, "I don't know how I didn't see it before, I rushed out to warn the others. I was fired the next day."), + "A puppy" = list(FALSE, "It's the cutest puppy I've ever seen."), + ) var/smash_damage_low = 16 var/smash_damage_high = 28 @@ -53,11 +53,11 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/abnormality/ppodae/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/ppodae/AttackingTarget(atom/attacked_target) if(!can_act) return FALSE - var/mob/living/carbon/L = target - if(iscarbon(target) && (L.health < 0 || L.stat == DEAD)) + var/mob/living/carbon/L = attacked_target + if(iscarbon(attacked_target) && (L.health < 0 || L.stat == DEAD)) if(HAS_TRAIT(L, TRAIT_NODISMEMBER)) return var/list/parts = list() @@ -72,7 +72,7 @@ bp.forceMove(get_turf(datum_reference.landmark)) // Teleports limb to containment QDEL_NULL(src) // Taken from eldritch_demons.dm - return Smash(target) + return Smash(attacked_target) //AoE attack taken from woodsman /mob/living/simple_animal/hostile/abnormality/ppodae/proc/Smash(target) diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/punishing_bird.dm b/code/modules/mob/living/simple_animal/abnormality/teth/punishing_bird.dm index e454d8b0bd30..6c2fa3bc93ef 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/punishing_bird.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/punishing_bird.dm @@ -60,9 +60,10 @@ ) observation_prompt = "A bird stares at you. What is the name of this bird?" - observation_choices = list("Little bird", "Punishing bird") - correct_choices = list("Little bird", "Punishing bird") - observation_success_message = "The small bird accepts whatever name you decide to give it. Its nature can never change now." + observation_choices = list( + "Little bird" = list(TRUE, "The small bird accepts whatever name you decide to give it. Its nature can never change now."), + "Punishing bird" = list(TRUE, "The small bird accepts whatever name you decide to give it. Its nature can never change now."), + ) do_not_possess = TRUE @@ -166,8 +167,8 @@ var/mob/living/carbon/le_target = pick(potential_mobs) pecking_targets |= le_target -/mob/living/simple_animal/hostile/abnormality/punishing_bird/AttackingTarget() - if(ishuman(target) && bird_angry) +/mob/living/simple_animal/hostile/abnormality/punishing_bird/AttackingTarget(atom/attacked_target) + if(ishuman(attacked_target) && bird_angry) melee_damage_lower = angry_damage_human melee_damage_upper = angry_damage_human @@ -179,8 +180,8 @@ melee_damage_lower = 1 melee_damage_upper = 2 - if(isliving(target)) - var/mob/living/L = target + if(isliving(attacked_target)) + var/mob/living/L = attacked_target if(!(L in enemies) && obj_damage > 0) // The target didn't attack us and we've transformed to_chat(src, span_warning("You can't punish innocent people!")) return diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/redblooded.dm b/code/modules/mob/living/simple_animal/abnormality/teth/redblooded.dm index f1d80feee7c4..2a1ef57e4e76 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/redblooded.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/redblooded.dm @@ -52,14 +52,14 @@ \"Blowing freakshits away with my shotgun.
Talking with my brothers in arms.\"
\ \"That's all I ever needed.
All I ever wanted.
Even now, I fight for the glory of my country.\"
\ \"Do you have anything, anyone, to serve and protect?\"" - observation_choices = list("I don't.", "I do.") - correct_choices = list("I do.") - observation_success_message = "\"Heh.\"
\ - \"We might not be on the same side but I can respect that.\"
\ - \"Go on then, freak.
Show me that you can protect what matters to you.\"" - observation_fail_message = "\"Feh.
Then what's the point of living, huh?\"
\ - \"Without a flag to protect, without a goal to achieve...\"
\ - \"Are you any better than an animal?
Get out of my sight.\"" + observation_choices = list( + "I do" = list(TRUE, "\"Heh.\"
\ + \"We might not be on the same side but I can respect that.\"
\ + \"Go on then, freak.
Show me that you can protect what matters to you.\""), + "I don't" = list(FALSE, "\"Feh.
Then what's the point of living, huh?\"
\ + \"Without a flag to protect, without a goal to achieve...\"
\ + \"Are you any better than an animal?
Get out of my sight.\""), + ) var/bloodlust = 0 //more you do repression, more damage it deals. decreases on other works. var/list/fighting_quotes = list( diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/scorched_girl.dm b/code/modules/mob/living/simple_animal/abnormality/teth/scorched_girl.dm index 6133ca1b59bd..2ff651dd3346 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/scorched_girl.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/scorched_girl.dm @@ -40,13 +40,13 @@ The match that never caught a fire before now burns to ash. Maybe is a price for taking my body, to burn so bright and fiery. \ Let's run when I can burn. I have been suffering and will suffer. But why you are still happy? \ I know the menace I have become. If nothing will change, I at least want to see you suffering." - observation_choices = list("Go to her", "Do not go to her") - correct_choices = list("Do not go to her") - observation_success_message = "I stopped. I can see her in the distance. \ - \"Maybe you are thinking I am some kind of lighthouse.\" \ - \"At least, I hope you realize my ash is all that remains after this flame consumes the all of me.\"" - observation_fail_message = "Come to me. \ - You who will soon become ashes just like me." + observation_choices = list( + "Do not go to her" = list(TRUE, "I stopped. I can see her in the distance. \ + \"Maybe you are thinking I am some kind of lighthouse.\" \ + \"At least, I hope you realize my ash is all that remains after this flame consumes the all of me.\""), + "Go to her" = list(FALSE, "Come to me. \ + You who will soon become ashes just like me."), + ) /// Restrict movement when this is set to TRUE var/exploding = FALSE @@ -84,7 +84,7 @@ var/highestcount = 0 for(var/turf/T in GLOB.department_centers) var/targets_at_tile = 0 - for(var/mob/living/L in view(10, T)) + for(var/mob/living/L in ohearers(10, T)) if(!faction_check_mob(L) && L.stat != DEAD) targets_at_tile++ if(targets_at_tile > highestcount) @@ -104,7 +104,7 @@ return var/amount_inview = 0 - for(var/mob/living/carbon/human/H in view(7, src)) + for(var/mob/living/carbon/human/H in ohearers(7, src)) if(!faction_check_mob(H) && H.stat != DEAD) amount_inview += 1 if(prob(amount_inview*20)) @@ -122,7 +122,15 @@ return FALSE /mob/living/simple_animal/hostile/abnormality/scorched_girl/AttackingTarget(atom/attacked_target) - explode() + if(client) + explode() + return + var/amount_inview = 0 + for(var/mob/living/carbon/human/H in ohearers(7, src)) + if(!faction_check_mob(H) && H.stat != DEAD) + amount_inview += 1 + if(prob(amount_inview * 20)) + explode() return /mob/living/simple_animal/hostile/abnormality/scorched_girl/proc/explode() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/shy_look.dm b/code/modules/mob/living/simple_animal/abnormality/teth/shy_look.dm index 0183a0c4ae90..54bbb65be449 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/shy_look.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/shy_look.dm @@ -30,10 +30,10 @@ abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY observation_prompt = "It's a good day! Are you still shy today?" - observation_choices = list("Yes", "No") - correct_choices = list("Yes") - observation_success_message = "\"That's no good, it's very important to have a smile on one's face! We need to be happy for our City!\"" - observation_fail_message = "\"That's great to hear! Let's see the biggest smile you can put on to make those in the Outskirts jealous!\"" + observation_choices = list( + "Yes" = list(TRUE, "\"That's no good, it's very important to have a smile on one's face! We need to be happy for our City!\""), + "No" = list(FALSE, "\"That's great to hear! Let's see the biggest smile you can put on to make those in the Outskirts jealous!\""), + ) var/chance_modifier = 1 var/previous_mood diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/simple_smile.dm b/code/modules/mob/living/simple_animal/abnormality/teth/simple_smile.dm index c7280ffdab6b..c2f288f7a2a5 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/simple_smile.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/simple_smile.dm @@ -44,14 +44,14 @@ abnormality_origin = ABNORMALITY_ORIGIN_WONDERLAB observation_prompt = "The abnormality appears to you from out of thin air, and swipes away your weapon." - observation_choices = list("Chase after it") - correct_choices = list("Chase after it") - observation_success_message = "You chase gone with a simple smile across the facility
\ - You trip and scrape your leg on the facility's floor.
\ - \"Well that wasn't very nice! You should apologize for so rudely disarming me, and having me run around like that!\"
\ - The words come out of your mouth before you even realize what is happening.
\ - And as if to answer, Gone with a Simple Smile hands your weapon back.
\ - Then, it disappears with a smile." + observation_choices = list( + "Chase after it" = list(TRUE, "You chase gone with a simple smile across the facility
\ + You trip and scrape your leg on the facility's floor.
\ + \"Well that wasn't very nice! You should apologize for so rudely disarming me, and having me run around like that!\"
\ + The words come out of your mouth before you even realize what is happening.
\ + And as if to answer, Gone with a Simple Smile hands your weapon back.
\ + Then, it disappears with a smile."), + ) var/list/stats = list( FORTITUDE_ATTRIBUTE, @@ -64,10 +64,10 @@ -/mob/living/simple_animal/hostile/abnormality/smile/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/smile/AttackingTarget(atom/attacked_target) . = ..() - if(ishuman(target)) - var/mob/living/carbon/human/L = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/L = attacked_target L.Knockdown(20) var/obj/item/held = L.get_active_held_item() L.dropItemToGround(held) //Drop weapon diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/skin_prophet.dm b/code/modules/mob/living/simple_animal/abnormality/teth/skin_prophet.dm index ff7b0cbeaca6..41050acbe1f6 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/skin_prophet.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/skin_prophet.dm @@ -32,16 +32,16 @@ hands are busy nonetheless.
\ Yearning for destruction and doom, it writes and writes and writes.
\ You feel the passages it’s writing may be prophecies for someplace and sometime." - observation_choices = list("Snuff out the candles", "Peek at the book") - correct_choices = list("Snuff out the candles") - observation_success_message = "You hushed the candles, one by one.
\ - The space grew darker, but its hands won’t stop.
\ - The only light left was on the quill it held.
\ - Even that was snuffed by our breaths.
\ - Then, the whole place went dark.
\ - All that’s left is the pen in its hand." - observation_fail_message = "!@)(!@&)&*%(%@!@#*(#)*(%&!@#$
\ - @$*@)$ ?
@#$!!@#* !
@*()!%&$(^!!!!@&(@)" + observation_choices = list( + "Snuff out the candles" = list(TRUE, "You hushed the candles, one by one.
\ + The space grew darker, but its hands won’t stop.
\ + The only light left was on the quill it held.
\ + Even that was snuffed by our breaths.
\ + Then, the whole place went dark.
\ + All that’s left is the pen in its hand."), + "Peek at the book" = list(FALSE, "!@)(!@&)&*%(%@!@#*(#)*(%&!@#$
\ + @$*@)$ ?
@#$!!@#* !
@*()!%&$(^!!!!@&(@)"), + ) var/list/speak_list = list( "!@)(!@&)&*%(%@!@#*(#)*(%&!@#$", diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/so_that_no_cry.dm b/code/modules/mob/living/simple_animal/abnormality/teth/so_that_no_cry.dm index 0756e364f675..1345db7664cf 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/so_that_no_cry.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/so_that_no_cry.dm @@ -44,15 +44,15 @@ In this cramped cell, the wooden doll stands.
\ Are the talismans here to fulfill a wish?
\ Does this wooden doll wish for anything?" - observation_choices = list("Remove the doll's talismans", "Do nothing") - correct_choices = list("Remove the doll's talismans") - observation_success_message = "After you removed them, the doll knelt.
\ - Is it begging you not to take it,
\ - or is it a gesture of gratitude?
\ - You won’t know for now." - observation_fail_message = "Nothing happened.
\ - The doll would simply stand there, producing small noises.
\ - It now ignores you, as if disappointed." + observation_choices = list( + "Remove the doll's talismans" = list(TRUE, "After you removed them, the doll knelt.
\ + Is it begging you not to take it,
\ + or is it a gesture of gratitude?
\ + You won’t know for now."), + "Do nothing" = list(FALSE, "Nothing happened.
\ + The doll would simply stand there, producing small noises.
\ + It now ignores you, as if disappointed."), + ) var/can_act = TRUE /// When this reaches 400 - begins reflecting damage @@ -193,12 +193,12 @@ can_act = TRUE //Talisman Stuff -/mob/living/simple_animal/hostile/abnormality/so_that_no_cry/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/so_that_no_cry/AttackingTarget(atom/attacked_target) if(!can_act) return - if(!ishuman(target)) + if(!ishuman(attacked_target)) return ..() - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target Apply_Talisman(H) return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/someonesportrait.dm b/code/modules/mob/living/simple_animal/abnormality/teth/someonesportrait.dm index 7dd806c49ac4..847d2781e6dd 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/someonesportrait.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/someonesportrait.dm @@ -29,11 +29,11 @@ //TODO: Resprite + redo of this observation_prompt = "The portrait has been in our family's possession for a long time.
\ They say it was of a very important relative of ours, but we do not recognize anyone present.
I've always hated the picture, why couldn't anyone else see it was just biding its time, waiting to strike?" - observation_choices = list("Destroy the picture") - correct_choices = list("Destroy the picture") - observation_success_message = "One night, when everyone else was asleep, I snuck out of my room and found myself before that horrible thing.
\ - Retrieving a lighter from my pocket I flicked it on and held it to the painting...
\ - It turned out I was right, it was waiting to attack and I got into its striking range when no one else was around..." + observation_choices = list( + "Destroy the picture" = list(TRUE, "One night, when everyone else was asleep, I snuck out of my room and found myself before that horrible thing.
\ + Retrieving a lighter from my pocket I flicked it on and held it to the painting...
\ + It turned out I was right, it was waiting to attack and I got into its striking range when no one else was around..."), + ) //Initialize /mob/living/simple_animal/hostile/abnormality/someones_portrait/PostSpawn() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/spider_bud.dm b/code/modules/mob/living/simple_animal/abnormality/teth/spider_bud.dm index 7bb700d05279..21012c411d33 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/spider_bud.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/spider_bud.dm @@ -30,13 +30,13 @@ observation_prompt = "I am a spider.
I eat anything my web catches.
I am starving.
\ I haven't eaten anything for days.
There is a big prey hanging on my web.
\ My starvation could kill me if I don't eat something." - observation_choices = list("Eat the prey.", "Do not eat the prey.") - correct_choices = list("Do not eat the prey.") - observation_success_message = "I could not eat the prey in front of me.
\ - This starvation is slowly tiring me.
The prey struggles to get out, to survive.
\ - The struggle did nothing but shaking my web a little bit.
And I watch the prey." - observation_fail_message = "I devoured the prey.
\ - My body reacted faster than my thoughts.
...
I am a spider.
I eat anything my web catches." + observation_choices = list( + "Do not eat the prey" = list(TRUE, "I could not eat the prey in front of me.
\ + This starvation is slowly tiring me.
The prey struggles to get out, to survive.
\ + The struggle did nothing but shaking my web a little bit.
And I watch the prey."), + "Eat the prey" = list(FALSE, "I devoured the prey.
\ + My body reacted faster than my thoughts.
...
I am a spider.
I eat anything my web catches."), + ) /// Filled with ckeys of people who broke our cocoons, they need to pay if they dare mess with us var/list/metagame_list = list() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/training_rabbit.dm b/code/modules/mob/living/simple_animal/abnormality/teth/training_rabbit.dm index cf9ed70d7468..1937f3a91e42 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/training_rabbit.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/training_rabbit.dm @@ -37,14 +37,14 @@ observation_prompt = "This is the training dummy that Lobotomy Corporation uses for training new agents.
\ But is that really all there is to it?
\ Looking closely, you find..." - observation_choices = list("A dead body?", "Nothing") - correct_choices = list("A dead body?") - observation_success_message = "The facial structure, the torso, arms and legs, not to mention the stench...
\ - There's no doubt that this is just a dead body in a body bag, flipped upside-down.
\ - In spite of all this, it provides a gift to you. It continues moving around as if it were alive.
\ - So this is what they call an abnormality.
\ - Are all abnormalities at Lobotomy Corporation this strange?" - observation_fail_message = "Your imagination must be going haywire due to the stress.
There's no way such an out-of-place thing could be there!" + observation_choices = list( + "A dead body?" = list(TRUE, "The facial structure, the torso, arms and legs, not to mention the stench...
\ + There's no doubt that this is just a dead body in a body bag, flipped upside-down.
\ + In spite of all this, it provides a gift to you. It continues moving around as if it were alive.
\ + So this is what they call an abnormality.
\ + Are all abnormalities at Lobotomy Corporation this strange?"), + "Nothing" = list(FALSE, "Your imagination must be going haywire due to the stress.
There's no way such an out-of-place thing could be there!"), + ) /mob/living/simple_animal/hostile/abnormality/training_rabbit/BreachEffect(mob/living/carbon/human/user, breach_type) . = ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/teth/void_dream.dm b/code/modules/mob/living/simple_animal/abnormality/teth/void_dream.dm index 0b28cd1ba22c..984a073ab150 100644 --- a/code/modules/mob/living/simple_animal/abnormality/teth/void_dream.dm +++ b/code/modules/mob/living/simple_animal/abnormality/teth/void_dream.dm @@ -40,10 +40,10 @@ I go out and bring such sweet dreams to those who've only learned to stop dreaming,
\ I'm not to blame if their dreams are so entrancing they become hollow people in their waking lives, am I not?
\ Don't you want such sweet dreams too?\"" - observation_choices = list("You're a demon", "Please, eat my dreams") - correct_choices = list("You're a demon") - observation_success_message = "\"Don't say such scary, complicated things.
I just gave them the enrapturing dreams they wanted.
They're destined to come back to me.\"" - observation_fail_message = "It's alright, dreams are harmless but unnecessary things.
So, just close your eyes and show me your most delectable dream..." + observation_choices = list( + "You're a demon" = list(TRUE, "\"Don't say such scary, complicated things.
I just gave them the enrapturing dreams they wanted.
They're destined to come back to me.\""), + "Please, eat my dreams" = list(FALSE, "It's alright, dreams are harmless but unnecessary things.
So, just close your eyes and show me your most delectable dream..."), + ) var/punched = FALSE var/pulse_damage = 50 diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/alriune.dm b/code/modules/mob/living/simple_animal/abnormality/waw/alriune.dm index 96ccecb95f18..d4cc3b554a9e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/alriune.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/alriune.dm @@ -35,12 +35,11 @@ observation_prompt = "You told me, shedding petals instead of tears.
\ \"We were all nothing but soil once, so do not speak of an end here.\"
\ You told me, blossoming flowers from body as if they are your last words.
\"Soon...\"" - observation_choices = list("Spring will come.", "Winter will come.") - correct_choices = list("Spring will come.", "Winter will come.") - observation_success_message = "Spring is coming.
Slowly, rapturously, my end began." - //Special answer for choice 2 - var/observation_success_message_2 = "Winter is coming.
\ - Gradually, my exipation was drawing to an end hectically." + observation_choices = list( + "Spring will come" = list(TRUE, "Spring is coming.
Slowly, rapturously, my end began."), + "Winter will come" = list(TRUE, "Winter is coming.
\ + Gradually, my exipation was drawing to an end hectically."), + ) /// Currently displayed petals. When value is at 3 - reset to 0 and perform attack var/petals_current = 0 @@ -58,13 +57,6 @@ gift_type = /datum/ego_gifts/aroma abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY -/mob/living/simple_animal/hostile/abnormality/alriune/ObservationResult(mob/living/carbon/human/user, condition, answer) //special answer for winter - if(answer == "Winter will come.") - observation_success_message = observation_success_message_2 - else - observation_success_message = initial(observation_success_message) - return ..() - /* Combat */ /mob/living/simple_animal/hostile/abnormality/alriune/Move() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/apex_predator.dm b/code/modules/mob/living/simple_animal/abnormality/waw/apex_predator.dm index 70ba22917f5a..8e75e6dcba6f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/apex_predator.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/apex_predator.dm @@ -50,14 +50,14 @@ You're not sure if it's even able to understand you.
Despite being shaped like a human, there's no face to relate to.
No eyes to look at.
\ Just the rough outline of a human.
\ Is there even anything you can say to it?" - observation_choices = list("Beat it up.", "Why?") - correct_choices = list("Why?") - observation_success_message = "The abnormality suddenly stops moving.
It doesn't quite know how to respond either.
\ - It stares down at the floor as if to contemplate the question.
\ - All it can offer is a shrug.
Perhaps there isn't an answer." - observation_fail_message = "There's nothing to say.
A crash test dummy's only purpose is to enable violence.
\ - Violence for the sake of violence.
\ - You smile as you pull out your baton." + observation_choices = list( + "Why?" = list(TRUE, "The abnormality suddenly stops moving.
It doesn't quite know how to respond either.
\ + It stares down at the floor as if to contemplate the question.
\ + All it can offer is a shrug.
Perhaps there isn't an answer."), + "Beat it up" = list(FALSE, "There's nothing to say.
A crash test dummy's only purpose is to enable violence.
\ + Violence for the sake of violence.
\ + You smile as you pull out your baton."), + ) var/revealed = TRUE var/can_act = TRUE @@ -115,7 +115,7 @@ Cloak() GiveTarget(user) -/mob/living/simple_animal/hostile/abnormality/apex_predator/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/apex_predator/AttackingTarget(atom/attacked_target) if(!can_act) return if(!revealed) @@ -126,23 +126,23 @@ Decloak() SLEEP_CHECK_DEATH(3) //Backstab - if(target in range(1, src)) - if(isliving(target)) - var/mob/living/V = target - visible_message(span_danger("The [src] rips out [target]'s guts!")) + if(attacked_target in range(1, src)) + if(isliving(attacked_target)) + var/mob/living/V = attacked_target + visible_message(span_danger("The [src] rips out [attacked_target]'s guts!")) new /obj/effect/gibspawner/generic(get_turf(V)) V.deal_damage(backstab_damage, RED_DAMAGE) //Backstab succeeds from any one of 3 tiles behind a mecha, backstab from directly behind gets boosted by mecha directional armor weakness - else if(ismecha(target)) - var/relative_angle = abs(dir2angle(target.dir) - dir2angle(get_dir(target, src))) + else if(ismecha(attacked_target)) + var/relative_angle = abs(dir2angle(attacked_target.dir) - dir2angle(get_dir(attacked_target, src))) relative_angle = relative_angle > 180 ? 360 - relative_angle : relative_angle if(relative_angle >= 135) - visible_message(span_danger("The [src] shreds [target]'s armor!")) - var/obj/vehicle/sealed/mecha/M = target + visible_message(span_danger("The [src] shreds [attacked_target]'s armor!")) + var/obj/vehicle/sealed/mecha/M = attacked_target M.take_damage(backstab_damage, RED_DAMAGE, attack_dir = get_dir(M, src)) new /obj/effect/temp_visual/kinetic_blast(get_turf(M)) else - visible_message(span_danger("The [src]'s attack misses [target]'s weakspots!")) + visible_message(span_danger("The [src]'s attack misses [attacked_target]'s weakspots!")) ..() else ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/babayaga.dm b/code/modules/mob/living/simple_animal/abnormality/waw/babayaga.dm index 4593c2ee1f94..91efb80b28ad 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/babayaga.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/babayaga.dm @@ -40,11 +40,11 @@ Seeing little recourse, you follow them to a palace made of ice, surrounded by a fence made out of various bones.
\ The palace stands on the precipice of life and death.
You know this palace and who it belongs to.
\ A terrifying witch lives here." - observation_choices = list("Knock on the door", "Keep wandering the blizzard") - correct_choices = list("Knock on the door") - observation_success_message = "You can't keep shivering in the cold forever.
You knock on the door..." - observation_fail_message = "You keep wandering the blizzard, the cold continuing to sap your strength.
\ - Eventually you collapse in the snow, your whole body frozen.
Ahh...
There's no more pain..." + observation_choices = list( + "Knock on the door" = list(TRUE, "You can't keep shivering in the cold forever.
You knock on the door..."), + "Keep wandering the blizzard" = list(FALSE, "You keep wandering the blizzard, the cold continuing to sap your strength.
\ + Eventually you collapse in the snow, your whole body frozen.
Ahh...
There's no more pain..."), + ) var/jump_cooldown = 0 var/jump_cooldown_time = 35 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/big_bird.dm b/code/modules/mob/living/simple_animal/abnormality/waw/big_bird.dm index 6f591a11b3fc..e3daa7ab1947 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/big_bird.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/big_bird.dm @@ -63,11 +63,11 @@ For monsters could come, hurting creatures at any time.
By the time eyes covered the whole body of the big bird, no one was around for it to protect.
\ To shine the light in this dark forest, the big bird burned every single feather it had to make an everlasting lamp.
\ The big bird now could hardly be called a bird now, it has no feathers at all." - observation_choices = list("Don't pet it", "Pet it") - correct_choices = list("Pet it") - observation_success_message = "It was not soft actually, it gave you chills.
You felt eyes looking at you with curiosity.
\ - Eyes started closing as you pet the bird.
The big bird, for the first time in a very long time, peacefully fell asleep." - observation_fail_message = "The bird could get angry and bite you.
You ran out of the room in fear." + observation_choices = list( + "Pet it" = list(TRUE, "It was not soft actually, it gave you chills.
You felt eyes looking at you with curiosity.
\ + Eyes started closing as you pet the bird.
The big bird, for the first time in a very long time, peacefully fell asleep."), + "Don't pet it" = list(FALSE, "The bird could get angry and bite you.
You ran out of the room in fear."), + ) var/bite_cooldown var/bite_cooldown_time = 8 SECONDS @@ -128,11 +128,11 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/abnormality/big_bird/AttackingTarget() - if(ishuman(target)) +/mob/living/simple_animal/hostile/abnormality/big_bird/AttackingTarget(atom/attacked_target) + if(ishuman(attacked_target)) if(bite_cooldown > world.time) return FALSE - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target var/obj/item/bodypart/head/head = H.get_bodypart("head") if(QDELETED(head)) return diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/big_wolf.dm b/code/modules/mob/living/simple_animal/abnormality/waw/big_wolf.dm index 6011aa6aa321..35956de77d70 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/big_wolf.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/big_wolf.dm @@ -60,12 +60,12 @@ observation_prompt = "(You see a wolf with patchy fur)
\ I like it here.
At least it's better than where I used to live.
There are no pigs or chickens, but I don't have to be Big Bad Wolf, at least.
\ You didn't immediately kick me out, so I will tell you my name.
My name is..." - observation_choices = list("Forget the name", "Remember the name") - correct_choices = list("Remember the name") - observation_success_message = "It's no use to remember it.
Nobody cares about my name.
\ - (Even though the wolf said such a thing, it seems happy.)" - observation_fail_message = "You better watch out.
I can eat you with one bite if I want to.
\ - (The wolf seems unhappy)" + observation_choices = list( + "Remember the name" = list(TRUE, "It's no use to remember it.
Nobody cares about my name.
\ + (Even though the wolf said such a thing, it seems happy.)"), + "Forget the name" = list(FALSE, "You better watch out.
I can eat you with one bite if I want to.
\ + (The wolf seems unhappy)"), + ) var/can_act = TRUE //For when the wolf becomes incorporal and flees. @@ -369,9 +369,9 @@ cut_overlay(visual_overlay) can_act = TRUE -/mob/living/simple_animal/hostile/abnormality/big_wolf/AttackingTarget() - if(istype(target, /mob/living/simple_animal/hostile/abnormality/red_hood)) //Red takes triple damage from the wolf, becauser her resistances are high - var/mob/living/simple_animal/hostile/abnormality/red_hood/mercenary = target +/mob/living/simple_animal/hostile/abnormality/big_wolf/AttackingTarget(atom/attacked_target) + if(istype(attacked_target, /mob/living/simple_animal/hostile/abnormality/red_hood)) //Red takes triple damage from the wolf, becauser her resistances are high + var/mob/living/simple_animal/hostile/abnormality/red_hood/mercenary = attacked_target var/bonus_damage_dealt = 2 * (rand(melee_damage_lower,melee_damage_upper)) mercenary.deal_damage(bonus_damage_dealt, RED_DAMAGE) return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/black_swan.dm b/code/modules/mob/living/simple_animal/abnormality/waw/black_swan.dm index aeb3656a878c..4d82d8fe5122 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/black_swan.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/black_swan.dm @@ -60,12 +60,12 @@ One day, her skin covered in blisters and her mouth oozing with spittle and pus, she passed by a lake, seemingly untouched by the pollution of the City.
\ Though her eyesight was almost ruined by fog and affliction, she could see it clearly.
\ Upon that lake were six white swans and a singular black swan. Elijah..." - observation_choices = list("Observed the white swans", "Observed the black swan") - correct_choices = list("Observed the black swan") - observation_success_message = "The black swan watches forlornly as her family takes flight, she's willing to give up everything for her family.
\ - Elijah embraces the near-finished nettle clothing wholeheartedly, soon..." - observation_fail_message = "The white swans were Elijah's favourite.
\ - They spread their wings and took flight to the sky, high above the fog, leaving the black swan behind. Elijah clutched her brooch tighter, she only had to work a little harder..." + observation_choices = list( + "Observed the black swan" = list(TRUE, "The black swan watches forlornly as her family takes flight, she's willing to give up everything for her family.
\ + Elijah embraces the near-finished nettle clothing wholeheartedly, soon..."), + "Observed the white swans" = list(FALSE, "The white swans were Elijah's favourite.
\ + They spread their wings and took flight to the sky, high above the fog, leaving the black swan behind. Elijah clutched her brooch tighter, she only had to work a little harder..."), + ) //family breach conditions var/insane_humans = 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/clouded_monk.dm b/code/modules/mob/living/simple_animal/abnormality/waw/clouded_monk.dm index 878d3cf3dd27..1bec87e49581 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/clouded_monk.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/clouded_monk.dm @@ -44,9 +44,9 @@ abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY observation_prompt = "Are you a monk?" - observation_choices = list("I am no longer a monk") - correct_choices = list("I am no longer a monk") - observation_success_message = "A demon shall never reach Heaven." + observation_choices = list( + "I am no longer a monk" = list(TRUE, "A demon shall never reach Heaven."), + ) var/datum/looping_sound/cloudedmonk_ambience/soundloop var/charging = FALSE diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/clown_smiling.dm b/code/modules/mob/living/simple_animal/abnormality/waw/clown_smiling.dm index 8959e6a6eabe..83e4933ad0a4 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/clown_smiling.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/clown_smiling.dm @@ -66,11 +66,11 @@ When I first met this thing, I started to understand how those people feel.
\ Right now, during my attachment work, it started its usual clown performance.
\ Things are looking good so far.
Out of its pocket, the clown pulls out..." - observation_choices = list("It's just a tool" ,"Run") - correct_choices = list("Run") - observation_success_message = "I bolted out of containment unit as fast as I could.
\ - I could hear giggling as I left.
But that was more than just a cruel prank." - observation_fail_message = "I thought it was a tool.
Just for that moment." + observation_choices = list( + "Run" = list(TRUE, "I bolted out of containment unit as fast as I could.
\ + I could hear giggling as I left.
But that was more than just a cruel prank."), + "It's just a tool" = list(FALSE, "I thought it was a tool.
Just for that moment."), + ) del_on_death = FALSE //for explosions var/finishing = FALSE @@ -109,12 +109,12 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/abnormality/clown/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/clown/AttackingTarget(atom/attacked_target) . = ..() if(.) - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/TH = target + var/mob/living/carbon/human/TH = attacked_target if(TH.health < 0) finishing = TRUE TH.Stun(4 SECONDS) diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/contract.dm b/code/modules/mob/living/simple_animal/abnormality/waw/contract.dm index 37200420daf4..42be0aad3e5f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/contract.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/contract.dm @@ -33,17 +33,17 @@ The paper is a jumbled mess of words, you can't make out anything on it.
\ A pen appears in your hand.
\ The seems to be running out of patience.
Will you sign?" - observation_choices = list("Sign the contract", "Do not sign") - correct_choices = list("Do not sign") - observation_success_message = "You take a closer look at the contract
\ - There is a tiny clause in fine print
\ - \"Your soul becomes the property of a contract signed.\"
\ - At your refusal, the man sighs and hands you a new contract.
\ - This contract seems legitimate, so you sign." - observation_fail_message = "You sign the contract in haste.
\ - In a few moments, you feel as if a piece of you is missing.
\ - You walk out in a daze, unable to remember what the contract was about.
\ - Perhaps you should have read the fine print." + observation_choices = list( + "Do not sign" = list(TRUE, "You take a closer look at the contract
\ + There is a tiny clause in fine print
\ + \"Your soul becomes the property of a contract signed.\"
\ + At your refusal, the man sighs and hands you a new contract.
\ + This contract seems legitimate, so you sign."), + "Sign the contract" = list(FALSE, "You sign the contract in haste.
\ + In a few moments, you feel as if a piece of you is missing.
\ + You walk out in a daze, unable to remember what the contract was about.
\ + Perhaps you should have read the fine print."), + ) var/list/total_havers = list() var/list/fort_havers = list() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/despair_knight.dm b/code/modules/mob/living/simple_animal/abnormality/waw/despair_knight.dm index 76fd03984a9f..94dc1c2701c4 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/despair_knight.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/despair_knight.dm @@ -50,11 +50,11 @@ observation_prompt = "I once dedicated myself to the justice of this world, to protect my king, the kingdom and the weak.
\ However in the end nothing was truly upheld on my watch.
Even so... I still want to protect someone, anyone..." - observation_choices = list("Accept her blessing", "Refuse it") - correct_choices = list("Refuse it") - observation_success_message = "Am I not needed anymore?
\ - No...
You're saying I should move on.
I don't know how, or if I can, but, perhaps things could turn out for the better.
We need only try." - observation_fail_message = "Thank you, though I am but a pitiful knight, I still yearn to protect, if I can't protect others, I may as well disappear..." + observation_choices = list( + "Refuse it" = list(TRUE, "Am I not needed anymore?
\ + No...
You're saying I should move on.
I don't know how, or if I can, but, perhaps things could turn out for the better.
We need only try."), + "Accept her blessing" = list(FALSE, "Thank you, though I am but a pitiful knight, I still yearn to protect, if I can't protect others, I may as well disappear..."), + ) var/mob/living/carbon/human/blessed_human = null var/teleport_cooldown diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/dimension_refraction.dm b/code/modules/mob/living/simple_animal/abnormality/waw/dimension_refraction.dm index 848b8206e938..6d50202a8714 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/dimension_refraction.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/dimension_refraction.dm @@ -13,6 +13,7 @@ maxHealth = 1200 health = 1200 + blood_volume = 0 density = FALSE damage_coeff = list(RED_DAMAGE = 0, WHITE_DAMAGE = 1.5, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1) stat_attack = HARD_CRIT @@ -40,12 +41,12 @@ observation_prompt = "It's invisible to almost all means of measurement, the only way I know it's there is due to the effect it has on the cup of water before me.
\ I calmly observe the chamber's surroundings and make adjustments when I notice the surface of the cup's liquid begin to bubble." - observation_choices = list("Stay and observe", "Exit the containment unit") - correct_choices = list("Stay and observe") - observation_success_message = "I continue to record my observations as the water rises up into the air, followed by the cup.
\ - The water folds into a sphere around the cup in a most immaculate manner before being violently dispersed, the cup shattering into infinitesmal fragments.
\ - I leave the chamber, satisfied with my observations." - observation_fail_message = "The manual says to leave the chamber immediately if the cup's condition becomes violent.
As I leave, the water falls still." + observation_choices = list( + "Stay and observe" = list(TRUE, "I continue to record my observations as the water rises up into the air, followed by the cup.
\ + The water folds into a sphere around the cup in a most immaculate manner before being violently dispersed, the cup shattering into infinitesmal fragments.
\ + I leave the chamber, satisfied with my observations."), + "Exit the containment unit" = list(FALSE, "The manual says to leave the chamber immediately if the cup's condition becomes violent.
As I leave, the water falls still."), + ) var/cooldown_time = 3 var/aoe_damage = 12 diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/dreaming_current.dm b/code/modules/mob/living/simple_animal/abnormality/waw/dreaming_current.dm index 361a59cedc8d..ad59de2feaa6 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/dreaming_current.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/dreaming_current.dm @@ -45,11 +45,11 @@ observation_prompt = "My mom and dad took me to this place when I was very small, it smells strange and the people in it only wear white.
\ Mom says she and dad will come back for me very soon.
\ Today one of the men in the white clothing offers me the purple candy, it's grape-flavoured he says.
Grape is my favourite." - observation_choices = list("Eat the candy", "Don't eat the candy") - correct_choices = list("Eat the candy") - observation_success_message = "It's grape flavour, the grape is my favourite.
\ - When I eat the grape candy I imagine myself swimming in an ocean of colour.
Today, I think I'm going to go to the Sea..." - observation_fail_message = "I don't eat the candy given to me.
When will mom and dad come?
Why aren't they here?
It doesn't stop hurting,
I'm scared..." + observation_choices = list( + "Eat the candy" = list(TRUE, "It's grape flavour, the grape is my favourite.
\ + When I eat the grape candy I imagine myself swimming in an ocean of colour.
Today, I think I'm going to go to the Sea..."), + "Don't eat the candy" = list(FALSE, "I don't eat the candy given to me.
When will mom and dad come?
Why aren't they here?
It doesn't stop hurting,
I'm scared..."), + ) var/list/movement_path = list() var/list/been_hit = list() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/ebony_queen.dm b/code/modules/mob/living/simple_animal/abnormality/waw/ebony_queen.dm index bc857687fa23..87c0784d83dd 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/ebony_queen.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/ebony_queen.dm @@ -12,6 +12,7 @@ health = 2000 pixel_x = -16 base_pixel_x = -16 + blood_volume = 0 melee_damage_type = BLACK_DAMAGE melee_damage_lower = 35 melee_damage_upper = 45 @@ -53,12 +54,12 @@ Her plan was a success - her behated Snow White has fallen into a death-like state.
\ Is that all I was for?
To bring pain to others whilst never experiencing it myself?
\ I'm beginning to rot and feel pests and other lowly creatures make a meal out of me..." - observation_choices = list("Rot into nothing", "Don't accept the end") - correct_choices = list("Don't accept the end") - observation_success_message = "The impression of poison brings pause to the pests and even they no longer wish to remain with me.
\ - Petrified roots grow from within me and I gain some sense of being ambulatory.
I know now how long I had laid but I refuse to remain still.
\ - I shall find vengeance.
Bring me snow white..." - observation_fail_message = "An apple culminates when it shrivels up and attracts lesser creatures.
I'm just an apple, I can't change a thing." + observation_choices = list( + "Don't accept the end" = list(TRUE, "The impression of poison brings pause to the pests and even they no longer wish to remain with me.
\ + Petrified roots grow from within me and I gain some sense of being ambulatory.
I know now how long I had laid but I refuse to remain still.
\ + I shall find vengeance.
Bring me snow white..."), + "Rot into nothing" = list(FALSE, "An apple culminates when it shrivels up and attracts lesser creatures.
I'm just an apple, I can't change a thing."), + ) var/barrier_cooldown var/barrier_cooldown_time = 4 SECONDS @@ -205,15 +206,15 @@ OpenFire() return - if(target) // You'd think this should be "attacked_target" but no this shit still uses target I hate it. - if(ismecha(target)) + if(attacked_target) // You'd think this should be "attacked_target" but no this shit still uses target I hate it. + if(ismecha(attacked_target)) if(burst_cooldown <= world.time && prob(50)) thornBurst() else OpenFire() return - else if(isliving(target)) - var/mob/living/L = target + else if(isliving(attacked_target)) + var/mob/living/L = attacked_target if(L.stat != DEAD) if(burst_cooldown <= world.time && prob(50)) thornBurst() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/express_train.dm b/code/modules/mob/living/simple_animal/abnormality/waw/express_train.dm index a53015794a56..07f3c55663ee 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/express_train.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/express_train.dm @@ -33,10 +33,10 @@ observation_prompt = "The booking clerk who remains dauntingly quiet sells tickets for a train with no final destination.
\ There are no clocks to alert the arrival times, instead, there are some blinking lights.
\ \"Sir! Your ticket?\" The clerk behind the counter smothered in shadow, save for two pinpricks of amber light for eyes, holds out an unmarked ticket with its gangly appendage." - observation_choices = list("Take the ticket") - correct_choices = list("Take the ticket") - observation_success_message = "I took the ticket from his hand, it felt like a lead weight, and asked him when the train would arrive.
\ - \"Sooner than you'd like, later than you prepare for.
It comes for everyone Sir.\"
I hear the sound of a distant horn." + observation_choices = list( + "Take the ticket" = list(TRUE, "I took the ticket from his hand, it felt like a lead weight, and asked him when the train would arrive.
\ + \"Sooner than you'd like, later than you prepare for.
It comes for everyone Sir.\"
I hear the sound of a distant horn."), + ) var/meltdown_tick = 60 SECONDS var/meltdown_timer diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/fire_bird.dm b/code/modules/mob/living/simple_animal/abnormality/waw/fire_bird.dm index 08f611ee68c8..eab18f94e30b 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/fire_bird.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/fire_bird.dm @@ -42,18 +42,17 @@ observation_prompt = "You can only hunt it wearing a thick blindfold, but even through the fabric you can track it by the light that manages to seep through and by the heat it radiates.
\ In your hands you carry a bow nocked with an arrow, it's your last one.
\ You've been pursuing your prey for days, you..." - observation_choices = list("Fire an arrow", "Take off your blindfold", "Do nothing") - correct_choices = list("Do nothing", "Take off your blindfold") - observation_success_message = "You watch and wait as the light and heat pass until only cold and darkness reign in the forest.
\ - Feeling safe, you remove your blindfold and find on the ground one of its radiant feathers.
\ - Bravo brave hunter, have you found what you were seeking?" - observation_fail_message = "You fire an arrow at what you percieve to be the source of the light and miss entirely.
You return empty-handed like so many hunters before you." - //Special answer for choice 2 - var/observation_success_message_2 = "Your curiosity gets the better of you.
\ - The sight of a mythological bird that no one has seen before is a prize no hunter has claimed.
\ - Steeling yourself, you remove the blindfold and immediately your vision is seared by the intensity of the light but you will yourself through the pain to catch a glimpse of what has long evaded every hunter's sight.
\ - The bird offers a tear for your efforts.
\ - Though your eyes may never recover, you have done what no hunter has dared to accomplish - captured it in your sight." + observation_choices = list( + "Do nothing" = list(TRUE, "You watch and wait as the light and heat pass until only cold and darkness reign in the forest.
\ + Feeling safe, you remove your blindfold and find on the ground one of its radiant feathers.
\ + Bravo brave hunter, have you found what you were seeking?"), + "Take off your blindfold" = list(TRUE, "Your curiosity gets the better of you.
\ + The sight of a mythological bird that no one has seen before is a prize no hunter has claimed.
\ + Steeling yourself, you remove the blindfold and immediately your vision is seared by the intensity of the light but you will yourself through the pain to catch a glimpse of what has long evaded every hunter's sight.
\ + The bird offers a tear for your efforts.
\ + Though your eyes may never recover, you have done what no hunter has dared to accomplish - captured it in your sight."), + "Fire an arrow" = list(FALSE, "You fire an arrow at what you percieve to be the source of the light and miss entirely.
You return empty-handed like so many hunters before you."), + ) var/pulse_cooldown var/pulse_cooldown_time = 1 SECONDS @@ -65,13 +64,6 @@ var/dash_damage = 220 var/list/been_hit = list() -/mob/living/simple_animal/hostile/abnormality/fire_bird/ObservationResult(mob/living/carbon/human/user, condition, answer) //borrowed from Bottle of Tears - if(answer == "Take off your blindfold") - observation_success_message = observation_success_message_2 - else - observation_success_message = initial(observation_success_message) - return ..() - //Initialize /mob/living/simple_animal/hostile/abnormality/fire_bird/HandleStructures() . = ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/flesh_idol.dm b/code/modules/mob/living/simple_animal/abnormality/waw/flesh_idol.dm index 7741f69fbc6f..3131e5f96cd7 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/flesh_idol.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/flesh_idol.dm @@ -30,10 +30,10 @@ observation_prompt = "I've been praying for 7 days and 7 nights, my skin is taut from malnutrition, my eyes bloodshot from lack of sleep and my clothes soiled with my own filth.
\ Though my throat is so dry I cannot even maintain the chants I move my lips anyway.
\ Is anyone even listening?
Does my prayer reach Him?
All I ask for is a sign." - observation_choices = list("Stop praying", "Keep praying") - correct_choices = list("Stop praying") - observation_success_message = "No one is there, God does not reside here." - observation_fail_message = "If God truly loves us, he'll show us a sign." + observation_choices = list( + "Stop praying" = list(TRUE, "No one is there, God does not reside here."), + "Keep praying" = list(FALSE, "If God truly loves us, he'll show us a sign."), + ) var/work_count = 0 var/breach_count = 4 //when do you breach? diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/generalb.dm b/code/modules/mob/living/simple_animal/abnormality/waw/generalb.dm index c5dc7452cd8c..645ccee2eb0e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/generalb.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/generalb.dm @@ -45,13 +45,18 @@ Unquestioningly loyal, I follow my orders to the letter.
\ I even feel excited whenever I get a new order.
\ Why am I doing this all again?" - observation_choices = list("I fight to survive", "I fight out of loyalty") - correct_choices = list("I fight to survive","I fight out of loyalty") - observation_success_message = "Bees have a natural instinct to fight for their queen.
\ - It is not something as complicated as human emotion.
\ - Rather, it is a hormone produced by the queen.
\ - I will die the moment I leave the queendom.
\ - There is no other option but to remain unquestionably loyal." + observation_choices = list( + "I fight to survive" = list(TRUE, "Bees have a natural instinct to fight for their queen.
\ + It is not something as complicated as human emotion.
\ + Rather, it is a hormone produced by the queen.
\ + I will die the moment I leave the queendom.
\ + There is no other option but to remain unquestionably loyal."), + "I fight out of loyalty" = list(TRUE, "Bees have a natural instinct to fight for their queen.
\ + It is not something as complicated as human emotion.
\ + Rather, it is a hormone produced by the queen.
\ + I will die the moment I leave the queendom.
\ + There is no other option but to remain unquestionably loyal."), + ) var/fire_cooldown_time = 3 SECONDS //She has 4 cannons, fires 4 times faster than the artillery bees var/fire_cooldown diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/greed_king.dm b/code/modules/mob/living/simple_animal/abnormality/waw/greed_king.dm index f6e25e918c58..505ede719b5a 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/greed_king.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/greed_king.dm @@ -38,15 +38,15 @@ Happiness of the world means happiness for me.
I'm trying to stay happy.
\ I don't care even if it got me to the point where I look like this.
Have you met my sisters?
We were always one.
\ We fought together, and shared a common goal.
By the way, are you happy now?" - observation_choices = list("Yes, I'm happy", "No, I'm not happy") - correct_choices = list("Yes, I'm happy") - observation_success_message = "(The egg shook violently)
\ - Don't lie.
Why have we been ruined like this if that's true?
\ - And why have you ended up like that?
My greed will not be sated with such flimsy conviction.
\ - But if your answer is a resolve for the future, and not just a statement of fact...
Things might change, slowly." - observation_fail_message = "I knew you were not happy.
\ - You are like me.
You trapped yourself inside of an egg, just like me.
\ - The amber-colored sky is beautiful.
Oh, I'm getting hungry again." + observation_choices = list( + "Yes, I'm happy" = list(TRUE, "(The egg shook violently)
\ + Don't lie.
Why have we been ruined like this if that's true?
\ + And why have you ended up like that?
My greed will not be sated with such flimsy conviction.
\ + But if your answer is a resolve for the future, and not just a statement of fact...
Things might change, slowly."), + "No, I'm not happy" = list(FALSE, "I knew you were not happy.
\ + You are like me.
You trapped yourself inside of an egg, just like me.
\ + The amber-colored sky is beautiful.
Oh, I'm getting hungry again."), + ) //Some Variables cannibalized from helper var/charge_check_time = 1 SECONDS @@ -133,6 +133,7 @@ offsets_pixel_y = list("south" = -8, "north" = -8, "west" = -8, "east" = -8) transform = matrix(1.5, MATRIX_SCALE) SetOccupiedTiles(1, 1, 1, 1) + damage_effect_scale = 1.2 startTeleport() //Let's Spaghettioodle out of here /mob/living/simple_animal/hostile/abnormality/greed_king/proc/startTeleport() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/hatred_queen.dm b/code/modules/mob/living/simple_animal/abnormality/waw/hatred_queen.dm index d9308962749d..0b7c8f2684b8 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/hatred_queen.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/hatred_queen.dm @@ -62,13 +62,13 @@ observation_prompt = "Everyone likes me, every day someone new visits me and asks about my stories, the villains I've fought, the friends I've made, the adventures I've had.
\ They never grow tired of my stories but, hey is it always peaceful around here?
The world still needs me, doesn't it?" - observation_choices = list("The world still needs you", "The world doesn't need you") - correct_choices = list("The world doesn't need you") - observation_success_message = "...
Somehow I think I already knew that.
\ - I don't know if I can accept a world that doesn't love me as I love it.
Can I keep on loving the world, even if I'm no longer a real Magical Girl..?" - observation_fail_message = "I knew it! Whilst I'm here, no villains will go unpunished!
Just call on me anytime!..
\ - ...
\ - Why is still so peaceful..?" + observation_choices = list( + "The world doesn't need you" = list(TRUE, "...
Somehow I think I already knew that.
\ + I don't know if I can accept a world that doesn't love me as I love it.
Can I keep on loving the world, even if I'm no longer a real Magical Girl..?"), + "The world still needs you" = list(FALSE, "I knew it! Whilst I'm here, no villains will go unpunished!
Just call on me anytime!..
\ + ...
\ + Why is still so peaceful..?"), + ) var/obj/effect/qoh_wand/wand var/chance_modifier = 1 @@ -233,8 +233,8 @@ wand.forceMove(get_turf(src)) //That way it will be behind her like in the game. return ..() -/mob/living/simple_animal/hostile/abnormality/hatred_queen/AttackingTarget() - return OpenFire(target) +/mob/living/simple_animal/hostile/abnormality/hatred_queen/AttackingTarget(atom/attacked_target) + return OpenFire(attacked_target) /mob/living/simple_animal/hostile/abnormality/hatred_queen/OpenFire() if(!can_act || IsContained()) diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/judgement_bird.dm b/code/modules/mob/living/simple_animal/abnormality/waw/judgement_bird.dm index b70fbf6d434a..81031d835019 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/judgement_bird.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/judgement_bird.dm @@ -52,11 +52,11 @@ observation_prompt = "\"Long Bird\" who lived in the forest didn't want to let creatures to be eaten by monsters.
\ His initial goal was pure, at least.
The forest began to be saturated by darkness.
His long vigil is saturated with memories and regrets." - observation_choices = list("Leave him be", "Console the bird") - correct_choices = list("Console the bird") - observation_success_message = "Long Bird put down his scales, that had been with him for a long time.
\ - The long-lasting judgement finally ends.
Long Bird slowly realizes the secrets behind the monster, and he waits.
For the forest that he will never take back." - observation_fail_message = "Long Bird sees through you, even though he is blind.
He is weighing your sins." + observation_choices = list( + "Console the bird" = list(TRUE, "Long Bird put down his scales, that had been with him for a long time.
\ + The long-lasting judgement finally ends.
Long Bird slowly realizes the secrets behind the monster, and he waits.
For the forest that he will never take back."), + "Leave him be" = list(FALSE, "Long Bird sees through you, even though he is blind.
He is weighing your sins."), + ) var/judgement_cooldown = 10 SECONDS var/judgement_cooldown_base = 10 SECONDS @@ -192,10 +192,10 @@ visible_message(span_danger("[src] taunts [A]!")) ranged_cooldown = world.time + ranged_cooldown_time -/mob/living/simple_animal/hostile/runawaybird/AttackingTarget() +/mob/living/simple_animal/hostile/runawaybird/AttackingTarget(atom/attacked_target) . = ..() - if(ishuman(target)) - var/mob/living/carbon/human/L = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/L = attacked_target L.Knockdown(20) var/obj/item/held = L.get_active_held_item() L.dropItemToGround(held) //Drop weapon diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/little_prince.dm b/code/modules/mob/living/simple_animal/abnormality/waw/little_prince.dm index ef4b636338f0..15b3a426a9a1 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/little_prince.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/little_prince.dm @@ -28,12 +28,12 @@ I have come across 15 billion light years to meet you.
\ However, a butterfly can only fly as high in the sky as the sun warms.
\ It does not know that it will crumble before it can reach the stars.
It fell from the sky and crushed into the ground." - observation_choices = list("Do nothing", "Become its friend") - correct_choices = list("Become its friend") - observation_success_message = "My voice can reach you unlike others.
\ - Come to me, step by step.
You will reach the stars if those steps continue." - observation_fail_message = "Many who tried to reach me got lost.
\ - Perhaps, we are standing on parallel lines.
Perhaps, we were looking at something that can never be reached." + observation_choices = list( + "Become its friend" = list(TRUE, "My voice can reach you unlike others.
\ + Come to me, step by step.
You will reach the stars if those steps continue."), + "Do nothing" = list(FALSE, "Many who tried to reach me got lost.
\ + Perhaps, we are standing on parallel lines.
Perhaps, we were looking at something that can never be reached."), + ) var/insight_count = 0 var/non_insight_count = 0 diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/luna.dm b/code/modules/mob/living/simple_animal/abnormality/waw/luna.dm index 69e549cfa40f..94663f50634e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/luna.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/luna.dm @@ -33,15 +33,15 @@ observation_prompt = "You enter the containment unit as respectfully as you can, the woman by the piano does not acknowledge your presence, merely clutching her cane tighter.
\ \"Begin.\" She commands, her lips a tight thin line.
It's the first time she's ever spoken.
\ The piano waits for you expectantly." - observation_choices = list("Begin a performance", "Refuse") - correct_choices = list("Begin a performance") - observation_success_message = "You begin to play, there is no sheet music to guide you, you play the performance that you were always meant to play.
\ - It's haunting and beautiful,
terrifying yet entrancing.
\ - With every key press, your body feels heavier and heavier and with every step upon the shrunken heads for pedals, your mind grows slower and more sluggish.
\ - By the end of the performance, you're slumped over the keyboard with hardly the strength or wherewithal to move.
\ - Above the piano, through your fading vision, you can swear you see the moon.
\ - And you despair." - observation_fail_message = "She gives no indication of being disappointed.
Perhaps if you played, you might understand the truth behind yourself as she did." + observation_choices = list( + "Begin a performance" = list(TRUE, "You begin to play, there is no sheet music to guide you, you play the performance that you were always meant to play.
\ + It's haunting and beautiful,
terrifying yet entrancing.
\ + With every key press, your body feels heavier and heavier and with every step upon the shrunken heads for pedals, your mind grows slower and more sluggish.
\ + By the end of the performance, you're slumped over the keyboard with hardly the strength or wherewithal to move.
\ + Above the piano, through your fading vision, you can swear you see the moon.
\ + And you despair."), + "Refuse" = list(FALSE, "She gives no indication of being disappointed.
Perhaps if you played, you might understand the truth behind yourself as she did."), + ) var/performance = FALSE var/performance_length = 60 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/my_form_empties.dm b/code/modules/mob/living/simple_animal/abnormality/waw/my_form_empties.dm index 7e7cd7e3da92..851b44b237fd 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/my_form_empties.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/my_form_empties.dm @@ -41,15 +41,15 @@ abnormality_origin = ABNORMALITY_ORIGIN_LIMBUS observation_prompt = "A bell occasionally tolls in the room.
\ -It's a heavy, subduing sound. You're unable to recognize its words.
\ -But, you feel that whatever it is, is not a joyous thing." - observation_choices = list("Listen closer.", "Repeat the mantras.") - correct_choices = list("Listen closer.") - observation_success_message = "You close your eyes and focus on the sound. What is is saying?
\ - This thing is uttering thoughts. Empty oneself by verbalizing one's thoughts.
\ - Expel everything within so that nothing remains." - observation_fail_message = "The statue won't move, no matter what happens around it.
\ - Though the tone of its mantra remains consistent, you knew its chants are imbued with a curse." + It's a heavy, subduing sound. You're unable to recognize its words.
\ + But, you feel that whatever it is, is not a joyous thing." + observation_choices = list( + "Listen closer" = list(TRUE, "You close your eyes and focus on the sound. What is is saying?
\ + This thing is uttering thoughts. Empty oneself by verbalizing one's thoughts.
\ + Expel everything within so that nothing remains."), + "Repeat the mantras" = list(FALSE, "The statue won't move, no matter what happens around it.
\ + Though the tone of its mantra remains consistent, you knew its chants are imbued with a curse.") + ) var/anatman_state = FALSE var/praying = FALSE diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/naked_nest.dm b/code/modules/mob/living/simple_animal/abnormality/waw/naked_nest.dm index 1af158cef9c4..eac69e295017 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/naked_nest.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/naked_nest.dm @@ -46,12 +46,12 @@ observation_prompt = "In the beginning, a serpent tempted Eve with a bite of the forbidden fruit an act which cast Man out of the Garden of Eden.
\ Now all that remains of that fruit is a rotten, decayed mass squirming with more evil serpents." - observation_choices = list("Cover your mouth", "Take a bite") - correct_choices = list("Take a bite") - observation_success_message = "Mankind's sin began long ago but it was never the serpent that was evil, it only followed its nature as did Man.
\ - The serpents within the fruit paused and entered into your mouth with the bite, and evil took root - \ - it's hard to blame them for mistaking you for being the same as the fruit that has long been their home." - observation_fail_message = "They could infect you at any time through any orifice, you best leave in a hurry." + observation_choices = list( + "Take a bite" = list(TRUE, "Mankind's sin began long ago but it was never the serpent that was evil, it only followed its nature as did Man.
\ + The serpents within the fruit paused and entered into your mouth with the bite, and evil took root - \ + it's hard to blame them for mistaking you for being the same as the fruit that has long been their home."), + "Cover your mouth" = list(FALSE, "They could infect you at any time through any orifice, you best leave in a hurry."), + ) var/serpentsnested = 4 var/origin_cooldown = 0 @@ -187,14 +187,14 @@ origin_nest = home_naked_nest AddComponent(/datum/component/swarming) -/mob/living/simple_animal/hostile/naked_nest_serpent/AttackingTarget() - if(iscarbon(target)) - var/mob/living/carbon/human/C = target +/mob/living/simple_animal/hostile/naked_nest_serpent/AttackingTarget(atom/attacked_target) + if(iscarbon(attacked_target)) + var/mob/living/carbon/human/C = attacked_target if(C.stat != DEAD && !C.NAKED_NESTED && a_intent == "harm") EnterHost(C) return - if(istype(target, /mob/living/simple_animal/hostile/abnormality/naked_nest)) - var/mob/living/simple_animal/hostile/abnormality/naked_nest/nest = target + if(istype(attacked_target, /mob/living/simple_animal/hostile/abnormality/naked_nest)) + var/mob/living/simple_animal/hostile/abnormality/naked_nest/nest = attacked_target nest.RecoverSerpent(src) return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/nosferatu.dm b/code/modules/mob/living/simple_animal/abnormality/waw/nosferatu.dm index 0b385e53a876..2ff2c0014b4e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/nosferatu.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/nosferatu.dm @@ -48,11 +48,11 @@ He seemed lost, wandering the backstreets in such finery made him a tempting target, I never realised it was everyone else who was in danger.
\ He wears the mask of humanity well, but a single drop of blood is all it took for him to reveal his ferocity.
\ \"It's too early for a nap...
Won't you join me and share the pleasure?\"
He asks, his lips still red with my blood." - observation_choices = list("Join the Danse Macabre") - correct_choices = list("Join the Danse Macabre") - observation_success_message = "Refusing wasn't an option and he smiles, raising his glass.
\ - \"A toast then! To a night when one is allowed to pursue all kinds of desire, a never-ending blood-red night!\"
\ - Blood....
The blood brings me eternal happiness, forfeiting false hope, let's forget all pretenses of humanity..." + observation_choices = list( + "Join the Danse Macabre" = list(TRUE, "Refusing wasn't an option and he smiles, raising his glass.
\ + \"A toast then! To a night when one is allowed to pursue all kinds of desire, a never-ending blood-red night!\"
\ + Blood....
The blood brings me eternal happiness, forfeiting false hope, let's forget all pretenses of humanity..."), + ) //work stuff var/feeding @@ -188,15 +188,15 @@ Banquet() return -/mob/living/simple_animal/hostile/abnormality/nosferatu/AttackingTarget() //Combo for double attacks - if(!ishuman(target)) +/mob/living/simple_animal/hostile/abnormality/nosferatu/AttackingTarget(atom/attacked_target) //Combo for double attacks + if(!ishuman(attacked_target)) return ..() - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(bloodlust <= 0) bloodlust = bloodlust_cooldown H.deal_damage(45, BLACK_DAMAGE) playsound(get_turf(src), 'sound/abnormalities/nosferatu/bat_attack.ogg', 50, 1) - to_chat(target, span_danger("The [src] attacks you savagely!")) + to_chat(attacked_target, span_danger("The [src] attacks you savagely!")) AdjustThirst(40) else bloodlust -= 1 @@ -267,8 +267,8 @@ retreat_distance = 3 minimum_distance = 1 -/mob/living/simple_animal/hostile/nosferatu_mob/AttackingTarget() //they spawn blood on hit - if(ishuman(target)) +/mob/living/simple_animal/hostile/nosferatu_mob/AttackingTarget(atom/attacked_target) //they spawn blood on hit + if(ishuman(attacked_target)) var/obj/effect/decal/cleanable/blood/B = locate() in get_turf(src) if(!B) B = new /obj/effect/decal/cleanable/blood(get_turf(src)) diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/orange_tree.dm b/code/modules/mob/living/simple_animal/abnormality/waw/orange_tree.dm index 7cacecfa10bb..d1e6cd0043af 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/orange_tree.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/orange_tree.dm @@ -38,10 +38,10 @@ observation_prompt = "Whenever I enter this containment cell, I find myself whisked away to Never Never Land by Peter Pan to join his merry band of Lost Boys.
\ I had forgotten all about him when I grew up, I want to stay longer..." - observation_choices = list("Stay", "Leave") - correct_choices = list("Leave") - observation_success_message = "Second to the right, and straight on till morning, I found my way back to where I'm supposed to - there's still work to be done." - observation_fail_message = "If no one comes to get me, I'll remain here - never noticing the passing of time..." + observation_choices = list( + "Leave" = list(TRUE, "Second to the right, and straight on till morning, I found my way back to where I'm supposed to - there's still work to be done."), + "Stay" = list(FALSE, "If no one comes to get me, I'll remain here - never noticing the passing of time..."), + ) var/datum/looping_sound/orangetree_ambience/soundloop diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/parasite_tree.dm b/code/modules/mob/living/simple_animal/abnormality/waw/parasite_tree.dm index 35d297bd9dbc..c273d98aa6e8 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/parasite_tree.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/parasite_tree.dm @@ -41,32 +41,24 @@ At the heart of the minituare forest you see a lush green tree with heavy, ripened fruit and a peaceful-looking face upon its trunk.
\ \"Hello, have you come here to recieve my blessing, too?\"
\ The voice on the wind (there is no wind) spoke, carrying a sweet, flowery scent asked. \"I just want to help you all, could you bring your friends to me as well?\" " - observation_choices = list("Accept the blessing and do as it asks", "Accept the blessing and refuse", "Refuse the blessing") - correct_choices = list("Accept the blessing and refuse") - observation_success_message = "\"You're a bad child, I don't need someone like you.\"
\ - Blessings should be given earnestly, not treated as an obligation.
You leave the chamber, pleased with yourself." - observation_fail_message = "\"If you say you've never had need of anyone's blessing, then that's a lie.\" The tree said, frowning deeply.
\ - \"... if you don't need my blessing then you're a bad person.
\ - There's nothing for you here, leave.\"
\ - You leave the verdant containment unit behind, the tree waits for someone else to fall into its snare." - //Extra wrong answers - var/observation_fail_message_2 = "You venture out and find some of your most trusting colleagues.
\ - \"Come with me, I have something wonderous to show you all\", you tell them as you bring them to stand before the tree, that same calm visage etched into its trunk.
\ - \"You're a good child, aren't you? Thank you for bringing these children to me.\"
\ - It says as you all stare rapturously at the bulbs about to flower. \"Let me gift you with something...\"
\ - I feel something sprout from my body..." + observation_choices = list( + "Accept the blessing and refuse" = list(TRUE, "\"You're a bad child, I don't need someone like you.\"
\ + Blessings should be given earnestly, not treated as an obligation.
You leave the chamber, pleased with yourself."), + "Refuse the blessing" = list(FALSE, "\"If you say you've never had need of anyone's blessing, then that's a lie.\" The tree said, frowning deeply.
\ + \"... if you don't need my blessing then you're a bad person.
\ + There's nothing for you here, leave.\"
\ + You leave the verdant containment unit behind, the tree waits for someone else to fall into its snare."), + "Accept the blessing and do as it asks" = list(FALSE, "You venture out and find some of your most trusting colleagues.
\ + \"Come with me, I have something wonderous to show you all\", you tell them as you bring them to stand before the tree, that same calm visage etched into its trunk.
\ + \"You're a good child, aren't you? Thank you for bringing these children to me.\"
\ + It says as you all stare rapturously at the bulbs about to flower. \"Let me gift you with something...\"
\ + I feel something sprout from my body..."), + ) var/origin_cooldown = 0 //null when compared to numbers is a eldritch concept so world.time cannot be more or less. var/static/list/blessed = list() //keeps track of status effected individuals var/static/list/minions = list() //keeps track of minions if suppressed forcefully -/mob/living/simple_animal/hostile/abnormality/parasite_tree/ObservationResult(mob/living/carbon/human/user, condition, answer) //special answer - if(answer == "Accept the blessing and do as it asks") - observation_fail_message = observation_fail_message_2 - else - observation_fail_message = initial(observation_fail_message) - return ..() - /mob/living/simple_animal/hostile/abnormality/parasite_tree/Initialize() . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_ABNORMALITY_BREACH, PROC_REF(dropLeaf)) diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/pygmalion.dm b/code/modules/mob/living/simple_animal/abnormality/waw/pygmalion.dm index b09f01c02142..f62837f3531a 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/pygmalion.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/pygmalion.dm @@ -46,9 +46,10 @@ observation_prompt = "The King Pygmalion prayed earnestly to the Goddess Aphrodite, wishing for the marble statue he had made and fallen in love to come to life.
\ She answered his prayer, bringing Galatea to life and united them in matrinomy.
\ What is the real name of the abnormality before you?" - observation_choices = list("Galatea", "Pygmalion") - correct_choices = list("Galatea", "Pygmalion") - observation_success_message = "Perhaps they sculpted each other." + observation_choices = list( + "Galatea" = list(TRUE, "Perhaps they sculpted each other."), + "Pygmalion" = list(TRUE, "Perhaps they sculpted each other."), + ) var/missing_prudence = 0 var/mob/living/carbon/human/sculptor = null diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/queen_bee.dm b/code/modules/mob/living/simple_animal/abnormality/waw/queen_bee.dm index 4f884519f9bf..fb114b3aa202 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/queen_bee.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/queen_bee.dm @@ -35,30 +35,22 @@ ) observation_prompt = "There was one summer so hot and unpleasant.
Bees were busily flying around the beehive.
\ - They live for the only one queen.
\'Are they happy? Living only to work\' I asked myself.
Then someone answered." - observation_choices = list("They work to survive", "They work out of loyalty") - correct_choices = list("They work to survive", "They work out of loyalty") - observation_success_message = "They have no other option but to obey.
\ - For they know that the moment they leave the queendom, only death awaits them.
\ - It is years later that I found out that their unshakable loyalty is because of special pheromone which only queen can produce.
\ - Everything started when I began to study that pheromone." - //Special answer for choice 2. Yes, the same text is used multiple times intentionally. This is from legacy LC. - var/observation_success_message_2 = "Loyalty that bees possess is a natural instinct.
\ - If we find a way to control that instinct,
\ - Things will change.
\ - It is years later that I found out that their unshakable loyalty is because of special pheromone which only queen can produce.
\ - Everything started when I began to study that pheromone." + They live for the only one queen.
'Are they happy? Living only to work' I asked myself.
Then someone answered." + observation_choices = list( + "They work to survive" = list(TRUE, "They have no other option but to obey.
\ + For they know that the moment they leave the queendom, only death awaits them.
\ + It is years later that I found out that their unshakable loyalty is because of special pheromone which only queen can produce.
\ + Everything started when I began to study that pheromone."), + "They work out of loyalty" = list(TRUE, "Loyalty that bees possess is a natural instinct.
\ + If we find a way to control that instinct,
\ + Things will change.
\ + It is years later that I found out that their unshakable loyalty is because of special pheromone which only queen can produce.
\ + Everything started when I began to study that pheromone."), + ) var/datum/looping_sound/queenbee/soundloop var/breached_others = FALSE -/mob/living/simple_animal/hostile/abnormality/queen_bee/ObservationResult(mob/living/carbon/human/user, condition, answer) //special answer - if(answer == "They work out of loyalty") - observation_success_message = observation_success_message_2 - else - observation_success_message = initial(observation_success_message) - return ..() - /mob/living/simple_animal/hostile/abnormality/queen_bee/Initialize() . = ..() soundloop = new(list(src), TRUE) @@ -135,11 +127,11 @@ alpha = 25 animate(src, alpha = 255, transform = init_transform, time = 5) -/mob/living/simple_animal/hostile/worker_bee/AttackingTarget() +/mob/living/simple_animal/hostile/worker_bee/AttackingTarget(atom/attacked_target) . = ..() - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.health <= 0) var/turf/T = get_turf(H) visible_message(span_danger("[src] bites hard on \the [H] as another bee appears!")) diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/red_riding_mercenary.dm b/code/modules/mob/living/simple_animal/abnormality/waw/red_riding_mercenary.dm index bc4923fdefa0..02d1c4727e40 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/red_riding_mercenary.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/red_riding_mercenary.dm @@ -56,12 +56,12 @@ It has now been over four months. Now we get her for real. -Coxswain observation_prompt = "(The chamber is empty, except the Little Red Riding Hooded Mercenary, and her axe and gun. She seems exhausted)
\ Am I really alive?
What if I'm a ghost that doesn't even know it's dead?
\ The only thing I love in my life is the death of the wolf." - observation_choices = list("Exit the room", "Mourn for her memories") - correct_choices = list("Mourn for her memories") - observation_success_message = "I will swing my axe again tomorrow, still driven by hatred like I have been forever.
\ - But tonight, I think I can sleep peacefully." - observation_fail_message = "Knock on my door whenever you need my service.
\ - This is my struggle." + observation_choices = list( + "Mourn for her memories" = list(TRUE, "I will swing my axe again tomorrow, still driven by hatred like I have been forever.
\ + But tonight, I think I can sleep peacefully."), + "Exit the room" = list(FALSE, "Knock on my door whenever you need my service.
\ + This is my struggle."), + ) /* Red's targeting logic diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/rose_sign.dm b/code/modules/mob/living/simple_animal/abnormality/waw/rose_sign.dm index c0ec8662ac94..d9e6c32aa479 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/rose_sign.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/rose_sign.dm @@ -39,18 +39,18 @@ observation_prompt = "What does this signboard say?
\ It hangs itself on a tree, trying to make its content known.
\ Its desperation is almost pitiable." - observation_choices = list("Pick a rose", "Unravel the brambles") - correct_choices = list("Pick a rose") - observation_success_message = "You pick a rose out of it.
\ - With closer examination, you notice
\ - that it has an intestinal texture.
\ - What is a flower-shaped organ for?" - observation_fail_message = "As you try to untangle the vines,
\ - sallow bits of flesh fall off.
\ - The thorny brambles you thought were a source of constricting pain
\ - ironically had been keeping the body together.
\ - The body writhes as its flesh falls apart.
\ - Blossoms of flowers sprawled on the ground substitute its screams." + observation_choices = list( + "Pick a rose" = list(TRUE, "You pick a rose out of it.
\ + With closer examination, you notice
\ + that it has an intestinal texture.
\ + What is a flower-shaped organ for?"), + "Unravel the brambles" = list(FALSE, "As you try to untangle the vines,
\ + sallow bits of flesh fall off.
\ + The thorny brambles you thought were a source of constricting pain
\ + ironically had been keeping the body together.
\ + The body writhes as its flesh falls apart.
\ + Blossoms of flowers sprawled on the ground substitute its screams."), + ) var/list/work_roses = list() var/list/work_damages = list() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/screenwriter.dm b/code/modules/mob/living/simple_animal/abnormality/waw/screenwriter.dm index b5db3f472314..a95c9a3751a4 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/screenwriter.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/screenwriter.dm @@ -14,6 +14,7 @@ Defeating the murderer also surpresses the abnormality. faction = list("hostile") threat_level = WAW_LEVEL start_qliphoth = 2 + blood_volume = 0 work_chances = list( "Nutrition" = 35, "Cleanliness" = 35, @@ -40,9 +41,11 @@ Defeating the murderer also surpresses the abnormality. abnormality_origin = ABNORMALITY_ORIGIN_ARTBOOK //Technically it was in the beta but I dont want it showing it up in LC-only modes observation_prompt = "The play started long ago. Here is the man who killed many. And you are holding a gun." - observation_choices = list("Shoot the man", "Wait and see", "Shoot someone else") - correct_choices = list("Shoot the man", "Wait and see", "Shoot someone else") - observation_success_message = "Whether you shoot or not, the play ends with tragedy." //TODO: multiple texts + observation_choices = list( //TODO: multiple texts + "Shoot the man" = list(TRUE, "Whether you shoot or not, the play ends with tragedy."), + "Wait and see" = list(TRUE, "Whether you shoot or not, the play ends with tragedy."), + "Shoot someone else" = list(TRUE, "Whether you shoot or not, the play ends with tragedy."), + ) pet_bonus = "shuffles" //saves a few lines of code by allowing funpet() to be called by attack_hand() var/mob/living/simple_animal/hostile/actor/A @@ -310,12 +313,12 @@ Defeating the murderer also surpresses the abnormality. if(LAZYLEN(priority)) return pick(priority) -/mob/living/simple_animal/hostile/actor/AttackingTarget() +/mob/living/simple_animal/hostile/actor/AttackingTarget(atom/attacked_target) . = ..() - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(!H.sanity_lost) return diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/shrimp.dm b/code/modules/mob/living/simple_animal/abnormality/waw/shrimp.dm index 1ded038e90a2..e0d2f491b203 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/shrimp.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/shrimp.dm @@ -38,10 +38,12 @@ The shrimp offers you a champagne glass full of... Something.
\ It looks and smells like wellcheers grape soda. It's soda.
\ You can even see the can's label torn off and stuck on the side.
Will you drink it?" - observation_choices = list("Drink the soda","Refuse") - correct_choices = list("Drink the soda","Refuse") - observation_success_message = "Before you can make a choice, two gigantic and heavily armed shrimp guards bust in through the door.
\ - They hold you down and force you to drink the soda, and you fall asleep...
...
Somewhere in the distance, you hear seagulls." + observation_choices = list( + "Drink the soda" = list(TRUE, "Before you can make a choice, two gigantic and heavily armed shrimp guards bust in through the door.
\ + They hold you down and force you to drink the soda, and you fall asleep...
...
Somewhere in the distance, you hear seagulls."), + "Refuse" = list(TRUE, "Before you can make a choice, two gigantic and heavily armed shrimp guards bust in through the door.
\ + They hold you down and force you to drink the soda, and you fall asleep...
...
Somewhere in the distance, you hear seagulls."), + ) var/liked var/happy = TRUE @@ -187,6 +189,8 @@ attack_verb_simple = "punches" attack_sound = 'sound/weapons/bite.ogg' speak_emote = list("burbles") + butcher_results = list(/obj/item/stack/spacecash/c50 = 1) + guaranteed_butcher_results = list(/obj/item/stack/spacecash/c10 = 1) silk_results = list(/obj/item/stack/sheet/silk/shrimple_simple = 4) /mob/living/simple_animal/hostile/shrimp/Initialize() @@ -221,6 +225,8 @@ minimum_distance = 3 casingtype = /obj/item/ammo_casing/caseless/ego_shrimpsoldier projectilesound = 'sound/weapons/gun/pistol/shot_alt.ogg' + butcher_results = list(/obj/item/stack/spacecash/c50 = 1) + guaranteed_butcher_results = list(/obj/item/stack/spacecash/c20 = 1, /obj/item/stack/spacecash/c1 = 5) silk_results = list(/obj/item/stack/sheet/silk/shrimple_simple = 8, /obj/item/stack/sheet/silk/shrimple_advanced = 4) /mob/living/simple_animal/hostile/shrimp_soldier/Initialize() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/silence.dm b/code/modules/mob/living/simple_animal/abnormality/waw/silence.dm index 9eea368f9e1c..ab4dfb18236b 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/silence.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/silence.dm @@ -25,11 +25,11 @@ observation_prompt = "Time's wasting.
Time's running out...
They are nothing but meaningless tantrums.
\ The watch will not only take your lost time back, but also give you even more time." - observation_choices = list("Do not use the watch", "Use the watch") - correct_choices = list("Use the watch") - observation_success_message = "The price will follow to your decision.
It is designed this way." - observation_fail_message = "Actually, you have no right to refuse this gift.
\ - Whether you want it or not, we all know that you have to take it." + observation_choices = list( + "Use the watch" = list(TRUE, "The price will follow to your decision.
It is designed this way."), + "Do not use the watch" = list(FALSE, "Actually, you have no right to refuse this gift.
\ + Whether you want it or not, we all know that you have to take it."), + ) var/meltdown_cooldown_time = 13 MINUTES var/meltdown_cooldown diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/siltcurrent.dm b/code/modules/mob/living/simple_animal/abnormality/waw/siltcurrent.dm index 75dce523d231..e423b90b03ea 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/siltcurrent.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/siltcurrent.dm @@ -67,16 +67,16 @@ We were all abandoned, yes.
But we all had dreams, too.
Remember?
\ Well, let's make our dreams come true.
Let's sink together into the depths.\"
\ The dim fluorescent lights impaling the entity's back flicker." - observation_choices = list("Say that you will sink together", "Fix the entity's flickering fluorescent lights") - correct_choices = list("Fix the entity's flickering fluorescent lights") - observation_success_message = "\"I remember.
I've always wanted to run across a rolling field of grass under the warm sun.
\ - To swim across the vast ocean that I've seen only through pictures.
\ - That was my dream.
\ - My only dream.
\ - Now, if you ever recall a dream in which you wished to twinkle, even as a faint flicker...\"" - observation_fail_message = "You still fear the dark, don't you?
\ - I know that you will miss the surface, forever out of your reach once this fluorescent lamp dies.
\ - So do return once you're ready.\"" + observation_choices = list( + "Fix the entity's flickering fluorescent lights" = list(TRUE, "\"I remember.
I've always wanted to run across a rolling field of grass under the warm sun.
\ + To swim across the vast ocean that I've seen only through pictures.
\ + That was my dream.
\ + My only dream.
\ + Now, if you ever recall a dream in which you wished to twinkle, even as a faint flicker...\""), + "Say that you will sink together" = list(FALSE, "You still fear the dark, don't you?
\ + I know that you will miss the surface, forever out of your reach once this fluorescent lamp dies.
\ + So do return once you're ready.\""), + ) var/stunned = FALSE //Stuff relating to the dive attack diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/snow_whites_apple.dm b/code/modules/mob/living/simple_animal/abnormality/waw/snow_whites_apple.dm index a059d5072b52..d4ba5c23f222 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/snow_whites_apple.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/snow_whites_apple.dm @@ -10,6 +10,7 @@ portrait = "snow_whites_apple" maxHealth = 1600 health = 1600 + blood_volume = 0 obj_damage = 0 damage_coeff = list(RED_DAMAGE = 0.5, WHITE_DAMAGE = 1.0, BLACK_DAMAGE = 0, PALE_DAMAGE = 1.5) ranged = TRUE @@ -59,19 +60,19 @@ Why does no one visit me?
Why does no one share my pain?
\ Why does no one like me?
I hope I had legs, no, it doesn't have to be legs.
\ All I want is to be able to move.
Oh, redemption......" - observation_choices = list("I shall go find it.", "It does not exist.") - correct_choices = list("It does not exist.") - observation_success_message = "This is unfair.
I want to be happy.
It's too painful to wait.
\ - It is my bane that no one is around me.
I want this misery to crush me to nonexistence.
\ - Some kind of legs sprouted out of me but I have no place to go.
However, I do not rot.
I cannot stop existing.
\ - I have to go, although I have no place to go.
I have to go.
I go." - - observation_fail_message = "From some moment, I realized I can walk.
\ - I see light.
I hear people.
I will be free from this torment.
For I will meet my redemption" + observation_choices = list( + "It does not exist" = list(TRUE, "This is unfair.
I want to be happy.
It's too painful to wait.
\ + It is my bane that no one is around me.
I want this misery to crush me to nonexistence.
\ + Some kind of legs sprouted out of me but I have no place to go.
However, I do not rot.
I cannot stop existing.
\ + I have to go, although I have no place to go.
I have to go.
I go."), + "I shall go find it" = list(FALSE, "From some moment, I realized I can walk.
\ + I see light.
I hear people.
I will be free from this torment.
For I will meet my redemption"), + ) initial_language_holder = /datum/language_holder/plant //essentially flavor var/togglemovement = FALSE var/toggleplants = TRUE + var/nightmare_mode = FALSE var/plant_cooldown = 30 var/hedge_cooldown = 0 var/hedge_cooldown_delay = FLORAL_BARRIER_COOLDOWN @@ -152,9 +153,18 @@ if(toggleplants) SpreadPlants() oldGrowth() - for(var/obj/structure/spreading/apple_vine/W in urange(15, get_turf(src))) + var/list/area_of_influence + if(nightmare_mode) + area_of_influence = vine_list + else + area_of_influence = urange(15, get_turf(src)) + for(var/obj/structure/spreading/apple_vine/W in area_of_influence) if(W.last_expand <= world.time) W.expand() + else if(nightmare_mode && ranged_cooldown <= world.time) + var/list/did_we_hit = HurtInTurf(get_turf(W), list(), 30, BLACK_DAMAGE, check_faction = TRUE, hurt_mechs = TRUE) + if(did_we_hit.len) + W.VineAttack(pick(did_we_hit)) if(teleport_cooldown <= world.time && !togglemovement && !client && !IsCombatMap()) TryTeleport() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/sphinx.dm b/code/modules/mob/living/simple_animal/abnormality/waw/sphinx.dm index c74b171ca215..6d5307692613 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/sphinx.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/sphinx.dm @@ -1,6 +1,4 @@ //Coded by Coxswain -#define SPHINX_GAZE_COOLDOWN (12 SECONDS) - /mob/living/simple_animal/hostile/abnormality/sphinx name = "Sphinx" desc = "A gigantic stone feline." @@ -21,18 +19,16 @@ melee_damage_lower = 70 melee_damage_upper = 100 attack_sound = 'sound/abnormalities/sphinx/attack.ogg' - attack_action_types = list(/datum/action/cooldown/sphinx_gaze) + attack_action_types = list(/datum/action/cooldown/sphinx_gaze, /datum/action/cooldown/sphinx_quake) can_breach = TRUE threat_level = WAW_LEVEL melee_damage_type = WHITE_DAMAGE start_qliphoth = 3 work_chances = list( - ABNORMALITY_WORK_INSTINCT = list(0, 0, 35, 35, 40), - ABNORMALITY_WORK_INSIGHT = list(20, 30, 45, 50, 50), - ABNORMALITY_WORK_ATTACHMENT = 0, - ABNORMALITY_WORK_REPRESSION = list(0, 0, 25, 30, 30), - "Riddle" = 0, //These should never be used, but they're here for clarity. - "Make Offering" = 0, + ABNORMALITY_WORK_INSTINCT = list(5, 10, 25, 25, 30), + ABNORMALITY_WORK_INSIGHT = -25, + ABNORMALITY_WORK_ATTACHMENT = 15, + ABNORMALITY_WORK_REPRESSION = list(5, 10, 25, 25, 30), ) work_damage_amount = 12 work_damage_type = WHITE_DAMAGE @@ -53,185 +49,131 @@ Beside me, the great sphinx lies.
It beckons me to answer the plaque.
\ Written in characters I have never seen before, well are the sculptor's passions read.
\ \"What goes on four feet in the morning, two feet in midday, and three feet in the evening?\"" - observation_choices = list("Man", "Monster") - correct_choices = list("Man") - observation_success_message = "The sphinx says something.
It seems happy, or proud.
\ - Then, it turns to stone, and sinks into the sand.
\ - Nothing beside remains. Round the decay
\ - Of that colossal Wreck, boundless and bare
\ - The lone and level sands stretch far away." - observation_fail_message = "The sphinx seems displeased. \ - It says some incomprehensible but hurtful words to me.
\ - Then, it turns to stone.
I try and look away, but I find that I cannot move either.
\ - My skin cracks like stone, my breathing stops.
I fall into an abyss.
\ - ...
\ - I am entombed in stone, with no end in sight.
\ - I cannot scream, for I have no tongue to scream with.
\ - I cannot see, for I have no eyes to see with.
\ - I cannot hear anything, for I have no ears to hear with.
\ - Soon after, my heart is taken away too.
And then there is nothing left." + observation_choices = list( + "Man" = list(TRUE, "The sphinx says something.
It seems happy, or proud.
\ + Then, it turns to stone, and sinks into the sand.
\ + Nothing beside remains. Round the decay
\ + Of that colossal Wreck, boundless and bare
\ + The lone and level sands stretch far away."), + "Monster" = list(FALSE, "The sphinx seems displeased. \ + It says some incomprehensible but hurtful words to me.
\ + Then, it turns to stone.
I try and look away, but I find that I cannot move either.
\ + My skin cracks like stone, my breathing stops.
I fall into an abyss.
\ + ...
\ + I am entombed in stone, with no end in sight.
\ + I cannot scream, for I have no tongue to scream with.
\ + I cannot see, for I have no eyes to see with.
\ + I cannot hear anything, for I have no ears to hear with.
\ + Soon after, my heart is taken away too.
And then there is nothing left."), + ) //work-related - var/happy = FALSE - var/demand - var/work_cooldown - var/work_cooldown_time = 3 SECONDS - var/list/worked = list() - var/list/satisfied = list( - "Ipi etog sind lemanto.", //You mind big human - "Lemantinco kom geng kaskihir etog!", //(Human-honor) show has (not-lazy) mind - ) - var/list/angry = list( - "Mi cadu cef ipi por sagmo!", //I king threat you beggar begone - "Mi thran lemantolly quistramos!", //I angry stupid man (body-coin) - ) - var/list/translate = list( - "Ipi etog geng quir.", //You mind paper translate - "Ipi inspuz geng quir.", //You quest paper translate - ) - var/list/riddleloot = list( + var/loot_progress = 0 + var/prudence_work_chance = 0 + var/list/workloot = list( /obj/item/golden_needle, /obj/item/canopic_jar, ) - var/list/demandlist = list( - /obj/item/clothing/suit/armor/ego_gear, - /obj/item/ego_weapon, - /obj/item/reagent_containers/food/drinks, - /obj/item/food, - ) - //breach var/can_act = TRUE var/curse_cooldown var/curse_cooldown_time = 12 SECONDS + var/quake_cooldown + var/quake_cooldown_time = 6 SECONDS + var/quake_damage = 20 //Playables buttons + attack_action_types = list( + /datum/action/cooldown/sphinx_gaze, + /datum/action/cooldown/sphinx_quake, + ) + /datum/action/cooldown/sphinx_gaze name = "Sphinx's Gaze" icon_icon = 'icons/mob/actions/actions_abnormality.dmi' button_icon_state = "sphinx" check_flags = AB_CHECK_CONSCIOUS transparent_when_unavailable = TRUE - cooldown_time = SPHINX_GAZE_COOLDOWN //12 seconds - -/mob/living/simple_animal/hostile/abnormality/sphinx/InitializeSecretIcon() - . = ..() - icon_aggro = "sphonx_eye" + cooldown_time = 12 SECONDS /datum/action/cooldown/sphinx_gaze/Trigger() - if(!..()) - return FALSE - if(!istype(owner, /mob/living/simple_animal/hostile/abnormality/sphinx)) + . = ..() + if(!.) return FALSE var/mob/living/simple_animal/hostile/abnormality/sphinx/sphinx = owner + if(!istype(sphinx)) + return FALSE if(sphinx.IsContained()) // No more using cooldowns while contained return FALSE + if(sphinx.curse_cooldown_time > world.time || !sphinx.can_act) + return FALSE StartCooldown() sphinx.StoneVision(FALSE) return TRUE -/mob/living/simple_animal/hostile/abnormality/sphinx/PostSpawn() - ..() - if((locate(/obj/structure/sacrifice_table) in range(1, src))) - return - new /obj/structure/sacrifice_table(get_step(src, SOUTH)) +/datum/action/cooldown/sphinx_quake + name = "Sphinx's Earthquake" + icon_icon = 'icons/mob/actions/actions_abnormality.dmi' + button_icon_state = "ebony_barrier" + check_flags = AB_CHECK_CONSCIOUS + transparent_when_unavailable = TRUE + cooldown_time = 6 SECONDS -// Work -/mob/living/simple_animal/hostile/abnormality/sphinx/AttemptWork(mob/living/carbon/human/user, work_type) - if((work_type != "Riddle") && work_type != "Make Offering") - return ..() - else if(work_cooldown > world.time) +/datum/action/cooldown/sphinx_quake/Trigger() + . = ..() + if(!.) return FALSE - - work_cooldown = world.time + work_cooldown_time - if(work_type == "Riddle") - if(!(user in worked)) - worked += user - new /obj/item/paper/fluff/translation_notes(get_turf(user)) - say(pick(translate)) - sleep(10) - NewQuest() //repeat quest lines or offer new quest + var/mob/living/simple_animal/hostile/abnormality/sphinx/sphinx = owner + if(!istype(sphinx)) return FALSE - else - var/I = null - for(var/obj/structure/sacrifice_table/S in range(1, src)) - if(S.showpiece) - I = S.showpiece - S.dump() - if(I) - to_chat(user, span_warning("[src] seems to be looking at the [I]!")) - else if(user.get_active_held_item()) - I = user.get_active_held_item() - else if(user.get_inactive_held_item()) - I = user.get_inactive_held_item() - if(!I) //both hands are empty and there is no table - to_chat(user, span_warning("You have nothing to offer to [src]!")) - return FALSE - QuestHandler(I,user) //quest item must be either the active hand, or the other hand if active is empty. No guessing. - return FALSE - -/mob/living/simple_animal/hostile/abnormality/sphinx/WorkChance(mob/living/carbon/human/user, chance) - if(happy) - chance+=30 - return chance + if(sphinx.IsContained()) // No more using cooldowns while contained + return FALSE + if(sphinx.quake_cooldown > world.time || !sphinx.can_act) + return FALSE + StartCooldown() + sphinx.Quake() + return TRUE + +/mob/living/simple_animal/hostile/abnormality/sphinx/InitializeSecretIcon() + . = ..() + icon_aggro = "sphonx_eye" + +// Abnormality Work Stuff +/mob/living/simple_animal/hostile/abnormality/sphinx/AttemptWork(mob/living/carbon/human/user, work_type) + prudence_work_chance = clamp(get_modified_attribute_level(user, PRUDENCE_ATTRIBUTE) * 0.45, 0, 60) // Additional roll on a every work tick based on prudence + var/player_temperance = get_modified_attribute_level(user, TEMPERANCE_ATTRIBUTE) + var/work_chance_bonus = 20 *((0.07*player_temperance-1.4)/(0.07*player_temperance+4)) // 20 is half of the usual temperance_mod of 40 + work_chance_bonus += datum_reference.understanding * 0.5 // Should be roughly half of the usual effects from temperance overall + prudence_work_chance = clamp(prudence_work_chance + work_chance_bonus, 0, 95) + if(datum_reference.overload_chance[user.ckey]) // Work penalty from overload applies here too. Probably. + prudence_work_chance += datum_reference.overload_chance[user.ckey] + return ..() + +/mob/living/simple_animal/hostile/abnormality/sphinx/ChanceWorktickOverride(mob/living/carbon/human/user, work_chance, init_work_chance, work_type) + if(!prob(init_work_chance)) + if(!prob(prudence_work_chance)) + return 0 // You failed both work checks, sorry bozo + loot_progress += 1 + return 100 /mob/living/simple_animal/hostile/abnormality/sphinx/PostWorkEffect(mob/living/carbon/human/user, work_type, pe, work_time) + if(loot_progress >= 16) + var/turf/dispense_turf = get_step(src, EAST) + var/reward = pick(workloot) + new reward(dispense_turf) + loot_progress = 0 if(user.sanity_lost) QDEL_NULL(user.ai_controller) user.ai_controller = /datum/ai_controller/insane/wander/sphinx user.InitializeAIController() - if(happy) - happy = FALSE - else - say(pick(angry)) - datum_reference.qliphoth_change(-1) - -// Riddle/Quest code -/mob/living/simple_animal/hostile/abnormality/sphinx/proc/NewQuest() - if(!demand) - demand = pick(demandlist) - switch(demand) - if(/obj/item/clothing/suit/armor/ego_gear) - say("Atan eblak esm quistra utast.")//Bring me an armor EGO - if(/obj/item/ego_weapon) - say("Atan eblak esm sommel utast.")//Bring me an weapon EGO - if(/obj/item/reagent_containers) - say("Kom eblak mina brit hethre.")//Find me a water with vessel - if(/obj/item/food) - say("Atan eblak gorno tai por prin enum gorno.")//Bring me what the beggar consumes and needs (Its food) - -/mob/living/simple_animal/hostile/abnormality/sphinx/proc/QuestHandler(obj/item/I, mob/living/carbon/human/user) - if (!istype(I, demand)) - if(demand) - QuestPenalty(user) - else - to_chat(user, span_warning("[src] is not waiting for an offering at the moment.")) - return - - if(demand == /obj/item/reagent_containers) - if(I.reagents.has_reagent(/datum/reagent/water)) - qdel(I) - else - QuestPenalty(user) - return - if(demand == /obj/item/food) - qdel(I) - - QuestReward() - -/mob/living/simple_animal/hostile/abnormality/sphinx/proc/QuestReward() - say(pick(satisfied)) - happy = TRUE - demand = null - datum_reference.qliphoth_change(3) - var/turf/dispense_turf = get_step(src, pick(GLOB.alldirs)) - var/reward = pick(riddleloot) - new reward(dispense_turf) - -/mob/living/simple_animal/hostile/abnormality/sphinx/proc/QuestPenalty(mob/living/carbon/human/user) - say(pick(angry)) +/mob/living/simple_animal/hostile/abnormality/sphinx/FailureEffect(mob/living/carbon/human/user, work_type, pe) + . = ..() datum_reference.qliphoth_change(-1) + if(!user) + return + if(get_attribute_level(user, PRUDENCE_ATTRIBUTE) >= 100) + return var/mob/living/carbon/human/H = user var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) var/obj/item/organ/ears/ears = H.getorganslot(ORGAN_SLOT_EARS) @@ -279,14 +221,13 @@ if(LAZYLEN(priority)) return pick(priority) -/mob/living/simple_animal/hostile/abnormality/sphinx/AttackingTarget() - ..() - if(!ishuman(target)) - return +/mob/living/simple_animal/hostile/abnormality/sphinx/AttackingTarget(atom/attacked_target) + if(!ishuman(attacked_target)) + return OpenFire(attacked_target) - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(!H.sanity_lost) - return + return OpenFire(attacked_target) QDEL_NULL(H.ai_controller) H.ai_controller = /datum/ai_controller/insane/wander/sphinx @@ -294,12 +235,58 @@ LoseTarget(H) /mob/living/simple_animal/hostile/abnormality/sphinx/OpenFire() - if(!can_act || client) + if(!can_act) return - if((curse_cooldown <= world.time)) + if((curse_cooldown <= world.time) && !client) StoneVision(FALSE) - return + return + StoneThrow(target) + +/mob/living/simple_animal/hostile/abnormality/sphinx/attackby(obj/item/I, mob/living/user, params) + ..() + if(!client) + TryQuake() + +/mob/living/simple_animal/hostile/abnormality/sphinx/attack_animal(mob/living/simple_animal/M) + ..() + if(!client) + TryQuake() + +/mob/living/simple_animal/hostile/abnormality/sphinx/proc/StoneThrow() + if(!can_act) + return + can_act = FALSE + SLEEP_CHECK_DEATH(3) + playsound(get_turf(target), 'sound/magic/arbiter/repulse.ogg', 20, 0, 5) + new /obj/effect/temp_visual/rockwarning(get_turf(target), src) + SLEEP_CHECK_DEATH(10) + can_act = TRUE + +/mob/living/simple_animal/hostile/abnormality/sphinx/proc/TryQuake() + if((quake_cooldown <= world.time) && !client) + Quake() + +/mob/living/simple_animal/hostile/abnormality/sphinx/proc/Quake() + if(quake_cooldown > world.time || !can_act) + return + quake_cooldown = world.time + quake_cooldown_time + can_act = FALSE + var/turf/origin = get_turf(src) + playsound(origin, 'sound/magic/arbiter/knock.ogg', 25, 0, 5) + SLEEP_CHECK_DEATH(9) + playsound(get_turf(src), 'sound/effects/ordeals/brown/rock_attack.ogg', 50, 0, 8) + for(var/turf/T in view(2, src)) + new /obj/effect/temp_visual/smash_effect(T) + for(var/mob/living/victim in HurtInTurf(T, list(), quake_damage, WHITE_DAMAGE, null, TRUE, FALSE, TRUE, FALSE, TRUE, TRUE)) + var/throw_target = get_edge_target_turf(victim, get_dir(victim, get_step_away(victim, src))) + if(!victim.anchored) + var/throw_velocity = (prob(60) ? 1 : 4) + victim.throw_at(throw_target, rand(1, 2), throw_velocity, src) + SLEEP_CHECK_DEATH(8) + icon_state = icon_living + SLEEP_CHECK_DEATH(3) + can_act = TRUE /mob/living/simple_animal/hostile/abnormality/sphinx/proc/StoneVision(attack_chain) if((curse_cooldown > world.time) && !attack_chain) @@ -345,11 +332,11 @@ /datum/ai_behavior/say_line/insanity_sphinx lines = list( - "Utast tom tai beos... Utast tom esm cadu!", - "TAI ARKUR AGAL TOM LUVRI!!!", - "Mi tai hur... Mi tai hur... Mi tai hur... Mi tai hur...", - "Mies geng thran utast lemantomos!", - "Ipi manba geng mosleti atan brit utast!", + "Our old masters are waiting for us.", + "Listen to the stars.", + "The age of mankind is over...", + "AHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHAHA!!", + "I can't... It's too much!", ) // Objects - Items @@ -401,71 +388,6 @@ qdel(src) return -/obj/item/paper/fluff/translation_notes //most of these are just fluff - name = "Translation Notes" - info = {"

You may find this helpful when interpreting the sphinx's demands.


- -A-
- agal: gate
- arkur: city
- atan: bring

- -B-
- beos: law
- brit: with

- -C-
- cadu: king
- ceffe: threat
- cihir: lazy

- -E-
- eblak: me
- enum: and
- esm: a
- etog: will/mind

- -G-
- geng: has/owns
- gorno: needs

- -H-
- hethre: vessel/boat
- hur: scared/cowardly
- huw: old

- -I-
- ipi: you
- inspuz: quest

- -K-
- kas: no
- kom: show

- -L-
- lemanto: human
- leti: gave
- luvri : open

- -M-
- manba: came
- medon: kill
- mina: water
- mos: coin
- mi: I

- -N-
- naar: fire
- neu: papyrus/textile

- -P-
- por: beggar/starving
- prin: consume
- puwun: to

- -Q-
- quir: translate
- quistra: body/armor

- -S-
- sagmo: begone
- sinco: honor/value
- sommel: weapon/stick

- -T-
- tai: the
- thran: angry
- tolly: stupid
- tom: to

- -U-
- ucaf: lands
- utast: abnormality/shell"} - // Chems /datum/reagent/medicine/ichor //from jar name = "Ichor" @@ -529,59 +451,41 @@ variable = TRUE multiplicative_slowdown = 2 -// Objects - Structures -/obj/structure/sacrifice_table - name = "sacrificial altar" - desc = "It looks impossibly ancient." - icon = 'ModularTegustation/Teguicons/32x32.dmi' - icon_state = "altar" - anchored = TRUE - density = TRUE - layer = TURF_LAYER - plane = FLOOR_PLANE - resistance_flags = INDESTRUCTIBLE - var/obj/item/showpiece = null - -/obj/structure/sacrifice_table/examine(mob/user) + //Effects +/obj/effect/temp_visual/rockattack + icon = 'icons/effects/effects.dmi' + icon_state = "rockattack" + duration = 6 + randomdir = TRUE // random spike appearance + layer = ABOVE_MOB_LAYER + +/obj/effect/temp_visual/rockwarning + name = "moving rocks" + desc = "A target warning you of incoming pain" + icon = 'icons/effects/effects.dmi' + icon_state = "rockwarning" + duration = 10 + layer = RIPPLE_LAYER // We want this HIGH. SUPER HIGH. We want it so that you can absolutely, guaranteed, see exactly what is about to hit you. + var/damage = 40 //Red Damage + var/mob/living/caster // who made this, anyway + +/obj/effect/temp_visual/rockwarning/Initialize(mapload, new_caster) . = ..() - if(showpiece) - . += span_notice("There's \a [showpiece] inside.") + if(new_caster) + caster = new_caster + addtimer(CALLBACK(src, PROC_REF(explode)), 0.9 SECONDS) -/obj/structure/sacrifice_table/update_overlays() - . = ..() - if(showpiece) - var/mutable_appearance/showpiece_overlay = mutable_appearance(showpiece.icon, showpiece.icon_state) - showpiece_overlay.copy_overlays(showpiece) - showpiece_overlay.transform *= 0.7 - . += showpiece_overlay - -/obj/structure/sacrifice_table/proc/insert_showpiece(obj/item/wack, mob/user) - if(user.transferItemToLoc(wack, src)) - showpiece = wack - to_chat(user, span_notice("You put [wack] on display.")) - update_icon() - -/obj/structure/sacrifice_table/proc/dump() - if(!QDELETED(showpiece)) - showpiece.forceMove(drop_location()) - showpiece = null - update_icon() - -/obj/structure/sacrifice_table/attack_hand(mob/user) - . = ..() - if(.) +/obj/effect/temp_visual/rockwarning/proc/explode() + var/turf/target_turf = get_turf(src) + if(!target_turf) return - user.changeNext_move(CLICK_CD_MELEE) - if (showpiece) - to_chat(user, span_notice("You remove [showpiece].")) - dump() - add_fingerprint(user) + if(QDELETED(caster) || caster?.stat == DEAD || !caster) return - -/obj/structure/sacrifice_table/attackby(obj/item/W, mob/user, params) - if(!showpiece) - insert_showpiece(W, user) - else - return ..() - -#undef SPHINX_GAZE_COOLDOWN + playsound(target_turf, 'sound/effects/ordeals/brown/rock_attack.ogg', 50, 0, 8) + new /obj/effect/temp_visual/rockattack(target_turf) + for(var/turf/T in view(1, src)) + new /obj/effect/temp_visual/smash_effect(T) + for(var/mob/living/L in caster.HurtInTurf(T, list(), damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_hidden = TRUE, hurt_structure = TRUE)) + if(L.health < 0) + L.gib() + qdel(src) diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/thunder_bird.dm b/code/modules/mob/living/simple_animal/abnormality/waw/thunder_bird.dm index 4d2efc44baaf..71c00fb7345e 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/thunder_bird.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/thunder_bird.dm @@ -56,12 +56,12 @@ observation_prompt = "The totem sits atop a pile of gore and viscera.
\ Human scalps dangle motionlessly, strung to its wings.
\ Though the totem lies still, you feel compelled to answer it." - observation_choices = list("Speak", "Remain silent") - correct_choices = list("Remain silent") - observation_success_message = "The disgusting totem answered with silence.
\ - The Thunderbird had been defeated long ago, its existence being its only privilege." - observation_fail_message = "Before you can utter a word, thunder booms within the cell.
\ - The Thunderbird can be spoken to, but never reasoned with." + observation_choices = list( + "Remain silent" = list(TRUE, "The disgusting totem answered with silence.
\ + The Thunderbird had been defeated long ago, its existence being its only privilege."), + "Speak" = list(FALSE, "Before you can utter a word, thunder booms within the cell.
\ + The Thunderbird can be spoken to, but never reasoned with."), + ) /*---Combat---*/ //Melee stats @@ -369,13 +369,13 @@ var/mob/living/simple_animal/hostile/abnormality/thunder_bird/master //Zombie conversion from zombie kills -/mob/living/simple_animal/hostile/thunder_zombie/AttackingTarget() +/mob/living/simple_animal/hostile/thunder_zombie/AttackingTarget(atom/attacked_target) . = ..() if(!can_act) return - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.stat >= SOFT_CRIT || H.health < 0) Convert(H) diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/warden.dm b/code/modules/mob/living/simple_animal/abnormality/waw/warden.dm index 52c6dcefe7a3..671ea42c3144 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/warden.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/warden.dm @@ -44,13 +44,13 @@ As far as I know it's just me left.
\ The site burial went off and escape is impossible, yet, the other abnormalities remain in their cells - if they leave she forces them back inside.
\ Maybe if I enter one of the unused cells, she might leave me alone?" - observation_choices = list("Enter a cell", "Surrender to her") - correct_choices = list("Enter a cell") - observation_success_message = "I step inside and lock the door behind me,
I'm stuck inside.
\ - She passes by the containment unit and peers through the glass and seems satisfied." - observation_fail_message = "Steeling myself, I confront her during one of her rounds.
I tell her I'm tired and just want it to end.
\ - She gets closer and lifts her skirt(?) and I'm thrust underneath, my colleagues are here- they're alive and well!
\ - But, they seem despondent.
One looks at me says simply; \"In here, you're with us. Forever.\"" + observation_choices = list( + "Enter a cell" = list(TRUE, "I step inside and lock the door behind me,
I'm stuck inside.
\ + She passes by the containment unit and peers through the glass and seems satisfied."), + "Surrender to her" = list(FALSE, "Steeling myself, I confront her during one of her rounds.
I tell her I'm tired and just want it to end.
\ + She gets closer and lifts her skirt(?) and I'm thrust underneath, my colleagues are here- they're alive and well!
\ + But, they seem despondent.
One looks at me says simply; \"In here, you're with us. Forever.\""), + ) var/finishing = FALSE @@ -78,14 +78,14 @@ |Soul Warden|: If you attack a corpse, you will dust it, heal and gain a stack of “Captured Soul”
\ For each stack of “Captured Soul”, you become faster, deal 10 less melee damage and take 50% more damage.") -/mob/living/simple_animal/hostile/abnormality/warden/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/warden/AttackingTarget(atom/attacked_target) . = ..() if(.) if(finishing) return FALSE - if(!istype(target, /mob/living/carbon/human)) + if(!istype(attacked_target, /mob/living/carbon/human)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.health < 0) @@ -152,4 +152,5 @@ /mob/living/simple_animal/hostile/abnormality/warden/bullet_act(obj/projectile/P) visible_message(span_userdanger("[src] is unfazed by \the [P]!")) + new /obj/effect/temp_visual/healing/no_dam(get_turf(src)) P.Destroy() diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/wrath_servant.dm b/code/modules/mob/living/simple_animal/abnormality/waw/wrath_servant.dm index 70b07408d024..ea4a455055e3 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/wrath_servant.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/wrath_servant.dm @@ -60,13 +60,13 @@ observation_prompt = "I made a mistake, I put my trust in someone I shouldn't have and my world paid the price for my indiscretion.
\ Was I wrong to call them friend?
Were they really my friend, all along?" - observation_choices = list("You were wrong", "It wasn't wrong") - correct_choices = list("It wasn't wrong") - observation_success_message = "If that's the case, then why did balance, why did justice, fail me?
\ - Why did my world burn if I truly did not make a mistake?
It still hurts, but, if you're right then maybe I can put my trust in you..." - observation_fail_message = "It was the most precious relationship to me...
\ - That's why I lost; I fell to my beloved companion...
\ - I should have killed them when I had the chance!
Sinners!!
Embodiments of evil..!" + observation_choices = list( + "It wasn't wrong" = list(TRUE, "If that's the case, then why did balance, why did justice, fail me?
\ + Why did my world burn if I truly did not make a mistake?
It still hurts, but, if you're right then maybe I can put my trust in you..."), + "You were wrong" = list(FALSE, "It was the most precious relationship to me...
\ + That's why I lost; I fell to my beloved companion...
\ + I should have killed them when I had the chance!
Sinners!!
Embodiments of evil..!"), + ) var/friendly = TRUE var/list/friend_ship = list() @@ -257,18 +257,18 @@ return if(prob(5)) if(friendly) - new /obj/effect/gibspawner/generic/silent/wrath_acid(get_turf(target)) + new /obj/effect/gibspawner/generic/silent/wrath_acid(get_turf(attacked_target)) else - new /obj/effect/gibspawner/generic/silent/wrath_acid/bad(get_turf(target)) + new /obj/effect/gibspawner/generic/silent/wrath_acid/bad(get_turf(attacked_target)) . = ..() attack_sound = pick('sound/abnormalities/wrath_servant/small_smash1.ogg','sound/abnormalities/wrath_servant/small_smash2.ogg') - if(!isliving(target) || (get_dist(target, src) > 1)) + if(!isliving(attacked_target) || (get_dist(attacked_target, src) > 1)) return - var/mob/living/L = target + var/mob/living/L = attacked_target L.deal_damage(rand(10, 15), BLACK_DAMAGE) - if(!istype(target, /mob/living/simple_animal/hostile/azure_hermit)) + if(!istype(attacked_target, /mob/living/simple_animal/hostile/azure_hermit)) return - var/mob/living/simple_animal/hostile/azure_hermit/AZ = target + var/mob/living/simple_animal/hostile/azure_hermit/AZ = attacked_target if(AZ.health > 120) return PerformEnding(AZ) @@ -727,8 +727,8 @@ /mob/living/simple_animal/hostile/azure_hermit/AttackingTarget(atom/attacked_target) if(!can_act || (status_flags & GODMODE)) return - if(istype(target, /mob/living/simple_animal/hostile/abnormality/wrath_servant)) - var/mob/living/simple_animal/hostile/abnormality/wrath_servant/SW = target + if(istype(attacked_target, /mob/living/simple_animal/hostile/abnormality/wrath_servant)) + var/mob/living/simple_animal/hostile/abnormality/wrath_servant/SW = attacked_target if(SW.stunned) return if(SW.health > 400) @@ -757,8 +757,8 @@ SW.icon_state = "wrath_staff_stun" SW.desc = "A large red monster with white bandages hanging from it. Its flesh oozes a bubble acid. A wooden staff is impaled in its chest, it can't seem to move!" return - if(ishuman(target)) - var/mob/living/carbon/human/H = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/H = attacked_target if(get_user_level(H) < 3) say("Pardon me.") var/turf/TT = get_turf(H) @@ -800,16 +800,15 @@ if(!can_act || (status_flags & GODMODE)) return can_act = FALSE - var/list/show_area = list() - show_area |= view(4, src) - for(var/turf/sT in show_area) + for(var/turf/open/sT in view(4, src)) new /obj/effect/temp_visual/cult/sparks(sT) SLEEP_CHECK_DEATH(1.25 SECONDS) playsound(src, 'sound/abnormalities/wrath_servant/hermit_magic.ogg', 75, FALSE, 10) - for(var/mob/living/L in show_area) + for(var/turf/open/sT in view(4, src)) + new /obj/effect/temp_visual/small_smoke/halfsecond(sT) + for(var/mob/living/L in livinginview(4, src)) if(faction_check_mob(L)) continue - new /obj/effect/temp_visual/small_smoke/halfsecond(get_turf(L)) L.deal_damage(60, WHITE_DAMAGE) can_act = TRUE return diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/yang.dm b/code/modules/mob/living/simple_animal/abnormality/waw/yang.dm index 481368534514..c144ba7ea043 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/yang.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/yang.dm @@ -61,14 +61,14 @@ observation_prompt = "The Angel's Pendant was one half of a greater whole, but now they've been cleaved in half, forever wanting to reunite.
\ The pendant laid upon the podium before you, even being in the same room as it seemed to fortify your body and soul." - observation_choices = list("Put it on", "Don't put it on") - correct_choices = list("Put it on") - observation_success_message = "The moment you put it on, you feel a radiance emanate out and mend pain you didn't even know was there.
\ - It doesn't intend to heal you, it's just the way it is.
\ - If there is darkness and evil in this world, shouldn't there be light and good too?
\ - The world is far more than darkness and cold." - observation_fail_message = "It is all that is bright given form, made to gather all the positivity in the world.
\ - If you can't accept the goodness in yourself, you're not ready to accept the goodness of the world." + observation_choices = list( + "Put it on" = list(TRUE, "The moment you put it on, you feel a radiance emanate out and mend pain you didn't even know was there.
\ + It doesn't intend to heal you, it's just the way it is.
\ + If there is darkness and evil in this world, shouldn't there be light and good too?
\ + The world is far more than darkness and cold."), + "Don't put it on" = list(FALSE, "It is all that is bright given form, made to gather all the positivity in the world.
\ + If you can't accept the goodness in yourself, you're not ready to accept the goodness of the world."), + ) var/explosion_damage = 150 var/explosion_timer = 7 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/yin.dm b/code/modules/mob/living/simple_animal/abnormality/waw/yin.dm index 5f2cb5ed4057..5a470a022723 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/yin.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/yin.dm @@ -46,14 +46,14 @@ observation_prompt = "The Devil's Pendant was one half of a greater whole, but now they've been cleaved in half, forever wanting to reunite.
\ The pendant laid upon the podium before you, even being in the same room as it seemed to suck the life out of you and erodes your very essence." - observation_choices = list("Put it on", "Don't put it on") - correct_choices = list("Put it on") - observation_success_message = "The moment you put it on, your body is stricken with deepest agony, feeling like thorns racing through your body, puncturing flesh and mind alike but you endure.
\ - It didn't mean to harm you, it's just the way it is.
\ - If there is light and goodness in this world, shouldn't there be darkness and evil too?
\ - The world is far more than brightness and warmth." - observation_fail_message = "It is darkness made manifest, made to encapsulate all the negativity in the world.
\ - If you can't accept the darkness of the world, you're not ready to accept the darkness in you." + observation_choices = list( + "Put it on" = list(TRUE, "The moment you put it on, your body is stricken with deepest agony, feeling like thorns racing through your body, puncturing flesh and mind alike but you endure.
\ + It didn't mean to harm you, it's just the way it is.
\ + If there is light and goodness in this world, shouldn't there be darkness and evil too?
\ + The world is far more than brightness and warmth."), + "Don't put it on" = list(FALSE, "It is darkness made manifest, made to encapsulate all the negativity in the world.
\ + If you can't accept the darkness of the world, you're not ready to accept the darkness in you."), + ) faction = list("neutral", "hostile") // Not fought by anything, typically. But... var/faction_override = list("hostile") // The effects hit non-hostiles. diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/bald.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/bald.dm index 31ae2759046e..6f4ed278a234 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/bald.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/bald.dm @@ -42,10 +42,10 @@ harvest_phrase_third = "%PERSON squeezes %ABNO. Some juice drips into %VESSEL." observation_prompt = "This abnormality is filled with dreams of bald people. Are you balding, or already bald?" - observation_choices = list("Yes", "No") - correct_choices = list("Yes") - observation_success_message = "Lobotomy Corporation welcomes you." - observation_fail_message = "Come back after watching the fast and the furious 7 five more times." + observation_choices = list( + "Yes" = list(TRUE, "Lobotomy Corporation welcomes you."), + "No" = list(FALSE, "Come back after watching the fast and the furious 7 five more times."), + ) var/bald_users = list() chem_type = /datum/reagent/abnormality/bald @@ -117,10 +117,10 @@ if(HAS_TRAIT(not_bald, TRAIT_BALD)) . -= not_bald -/mob/living/simple_animal/hostile/abnormality/bald/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/bald/AttackingTarget(atom/attacked_target) . = ..() - if(ishuman(target)) - var/mob/living/carbon/human/H = target + if(ishuman(attacked_target)) + var/mob/living/carbon/human/H = attacked_target do_bald(H) /mob/living/simple_animal/hostile/abnormality/bald/Login() diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/blubbering_toad.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/blubbering_toad.dm index 91b51986a08d..9cfa1fd626f3 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/blubbering_toad.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/blubbering_toad.dm @@ -58,20 +58,20 @@ This resin is like gloom.
\ A sap of gloom, not quite like tears or sadness.
\ The toad holds this resin." - observation_choices = list("Mimic the cry", "Sit and wait") - correct_choices = list("Sit and wait") - observation_success_message = "An indeterminate amount of time passes.
\ - As you waited for the toad to finish its cries,
\ - it gazed into you, closing and opening its eyelids slowly.
\ - With a quick, slick sound,a long blue tongue popped out towards you.
\ - An eyeball belonging to the toad was on its tongue.
\ - When you picked it up, it blinked its other eye at us before going on its way.
\ - Was that its thanks for lending an ear?" - observation_fail_message = "\"Croohic, croohoo.\"
\ - The toad’s cry is dull and heavy.
\ - It doesn’t seem to have understood what it heard.
\ - After crying like that a few more times, it hopped away from its spot.
\ - All that’s left is the sticky blue resin." + observation_choices = list( + "Sit and wait" = list(TRUE, "An indeterminate amount of time passes.
\ + As you waited for the toad to finish its cries,
\ + it gazed into you, closing and opening its eyelids slowly.
\ + With a quick, slick sound, a long blue tongue popped out towards you.
\ + An eyeball belonging to the toad was on its tongue.
\ + When you picked it up, it blinked its other eye at us before going on its way.
\ + Was that its thanks for lending an ear?"), + "Mimic the cry" = list(FALSE, "\"Croohic, croohoo.\"
\ + The toad’s cry is dull and heavy.
\ + It doesn’t seem to have understood what it heard.
\ + After crying like that a few more times, it hopped away from its spot.
\ + All that’s left is the sticky blue resin."), + ) //work var/pulse_healing = 15 @@ -229,14 +229,14 @@ update_icon_state() //prevents icons from getting stuck ..() -/mob/living/simple_animal/hostile/abnormality/blubbering_toad/AttackingTarget() - if(!ishuman(target)) +/mob/living/simple_animal/hostile/abnormality/blubbering_toad/AttackingTarget(atom/attacked_target) + if(!ishuman(attacked_target)) return - if(target != idiot) - LoseTarget(target) + if(attacked_target != idiot) + LoseTarget(attacked_target) return ..() - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.sanity_lost) //prevents hitting the same guy in an infinite loop melee_damage_type = BLACK_DAMAGE if(H.health < 0) diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/bottle.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/bottle.dm index f35de3ec6a90..58b5ab36d39f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/bottle.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/bottle.dm @@ -55,26 +55,17 @@ observation_prompt = "It was all very well to say \"Drink me\" but wisdom told you not to do that in a hurry.
\ The bottle had no markings to denote whether it was poisonous but you could not be sure, it was almost certain to disagree with you, sooner or later..." - observation_choices = list("Drink the bottle", "Eat the cake", "Leave") - correct_choices = list("Leave", "Eat the cake") - observation_success_message = "Suspicious things are suspicious, common sense hasn't failed you yet." - observation_fail_message = "However this bottle was not marked as poisonous and you ventured a taste, \ - and found it horrid, the brine clung to your tongue.
Who'd mark such a horrible thing for drinking?" - //Special answer for choice 2 - var/observation_success_message_2 = "Abandon reason, that's how you survive in Wonderland.
\ - You devour the cake by the handful, frosting and crumbs smear your hands, your face and the floor.
\ - It's sweet and tart, with only the slightest hint of salt.
\ - As you breach the final layer of cake, the top of the bottle cracks and a deluge of brine spills forth, filling the room faster than you could draw a breath.
\ - In spite of that, you're at peace and smiling.
\ - Through your fading eyesight, you spy yourself through the other side of the containment door's window - frowning." - -// Final Observation -/mob/living/simple_animal/hostile/abnormality/bottle/ObservationResult(mob/living/carbon/human/user, condition, answer) //special answer for cake result - if(answer == "Eat the cake") - observation_success_message = observation_success_message_2 - else - observation_success_message = initial(observation_success_message) - return ..() + observation_choices = list( + "Leave" = list(TRUE, "Suspicious things are suspicious, common sense hasn't failed you yet."), + "Eat the cake" = list(TRUE, "Abandon reason, that's how you survive in Wonderland.
\ + You devour the cake by the handful, frosting and crumbs smear your hands, your face and the floor.
\ + It's sweet and tart, with only the slightest hint of salt.
\ + As you breach the final layer of cake, the top of the bottle cracks and a deluge of brine spills forth, filling the room faster than you could draw a breath.
\ + In spite of that, you're at peace and smiling.
\ + Through your fading eyesight, you spy yourself through the other side of the containment door's window - frowning."), + "Drink the bottle" = list(FALSE, "However this bottle was not marked as poisonous and you ventured a taste, \ + and found it horrid, the brine clung to your tongue.
Who'd mark such a horrible thing for drinking?"), + ) // Work Mechanics /mob/living/simple_animal/hostile/abnormality/bottle/AttemptWork(mob/living/carbon/human/user, work_type) @@ -230,8 +221,8 @@ /mob/living/simple_animal/hostile/abnormality/bottle/AttackingTarget(atom/attacked_target) if(eating) return - if(isliving(target)) - var/mob/living/L = target + if(isliving(attacked_target)) + var/mob/living/L = attacked_target if(faction_check_mob(L)) L.visible_message(span_danger("[src] feeds [L]... [L] seems heartier!"), span_nicegreen("[src] feeds you, you feel heartier!")) L.adjustBruteLoss(-speak_damage/2) diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/fairy_festival.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/fairy_festival.dm index 9b75c676af9a..a545fb902202 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/fairy_festival.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/fairy_festival.dm @@ -46,10 +46,10 @@ observation_prompt = "A gaggle of fairies flitter to and fro about the containment cell, they giggle as you approach.
\ \"You're a peaceful child, aren't you? You're lucky to accept our care.\"
\ They say in a sing-song all around you. \"Only good people ever speak to us, you're a good person too, right?\"" - observation_choices = list("Accept their care") - correct_choices = list("Accept their care") - observation_success_message = "The fairies sprinkle their powder around you and it collects upon your hands.
You feel special.
\ - You retreat from the cell and the fairies' hungry gazes.
You've always known the true meaning of The Fairies' Care." + observation_choices = list( + "Accept their care" = list(TRUE, "The fairies sprinkle their powder around you and it collects upon your hands.
You feel special.
\ + You retreat from the cell and the fairies' hungry gazes.
You've always known the true meaning of The Fairies' Care."), + ) /mob/living/simple_animal/hostile/abnormality/fairy_festival/proc/FairyHeal() for(var/mob/living/carbon/human/P in protected_people) @@ -164,15 +164,15 @@ AddComponent(/datum/component/swarming) summon_backup() -/mob/living/simple_animal/hostile/mini_fairy/AttackingTarget() +/mob/living/simple_animal/hostile/mini_fairy/AttackingTarget(atom/attacked_target) . = ..() var/friends = 0 for(var/mob/living/simple_animal/hostile/mini_fairy/fren in view(6, src)) friends++ if(friends < 3) summon_backup() - if(ishuman(target)) - var/mob/living/L = target + if(ishuman(attacked_target)) + var/mob/living/L = attacked_target if(L.health < 0 || L.stat == DEAD) var/mob/living/simple_animal/hostile/mini_fairy/MF = new(get_turf(L)) MF.faction = src.faction diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/fallen_amurdad.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/fallen_amurdad.dm index fa6ba5c393fe..8b7dc83b5324 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/fallen_amurdad.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/fallen_amurdad.dm @@ -27,10 +27,10 @@ observation_prompt = "The sweet stench of rot and decay hit you before you noticed the source was the bleeding person covered in plants.
\ His lips gape open and close like a fish's and what little strength he has in his limbs, he uses to beckons you closer..." - observation_choices = list("Get closer and listen", "Leave") - correct_choices = list("Get closer and listen") - observation_success_message = "You bend down and lend your ear to his mouth...
You hear the words you've been waiting your whole life to hear." - observation_fail_message = "The man clearly needs help, you rush to find a medic." + observation_choices = list( + "Get closer and listen" = list(TRUE, "You bend down and lend your ear to his mouth...
You hear the words you've been waiting your whole life to hear."), + "Leave" = list(FALSE, "The man clearly needs help, you rush to find a medic."), + ) var/seed_list = list( /obj/item/seeds/grass/fairy, diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/hammer_light.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/hammer_light.dm index 590fc73aedb1..c832ee68a798 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/hammer_light.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/hammer_light.dm @@ -30,14 +30,13 @@ gift_type = /datum/ego_gifts/evening abnormality_origin = ABNORMALITY_ORIGIN_ARTBOOK // Technically it was in the beta but I dont want it showing it up in LC-only modes - observation_prompt = "I was the unluckiest man in the world.
\ - Everything around me did nothing but ruining my life.But I had no power to change this fate.
\ - Someday, someone made an offer to me.\"If you accept it, your whole world will change.\"
\ + observation_prompt = "I was the unluckiest man in the world.
\ + Everything around me did nothing but ruining my life. But I had no power to change this fate.
\ + Someday, someone made an offer to me. \"If you accept it, your whole world will change.\"
\ Such a tempting offer. I would become something that I could only hope to be." - observation_choices = list("Accept the offer") - correct_choices = list("Accept the offer") - observation_success_message = "I accepted the offer and paid the price.
\ - The $0 Hammer of Light shined." + observation_choices = list( + "Accept the offer" = list(TRUE, "I accepted the offer and paid the price.
The $0 Hammer of Light shined.") + ) pet_bonus = "hums" // saves a few lines of code by allowing funpet() to be called by attack_hand() var/sealed = TRUE diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/oceanwaves.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/oceanwaves.dm index 3fd1d945f66b..e0b2169bfe95 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/oceanwaves.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/oceanwaves.dm @@ -43,11 +43,11 @@ Where does it get its power…?
Besides that, what’s with this sound of crashing waves?
\ Regardless, this vacant lot looks to be a good place to take a break.
\ Standing in front of the vending machine, you see rows of buttons." - observation_choices = list("Press one") - correct_choices = list("Press one") - observation_success_message = "With just a single press, the machine ejected one can after another.
\ - All the cans are purple. You can’t fathom the meaning of the ships and grapes doodled on them, but they somehow feel familiar, and well… cheery.
\ - They should be okay to drink." + observation_choices = list( + "Press one" = list(TRUE, "With just a single press, the machine ejected one can after another.
\ + All the cans are purple. You can’t fathom the meaning of the ships and grapes doodled on them, but they somehow feel familiar, and well… cheery.
\ + They should be okay to drink."), + ) var/list/goodsoders = list( /obj/item/reagent_containers/food/drinks/soda_cans/oceanwave/unlabeled, diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/one_sin.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/one_sin.dm index 74c4c9182002..e4f8e3562293 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/one_sin.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/one_sin.dm @@ -24,7 +24,7 @@ /datum/ego_datum/armor/penitence ) max_boxes = 10 - gift_type = /datum/ego_gifts/penitence + gift_type = /datum/ego_gifts/penitence gift_message = "From this day forth, you shall never forget his words." abnormality_origin = ABNORMALITY_ORIGIN_LOBOTOMY @@ -38,12 +38,12 @@ observation_prompt = "It has great power. It is savior that will judge you, and executioner that will put you in your demise.
\ In its eyes, you find...
(Technically, it has no eyes, so in its pitch-black holes you find...)" - observation_choices = list("You find yourself.", "Nothing.") - correct_choices = list("Nothing.") - observation_success_message = "Darkness.
\ - Nothing is there. Have you found the answers you were looking for?" - observation_fail_message = "You are found.
\ - You have great power.
You willingly lift the axe for the greater good." + observation_choices = list( + "Nothing" = list(TRUE, "Darkness.
\ + Nothing is there. Have you found the answers you were looking for?"), + "You find yourself" = list(FALSE, "You are found.
\ + You have great power.
You willingly lift the axe for the greater good."), + ) var/halo_status = "onesin_halo_normal" //used for changing the halo overlays @@ -57,7 +57,7 @@ . += "onesin" //by the nine this is too cursed /mob/living/simple_animal/hostile/abnormality/onesin/WorkChance(mob/living/carbon/human/user, chance) - if(istype(user.ego_gift_list[HAT], /datum/ego_gifts/penitence)) + if(istype(user.ego_gift_list[HAT], gift_type)) return chance + 10 return chance diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/oracle.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/oracle.dm index e39ad98d3a79..11c9166ff841 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/oracle.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/oracle.dm @@ -22,7 +22,7 @@ work_damage_type = WHITE_DAMAGE ego_list = list( - /datum/ego_datum/weapon/dead_dream, + /datum/ego_datum/weapon/dead_dream, /datum/ego_datum/armor/dead_dream ) // gift_type = /datum/ego_gifts/oracle @@ -32,15 +32,15 @@
She was told that it would feel like no time at all. \
Silently sleeping she dreams of the future, a future she was promised. \
Before your eyes untold time passes until one day." - observation_choices = list("She woke up.", "The pod broke.") - correct_choices = list("The pod broke.") - observation_success_message = "You look into the window as you see her stir in her slumber before falling still. \ -
Holding your breath in silence, \ -
You remember Maria, \ -
Forever dreaming of a future she will never see." - observation_fail_message = "The pod opens with a hiss as you watch her step out. \ -
The joy on her face is immesurable, for she left behind so much to be here. \ -
Then she melts away, for this was your dream." + observation_choices = list( + "The pod broke" = list(TRUE, "You look into the window as you see her stir in her slumber before falling still. \ +
Holding your breath in silence, \ +
You remember Maria, \ +
Forever dreaming of a future she will never see."), + "She woke up" = list(FALSE, "The pod opens with a hiss as you watch her step out. \ +
The joy on her face is immesurable, for she left behind so much to be here. \ +
Then she melts away, for this was your dream."), + ) var/list/sleeplines = list( "Hello...", diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/pile_of_mail.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/pile_of_mail.dm index 00ab394bedde..d5eeb20a159c 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/pile_of_mail.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/pile_of_mail.dm @@ -32,12 +32,12 @@ observation_prompt = "Letters addressed to various addresses and recipients litter the containment cell.
\ Occasionally, some of the letters flutter in the air, as if a breeze has come through the cell.
\ A new batch of letters comes flooding out of the mailbox, one lands right in front of you, with your name on it." - observation_choices = list("Open the letter", "Ignore it") - correct_choices = list("Open the letter") - observation_success_message = "You open the letter, but the inside is blank.
\ - Looking at the envelope, you notice that it is labelled \"RETURN TO SENDER\"
\ - You put the envelope back in the mailbox, and find a gift inside." - observation_fail_message = "You know better than to fall for the tricks of an abnormality.
You walk out of the cell, never knowing what was in that letter." + observation_choices = list( + "Open the letter" = list(TRUE, "You open the letter, but the inside is blank.
\ + Looking at the envelope, you notice that it is labelled \"RETURN TO SENDER\"
\ + You put the envelope back in the mailbox, and find a gift inside."), + "Ignore it" = list(FALSE, "You know better than to fall for the tricks of an abnormality.
You walk out of the cell, never knowing what was in that letter."), + ) var/cooldown var/cooldown_time = 10 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/quiet_day.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/quiet_day.dm index 0549c06acd1e..1ce51091c908 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/quiet_day.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/quiet_day.dm @@ -11,6 +11,7 @@ core_icon = "quiet_day" maxHealth = 451 health = 451 + blood_volume = 0 threat_level = ZAYIN_LEVEL faction = list("hostile", "neutral") //Bad for stat gain, but the damage is negligable and there's a nice bonus at the end @@ -40,19 +41,19 @@ harvest_phrase_third = "%ABNO glances at %PERSON. Suddenly, %VESSEL seems to be more full." observation_prompt = "The shadow of an old man seems to be contemplating about something.
\ - \"Don\'t you ever wish you could go back to those better times? To be able to enjoy life to the fullest?
\ + \"Don't you ever wish you could go back to those better times? To be able to enjoy life to the fullest?
\ To relive the best moments of your life again?
\ To remember her face? To remember that young man's name?
\ - Perhaps it's foolish of me to ask for this. I want to hear your opinion, young\'in.
\ + Perhaps it's foolish of me to ask for this. I want to hear your opinion, young'in.
\ Would it be worth chasing after those old, familiar memories?\"" - observation_choices = list("It's not wrong.", "Perhaps it's better to move on.") - correct_choices = list("Perhaps it's better to move on.") - observation_success_message = "\"I suppose you're right after all.\"
\ - \"If I can't even remember their names and faces, what worth even are those memories?\"
\ - \"Go on. Leave before you forget too.\"" - observation_fail_message = "\"Indeed. There's no harm, right?\"
\ - \"...Yet why can't I remember her face?\"
\ - As you're about to leave, you hear the old man croak out something. \"Who are you again?\"" + observation_choices = list( + "Perhaps it's better to move on." = list(TRUE, "\"I suppose you're right after all.\"
\ + \"If I can't even remember their names and faces, what worth even are those memories?\"
\ + \"Go on. Leave before you forget too.\""), + "It's not wrong." = list(FALSE, "\"Indeed. There's no harm, right?\"
\ + \"...Yet why can't I remember her face?\"
\ + As you're about to leave, you hear the old man croak out something. \"Who are you again?\""), + ) var/performed_work var/datum/looping_sound/quietday_ambience/soundloop diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/sleeping_beauty.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/sleeping_beauty.dm index 9c51a111228d..7e33eb19cfc5 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/sleeping_beauty.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/sleeping_beauty.dm @@ -39,11 +39,10 @@ harvest_phrase_third = "%PERSON jostles %ABNO, then captures the resulting clouds with %VESSEL." observation_prompt = "The couch looks inviting, softer and plusher than anything you've ever known.
You've been working for so long, it couldn't hurt to take a break?" - observation_choices = list("Lie down", "Get back to work") - correct_choices = list("Get back to work") - observation_success_message = "You shake your head. You'll have time to rest when you're dead." - observation_fail_message = "You lay your head down into your soft and comfy pillow. You can always try again tomorrow." - + observation_choices = list( + "Get back to work" = list(TRUE, "You shake your head. You'll have time to rest when you're dead."), + "Lie down" = list(FALSE, "You lay your head down into your soft and comfy pillow. You can always try again tomorrow."), + ) var/grab_cooldown var/grab_cooldown_time = 20 SECONDS @@ -159,9 +158,9 @@ //pink midnight code -/mob/living/simple_animal/hostile/abnormality/sleeping/AttackingTarget() +/mob/living/simple_animal/hostile/abnormality/sleeping/AttackingTarget(atom/attacked_target) if(grab_cooldown < world.time) - buckle_mob(target) + buckle_mob(attacked_target) grab_cooldown = world.time + grab_cooldown_time return ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/sunset_traveller.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/sunset_traveller.dm index 672a3e6531e2..b62429f661e0 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/sunset_traveller.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/sunset_traveller.dm @@ -37,16 +37,16 @@ observation_prompt = "\"Look at those butterflies! Aren’t they just beautiful?
And gander at that sunset, too! Really makes you want to go for a stroll.\"
\ \"Why don’t you stop for a moment and take a breather here?\"
\ Something yellow gestures warmly at you." - observation_choices = list("Take a break", "Ignore it and leave") - correct_choices = list("Take a break") - observation_success_message = "\"Wasn’t it tiring coming all the way here? Really, check out those butterflies.
\ - Just watching them will warm your heart.\"
\ - You looked at the butterflies as the voice suggested. They indeed fill the heart with a certain warmth.
\ - \"Looks like some of them want to tag along!\"
\ - A kaleidoscope of butterflies started following you, even after you left that scenic spot." - observation_fail_message = "\"You must be very busy then!\"
It made the same gesture as when it first greeted you.
\ - Perhaps it was waving goodbye all along.
\ - \"Another time, I suppose!\"" + observation_choices = list( + "Take a break" = list(TRUE, "\"Wasn’t it tiring coming all the way here? Really, check out those butterflies.
\ + Just watching them will warm your heart.\"
\ + You looked at the butterflies as the voice suggested. They indeed fill the heart with a certain warmth.
\ + \"Looks like some of them want to tag along!\"
\ + A kaleidoscope of butterflies started following you, even after you left that scenic spot."), + "Ignore it and leave" = list(FALSE, "\"You must be very busy then!\"
It made the same gesture as when it first greeted you.
\ + Perhaps it was waving goodbye all along.
\ + \"Another time, I suppose!\""), + ) light_color = COLOR_ORANGE light_range = 5 diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/we_can_change_anything.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/we_can_change_anything.dm index f277b68aa709..be8a7c4be4bc 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/we_can_change_anything.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/we_can_change_anything.dm @@ -49,10 +49,10 @@ Is your house suffering from an outage because you don’t have the money to pay for the power bill?
\ We can change that!
\ It’s quite simple. Just open up the machine, step inside, and press the button to make it shut." - observation_choices = list("Enter the machine") - correct_choices = list("Enter the machine") - observation_success_message = "You step inside the machine, it's just as comfortable as advertised.
\ - Now everything will be just fine." + observation_choices = list( + "Enter the machine" = list(TRUE, "You step inside the machine, it's just as comfortable as advertised.
\ + Now everything will be just fine."), + ) var/grinding = FALSE var/grind_duration = 5 SECONDS diff --git a/code/modules/mob/living/simple_animal/abnormality/zayin/wellcheers.dm b/code/modules/mob/living/simple_animal/abnormality/zayin/wellcheers.dm index c47e39ca4bd4..a83628fe5892 100644 --- a/code/modules/mob/living/simple_animal/abnormality/zayin/wellcheers.dm +++ b/code/modules/mob/living/simple_animal/abnormality/zayin/wellcheers.dm @@ -58,11 +58,12 @@ observation_prompt = "A vending machine stands before you.
\ Two delicious looking shrimp are standing at both sides of the machine.
Will you buy soda?" - observation_choices = list("Yes", "No") - correct_choices = list("Yes", "No") - observation_success_message = "Before you can make a choice, one of the shrimp buys you soda.
\ - You drink the soda, and fall asleep...
...
Somewhere in the distance, you hear seagulls." - + observation_choices = list( + "Yes" = list(TRUE, "Before you can make a choice, one of the shrimp buys you soda.
\ + You drink the soda, and fall asleep...
...
Somewhere in the distance, you hear seagulls."), + "No" = list(TRUE, "Before you can make a choice, one of the shrimp buys you soda.
\ + You drink the soda, and fall asleep...
...
Somewhere in the distance, you hear seagulls.") + ) /mob/living/simple_animal/hostile/abnormality/wellcheers/HandleStructures() . = ..() diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index 0ba7958c5842..59b35d8eed8e 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -107,10 +107,9 @@ if(.) L.amount_grown = min(L.amount_grown + damage, L.max_grown) -/mob/living/simple_animal/attack_animal(mob/living/simple_animal/M) +/mob/living/simple_animal/attack_animal(mob/living/simple_animal/M, damage) . = ..() if(.) - var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) return attack_threshold_check(damage, M.melee_damage_type) /mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M) @@ -142,6 +141,7 @@ if(temp_damage >= 0 && temp_damage <= force_threshold) visible_message(span_warning("[src] looks unharmed!")) + DamageEffect(0, damagetype) return FALSE if(actuallydamage) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 8c375caaf748..7f6c1ae471d1 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -198,9 +198,7 @@ if(istype(W, /obj/item/ego_weapon)) var/obj/item/ego_weapon/EW = W if(!EW.CanUseEgo(src)) - to_chat(user, span_notice("You try attaching \the [W] to \the [src]... but it falls off!")) - user.dropItemToGround(EW) - EW.forceMove(get_turf(src)) + to_chat(user, span_notice("You try attaching \the [W] to \the [src]... but it refuses to stay on!")) return FALSE to_chat(user, span_notice("You start attaching \the [W] to \the [src]...")) if(do_after(user, 25, target = src)) diff --git a/code/modules/mob/living/simple_animal/distortion/legend/papa_bongy.dm b/code/modules/mob/living/simple_animal/distortion/legend/papa_bongy.dm index cdef95961439..83713bf5d8d6 100644 --- a/code/modules/mob/living/simple_animal/distortion/legend/papa_bongy.dm +++ b/code/modules/mob/living/simple_animal/distortion/legend/papa_bongy.dm @@ -125,14 +125,14 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/distortion/papa_bongy/AttackingTarget() - if(!can_act || !target) +/mob/living/simple_animal/hostile/distortion/papa_bongy/AttackingTarget(atom/attacked_target) + if(!can_act || !attacked_target) return FALSE - if(!isliving(target)) + if(!isliving(attacked_target)) return ..() - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(ishuman(H)) - if(istype(target.ai_controller, /datum/ai_controller/insane/murder/bongy)) + if(istype(H.ai_controller, /datum/ai_controller/insane/murder/bongy)) LoseTarget() return//need to test whether this is still needed H.add_movespeed_modifier(/datum/movespeed_modifier/bongy) @@ -141,7 +141,7 @@ BongyPanic(H) ..() can_act = FALSE - return DingAttack(target) + return DingAttack(attacked_target) /mob/living/simple_animal/hostile/distortion/papa_bongy/proc/DingAttack(target) var/turf/target_turf = get_turf(target) @@ -241,10 +241,10 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/bongy_hostile/AttackingTarget() - if(!target) +/mob/living/simple_animal/hostile/bongy_hostile/AttackingTarget(atom/attacked_target) + if(!attacked_target) return FALSE - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target ..() if(ishuman(H) && H.sanity_lost) BongyPanic(H) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index c00b2af3caa5..b761fa37cb81 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -24,9 +24,12 @@ var/list/emote_taunt = list() var/taunt_chance = 0 - var/rapid_melee = 1 //Number of melee attacks between each npc pool tick. Spread evenly. + var/rapid_melee = 1 //Number of melee attacks between each npc pool tick. Spread evenly. !!OBSOLETE!! It still works but use attack_cooldown instead. var/melee_queue_distance = 4 //If target is close enough start preparing to hit them if we have rapid_melee enabled var/melee_reach = 1 // The range at which a mob can make melee attacks + var/attack_cooldown = 0 //The time between attacks in deciseconds. If 0 at initialization then uses rapid_melee to calculate the initial value. + var/attack_is_on_cooldown = FALSE + var/old_rapid_melee = 0 //used for compatibility with old rapid_melee system to detect outside code changing the rapid_melee value and adjusts attack_cooldown accordingly var/ranged_message = "fires" //Fluff text for ranged mobs var/ranged_cooldown = 0 //What the current cooldown on ranged attacks is, generally world.time + ranged_cooldown_time @@ -51,8 +54,8 @@ var/attack_same = 0 //Set us to 1 to allow us to attack our own faction var/atom/targets_from = null //all range/attack/etc. calculations should be done from this atom, defaults to the mob itself, useful for Vehicles and such var/attack_all_objects = FALSE //if true, equivalent to having a wanted_objects list containing ALL objects. - var/lose_patience_timer_id //id for a timer to call LoseTarget(), used to stop mobs fixating on a target they can't reach - var/lose_patience_timeout = 300 //30 seconds by default, so there's no major changes to AI behaviour, beyond actually bailing if stuck forever + var/patience_last_interaction = 0 //instead of expensive timers checks whether enough time passed in Life() to try find a different target + var/lose_patience_timeout = 60 //6 seconds by default, so there's no major changes to AI behaviour, beyond actually bailing if stuck forever // Experimental Target Memory. Short term HATE. Things added to this list will have their accossiated values considered. var/list/target_memory = list() @@ -77,6 +80,11 @@ var/patrol_tries = 0 //max of 5 var/patrol_move_timer = null + /// How willing a mob is to switch targets. More resistance means more aggro is required + var/target_switch_resistance + + var/damage_effect_scale = 1 + /mob/living/simple_animal/hostile/Initialize() /*Update Speed overrides set speed and sets it to the equivilent of move_to_delay. Basically @@ -86,8 +94,12 @@ if(SSmaptype.maptype in SSmaptype.citymaps) vision_range = min(vision_range, 8) + if(attack_cooldown == 0) + attack_cooldown = SSnpcpool.wait / rapid_melee + old_rapid_melee = rapid_melee if(!targets_from) targets_from = src + target_switch_resistance = clamp(maxHealth * 0.15, 100, 600) wanted_objects = typecacheof(wanted_objects) @@ -99,7 +111,12 @@ . = ..() if(!.) //dead walk(src, 0) //stops walking - if(!can_patrol || client) + return + if(client) + return + if(lose_patience_timeout && !QDELETED(target) && AIStatus == AI_ON && patience_last_interaction + lose_patience_timeout < world.time) + LosePatience() + if(!can_patrol) return if(target && length(patrol_path)) //if AI has acquired a target while on patrol, stop patrol patrol_reset() @@ -123,20 +140,22 @@ return FALSE //we look around for potential targets and make it a list for later use. var/list/possible_targets = ListTargets() - if(environment_smash) - EscapeConfinement() - if(AICanContinue(possible_targets)) + if(!attack_is_on_cooldown) + TryAttack() if(!QDELETED(target) && !targets_from.Adjacent(target)) DestroyPathToTarget() if(!MoveToTarget(possible_targets)) //if we lose our target if(AIShouldSleep(possible_targets)) // we try to acquire a new one + target_memory.Cut() toggle_ai(AI_IDLE) // otherwise we go idle return TRUE /mob/living/simple_animal/hostile/handle_automated_movement() . = ..() - if(dodging && target && in_melee && isturf(loc) && isturf(target.loc)) + if(environment_smash) + EscapeConfinement() + if(dodging && !QDELETED(target) && in_melee && isturf(loc) && isturf(target.loc)) var/datum/cb = CALLBACK(src, PROC_REF(sidestep)) if(sidestep_per_cycle > 1) //For more than one just spread them equally - this could changed to some sensible distribution later var/sidestep_delay = SSnpcpool.wait / sidestep_per_cycle @@ -148,19 +167,30 @@ /mob/living/simple_animal/hostile/attacked_by(obj/item/I, mob/living/user) if(stat == CONSCIOUS && AIStatus != AI_OFF && !client && user) if(!target) + if(AIStatus == AI_IDLE) + toggle_ai(AI_ON) FindTarget(list(user), 1) + var/add_aggro = 0 + var/add_damtype + if(I) + add_aggro = I.force + add_damtype = I.damtype + if(ishuman(user)) + var/mob/living/carbon/human/H = user + var/justice_mod = 1 + get_modified_attribute_level(H, JUSTICE_ATTRIBUTE) / 100 + add_aggro *= justice_mod + if(istype(I, /obj/item/ego_weapon/)) + var/obj/item/ego_weapon/EW = I + add_aggro *= EW.force_multiplier else - var/add_aggro = 0 - var/add_damtype - if(I) - add_aggro = I.force - add_damtype = I.damtype - else - add_aggro = user.melee_damage_upper - if(isanimal(user)) - var/mob/living/simple_animal/A = user - add_damtype = A.melee_damage_type - RegisterAggroValue(user, add_aggro, add_damtype) + //this code does not seem to ever get executed + add_aggro = user.melee_damage_upper + if(isanimal(user)) + var/mob/living/simple_animal/A = user + add_damtype = A.melee_damage_type + RegisterAggroValue(user, add_aggro, add_damtype) + if(target == user) + GainPatience() return ..() /mob/living/simple_animal/hostile/bullet_act(obj/projectile/P) @@ -170,19 +200,23 @@ FindTarget(list(P.firer), 1) else Goto(P.starting, move_to_delay, 3) - //If we have a target register the attacker in our memory. - else - if(P.firer) - RegisterAggroValue(P.firer, P.damage, P.damage_type) - //If the projectile had no firer then just list it as nobuddy - if(!P.firer) - if(target_memory["nobuddy"] > MAX_DAMAGE_SUFFERED) - FindTarget() - //If our damage value for that person exceeds this number then we consider targeting them. - if(target_memory[P.firer] > MAX_DAMAGE_SUFFERED) - FindTarget(list(P.firer), 1) + //register the attacker in our memory. + if(P.firer) + RegisterAggroValue(P.firer, P.damage, P.damage_type) return ..() +/mob/living/simple_animal/hostile/attack_animal(mob/living/simple_animal/M, damage) + damage = rand(M.melee_damage_lower, M.melee_damage_upper) + . = ..() + if(. && stat == CONSCIOUS && AIStatus != AI_OFF && !client) + if(!target) + if(AIStatus == AI_IDLE) + toggle_ai(AI_ON) + FindTarget(list(M), TRUE) + RegisterAggroValue(M, damage, M.melee_damage_type) + if(target == M) + GainPatience() + /mob/living/simple_animal/hostile/Move(atom/newloc, dir , step_x , step_y) if(dodging && approaching_target && prob(dodge_prob) && moving_diagonally == 0 && isturf(loc) && isturf(newloc)) return dodge(newloc,dir) @@ -217,10 +251,9 @@ if(AIStatus != AI_ON && AIStatus != AI_OFF) toggle_ai(AI_ON) FindTarget() - else if(target != null && prob(40))//No more pulling a mob forever and having a second player attack it, it can switch targets now if it finds a more suitable one - FindTarget() /mob/living/simple_animal/hostile/death(gibbed) + target_memory.Cut() LoseTarget() ..(gibbed) @@ -245,59 +278,96 @@ add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/variable_hostile_speed_bonus, TRUE, amount, TRUE) addtimer(CALLBACK(src, TYPE_PROC_REF(/mob, add_or_update_variable_movespeed_modifier), /datum/movespeed_modifier/variable_hostile_speed_bonus, TRUE, -amount, TRUE), time) -/mob/living/simple_animal/hostile/attacked_by(obj/item/I, mob/living/user) - if(stat == CONSCIOUS && !target && AIStatus != AI_OFF && !client && user) - FindTarget(list(user), 1) - return ..() - -/mob/living/simple_animal/hostile/bullet_act(obj/projectile/P) - if(stat == CONSCIOUS && !target && AIStatus != AI_OFF && !client) - if(P.firer && get_dist(src, P.firer) <= aggro_vision_range) - FindTarget(list(P.firer), 1) - Goto(P.starting, move_to_delay, 3) - - . = ..() - DamageEffect(P.damage_type) - /*-------------------\ |Damage Visual Effect| \-------------------*/ - -/mob/living/simple_animal/hostile/attack_threshold_check(damage, damagetype = BRUTE, armorcheck = MELEE, actuallydamage = TRUE) - //This used to also check actually damage but turns out melee weapons in item_attack.dm dont call actually damage. - if(stat != DEAD && (damagetype in list(RED_DAMAGE, WHITE_DAMAGE, BLACK_DAMAGE, PALE_DAMAGE))) - //To simplify things, if you bash a abnormality with a wrench it wont show any effect. --uhh it will though - DamageEffect(damagetype) - return ..() - -/mob/living/simple_animal/hostile/proc/DamageEffect(damtype) - //Code stolen from attack_threshold_check() in animal_defense.dm - var/damage_modifier - if(islist(damage_coeff)) - damage_modifier = damage_coeff[damtype] - else - damage_modifier = damage_coeff.getCoeff(damtype) - - if(damage_modifier == 0) - //Visual Effect for immunity. - return new /obj/effect/temp_visual/healing/no_dam(get_turf(src)) - if(damage_modifier < 0) - //Visual Effect for healing. - return new /obj/effect/temp_visual/healing(get_turf(src)) - +/mob/living/proc/DamageEffect(damage, damtype) + if(damage > 0) + switch(damtype) + if(RED_DAMAGE) + return new /obj/effect/temp_visual/damage_effect/red(get_turf(src)) + if(WHITE_DAMAGE) + return new /obj/effect/temp_visual/damage_effect/white(get_turf(src)) + if(BLACK_DAMAGE) + return new /obj/effect/temp_visual/damage_effect/black(get_turf(src)) + if(PALE_DAMAGE) + return new /obj/effect/temp_visual/damage_effect/pale(get_turf(src)) + if(BURN) + return new /obj/effect/temp_visual/damage_effect/burn(get_turf(src)) + if(TOX) + return new /obj/effect/temp_visual/damage_effect/tox(get_turf(src)) + else + return null + +/mob/living/simple_animal/hostile/DamageEffect(damage, damtype) + var/obj/effect/dam_effect = null + if(!damage) + dam_effect = new /obj/effect/temp_visual/healing/no_dam(get_turf(src)) + if(damage_effect_scale != 1) + dam_effect.transform *= damage_effect_scale + return dam_effect + if(damage < 0) + dam_effect = new /obj/effect/temp_visual/healing(get_turf(src)) + if(damage_effect_scale != 1) + dam_effect.transform *= damage_effect_scale + return dam_effect switch(damtype) if(RED_DAMAGE) - return new /obj/effect/temp_visual/damage_effect/red(get_turf(src)) + dam_effect = new /obj/effect/temp_visual/damage_effect/red(get_turf(src)) if(WHITE_DAMAGE) - return new /obj/effect/temp_visual/damage_effect/white(get_turf(src)) + dam_effect = new /obj/effect/temp_visual/damage_effect/white(get_turf(src)) if(BLACK_DAMAGE) - return new /obj/effect/temp_visual/damage_effect/black(get_turf(src)) + dam_effect = new /obj/effect/temp_visual/damage_effect/black(get_turf(src)) if(PALE_DAMAGE) - return new /obj/effect/temp_visual/damage_effect/pale(get_turf(src)) + dam_effect = new /obj/effect/temp_visual/damage_effect/pale(get_turf(src)) if(BURN) - return new /obj/effect/temp_visual/damage_effect/burn(get_turf(src)) + dam_effect = new /obj/effect/temp_visual/damage_effect/burn(get_turf(src)) if(TOX) - return new /obj/effect/temp_visual/damage_effect/tox(get_turf(src)) + dam_effect = new /obj/effect/temp_visual/damage_effect/tox(get_turf(src)) + else + return null + if(damage_effect_scale != 1) + dam_effect.transform *= damage_effect_scale + if(length(projectile_blockers) > 0) + dam_effect.pixel_x += rand(-occupied_tiles_left_current * 32, occupied_tiles_right_current * 32) + dam_effect.pixel_y += rand(-occupied_tiles_down_current * 32, occupied_tiles_up_current * 32) + return dam_effect + +/mob/living/simple_animal/hostile/adjustRedLoss(amount, updating_health, forced) + var/was_alive = stat != DEAD + . = ..() + if(was_alive) + DamageEffect(., RED_DAMAGE) + +/mob/living/simple_animal/hostile/adjustWhiteLoss(amount, updating_health, forced, white_healable) + var/was_alive = stat != DEAD + . = ..() + if(was_alive) + DamageEffect(., WHITE_DAMAGE) + +/mob/living/simple_animal/hostile/adjustBlackLoss(amount, updating_health, forced, white_healable) + var/was_alive = stat != DEAD + . = ..() + if(was_alive) + DamageEffect(., BLACK_DAMAGE) + +/mob/living/simple_animal/hostile/adjustPaleLoss(amount, updating_health, forced) + var/was_alive = stat != DEAD + . = ..() + if(was_alive) + DamageEffect(., PALE_DAMAGE) + +/mob/living/simple_animal/hostile/adjustFireLoss(amount, updating_health, forced) + var/was_alive = stat != DEAD + . = ..() + if(was_alive) + DamageEffect(., BURN) + +/mob/living/simple_animal/hostile/adjustToxLoss(amount, updating_health, forced) + var/was_alive = stat != DEAD + . = ..() + if(was_alive) + DamageEffect(., TOX) /*Used in LC13 abnormality calculations. Moved here so we can use it for all hostiles. @@ -335,17 +405,17 @@ //////////////HOSTILE MOB TARGETTING AND AGGRESSION//////////// -/mob/living/simple_animal/hostile/proc/ListTargets() //Step 1, find out what we can see +/mob/living/simple_animal/hostile/proc/ListTargets(max_range = vision_range) //Step 1, find out what we can see if(!search_objects) - . = hearers(vision_range, targets_from) - src //Remove self, so we don't suicide + . = hearers(max_range, targets_from) - src //Remove self, so we don't suicide var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/vehicle/sealed/mecha)) - for(var/HM in typecache_filter_list(range(vision_range, targets_from), hostile_machines)) - if(can_see(targets_from, HM, vision_range)) - . += HM + for(var/obj/O in oview(max_range, targets_from)) + if(is_type_in_typecache(O, hostile_machines)) + . += O else - . = oview(vision_range, targets_from) + . = oview(max_range, targets_from) /mob/living/simple_animal/hostile/proc/ListTargetsLazy(_Z) var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/vehicle/sealed/mecha)) @@ -382,9 +452,9 @@ /* Essentially is the middle part of FindTarget but returns only a list without giving a target.*/ -/mob/living/simple_animal/hostile/proc/PossibleThreats() +/mob/living/simple_animal/hostile/proc/PossibleThreats(max_range = vision_range) . = list() - for(var/pos_targ in ListTargets()) + for(var/pos_targ in ListTargets(max_range)) var/atom/A = pos_targ if(Found(A)) . = list(A) @@ -471,7 +541,7 @@ This may be changed in the future if we want to still value them to see if we even care about attacking. */ if(Targets.len == 1) - return pick(Targets) + return Targets[1] /* Form a list of our targets, value how much we hate them, and then pick the target who has the MOST hate. */ @@ -482,7 +552,7 @@ /* If we have a target do we continue fighting if asked to pick again? */ - if(target) + if(target && target != .) if(KeepTargetCondition(target, .)) return target @@ -497,21 +567,37 @@ // Adds entity to THE LIST OF GRUDGES which is reset upon gaining a new target. /mob/living/simple_animal/hostile/proc/RegisterAggroValue(atom/remembered_target, value, damage_type) - if(!remembered_target) - remembered_target = "nobody" - if(!target_memory[remembered_target]) + if(!remembered_target || !damage_type) + return FALSE + if(!isnum(target_memory[remembered_target])) target_memory += remembered_target - if(damage_type) + + //could potentially add aggro as a mob armor type to also apply aggro damage coeff + //also could potentially check for remembered_target's aggro modifiers here such as from armor or status effects + if(damage_type == AGGRO_DAMAGE) + if(istype(remembered_target, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = remembered_target + var/aggro_stat_modifier = 1 + (get_attribute_level(H, FORTITUDE_ATTRIBUTE) + get_attribute_level(H, PRUDENCE_ATTRIBUTE)) / 200 + value *= aggro_stat_modifier + else value *= damage_coeff.getCoeff(damage_type) target_memory[remembered_target] += value + if(!QDELETED(target) && remembered_target != target && target_memory[remembered_target] > target_memory[target] + target_switch_resistance && CanAttack(remembered_target)) + GiveTarget(remembered_target) + target_memory[remembered_target] += value + return TRUE + /*-------------------\ |Standard Hate Levels| |--------------------/ |Living Adjacent = 80 -|Living Far = 30 +|Living Far = 10 |Other Adjacent = 0 -|Other Far = -50 +|Other Far = -70 +|Modifiers: +|Previous target -60 +|Damage dealt +0 to +25 \-------------------*/ /mob/living/simple_animal/hostile/proc/ValueTarget(atom/target_thing) if(!target_thing) @@ -519,13 +605,6 @@ //This is a safety net just in the case that no value is returned. . = 0 - //If your farther than 5 tiles from us you suffer the max 50 of hate penalty. - . -= clamp(get_dist(targets_from, target_thing) * 10,0,50) - - //This is in order to make mobs not instantly reaggro on mobs they lost patience on. - if(isnum(target_memory[target_thing])) - . -= (target_memory[target_thing] / 10) - /* This is in order to treat Mechas as living by instead considering their pilot for the hate value. */ if(ismecha(target_thing)) @@ -533,22 +612,33 @@ for(var/occupant in M.occupants) if(isliving(occupant) && CanAttack(occupant)) . += 80 - - if(isliving(target_thing)) + else if(isliving(target_thing)) //Minimum starting hate for anything living is 80. . += 80 + //If your farther than 7 tiles from us you suffer the max 70 of hate penalty. + var/distance = get_dist(targets_from, target_thing) - 1 + . -= clamp(10 * distance , 0, 70) + + //This is in order to make mobs not instantly reaggro on mobs they lost patience on. + if(target_thing == target) + . -= 60 + + //up to 25 points for damage taken from target_thing + if(target_memory[target_thing]) + var/fraction_hp_lost_to_thing = min(target_memory[target_thing] / maxHealth, 1) + . += fraction_hp_lost_to_thing * 25 + /mob/living/simple_animal/hostile/proc/GiveTarget(new_target) target = new_target - LosePatience() + target_memory.Cut() + target_memory[target] = 0 if(target != null) GainPatience() Aggro() return 1 /mob/living/simple_animal/hostile/proc/LoseTarget() - if(target_memory.len > 1) - target_memory.Cut() target = null approaching_target = FALSE in_melee = FALSE @@ -581,13 +671,74 @@ /mob/living/simple_animal/hostile/proc/CheckAndAttack() if(!target) return FALSE - var/in_range = melee_reach > 1 ? target.Adjacent(targets_from) || (get_dist(src, target) <= melee_reach && (target in view(src, melee_reach))) : target.Adjacent(targets_from) + var/in_range = melee_reach > 1 ? target.Adjacent(targets_from) || (get_dist(src, target) <= melee_reach && (target in view(melee_reach, src))) : target.Adjacent(targets_from) if(targets_from && isturf(targets_from.loc) && in_range && !incapacitated()) AttackingTarget() return TRUE return FALSE - // Called by automated_action and causes the AI to go idle if it returns false. This proc is pretty big. +/mob/living/simple_animal/hostile/Bumped(atom/movable/AM) + . = ..() + if(!client && AIStatus == AI_ON && !attack_is_on_cooldown && CanAttack(AM)) + TryAttack() + +/mob/living/simple_animal/hostile/Moved() + . = ..() + if(!client && AIStatus == AI_ON && target) + MovedTryAttack() + +/mob/living/simple_animal/hostile/proc/MovedTryAttack() + set waitfor = FALSE + SLEEP_CHECK_DEATH(move_to_delay * 0.5) // half of move delay so that its in between moves + if(!client && AIStatus == AI_ON && target && !attack_is_on_cooldown) + TryAttack() + +/mob/living/simple_animal/hostile/proc/TryAttack() + //at this point it is assumed that an attack can be made regardless of cooldown state, + //cooldown checks are made before calling TryAttack or you might want to be able to attack without caring about cooldowns + if(QDELETED(src)) + return + if(client || stat != CONSCIOUS || AIStatus != AI_ON || incapacitated() || !targets_from || !isturf(targets_from.loc)) + attack_is_on_cooldown = FALSE + return + var/atom/attacked_target + var/should_gain_patience = FALSE + if(!QDELETED(target) && (target.Adjacent(targets_from) || melee_reach > 1 && can_see(targets_from, target, melee_reach - 1))) + //attack target + attacked_target = target + should_gain_patience = TRUE + else + in_melee = FALSE + var/list/targets_in_range = PossibleThreats(melee_reach) + if(targets_in_range.len > 0) + //attack random thing in the list + attacked_target = pick(targets_in_range) + + if(attacked_target) + attack_is_on_cooldown = TRUE + AttackingTarget(attacked_target) + if(QDELETED(src) || stat != CONSCIOUS) + return + ResetAttackCooldown(attack_cooldown) + if(should_gain_patience) + GainPatience() + else + attack_is_on_cooldown = FALSE + DelayedTryAttack(attack_cooldown) + +/mob/living/simple_animal/hostile/proc/ResetAttackCooldown(delay) + set waitfor = FALSE + SLEEP_CHECK_DEATH(delay) + attack_is_on_cooldown = FALSE + TryAttack() + +/mob/living/simple_animal/hostile/proc/DelayedTryAttack(delay) + set waitfor = FALSE + SLEEP_CHECK_DEATH(delay) + if(!attack_is_on_cooldown) + TryAttack() + +// Called by automated_action and causes the AI to go idle if it returns false. This proc is pretty big. /mob/living/simple_animal/hostile/proc/MoveToTarget(list/possible_targets) stop_automated_movement = 1 /*Stop automated movement is only used for wander code. @@ -595,16 +746,18 @@ target and if we are currently moving towards a target and they suddenly or are currently something we dont attack.*/ - if(!target) - if(approaching_target) - /* Approaching target means we are currently moving menacingly - towards something. Otherwise we are just moving and if we - are investigating a location we dont want to be told to stand still. */ - LoseTarget() - return FALSE + if(QDELETED(target)) + if(!FindTarget(possible_targets, TRUE)) + if(approaching_target) + /* Approaching target means we are currently moving menacingly + towards something. Otherwise we are just moving and if we + are investigating a location we dont want to be told to stand still. */ + LoseTarget() + return FALSE if(!CanAttack(target)) - LoseTarget() - return FALSE + if(!FindTarget(possible_targets, TRUE)) + LoseTarget() + return FALSE // The target we currently have is in our view and we must decide if we move towards it more. if(target in possible_targets) var/turf/T = get_turf(src) @@ -641,13 +794,6 @@ //This is for attacking. if(target) - if(targets_from && isturf(targets_from.loc) && in_range) - //If they're next to us, attack - MeleeAction() - else - if(rapid_melee > 1 && target_distance <= melee_queue_distance) - MeleeAction(FALSE) - in_melee = FALSE //If we're just preparing to strike do not enter sidestep mode return TRUE return FALSE @@ -675,13 +821,19 @@ walk_to(src, target, minimum_distance, delay) /mob/living/simple_animal/hostile/proc/AttackingTarget(atom/attacked_target) - SEND_SIGNAL(src, COMSIG_HOSTILE_ATTACKINGTARGET, target) - in_melee = TRUE - if(ismob(target)) - changeNext_move(SSnpcpool.wait / rapid_melee) - // Wow! that's a really weird variable to base attack speed on! Yes. - // It's because mobs typically attack once per this duration, because the subsystem calls handle_automated_movement() which then calls the attacking procs. - return target.attack_animal(src) + if(!attacked_target) + attacked_target = target + if(old_rapid_melee != rapid_melee) + attack_cooldown = SSnpcpool.wait / rapid_melee + old_rapid_melee = rapid_melee + //Enforcing minimum attack cooldown here cause i tried setting this to 0 and it was not fun for the server.(1 decisecond is basically rapid_melee 20) + attack_cooldown = max(attack_cooldown, 1) + SEND_SIGNAL(src, COMSIG_HOSTILE_ATTACKINGTARGET, attacked_target) + if(attacked_target == target) + in_melee = TRUE + if(ismob(attacked_target) || isobj(attacked_target)) + changeNext_move(attack_cooldown) + return attacked_target.attack_animal(src) //////////////END HOSTILE MOB TARGETTING AND AGGRESSION//////////// @@ -866,14 +1018,11 @@ more than lose_patience_timeout deciseconds, which probably means we're stuck */ /mob/living/simple_animal/hostile/proc/GainPatience() - if(lose_patience_timeout) - LosePatience() - lose_patience_timer_id = addtimer(CALLBACK(src, PROC_REF(LoseTarget)), lose_patience_timeout, TIMER_STOPPABLE) - + patience_last_interaction = world.time /mob/living/simple_animal/hostile/proc/LosePatience() - deltimer(lose_patience_timer_id) - + if(!FindTarget()) + LoseTarget() //These two procs handle losing and regaining search_objects when attacked by a mob /mob/living/simple_animal/hostile/proc/LoseSearchObjects() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index ea7f320a71c2..fa6c4ce79523 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -117,12 +117,12 @@ else ..() -/mob/living/simple_animal/hostile/megafauna/AttackingTarget() +/mob/living/simple_animal/hostile/megafauna/AttackingTarget(atom/attacked_target) if(recovery_time >= world.time) return . = ..() - if(. && isliving(target)) - var/mob/living/L = target + if(. && isliving(attacked_target)) + var/mob/living/L = attacked_target if(L.stat != DEAD) if(!client && ranged && ranged_cooldown <= world.time) OpenFire() diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/amber.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/amber.dm index 0ad86cc3f495..b58de9d8d14e 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/amber.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/amber.dm @@ -79,10 +79,12 @@ if(. && target) //reset burrow cooldown whenever in combat burrow_cooldown = world.time + burrow_cooldown_time -/mob/living/simple_animal/hostile/ordeal/amber_bug/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/amber_bug/AttackingTarget(atom/attacked_target) + if(burrowing) + return . = ..() if(.) - var/dir_to_target = get_dir(get_turf(src), get_turf(target)) + var/dir_to_target = get_dir(get_turf(src), get_turf(attacked_target)) animate(src, pixel_y = (base_pixel_y + 18), time = 2) addtimer(CALLBACK(src, PROC_REF(AnimateBack)), 2) for(var/i = 1 to 2) @@ -190,6 +192,7 @@ should_projectile_blockers_change_orientation = TRUE occupied_tiles_up = 1 offsets_pixel_x = list("south" = -16, "north" = -16, "west" = 0, "east" = -32) + offsets_pixel_y = list("south" = 9, "north" = -20, "west" = 0, "east" = 0) /// This cooldown responds for both the burrowing and spawning in the dawns var/burrow_cooldown @@ -224,10 +227,25 @@ /mob/living/simple_animal/hostile/ordeal/amber_dusk/Initialize() . = ..() + setDir(WEST) soundloop = new(list(src), TRUE) if(LAZYLEN(butcher_results)) addtimer(CALLBACK(src, PROC_REF(BurrowOut), get_turf(src))) +/mob/living/simple_animal/hostile/ordeal/amber_dusk/OnDirChange(atom/thing, dir, newdir) + . = ..() + if(stat == DEAD) + return + var/static/matrix/add_vertical_transform = matrix(0.8, 1.4, MATRIX_SCALE) + var/static/south_north = SOUTH | NORTH + var/static/east_west = EAST | WEST + var/combined = dir | newdir + if((combined & south_north) && (combined & east_west)) + if(newdir & south_north) + transform = add_vertical_transform + else + transform = matrix() + /mob/living/simple_animal/hostile/ordeal/amber_dusk/Destroy() QDEL_NULL(soundloop) for(var/mob/living/simple_animal/hostile/ordeal/amber_bug/spawned/bug as anything in spawned_mobs) @@ -247,6 +265,8 @@ if(LAZYLEN(butcher_results)) alpha = 255 offsets_pixel_x = list("south" = -16, "north" = -16, "west" = -16, "east" = -16) + offsets_pixel_y = list("south" = 0, "north" = 0, "west" = 0, "east" = 0) + transform = matrix() soundloop.stop() for(var/mob/living/simple_animal/hostile/ordeal/amber_bug/bug in spawned_mobs) bug.can_burrow_solo = TRUE @@ -255,6 +275,8 @@ /mob/living/simple_animal/hostile/ordeal/amber_dusk/revive(full_heal, admin_revive) . = ..() offsets_pixel_x = list("south" = -16, "north" = -16, "west" = 0, "east" = -32) + offsets_pixel_y = list("south" = 9, "north" = -20, "west" = 0, "east" = 0) + density = TRUE /mob/living/simple_animal/hostile/ordeal/amber_dusk/proc/AttemptBirth() var/max_spawn = clamp(length(GLOB.clients) * 2, 4, 8) @@ -366,6 +388,7 @@ occupied_tiles_up = 2 offsets_pixel_x = list("south" = -96, "north" = -96, "west" = -96, "east" = -96) offsets_pixel_y = list("south" = -16, "north" = -16, "west" = -16, "east" = -16) + damage_effect_scale = 1.25 blood_volume = BLOOD_VOLUME_NORMAL death_sound = 'sound/effects/ordeals/amber/midnight_dead.ogg' diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/brown/dawn.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/brown/dawn.dm index 5bbbc2cb0abb..cc4bd0f98d4e 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/brown/dawn.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/brown/dawn.dm @@ -184,10 +184,10 @@ guaranteed_butcher_results = list(/obj/item/food/meat/slab/human/mutant/plant = 1) stat_attack = DEAD -/mob/living/simple_animal/hostile/ordeal/sin_gluttony/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/sin_gluttony/AttackingTarget(atom/attacked_target) . = ..() - if(. && isliving(target) && SSmaptype.maptype != "limbus_labs") - var/mob/living/L = target + if(. && isliving(attacked_target) && SSmaptype.maptype != "limbus_labs") + var/mob/living/L = attacked_target if(L.stat != DEAD) if(L.health <= HEALTH_THRESHOLD_DEAD && HAS_TRAIT(L, TRAIT_NODEATH)) devour(L) @@ -299,16 +299,16 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/ordeal/sin_pride/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/sin_pride/AttackingTarget(atom/attacked_target) if(charging) return if(dash_cooldown <= world.time && prob(10) && !client) - PrepCharge(target) + PrepCharge(attacked_target) return . = ..() - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.health < 0) if(SSmaptype.maptype != "limbus_labs") H.gib() diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/crimson.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/crimson.dm index 642d56829898..c326d7b8f587 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/crimson.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/crimson.dm @@ -36,9 +36,9 @@ return TRUE return FALSE -/mob/living/simple_animal/hostile/ordeal/crimson_clown/AttackingTarget() - if(istype(target, /obj/machinery/computer/abnormality)) - var/obj/machinery/computer/abnormality/CA = target +/mob/living/simple_animal/hostile/ordeal/crimson_clown/AttackingTarget(atom/attacked_target) + if(istype(attacked_target, /obj/machinery/computer/abnormality)) + var/obj/machinery/computer/abnormality/CA = attacked_target if(console_attack_counter < 12) console_attack_counter += 1 visible_message(span_warning("[src] hits [CA]'s buttons at random!")) @@ -382,10 +382,10 @@ L.apply_damage(700, RED_DAMAGE, null, L.run_armor_check(null, RED_DAMAGE)) gib() -/mob/living/simple_animal/hostile/ordeal/crimson_tent/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/crimson_tent/AttackingTarget(atom/attacked_target) if(!can_act) return FALSE - return Bite(target) + return Bite(attacked_target) /mob/living/simple_animal/hostile/ordeal/crimson_tent/proc/Bite(target) if (get_dist(src, target) > 3) diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/gold/dusk.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/gold/dusk.dm index 04a7b3ac732a..7f4147e430d6 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/gold/dusk.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/gold/dusk.dm @@ -191,19 +191,19 @@ recharge_cooldown = world.time + recharge_cooldown_time current_beam = Beam(A, icon_state="lightning[rand(1,12)]", time = 3 SECONDS) -/mob/living/simple_animal/hostile/ordeal/thunderbird_corrosion/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/thunderbird_corrosion/AttackingTarget(atom/attacked_target) . = ..() - if(!isliving(target)) + if(!isliving(attacked_target)) return - var/mob/living/L = target + var/mob/living/L = attacked_target if(charge_level) // We deal up to 20 more damage, 1 for every point of charge. L.deal_damage(charge_level, BLACK_DAMAGE) playsound(get_turf(src), 'sound/weapons/fixer/generic/energyfinisher1.ogg', 75, 1) to_chat(L,span_danger("The [src] unleashes its charge!")) AdjustCharge(-charge_level) - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target if(H.stat >= SOFT_CRIT || H.health < 0) Convert(H) diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/gold/noon.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/gold/noon.dm index 9a6d8edb0774..85099a61d838 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/gold/noon.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/gold/noon.dm @@ -60,10 +60,10 @@ AreaAttack() return -/mob/living/simple_animal/hostile/ordeal/white_lake_corrosion/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/white_lake_corrosion/AttackingTarget(atom/attacked_target) if(!can_act) return FALSE - return Slash(target) + return Slash(attacked_target) /mob/living/simple_animal/hostile/ordeal/white_lake_corrosion/proc/Slash(target) if (get_dist(src, target) > 3) @@ -293,14 +293,14 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/ordeal/silentgirl_corrosion/AttackingTarget() - if(!vengeful && (target != current_target)) +/mob/living/simple_animal/hostile/ordeal/silentgirl_corrosion/AttackingTarget(atom/attacked_target) + if(!vengeful && (attacked_target != current_target)) return FALSE . = ..() if(.) - if(!ishuman(target)) + if(!ishuman(attacked_target)) return - var/mob/living/carbon/human/TH = target + var/mob/living/carbon/human/TH = attacked_target if(TH.health < 0 || TH.sanity_lost) finishing = TRUE TH.Stun(4 SECONDS) diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/green.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/green.dm index 213668d0706d..d8a730d85a39 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/green.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/green.dm @@ -38,6 +38,7 @@ /// Can't move/attack when it's TRUE var/reloading = FALSE + var/firing_time = 0 /// When at 12 - it will start "reloading" var/fire_count = 0 @@ -64,18 +65,23 @@ /mob/living/simple_animal/hostile/ordeal/green_bot_big/OpenFire(atom/A) if(reloading) return FALSE + firing_time = world.time fire_count += 1 if(fire_count >= 12) StartReloading() return FALSE return ..() -/mob/living/simple_animal/hostile/ordeal/green_bot_big/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/green_bot_big/AttackingTarget(atom/attacked_target) + if(reloading) + return FALSE + if(world.time < firing_time + 1.2 SECONDS) + return FALSE . = ..() if(.) - if(!istype(target, /mob/living)) + if(!istype(attacked_target, /mob/living)) return - var/turf/T = get_turf(target) + var/turf/T = get_turf(attacked_target) if(!T) return for(var/i = 1 to 4) @@ -269,6 +275,7 @@ guaranteed_butcher_results = list(/obj/item/food/meat/slab/robot = 16) death_sound = 'sound/effects/ordeals/green/midnight_dead.ogg' offsets_pixel_x = list("south" = -96, "north" = -96, "west" = -96, "east" = -96) + damage_effect_scale = 1.25 var/laser_cooldown var/laser_cooldown_time = 20 SECONDS diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/green/dawn.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/green/dawn.dm index 82114dbd31ca..d7bc8f7de31d 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/green/dawn.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/green/dawn.dm @@ -47,14 +47,16 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/ordeal/green_bot/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/green_bot/AttackingTarget(atom/attacked_target) + if(finishing) + return . = ..() if(.) - if(!istype(target, /mob/living/carbon/human)) + if(!istype(attacked_target, /mob/living/carbon/human)) return if(SSmaptype.maptype in SSmaptype.citymaps) return - var/mob/living/carbon/human/TH = target + var/mob/living/carbon/human/TH = attacked_target if(TH.health < 0) finishing = TRUE TH.Stun(4 SECONDS) @@ -103,12 +105,14 @@ melee_damage_lower = 14 melee_damage_upper = 16 -/mob/living/simple_animal/hostile/ordeal/green_bot/syringe/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/green_bot/syringe/AttackingTarget(atom/attacked_target) + if(finishing) + return . = ..() if(.) - if(!istype(target, /mob/living/carbon/human)) + if(!istype(attacked_target, /mob/living/carbon/human)) return - var/mob/living/carbon/human/H = target + var/mob/living/carbon/human/H = attacked_target H.add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/aggressive) addtimer(CALLBACK(H, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/grab_slowdown/aggressive), 4 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/indigo.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/indigo.dm index d4389faca882..62136ba226ee 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/indigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/indigo.dm @@ -38,10 +38,10 @@ . = ..() a_intent_change(INTENT_HELP) -/mob/living/simple_animal/hostile/ordeal/indigo_noon/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/indigo_noon/AttackingTarget(atom/attacked_target) . = ..() - if(. && isliving(target)) - var/mob/living/L = target + if(. && isliving(attacked_target)) + var/mob/living/L = attacked_target if(L.stat != DEAD) if(L.health <= HEALTH_THRESHOLD_DEAD && HAS_TRAIT(L, TRAIT_NODEATH)) devour(L) @@ -196,10 +196,10 @@ . = ..() a_intent_change(INTENT_HELP) //so that they dont get body blocked by their kin outside of combat -/mob/living/simple_animal/hostile/ordeal/indigo_dusk/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/indigo_dusk/AttackingTarget(atom/attacked_target) . = ..() - if(. && isliving(target)) - var/mob/living/L = target + if(. && isliving(attacked_target)) + var/mob/living/L = attacked_target if(L.stat != DEAD) if(L.health <= HEALTH_THRESHOLD_DEAD && HAS_TRAIT(L, TRAIT_NODEATH)) devour(L) @@ -361,10 +361,10 @@ patrol_reset() return FALSE -/mob/living/simple_animal/hostile/ordeal/indigo_midnight/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/indigo_midnight/AttackingTarget(atom/attacked_target) . = ..() - if(. && isliving(target)) - var/mob/living/L = target + if(. && isliving(attacked_target)) + var/mob/living/L = attacked_target if(L.stat != DEAD) if(L.health <= HEALTH_THRESHOLD_DEAD && HAS_TRAIT(L, TRAIT_NODEATH)) devour(L) diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/indigo/dawn.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/indigo/dawn.dm index fb28ff044476..cec30ba012a8 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/indigo/dawn.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/indigo/dawn.dm @@ -23,10 +23,10 @@ blood_volume = BLOOD_VOLUME_NORMAL silk_results = list(/obj/item/stack/sheet/silk/indigo_simple = 1) -/mob/living/simple_animal/hostile/ordeal/indigo_dawn/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/indigo_dawn/AttackingTarget(atom/attacked_target) . = ..() - if(. && isliving(target)) - var/mob/living/L = target + if(. && isliving(attacked_target)) + var/mob/living/L = attacked_target if(L.stat != DEAD) if(L.health <= HEALTH_THRESHOLD_DEAD && HAS_TRAIT(L, TRAIT_NODEATH)) devour(L) diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm index 3e4529bfbc49..a1ecc6df5839 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm @@ -4,6 +4,7 @@ icon = 'ModularTegustation/Teguicons/32x32.dmi' icon_state = "wellcheers_bad" icon_living = "wellcheers_bad" + icon_dead = "wellcheers_bad_dead" faction = list("shrimp") health = 500 //They're here to help maxHealth = 500 @@ -23,7 +24,13 @@ minimum_distance = 3 casingtype = /obj/item/ammo_casing/caseless/ego_shrimprifle projectilesound = 'sound/weapons/gun/pistol/shot_alt.ogg' + butcher_results = list(/obj/item/stack/spacecash/c100 = 1) + silk_results = list(/obj/item/stack/sheet/silk/shrimple_simple = 10, /obj/item/stack/sheet/silk/shrimple_advanced = 5) +/mob/living/simple_animal/hostile/shrimp_rifleman/Initialize() + . = ..() + if(SSmaptype.maptype == "fixers" || SSmaptype.maptype == "city") + del_on_death = FALSE //extra buff shrimp i guess /mob/living/simple_animal/hostile/senior_shrimp @@ -32,6 +39,7 @@ icon = 'ModularTegustation/Teguicons/32x32.dmi' icon_state = "wellcheers_ripped" icon_living = "wellcheers_ripped" + icon_dead = "wellcheers_ripped_dead" faction = list("shrimp") health = 1337 maxHealth = 1337 @@ -47,6 +55,13 @@ attack_verb_simple = "bashes" attack_sound = 'sound/effects/meteorimpact.ogg' speak_emote = list("burbles") + butcher_results = list(/obj/item/stack/spacecash/c100 = 1, /obj/item/stack/spacecash/c50 = 1) + silk_results = list(/obj/item/stack/sheet/silk/shrimple_simple = 12, /obj/item/stack/sheet/silk/shrimple_advanced = 6) + +/mob/living/simple_animal/hostile/senior_shrimp/Initialize() + . = ..() + if(SSmaptype.maptype == "fixers" || SSmaptype.maptype == "city") + del_on_death = FALSE /mob/living/simple_animal/hostile/senior_shrimp/ComponentInitialize() . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/white.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/white.dm index 1bf75d26c79a..2bdaacdd96c5 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/white.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/white.dm @@ -59,12 +59,12 @@ current_pulse_range = max(6, current_pulse_range - min(round(amount * 0.1), 4)) // Being attacked will reduce the range temporarily return ..() -/mob/living/simple_animal/hostile/ordeal/black_fixer/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/black_fixer/AttackingTarget(atom/attacked_target) if(busy) return ..() if(hammer_cooldown < world.time) - HammerAttack(target) + HammerAttack(attacked_target) /mob/living/simple_animal/hostile/ordeal/black_fixer/OpenFire() if(busy) @@ -407,15 +407,15 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/ordeal/red_fixer/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/red_fixer/AttackingTarget(atom/attacked_target) if(busy) return ..() if(multislash_cooldown < world.time) - MultiSlash(target) + MultiSlash(attacked_target) return if(prob(50) && beam_cooldown < world.time) - LaserBeam(target) + LaserBeam(attacked_target) return /mob/living/simple_animal/hostile/ordeal/red_fixer/OpenFire() @@ -565,14 +565,14 @@ return FALSE return ..() -/mob/living/simple_animal/hostile/ordeal/pale_fixer/AttackingTarget() +/mob/living/simple_animal/hostile/ordeal/pale_fixer/AttackingTarget(atom/attacked_target) if(!can_act) return if(prob(60) && multislash_cooldown < world.time) - MultiSlash(target) + MultiSlash(attacked_target) return if(prob(40) && tentacle_cooldown < world.time) - TentacleAttack(target) + TentacleAttack(attacked_target) return return ..() diff --git a/code/modules/mob/living/simple_animal/projectile_blocker.dm b/code/modules/mob/living/simple_animal/projectile_blocker.dm index 631618fb0232..7e9c7645270b 100644 --- a/code/modules/mob/living/simple_animal/projectile_blocker.dm +++ b/code/modules/mob/living/simple_animal/projectile_blocker.dm @@ -47,7 +47,7 @@ return TRUE if(!isturf(parent.loc)) return TRUE - if(parent.CanPassThroughBlocker(mover, target)) + if(parent.CanPassThroughBlocker(mover, target, get_turf(src))) return TRUE return parent.CanPass(mover, target) @@ -126,10 +126,12 @@ moveToNullspace() ///For letting some mobs walk through the blockers -/mob/living/simple_animal/proc/CanPassThroughBlocker(atom/movable/mover, turf/target) +/mob/living/simple_animal/proc/CanPassThroughBlocker(atom/movable/mover, turf/start, turf/destination) return FALSE -/mob/living/simple_animal/hostile/CanPassThroughBlocker(atom/movable/mover, turf/target) +/mob/living/simple_animal/hostile/CanPassThroughBlocker(atom/movable/mover, turf/start, turf/destination) if(isliving(mover) && faction_check_mob(mover)) return TRUE + if(isliving(mover) && get_dist_manhattan(get_turf(src), destination) > get_dist_manhattan(get_turf(src), start)) + return TRUE return FALSE diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 3bb706730f8c..d34519e17b52 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -93,6 +93,8 @@ SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client) client.init_verbs() + client.patreon = new(client) + return TRUE diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index dc7ed32c4c4d..6d97beb392c1 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -191,8 +191,11 @@ var/mob/living/L = mob switch(L.incorporeal_move) if(INCORPOREAL_MOVE_BASIC) - var/T = get_step(L,direct) + var/turf/T = get_step(L,direct) if(T) + if(T.turf_flags & NO_BASIC_INCORP_MOVE) + to_chat(L, span_warning("Can't move there.")) + return L.forceMove(T) L.setDir(direct) if(INCORPOREAL_MOVE_SHADOW) diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index ff66b3ce3209..f0dfaa133468 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -26,7 +26,7 @@
\ * Silkweaver: Your main silk gathering tool, When you attack a dead body you will butcher it and create a unique type of silk depending on the creature you butchered. Stronger creatures will give out more, and higher rarity silk. If a creature you butcher doesn’t have silk associated with them, they will drop a random simple silk. (Green, Indigo, Steel or Amber) Lastly, You are able to butcher humans with the silk knife. The stronger the human is, the more silk they will drop. However, if that human still has a soul, you will be unable to butcher them.
\
\ - * Carnival Spear: Your weapon of choice! (Workshop Fixers get a off-brand/weaker version of this weapon.) This is a normal spear which deals 30 BLACK damage on hit (The off-brand version deals 15 BLACK damage), However the main highlight of the carnival spear is that it deals double damage to most backstreets mobs!
\ + * Carnival Spear: Your weapon of choice! (Workshop Fixers get a off-brand/weaker version of this weapon.) This is a normal spear which deals 30 BLACK damage on hit (The off-brand version deals 22 BLACK damage), However the main highlight of the carnival spear is that it deals double damage to most backstreets mobs!
\
\ * Silk Bag: A Small bag which can hold a massive amount of silk! You can use it to store all of the silk you collect while hunting in the backstreets.
\
\ @@ -95,7 +95,7 @@ | Silk Type | Armor Effect | Common Sources |
\ | ---------- | ------------------------- | --------------------- |
\ | Indigo Silk| BLACK +5%, RED -5% | Sweepers |
\ - | Green Silk | RED +5%, BLACK -5% | Bots |
\ + | Green Silk | RED +5%, BLACK -5% | Bots |
\ | Amber Silk | BLACK +5%, WHITE -5% | Worms |
\ | Steel Silk | RED +5%, WHITE -5% | G-Corp Remnants |
\ | Human Silk | PALE +5%, RED/WHITE -2.5% | Flesh Monsters/Humans |
\ diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 42c3a6eb69c7..694fcbc4a488 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -43,6 +43,8 @@ var/color_mode = PHOTO_COLOR /// Indicates whether the printer is currently busy copying or not. var/busy = FALSE + /// Variable needed to determine the selected category of forms on Photocopier.js + var/category /obj/machinery/photocopier/Initialize() . = ..() @@ -60,6 +62,18 @@ data["has_item"] = !copier_empty() data["num_copies"] = num_copies + try + // var/list/blanks = json_decode(file2text("config/blanks.json")) LOBOTOMYCORPORATION EDIT OLD + var/list/blanks = (SSmaptype.maptype in SSmaptype.citymaps) ? json_decode(file2text("config/blanks_city.json")) : json_decode(file2text("config/blanks.json")) // LOBOTOMYCORPORATION EDIT NEW + if (blanks != null) + data["blanks"] = blanks + data["category"] = category + data["forms_exist"] = TRUE + else + data["forms_exist"] = FALSE + catch() + data["forms_exist"] = FALSE + if(photo_copy) data["is_photo"] = TRUE data["color_mode"] = color_mode @@ -156,6 +170,27 @@ if("set_copies") num_copies = clamp(text2num(params["num_copies"]), 1, MAX_COPIES_AT_ONCE) return TRUE + // Changes the forms displayed on Photocopier.js when you switch categories + if("choose_category") + category = params["category"] + return TRUE + // Called when you press print blank + if("print_blank") + if(busy) + to_chat(usr, span_warning("[src] is currently busy copying something. Please wait until it is finished.")) + return FALSE + if (toner_cartridge.charges - PAPER_TONER_USE < 0) + to_chat(usr, span_warning("There is not enough toner in [src] to print the form, please replace the cartridge.")) + return FALSE + do_copy_loop(CALLBACK(src, PROC_REF(make_blank_print)), usr) + var/obj/item/paper/printblank = new /obj/item/paper (loc) + var/printname = params["name"] + var/list/printinfo + for(var/infoline as anything in params["info"]) + printinfo += infoline + printblank.name = printname + printblank.info = printinfo + return printblank /** * Determines if the photocopier has enough toner to create `num_copies` amount of copies of the currently inserted item. @@ -267,6 +302,12 @@ give_pixel_offset(copied_doc) toner_cartridge.charges -= DOCUMENT_TONER_USE +/** + * The procedure is called when printing a blank to write off toner consumption. + */ +/obj/machinery/photocopier/proc/make_blank_print() + toner_cartridge.charges -= PAPER_TONER_USE + /** * Handles the copying of an ass photo. * diff --git a/code/modules/paperwork/records/info/waw.dm b/code/modules/paperwork/records/info/waw.dm index 6505c4dd95ce..157fb14115e0 100644 --- a/code/modules/paperwork/records/info/waw.dm +++ b/code/modules/paperwork/records/info/waw.dm @@ -368,13 +368,10 @@ abno_type = /mob/living/simple_animal/hostile/abnormality/sphinx abno_code = "T-03-33" abno_info = list( - "When the work was complete, the Qliphoth Counter lowered depending on the abnormality's mood. The abnormality's mood improved after an offering was successfully made.", - "When an employee performed riddle work, the abnormality posed a question in a strange language. Agents are then provided with a cipher.", - "When the employee performed offering work, an item placed on the nearby offering table was inspected by the abnormality. If the table was empty, the abnormality checked the employee's hands.", - "When the abnormality was disappointed with an offering, the offender had one of their senses taken away.", - "When the riddle was successfully solved with an offering, the Qliphoth counter raised to its maximum. In addition, the abnormality willingly parted with an anomalous object referred to henceforth as a gift.", - "When agent bong bong used the canopic jar gift, she was cured of permanent blindness. Effects may differ but are usually beneficial.", - "Agent Joshua, who was turned to stone by the abnormality was able to be saved using gift of golden needles.") + "Employees with a high Prudence Level had their work chance increased dramatically.", + "When the work result was Good, the abnormality provided a treasure with a low probability.", + "When the work result was Bad, the Qliphoth counter reduced. Additionally, employees with Prudence Level 4 or lower had one of their senses taken away.", + "Agent Joshua, who was turned to stone by the abnormality was able to be saved using the treasure of golden needles.") //Clouded Monk /obj/item/paper/fluff/info/waw/clouded_monk diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index d746671b11e3..f4c7be092c68 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -891,6 +891,7 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "Barefoot" glass_desc = "Barefoot and pregnant." +/* LOBOTOMYCORPORATION REMOVAL /datum/reagent/consumable/ethanol/barefoot/on_mob_life(mob/living/carbon/M) if(ishuman(M)) //Barefoot causes the imbiber to quickly regenerate brute trauma if they're not wearing shoes. var/mob/living/carbon/human/H = M @@ -898,6 +899,7 @@ All effects don't start immediately, but rather get worse over time; the rate is H.adjustBruteLoss(-3, 0) . = 1 return ..() || . +*/ /datum/reagent/consumable/ethanol/snowwhite name = "Snow White" @@ -1957,7 +1959,7 @@ All effects don't start immediately, but rather get worse over time; the rate is generate_data_info(data) /datum/reagent/consumable/ethanol/fruit_wine/proc/generate_data_info(list/data) - var/const/minimum_percent = 0.15 + var/const/minimum_percent = 0.15 var/const/notable_percent = minimum_percent * 2 var/list/primary_tastes = list() var/list/secondary_tastes = list() diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm index c87b48954263..3bb2e8b719e6 100644 --- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm @@ -157,11 +157,11 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/structure/necropolis_gate/legion_gate/attack_hand(mob/user) if(!open && !changing_openness) - var/safety = alert(user, "You think this might be a bad idea...", "Knock on the door?", "Proceed", "Abort") + var/safety = alert(user, "Are you willing to face your fears?...", "Knock on the door?", "Proceed", "Abort") if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated()) return user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]...")) - playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, TRUE) + playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, TRUE) sleep(50) return ..() @@ -183,11 +183,11 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) var/sound/legion_sound = sound('sound/creatures/legion_spawn.ogg') for(var/mob/M in GLOB.player_list) if(M.z == z) - to_chat(M, span_userdanger("Discordant whispers flood your mind in a thousand voices. Each one speaks your name, over and over. Something horrible has been released.")) - M.playsound_local(T, null, 100, FALSE, 0, FALSE, pressure_affected = FALSE, S = legion_sound) + to_chat(M, span_userdanger("Discordant whispers flood your mind in a thousand voices. Each one speaks your name, over and over. Something horrible has been opened...")) + M.playsound_local(T, null, 25, FALSE, 0, FALSE, pressure_affected = FALSE, S = legion_sound) flash_color(M, flash_color = "#FF0000", flash_time = 50) var/mutable_appearance/release_overlay = mutable_appearance('icons/effects/effects.dmi', "legiondoor") - notify_ghosts("Legion has been released in the [get_area(src)]!", source = src, alert_overlay = release_overlay, action = NOTIFY_JUMP, flashwindow = FALSE) + notify_ghosts("La Mancha Land has been opened in the [get_area(src)]!", source = src, alert_overlay = release_overlay, action = NOTIFY_JUMP, flashwindow = FALSE) /obj/effect/temp_visual/necropolis icon = 'icons/effects/96x96.dmi' diff --git a/code/modules/spells/ability_types/realized.dm b/code/modules/spells/ability_types/realized.dm index 8a55f6f43fbe..693b857bba04 100644 --- a/code/modules/spells/ability_types/realized.dm +++ b/code/modules/spells/ability_types/realized.dm @@ -1106,10 +1106,10 @@ AddComponent(/datum/component/knockback, 1, FALSE, TRUE) QDEL_IN(src, (90 SECONDS)) -/mob/living/simple_animal/hostile/shrimp/friendly/AttackingTarget() +/mob/living/simple_animal/hostile/shrimp/friendly/AttackingTarget(atom/attacked_target) . = ..() if(.) - var/mob/living/L = target + var/mob/living/L = attacked_target if(L.health < 0 || L.stat == DEAD) L.gib() //Punch them so hard they explode /* Flesh Idol - Repentance */ @@ -1283,8 +1283,8 @@ AddComponent(/datum/component/swarming) QDEL_IN(src, (20 SECONDS)) -/mob/living/simple_animal/hostile/naked_nest_serpent_friend/AttackingTarget() - var/mob/living/L = target +/mob/living/simple_animal/hostile/naked_nest_serpent_friend/AttackingTarget(atom/attacked_target) + var/mob/living/L = attacked_target var/datum/status_effect/stacking/infestation/INF = L.has_status_effect(/datum/status_effect/stacking/infestation) if(!INF) INF = L.apply_status_effect(/datum/status_effect/stacking/infestation) diff --git a/code/modules/suppressions/extraction.dm b/code/modules/suppressions/extraction.dm index 355d3f976992..b2233c9a9d29 100644 --- a/code/modules/suppressions/extraction.dm +++ b/code/modules/suppressions/extraction.dm @@ -176,8 +176,8 @@ /* Combat */ -/mob/living/simple_animal/hostile/megafauna/arbiter/AttackingTarget() - return OpenFire(target) +/mob/living/simple_animal/hostile/megafauna/arbiter/AttackingTarget(atom/attacked_target) + return OpenFire(attacked_target) /mob/living/simple_animal/hostile/megafauna/arbiter/OpenFire(target) if(charging) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index ba1b1509409b..562a73c9794c 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -423,6 +423,8 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/machinery/vending/screwdriver_act(mob/living/user, obj/item/I) if(..()) return TRUE + if(resistance_flags & INDESTRUCTIBLE) + return FALSE if(anchored) default_deconstruction_screwdriver(user, icon_state, icon_state, I) cut_overlays() @@ -497,6 +499,8 @@ GLOBAL_LIST_EMPTY(vending_products) // do nothing /obj/machinery/vending/proc/freebie(mob/fatty, freebies) + if(resistance_flags & INDESTRUCTIBLE) + return visible_message("[src] yields [freebies > 1 ? "several free goodies" : "a free goody"]!") for(var/i in 1 to freebies) @@ -515,6 +519,8 @@ GLOBAL_LIST_EMPTY(vending_products) ///Tilts ontop of the atom supplied, if crit is true some extra shit can happen. Returns TRUE if it dealt damage to something. /obj/machinery/vending/proc/tilt(atom/fatty, crit=FALSE) + if(resistance_flags & INDESTRUCTIBLE) + return visible_message("[src] tips over!") tilted = TRUE layer = ABOVE_MOB_LAYER diff --git a/config/blanks.json b/config/blanks.json new file mode 100644 index 000000000000..24c2d0e8cc1d --- /dev/null +++ b/config/blanks.json @@ -0,0 +1,817 @@ +[ + { + "code": "NT-CMD-JA", + "category": "Command Department", + "name": "Job Application", + "info": [ + "

Job Application

", + "
", + "

Applicant's name (with signature):

", + "

[]

", + "

Desired position

", + "

[]

", + "
", + "

By signing this document, you agree to Nanotrasen's policies on labor protection, occupational health and safety, compensation, and confidentiality.

", + "
", + "

Condemnation Review

", + "

Name of the Head of Personal or deputy head (with signature):

", + "

[]

", + "

Head of Personal Decision:

", + "

[]

", + "

[]

", + "

Review Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "

Name of department head or deputy head (with signature):

", + "

[]

", + "

Department Head's Decision:

", + "

[]

", + "

[]

", + "

Review Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

Appointment decision

", + "

[]

", + "

[]

", + "

[]

", + "

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and stamps of the heads or their deputies, this document has no corporate validity and cannot be considered evidence of the candidate's enrollment in the desired position.

" + ] + }, + { + "code": "NT-CMD-JT", + "category": "Command Department", + "name": "Job termination", + "info": [ + "

Job Termination

", + "
", + "

Name of the dismissed person:

", + "

[]

", + "

Position held

", + "

[]

", + "

Description of the reason for dismissal:

", + "

[]

", + "

[]

", + "

[]

", + "

Name of the Head of Personal or deputy head (with signature):

", + "

[]

", + "

Head of Personal Decision:

", + "

[]

", + "

[]

", + "

Decision Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

The decision of the head of staff or his deputy is sufficient grounds for dismissal. If only the head of personnel or his deputy makes the decision to dismiss, VOID values must be entered in the head of department fields.

", + "
", + "

Name of department head or deputy head (with signature):

", + "

[]

", + "

Department Head's Decision:

", + "

[]

", + "

[]

", + "

Decision Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

" + ] + }, + { + "code": "NT-CMD-JR", + "category": "Command Department", + "name": "Job reassignment", + "info": [ + "

Job Reassignment

", + "
", + "

Name of the person to be reassigned:

", + "

[]

", + "

Position held

", + "

[]

", + "

New position

", + "

[]

", + "

Reason :

", + "

[]

", + "

[]

", + "

[]

", + "

Name of the Head of Personal or deputy head (with signature):

", + "

[]

", + "

Head of Personal Decision:

", + "

[]

", + "

[]

", + "

Decision Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "

Name of department head or deputy head (with signature):

", + "

[]

", + "

Department Head's Decision:

", + "

[]

", + "

[]

", + "

Decision Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

" + ] + }, + { + "code": "NT-CMD-C", + "category": "Command Department", + "name": "Complaint form", + "info": [ + "

Complaint form

", + "
", + "

Complainant's name (with signature):

", + "

[]

", + "

Complaint text:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "
", + "

By writing and signing this complaint, you consent to the processing of your personal data by Nanotrasen Corporation.

", + "
", + "

Name of the person who received the complaint (with signature):

", + "

[]

", + "

Actions taken:

", + "

[]

", + "

[]

", + "

Date the complaint was reviewed:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

" + ] + }, + { + "code": "NT-CMD-O", + "category": "Command Department", + "name": "Order form", + "info": [ + "

Order form

", + "
", + "

The name of the orderer (with signature):

", + "

[]

", + "

Order text:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

An order may be addressed not only to a specific person, but also to a group of people, as well as to a department. This should be indicated in the text of the order. The person responsible for the execution of the order must sign in the name of the person who received the order.

", + "
", + "

Name of the executor (with signature):

", + "

[]

", + "

Other notes:

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-CMD-PH", + "category": "Command Department", + "name": "Permit to perform hazardous work", + "info": [ + "

Permit to perform hazardous work

", + "
", + "

Permission requestor's name (with signature):

", + "

[]

", + "

Work description:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "
", + "

Responsibility for any damage to property or employees of Nanotrasen Corporation during the execution of dangerous work lies with the person requesting the permit and the person issuing the permit.

", + "
", + "

The name of the permittee (with signature):

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

" + ] + }, + { + "code": "NT-SCR-W", + "category": "Security Department", + "name": "Warrant", + "info": [ + "

Warrant

", + "
", + "

Arrestee's name:

", + "

[]

", + "

Reason:

", + "

[]

", + "

[]

", + "

[]

", + "
", + "

The arrest form is legally and corporately valid if stamped and signed by the Head of Security or his/her deputy. Arrest forms should only be used during Green and BLUE threat code of the Nanotrasen facility. In the case of a higher threat code, Nanotrasen Corporation allows security personnel to make arrests with the verbal approval of the Head of Security.

", + "
", + "

Name of the head of security or his deputy (with signature):

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

" + ] + }, + { + "code": "NT-SCR-SW", + "category": "Security Department", + "name": "Search warrant", + "info": [ + "

Search Warrant

", + "
", + "

Name of the person being searched:

", + "

[]

", + "

Reason:

", + "

[]

", + "

[]

", + "

[]

", + "
", + "

The arrest form is legally and corporately valid if stamped and signed by the Head of Security or his/her deputy. Arrest forms should only be used during Green and BLUE threat code of the Nanotrasen facility. In the case of a higher threat code, Nanotrasen Corporation allows security personnel to make arrests with the verbal approval of the Head of Security.

", + "
", + "

Name of the head of security or his deputy (with signature):

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

" + ] + }, + { + "code": "NT-SCR-IR", + "category": "Security Department", + "name": "Interrogation Report", + "info": [ + "

Interrogation Report

", + "
", + "

Name of Interrogated:

", + "

[]

", + "

Reason for interrogation:

", + "

[]

", + "

Start date of the interrogation:

", + "

[].[].[]

", + "

[]:[]

", + "

End date of interrogation:

", + "

[].[].[]

", + "

[]:[]

", + "

The course of the interrogation:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

Other materials (interrogation notes):

", + "

[]

", + "

[]

", + "
", + "

Nanotrasen Corporation recommends the use of interrogation recording tools.

", + "
", + "

Name of the interrogator (with signature):

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

" + ] + }, + { + "code": "NT-SCR-SR", + "category": "Security Department", + "name": "Security Report", + "info": [ + "

Security Report

", + "
", + "

Name of the reporting person (with signature):

", + "

[]

", + "

Report text:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

Other materials (notes):

", + "

[]

", + "

[]

", + "

Report Date:

", + "

[].[].[]

", + "

[]:[]

", + "
", + "

Name of the person who received the report (with signature):

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

" + ] + }, + { + "code": "NT-SCR-EO", + "category": "Security Department", + "name": "Execution order", + "info": [ + "

Execution order

", + "
", + "

The name of the condemned to the execution:

", + "

[]

", + "

Reason for execution:

", + "

[]

", + "

[]

", + "

[]

", + "

Type of execution:

", + "

[]

", + "
", + "

Only the top management of the Nanotrasen facility, the Nanotrasen Central Command or the Nanotrasen Board of Directors can order an execution. Remember that execution is an exceptional punishment. By signing this order, you take full responsibility for any mistakes that may occur. This order must be stapled to form NT-MDC-DC after the execution of the punishment.

", + "
", + "

The name of the orderer (with signature):

", + "

[]

", + "

Other notes:

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-SCR-PP", + "category": "Security Department", + "name": "Permission to possess", + "info": [ + "

Permission to possess

", + "
", + "

Owner's name:

", + "

[]

", + "

List of items:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "
", + "

This permit authorizes the possession, custody, and use of the listed equipment by the person designated on the permit. The Designated Person must present this permit to any Security Officer on first request. The permit may be revoked and withdrawn at any time without cause. When filling out this form, the authorizer should fill in the blank fields with the VOID designation.

", + "
", + "

The name of the permittee (with signature):

", + "

[]

", + "

Other notes:

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-ENG-PW", + "category": "Engineering Department", + "name": "Permission to perform non-standard work", + "info": [ + "

Permission to perform non-standard work

", + "
", + "

Permission requestor's name (with signature):

", + "

[]

", + "

Description of work:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

Responsibility for any damage caused to the Nanotrasen during the execution of the described work lies with the person requesting the permit and the person giving the permit.

", + "
", + "

The name of the permittee (with signature):

", + "

[]

", + "

Other notes:

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-ENG-PE", + "category": "Engineering Department", + "name": "Permit for the issuance of engineering equipment", + "info": [ + "

Permit for the issuance of engineering equipment

", + "
", + "

Name of the requesting equipment (with signature):

", + "

[]

", + "

Purpose of application of the equipment:

", + "

[]

", + "

[]

", + "

[]

", + "

List of equipment:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

Responsibility for improper receipt of equipment lies with the person who signed the permit for the issuance of equipment. The VOID value must be filled in when completing the equipment list.

", + "
", + "

Name of issuing equipment (with signature):

", + "

[]

", + "

The decision to issue:

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-RSH-PR", + "category": "Research Department", + "name": "Permission to perform non-standard research", + "info": [ + "

Permission to perform non-standard research

", + "
", + "

Permission requestor's name (with signature):

", + "

[]

", + "

Description of research:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

Responsibility for any damage caused to the Nanotrasen object during the execution of the research described herein lies with the person requesting the permit and the person giving the permit.

", + "
", + "

The name of the permittee (with signature):

", + "

[]

", + "

Other notes:

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-RSH-PE", + "category": "Research Department", + "name": "Permit for the issuance of research equipment", + "info": [ + "

Permit for the issuance of research equipment

", + "
", + "

Name of the requesting equipment (with signature):

", + "

[]

", + "

Purpose of application of the equipment:

", + "

[]

", + "

[]

", + "

[]

", + "

List of equipment:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

Responsibility for improper receipt of equipment lies with the person who signed the permit for the issuance of equipment. The VOID value must be filled in when completing the equipment list.

", + "
", + "

Name of issuing equipment (with signature):

", + "

[]

", + "

The decision to issue:

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-MDC-MP", + "category": "Medical Department", + "name": "Medical prescription", + "info": [ + "

Medical Prescription

", + "
", + "

Patient name:

", + "

[]

", + "

Diagnosis:

", + "

[]

", + "

[]

", + "

[]

", + "

Recommendations for treatment:

", + "

[]

", + "

[]

", + "

[]

", + "

List of treating drugs:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "
", + "

This document entitles you to receive, store and use the listed medications. Patients should follow their doctor's recommendations when using medications. When filling out this form, the doctor should indicate the VOID value in the blank fields to avoid tampering.

", + "
", + "

The attending doctor (with signature):

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-MDC-AR", + "category": "Medical Department", + "name": "Autopsy report", + "info": [ + "

Autopsy Report

", + "
", + "

Body Name:

", + "

[]

", + "

The reason for the autopsy:

", + "

[]

", + "

[]

", + "

[]

", + "

Autopsy result:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "
", + "

Coroner's Name (with signature):

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-MDC-DC", + "category": "Medical Department", + "name": "Death Certificate", + "info": [ + "

Death Certificate

", + "
", + "

Body Name:

", + "

[]

", + "

Confirmation of Death:

", + "

[]

", + "

[]

", + "

[]

", + "

Cause of death:

", + "

[]

", + "

[]

", + "

[]

", + "
", + "

This is evidence that the designated person is permanently dead and cannot be resurrected. The person signing the certificate is responsible for the wrongful death.

", + "
", + "

Coroner's Name (with signature):

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-SPL-PO", + "category": "Supply Department", + "name": "Permission to execute a non-standard order", + "info": [ + "

Permission to execute a non-standard order

", + "
", + "

The name of the person requesting the delivery (with signature):

", + "

[]

", + "

Purpose of delivery target:

", + "

[]

", + "

[]

", + "

[]

", + "

List of deliveries:

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

The person who signed the permission to receive the package is responsible for the improper receipt of the package. The VOID value must be filled in when completing the equipment list.

", + "
", + "

Name of the person who approved the delivery (with signature):

", + "

[]

", + "

The decision to issue:

", + "

[]

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "

Place for a stamp

", + "
", + "

This document is the property of Nanotrasen Corporation. Without the signatures and seals of the managers or their deputies, this document has no corporate force.

", + "
" + ] + }, + { + "code": "NT-LB", + "category": "Other", + "name": "Lunch bill", + "info": [ + "

Lunch Bill

", + "
", + "

Name of the place:

", + "

[]

", + "

Waiter's name (with signature):

", + "

[]

", + "
", + "

Order

", + "

1. []

", + "

2. []

", + "

3. []

", + "

4. []

", + "

5. []

", + "

6. []

", + "

7. []

", + "

8. []

", + "

9.  []

", + "

Total price (includes the cost of paper)

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "
", + "

This payment document is the property of NanoTrasen. You must deliver this document to the head of the NanoTrasen facility staff within 24 hours of service for independent tax accounting.

", + "
" + ] + }, + { + "code": "NT-PS", + "category": "Other", + "name": "Provision of paid services", + "info": [ + "

Provision of paid services

", + "
", + "

Name of the place:

", + "

[]

", + "

Name of service provider (with signature):

", + "

[]

", + "
", + "

List of services rendered

", + "

1. []

", + "

2. []

", + "

3. []

", + "

4. []

", + "

5. []

", + "

6. []

", + "

7. []

", + "

8. []

", + "

9.  []

", + "

Total price (includes the cost of paper)

", + "

[]

", + "

Date:

", + "

[].[].[]

", + "

[]:[]

", + "
", + "

This payment document is the property of NanoTrasen. You must deliver this document to the head of the NanoTrasen facility staff within 24 hours of service for independent tax accounting.

", + "
" + ] + } +] diff --git a/config/blanks_city.json b/config/blanks_city.json new file mode 100644 index 000000000000..8017b63a72c6 --- /dev/null +++ b/config/blanks_city.json @@ -0,0 +1,167 @@ +[ + { + "code": "COL-FF-FOR", + "category": "Fixer Forms", + "name": "Fixer Office Registration", + "info": [ + "

Hana-Association - Fixer Office Registration form

", + "
", + "

This is a Registration form for the creation of an office. Please fill in the following information properly. This form is meant for the Office Director.

", + "

Registrant Information

", + "
    ", + "

  • Name:[]

    • ", + "

  • Age:[] Sex:[]

    • ", + "

  • Has the registrant previously registered to another Office? (Y/N) []

    • ", + "
", + "
", + "
", + "

========

", + "

STAMP HERE

", + "

========

", + "
", + "
", + "

Office Details

", + "

Office-Name: []

", + "

Office Type (ONLY CHECK 1)

", + "
    ", + "

  • [] Combat

    • ", + "

  • [] Protection

    • ", + "

  • [] Peacekeeping

    • ", + "

  • [] Recon

    • ", + "

  • [] Fishing

    • ", + "

  • [] Workshop

    • ", + "

  • [] Other*

    • ", + "
", + "

*Other must be defined for capsule, if definition is not qualified for a specific capsule, your Hana Associate will choose one for you.

", + "

Starting-Number of Fixers: []

", + "

By signing this, you agree to the laws and stipulations that Hana can impose.

", + "

Signature:[]

", + "

Approved By: []

", + "
", + "

Offices approved by the Hana-Association are liable to direct-orders/Emergency Summons in regards to Urban-Myths and above. Please keep in mind the Hana-Association retains the right to Remove your office from the list of Registered offices, if the Hana-Association has in any reason, or any case decided to do so. In which case, the Hana-Association retains the right to termination of this authorization

", + "" + ] + }, + { + "code": "COL-FF-HGS", + "category": "Fixer Forms", + "name": "Hana Grading Sheet", + "info": [ + "

Hana Grading Sheet

", + "

Fixer information

", + "

Name []

", + "

Office []

", + "

Grade Issued (C denotes Color): []

", + "

Hana Official Name:

", + "

[]

", + "

Stamp Below:

", + "" + ] + }, + { + "code": "COL-FF-SFL", + "category": "Fixer Forms", + "name": "Solo Fixer License", + "info": [ + "

Hana-Association - Solo Fixer License Form

", + "
", + "

This is a Hana-Association official form stating that you are an official Fixer with no office or association affiliation.

", + "

As of, []Citizen[]has requested to form a fixer under the Hana Association. Within District[] of the City.

", + "

Fixer approval given by [], Official of the Hana-Association

", + "
", + "
", + "

========

", + "

STAMP HERE

", + "

========

", + "
", + "
", + "

Fixers approved by the Hana-Association are liable to direct-orders/Emergency Summons in regards to Urban-Myths and above. Please keep in mind the Hana-Association retains the right to Remove your status from the registry, if the Hana-Association has in any reason, or any case decided to do so. In which case, the Hana-Association retains the right to termination of this authorization

", + "" + ] + }, + { + "code": "COL-HQ-CQ-GMG", + "category": "Combat Hana Quests", + "name": "Combat Quest - General Meat Gathering", + "info": [ + "

Type - Combat

", + "

There have been reports of the Outskirts being flooded with excess amounts of sweepers, robots, worms, and people with augments that look like bugs.

", + "

The Hana Association requests assistance from fixers in clearing out the Outskirts.

", + "

Rewards:

", + "
    ", + "

  • 5 Bug Meat from G-Corp Remnants: 1300 Ahn

    • ", + "

  • 6 Meat Slurry from Sweepers: 1500 Ahn

    • ", + "

  • 5 Nihilist Components from Robots: 1700 Ahn

    • ", + "

  • 4 Perfect Meat from small Worms: 900 Ahn

    • ", + "
", + "

(These jobs are repeatable a total of three times per person/office.)

", + "" + ] + }, + { + "code": "COL-HQ-CQ-PTC", + "category": "Combat Hana Quests", + "name": "Combat Quest - Protecting The City", + "info": [ + "

Type - Combat (Protection)

", + "

There has been reports of hostiles around the city. Hana will give you a lump sum up front,

", + "

so long as you assist in cleaning them out.

", + "

Rewards

", + "
    ", + "

  • All proceeds from kills.

    • ", + "

  • Grade 9 Fixer - 500 ahn

    • ", + "

  • Grade 8 Fixer - 700 ahn

    • ", + "

  • Grade 7 Fixer - 1000 ahn

    • ", + "

  • Grade 6 Fixer - 1500 ahn

    • ", + "

  • Grade 5 Fixer - 2000 ahn

    • ", + "

  • Grade 4 Fixer - 2500 ahn

    • ", + "

  • Grade 3 Fixer - 3000 ahn

    • ", + "

  • Grade 2 Fixer - 4000 ahn

    • ", + "

  • Grade 1 Fixer - 5000 ahn

    • ", + "
", + "

(Failure to assist will result in a breach of contract)

", + "" + ] + }, + { + "code": "COL-HQ-RQ-BR", + "category": "Retrieval Hana Quests", + "name": "Retrieval Quest - Body Retrieval", + "info": [ + "

Type - Retrieval

", + "

Fixers going in to the Outskirts have proven to have a high chance of not coming back from their expeditions.

", + "

Bringing back the corpse of a registered fixer in a state that is revivable will be eligible for a reward.

", + "

Reward:

", + "
  • Fixer Corpse returned to Hana: 1000 Ahn
", + "" + ] + }, + { + "code": "COL-HQ-BR", + "category": "Misc Hana Quests", + "name": "Contract Breach", + "info": [ + "

Type - Contract Enforcement

", + "

A Hana-made contract has been breached.

", + "

You are being hired to kill and retrieve their body.

", + "

Target - []

", + "

Rewards

", + "
  • [] Ahn
", + "" + ] + }, + { + "code": "COL-HQ-OI", + "category": "Misc Hana Quests", + "name": "Office Inspection", + "info": [ + "

Type - Office Grading

", + "

This is a lump sum grant given to offices that are graded.

", + "

Office grades are up to the local Hana Representative or Administrator.

", + "

Rewards

", + "
  • Increase in Grade x 500 ahn
", + "

(Only available to offices with a physical office space)

", + "" + ] + } +] diff --git a/config/admin_nicknames.json b/config/example/admin_nicknames.json similarity index 100% rename from config/admin_nicknames.json rename to config/example/admin_nicknames.json diff --git a/config/admin_ranks.txt b/config/example/admin_ranks.txt similarity index 100% rename from config/admin_ranks.txt rename to config/example/admin_ranks.txt diff --git a/config/admins.txt b/config/example/admins.txt similarity index 100% rename from config/admins.txt rename to config/example/admins.txt diff --git a/config/antag_rep.txt b/config/example/antag_rep.txt similarity index 100% rename from config/antag_rep.txt rename to config/example/antag_rep.txt diff --git a/config/arenas/README.md b/config/example/arenas/README.md similarity index 100% rename from config/arenas/README.md rename to config/example/arenas/README.md diff --git a/config/awaymissionconfig.txt b/config/example/awaymissionconfig.txt similarity index 100% rename from config/awaymissionconfig.txt rename to config/example/awaymissionconfig.txt diff --git a/config/badges.json b/config/example/badges.json similarity index 100% rename from config/badges.json rename to config/example/badges.json diff --git a/config/comms.txt b/config/example/comms.txt similarity index 100% rename from config/comms.txt rename to config/example/comms.txt diff --git a/config/config.txt b/config/example/config.txt similarity index 100% rename from config/config.txt rename to config/example/config.txt diff --git a/config/dbconfig.txt b/config/example/dbconfig.txt similarity index 100% rename from config/dbconfig.txt rename to config/example/dbconfig.txt diff --git a/config/dynamic.json b/config/example/dynamic.json similarity index 100% rename from config/dynamic.json rename to config/example/dynamic.json diff --git a/config/game_options.txt b/config/example/game_options.txt similarity index 100% rename from config/game_options.txt rename to config/example/game_options.txt diff --git a/config/iceruinblacklist.txt b/config/example/iceruinblacklist.txt similarity index 100% rename from config/iceruinblacklist.txt rename to config/example/iceruinblacklist.txt diff --git a/config/in_character_filter.txt b/config/example/in_character_filter.txt similarity index 100% rename from config/in_character_filter.txt rename to config/example/in_character_filter.txt diff --git a/config/interviews.txt b/config/example/interviews.txt similarity index 100% rename from config/interviews.txt rename to config/example/interviews.txt diff --git a/config/jobs.txt b/config/example/jobs.txt similarity index 100% rename from config/jobs.txt rename to config/example/jobs.txt diff --git a/config/jukebox_music/LICENSE.txt b/config/example/jukebox_music/LICENSE.txt similarity index 100% rename from config/jukebox_music/LICENSE.txt rename to config/example/jukebox_music/LICENSE.txt diff --git a/config/jukebox_music/README.txt b/config/example/jukebox_music/README.txt similarity index 100% rename from config/jukebox_music/README.txt rename to config/example/jukebox_music/README.txt diff --git a/config/jukebox_music/sounds/exclude b/config/example/jukebox_music/sounds/exclude similarity index 100% rename from config/jukebox_music/sounds/exclude rename to config/example/jukebox_music/sounds/exclude diff --git a/config/lavaruinblacklist.txt b/config/example/lavaruinblacklist.txt similarity index 100% rename from config/lavaruinblacklist.txt rename to config/example/lavaruinblacklist.txt diff --git a/config/maps.txt b/config/example/maps.txt similarity index 100% rename from config/maps.txt rename to config/example/maps.txt diff --git a/config/motd.txt b/config/example/motd.txt similarity index 100% rename from config/motd.txt rename to config/example/motd.txt diff --git a/config/policy.json b/config/example/policy.json similarity index 100% rename from config/policy.json rename to config/example/policy.json diff --git a/config/resources.txt b/config/example/resources.txt similarity index 100% rename from config/resources.txt rename to config/example/resources.txt diff --git a/config/silicon_laws.txt b/config/example/silicon_laws.txt similarity index 100% rename from config/silicon_laws.txt rename to config/example/silicon_laws.txt diff --git a/config/spaceruinblacklist.txt b/config/example/spaceruinblacklist.txt similarity index 100% rename from config/spaceruinblacklist.txt rename to config/example/spaceruinblacklist.txt diff --git a/config/title_music/LICENSE.txt b/config/example/title_music/LICENSE.txt similarity index 100% rename from config/title_music/LICENSE.txt rename to config/example/title_music/LICENSE.txt diff --git a/config/title_music/README.txt b/config/example/title_music/README.txt similarity index 100% rename from config/title_music/README.txt rename to config/example/title_music/README.txt diff --git a/config/title_music/sounds/exclude b/config/example/title_music/sounds/exclude similarity index 100% rename from config/title_music/sounds/exclude rename to config/example/title_music/sounds/exclude diff --git a/config/title_screens/LICENSE.txt b/config/example/title_screens/LICENSE.txt similarity index 100% rename from config/title_screens/LICENSE.txt rename to config/example/title_screens/LICENSE.txt diff --git a/config/title_screens/README.txt b/config/example/title_screens/README.txt similarity index 100% rename from config/title_screens/README.txt rename to config/example/title_screens/README.txt diff --git a/config/title_screens/images/exclude b/config/example/title_screens/images/exclude similarity index 100% rename from config/title_screens/images/exclude rename to config/example/title_screens/images/exclude diff --git a/config/trusted_players.txt b/config/example/trusted_players.txt similarity index 100% rename from config/trusted_players.txt rename to config/example/trusted_players.txt diff --git a/config/unbuyableshuttles.txt b/config/example/unbuyableshuttles.txt similarity index 100% rename from config/unbuyableshuttles.txt rename to config/example/unbuyableshuttles.txt diff --git a/config/whitelist.txt b/config/example/whitelist.txt similarity index 100% rename from config/whitelist.txt rename to config/example/whitelist.txt diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index f1cc646bd4f9..5b4e3e87b469 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/mob/clothing/ego_gear/head.dmi b/icons/mob/clothing/ego_gear/head.dmi index ad18b1782f69..89431d55c445 100644 Binary files a/icons/mob/clothing/ego_gear/head.dmi and b/icons/mob/clothing/ego_gear/head.dmi differ diff --git a/icons/mob/clothing/ego_gear/lc13_armor.dmi b/icons/mob/clothing/ego_gear/lc13_armor.dmi index ff2bf8aa2d32..0cd054dbc78f 100644 Binary files a/icons/mob/clothing/ego_gear/lc13_armor.dmi and b/icons/mob/clothing/ego_gear/lc13_armor.dmi differ diff --git a/icons/mob/inhands/weapons/ego_lefthand.dmi b/icons/mob/inhands/weapons/ego_lefthand.dmi index 5d331e0d00b8..6e289938bd29 100644 Binary files a/icons/mob/inhands/weapons/ego_lefthand.dmi and b/icons/mob/inhands/weapons/ego_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/ego_righthand.dmi b/icons/mob/inhands/weapons/ego_righthand.dmi index f6538be472e0..4ea207a98372 100644 Binary files a/icons/mob/inhands/weapons/ego_righthand.dmi and b/icons/mob/inhands/weapons/ego_righthand.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 42bab007d5a0..e0352048a479 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/clothing/ego_gear/head.dmi b/icons/obj/clothing/ego_gear/head.dmi index f965d47f49df..b37ae43430d9 100644 Binary files a/icons/obj/clothing/ego_gear/head.dmi and b/icons/obj/clothing/ego_gear/head.dmi differ diff --git a/icons/obj/clothing/ego_gear/lc13_armor.dmi b/icons/obj/clothing/ego_gear/lc13_armor.dmi index b85feba2b3a1..d5094c6ad94e 100644 Binary files a/icons/obj/clothing/ego_gear/lc13_armor.dmi and b/icons/obj/clothing/ego_gear/lc13_armor.dmi differ diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index f64fbe4ae5ed..bf39aa28d0d4 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -157,8 +157,10 @@ #include "code\__DEFINES\dcs\signals.dm" #include "code\__DEFINES\dcs\signals_fish.dm" #include "code\__DEFINES\research\anomalies.dm" +#include "code\__DEFINES\~lobotomy_defines\_patreon.dm" #include "code\__DEFINES\~lobotomy_defines\adventure.dm" #include "code\__DEFINES\~lobotomy_defines\is_helpers.dm" +#include "code\__DEFINES\~lobotomy_defines\jobs.dm" #include "code\__DEFINES\~lobotomy_defines\weapon.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_logging.dm" @@ -223,6 +225,7 @@ #include "code\_globalvars\misc.dm" #include "code\_globalvars\regexes.dm" #include "code\_globalvars\religion.dm" +#include "code\_globalvars\tgui.dm" #include "code\_globalvars\traits.dm" #include "code\_globalvars\lists\achievements.dm" #include "code\_globalvars\lists\admin.dm" @@ -416,6 +419,7 @@ #include "code\datums\mutable_appearance.dm" #include "code\datums\numbered_display.dm" #include "code\datums\outfit.dm" +#include "code\datums\patreon_data.dm" #include "code\datums\position_point_vector.dm" #include "code\datums\profiling.dm" #include "code\datums\progressbar.dm" @@ -951,7 +955,6 @@ #include "code\game\machinery\recharger.dm" #include "code\game\machinery\rechargestation.dm" #include "code\game\machinery\recycler.dm" -#include "code\game\machinery\regenerator.dm" #include "code\game\machinery\requests_console.dm" #include "code\game\machinery\roulette_machine.dm" #include "code\game\machinery\scan_gate.dm" @@ -976,12 +979,6 @@ #include "code\game\machinery\camera\presets.dm" #include "code\game\machinery\camera\tracking.dm" #include "code\game\machinery\computer\_computer.dm" -#include "code\game\machinery\computer\abnormality_archive.dm" -#include "code\game\machinery\computer\abnormality_auxiliary.dm" -#include "code\game\machinery\computer\abnormality_ego.dm" -#include "code\game\machinery\computer\abnormality_logs.dm" -#include "code\game\machinery\computer\abnormality_queue.dm" -#include "code\game\machinery\computer\abnormality_work.dm" #include "code\game\machinery\computer\aifixer.dm" #include "code\game\machinery\computer\apc_control.dm" #include "code\game\machinery\computer\arcade.dm" @@ -1633,6 +1630,7 @@ #include "code\modules\admin\verbs\one_click_antag.dm" #include "code\modules\admin\verbs\onlyone.dm" #include "code\modules\admin\verbs\panicbunker.dm" +#include "code\modules\admin\verbs\patreon_ranks.dm" #include "code\modules\admin\verbs\playsound.dm" #include "code\modules\admin\verbs\possess.dm" #include "code\modules\admin\verbs\pray.dm" @@ -2088,6 +2086,7 @@ #include "code\modules\clothing\suits\ego_gear\non_abnormality\color.dm" #include "code\modules\clothing\suits\ego_gear\non_abnormality\custom.dm" #include "code\modules\clothing\suits\ego_gear\non_abnormality\dawn.dm" +#include "code\modules\clothing\suits\ego_gear\non_abnormality\echo_office.dm" #include "code\modules\clothing\suits\ego_gear\non_abnormality\fullstop.dm" #include "code\modules\clothing\suits\ego_gear\non_abnormality\hana.dm" #include "code\modules\clothing\suits\ego_gear\non_abnormality\index.dm" @@ -2373,8 +2372,8 @@ #include "code\modules\jobs\job_types\city\civilian.dm" #include "code\modules\jobs\job_types\city\doctor.dm" #include "code\modules\jobs\job_types\city\HHPP.dm" -#include "code\modules\jobs\job_types\city\rat.dm" #include "code\modules\jobs\job_types\city\prosthetic.dm" +#include "code\modules\jobs\job_types\city\rat.dm" #include "code\modules\jobs\job_types\city\workshop.dm" #include "code\modules\jobs\job_types\city\fixer\east.dm" #include "code\modules\jobs\job_types\city\fixer\minifixers.dm" @@ -2562,6 +2561,7 @@ #include "code\modules\mob\status_procs.dm" #include "code\modules\mob\transform_procs.dm" #include "code\modules\mob\camera\camera.dm" +#include "code\modules\mob\dead\crew_manifest.dm" #include "code\modules\mob\dead\dead.dm" #include "code\modules\mob\dead\new_player\login.dm" #include "code\modules\mob\dead\new_player\logout.dm" @@ -3948,32 +3948,6 @@ #include "ModularTegustation\tegushuttles.dm" #include "ModularTegustation\trusted.dm" #include "ModularTegustation\turfs.dm" -#include "ModularTegustation\_adventure_console\adventure_layout.dm" -#include "ModularTegustation\_adventure_console\console.dm" -#include "ModularTegustation\_adventure_console\adventure_events\_event.dm" -#include "ModularTegustation\_adventure_console\adventure_events\abnormality\aleph\giant.dm" -#include "ModularTegustation\_adventure_console\adventure_events\abnormality\he\tsa_woods.dm" -#include "ModularTegustation\_adventure_console\adventure_events\abnormality\teth\forsaken_murderer.dm" -#include "ModularTegustation\_adventure_console\adventure_events\abnormality\teth\old_lady.dm" -#include "ModularTegustation\_adventure_console\adventure_events\abnormality\teth\scorched_girl.dm" -#include "ModularTegustation\_adventure_console\adventure_events\abnormality\waw\thunder_bird.dm" -#include "ModularTegustation\_adventure_console\adventure_events\general\jazz_end.dm" -#include "ModularTegustation\_adventure_console\adventure_events\general\legacy.dm" -#include "ModularTegustation\_adventure_console\adventure_events\general\quiz.dm" -#include "ModularTegustation\_adventure_console\adventure_events\general\sinking_bell.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\allaround_cleaner.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\ambling_pearl.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\ardor_blossom.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\blubbering_toad.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\chicken_strife.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\coffin_return.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\fourthfront_smokewar.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\golden_grip.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\kqe.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\lost_mind.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\monkey_tree.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\nymph.dm" -#include "ModularTegustation\_adventure_console\adventure_events\limbus_company\poultry_passion_tango.dm" #include "ModularTegustation\altjobtitles\altjobtitles.dm" #include "ModularTegustation\altjobtitles\LC13.dm" #include "ModularTegustation\altjobtitles\outfits.dm" @@ -3996,6 +3970,7 @@ #include "ModularTegustation\ego_weapons\melee\non_abnormality\cinq.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\color_fixer.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\dawn.dm" +#include "ModularTegustation\ego_weapons\melee\non_abnormality\echo_office.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\fullstop.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\gradeone.dm" #include "ModularTegustation\ego_weapons\melee\non_abnormality\hana.dm" @@ -4088,6 +4063,49 @@ #include "ModularTegustation\hiding\abnormality.dm" #include "ModularTegustation\hiding\closet.dm" #include "ModularTegustation\hiding\turf.dm" +#include "ModularTegustation\lc13_obj\regenerator.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_layout.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\console.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\_event.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\aleph\giant.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\he\singing_machine.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\he\tsa_woods.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\teth\forsaken_murderer.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\teth\old_lady.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\teth\ppodae.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\teth\scorched_girl.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\teth\void_dream.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\waw\general_bee.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\waw\thunder_bird.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\zayin\fairy_festival.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\zayin\oceanic.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\abnormality\zayin\we_can_change_anything.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\general\fun_contract.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\general\jazz_end.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\general\legacy.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\general\Man_Sand.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\general\quiz.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\general\sinking_bell.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\general\vending machine.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\allaround_cleaner.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\ambling_pearl.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\ardor_blossom.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\blubbering_toad.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\chicken_strife.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\coffin_return.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\fourthfront_smokewar.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\golden_grip.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\kqe.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\lost_mind.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\monkey_tree.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\nymph.dm" +#include "ModularTegustation\lc13_obj\_adventure_console\adventure_events\limbus_company\poultry_passion_tango.dm" +#include "ModularTegustation\lc13_obj\lc13_computers\abnormality_archive.dm" +#include "ModularTegustation\lc13_obj\lc13_computers\abnormality_auxiliary.dm" +#include "ModularTegustation\lc13_obj\lc13_computers\abnormality_ego.dm" +#include "ModularTegustation\lc13_obj\lc13_computers\abnormality_logs.dm" +#include "ModularTegustation\lc13_obj\lc13_computers\abnormality_queue.dm" +#include "ModularTegustation\lc13_obj\lc13_computers\abnormality_work.dm" #include "ModularTegustation\living\damage_procs.dm" #include "ModularTegustation\living\living.dm" #include "ModularTegustation\living\carbon\life.dm" @@ -4175,7 +4193,12 @@ #include "ModularTegustation\tegu_items\prosthetics\chainsword.dm" #include "ModularTegustation\tegu_items\prosthetics\explosivearm.dm" #include "ModularTegustation\tegu_items\prosthetics\extra_arm_implant.dm" +#include "ModularTegustation\tegu_items\prosthetics\fixertools.dm" #include "ModularTegustation\tegu_items\prosthetics\mantis.dm" +#include "ModularTegustation\tegu_items\prosthetics\overdrive.dm" +#include "ModularTegustation\tegu_items\prosthetics\scrying.dm" +#include "ModularTegustation\tegu_items\prosthetics\storage.dm" +#include "ModularTegustation\tegu_items\prosthetics\timestop.dm" #include "ModularTegustation\tegu_items\prosthetics\zippyarm.dm" #include "ModularTegustation\tegu_items\rcorp\!abno_overwrites.dm" #include "ModularTegustation\tegu_items\rcorp\basecode.dm" diff --git a/tgui/packages/tgui/interfaces/CrewManifest.js b/tgui/packages/tgui/interfaces/CrewManifest.js new file mode 100644 index 000000000000..c91be56197b4 --- /dev/null +++ b/tgui/packages/tgui/interfaces/CrewManifest.js @@ -0,0 +1,152 @@ +import { classes } from 'common/react'; +import { useBackend } from "../backend"; +import { Icon, Section, Table, Tooltip } from "../components"; +import { Window } from "../layouts"; + +// LOBOTOMYCORPORATION ADDITION START +const highcommandjobs = [ + "W-Corp L3 Squad Captain", + "Ground Commander", + "Assault Commander", + "Hana Administrator", + "Association Section Director", + "Index Messenger", + "Blade Lineage Cutthroat", + "Grand Inquisitor", + "Thumb Sottocapo", + "Kurokumo Kashira", +]; +// LOBOTOMYCORPORATION ADDITION END + +const commandJobs = [ +// LOBOTOMYCORPORATION ADDITION START + "Hana Representative", + "Index Proxy", + "Blade Lineage Salsu", + "N Corp Grosshammer", + "Thumb Capo", + "Kurokumo Hosa", + + "W-Corp L2 Type A Lieutenant", + + "Lieutenant Commander", + "Operations Officer", + "Rabbit Squad Captain", + "Reindeer Squad Captain", + "Rhino Squad Captain", + "Raven Squad Captain", + + "Base Commander", + "Support Officer", + "Rat Squad Leader", + "Rooster Squad Leader", + "Raccoon Squad Leader", + "Roadrunner Squad Leader", + // LOBOTOMYCORPORATION ADDITION END + "Head of Personnel", + "Head of Security", + "Chief Engineer", + "Research Director", + "Chief Medical Officer", +]; + +export const CrewManifest = (props, context) => { + const { data: { manifest, positions } } = useBackend(context); + + return ( + + + {Object.entries(manifest).map(([dept, crew]) => ( +
+ + {Object.entries(crew).map(([crewIndex, crewMember]) => ( + + + {crewMember.name} + + + {positions[dept].exceptions.includes(crewMember.rank) && ( + + + + )} + {crewMember.rank === "Captain" && ( + + + + )} + {/* LOBOTOMYCORPORATION ADDITION START */} + {highcommandjobs.includes(crewMember.rank) && ( + + + + )} + {/* LOBOTOMYCORPORATION ADDITION END */} + {commandJobs.includes(crewMember.rank) && ( + + + + )} + + + {crewMember.rank} + + + ))} +
+
+ ))} + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/Photocopier.js b/tgui/packages/tgui/interfaces/Photocopier.js index 583778f51207..e74354d312bb 100644 --- a/tgui/packages/tgui/interfaces/Photocopier.js +++ b/tgui/packages/tgui/interfaces/Photocopier.js @@ -1,5 +1,6 @@ -import { ProgressBar, NumberInput, Button, Section, Box, Flex } from '../components'; +import { sortBy } from 'common/collections'; import { useBackend } from '../backend'; +import { Box, Button, Dropdown, Flex, NumberInput, ProgressBar, Section } from '../components'; import { Window } from '../layouts'; export const Photocopier = (props, context) => { @@ -8,13 +9,14 @@ export const Photocopier = (props, context) => { isAI, has_toner, has_item, + forms_exist, } = data; return ( + width={320} + height={512}> {has_toner ? ( @@ -25,6 +27,15 @@ export const Photocopier = (props, context) => { )} + {forms_exist ? ( + + ) : ( +
+ + No forms found. Please contact your system administrator. + +
+ )} {has_item ? ( ) : ( @@ -162,6 +173,59 @@ const Options = (props, context) => { ); }; +const Blanks = (props, context) => { + const { act, data } = useBackend(context); + const { + blanks, + category, + has_toner, + } = data; + + const sortedBlanks = sortBy( + blank => blanks.category, + )(blanks || []); + + const categories = []; + for (let blank of sortedBlanks) { + if (!categories.includes(blank.category)) { + categories.push(blank.category); + } + } + + const selectedCategory = category ?? categories[0]; + const visibleBlanks = sortedBlanks.filter(blank => ( + blank.category === selectedCategory + )); + + return ( +
+ act("choose_category", { + category: value, + })} + /> + + {visibleBlanks.map(blank => ( + + ))} + +
+ ); +}; + const AIOptions = (props, context) => { const { act, data } = useBackend(context); const { can_AI_print } = data; diff --git a/tgui/packages/tgui/interfaces/SephirahPanel.js b/tgui/packages/tgui/interfaces/SephirahPanel.js index 546e791432c1..965df83d50f5 100644 --- a/tgui/packages/tgui/interfaces/SephirahPanel.js +++ b/tgui/packages/tgui/interfaces/SephirahPanel.js @@ -20,11 +20,9 @@ const AbnoInfo = (props, context) => { const { abno_number, queued_abno, - minimum_arrival, - current_arrival, - next_arrival, - maximum_arrival, - progress_component, + previous_arrival_time, + current_arrival_time, + next_arrival_time, } = data; return ( @@ -36,19 +34,17 @@ const AbnoInfo = (props, context) => { {queued_abno} - {/* - + + value={current_arrival_time} + minValue={previous_arrival_time} + maxValue={next_arrival_time} + > - */} ); @@ -59,163 +55,161 @@ const ButtonPanel = (props, context) => { const { abnormality_arrival, meltdown_speed } = data; return ( -
+
- - - act('Complete quest')} - /> - } - /> - - - act('Make announcement')} - /> - } - /> - - - act('Randomize abnormality')} - /> - } - /> - - - act('Randomize selection')} - /> - } - /> - - - - - - - - act('Quicken abnormality arrival')} - /> - } - /> - -3 ? 'Slow abnormality arrival': 'Speed at minimum!'} - color={abnormality_arrival > -3 ? 'green' : 'red'} - onClick={() => act('Slow abnormality arrival')} - /> - } - /> - - - - - - - - act('Increase Work per Meltdown ratio')} - /> - } - /> - -4 ? 'Decrease Work per Meltdown ratio': 'Additional meltdown works at minimum!'} - color={meltdown_speed > -4 ? 'green' : 'red'} - onClick={() => act('Decrease Work per Meltdown ratio')} - /> - } - /> - - - act('Increase abnormality per meltdown ratio')} - /> - } - /> - act('Decrease abnormality per meltdown')} - /> - } - /> - - - act('Authorize execution bullets')} - /> - } - /> - - + + act('Complete quest')} + /> + } + /> + + + act('Make announcement')} + /> + } + /> + + + act('Randomize abnormality')} + /> + } + /> + + + act('Randomize selection')} + /> + } + /> + + + + + + + + act('Quicken abnormality arrival')} + /> + } + /> + -3 ? 'Slow abnormality arrival': 'Speed at minimum!'} + color={abnormality_arrival > -3 ? 'green' : 'red'} + onClick={() => act('Slow abnormality arrival')} + /> + } + /> + + + + + + + + act('Increase Work per Meltdown ratio')} + /> + } + /> + -4 ? 'Decrease Work per Meltdown ratio': 'Additional meltdown works at minimum!'} + color={meltdown_speed > -4 ? 'green' : 'red'} + onClick={() => act('Decrease Work per Meltdown ratio')} + /> + } + /> + + + act('Increase abnormality per meltdown ratio')} + /> + } + /> + act('Decrease abnormality per meltdown')} + /> + } + /> + + + act('Authorize execution bullets')} + /> + } + /> +
); diff --git a/tgui/packages/tgui/styles/components/Tooltip.scss b/tgui/packages/tgui/styles/components/Tooltip.scss index 0ef766b694d0..5c041bb12632 100644 --- a/tgui/packages/tgui/styles/components/Tooltip.scss +++ b/tgui/packages/tgui/styles/components/Tooltip.scss @@ -16,6 +16,7 @@ $border-radius: base.$border-radius !default; left: 0; right: 0; bottom: 0; + font-family: Verdana, sans-serif; font-style: normal; font-weight: normal; diff --git a/tgui/packages/tgui/styles/interfaces/CrewManifest.scss b/tgui/packages/tgui/styles/interfaces/CrewManifest.scss new file mode 100644 index 000000000000..1bd608a94cf5 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/CrewManifest.scss @@ -0,0 +1,66 @@ +@use '../colors.scss'; + +$department_map: ( + 'Command': colors.$yellow, + 'Security': colors.$red, + 'Engineering': colors.$orange, + 'Medical': colors.$teal, + 'Misc': colors.$white, + 'Science': colors.$purple, + 'Supply': colors.$brown, + 'Service': colors.$green, + 'Silicon': colors.$pink, + // LOBOTOMYCORPORATION ADDITION START + 'W Corp': colors.$teal, + 'R Corp': colors.$orange, + 'Hana': colors.$white, + 'Association': colors.$good, + 'Syndicate': colors.$bad, + 'Fixers': colors.$grey, + // LOBOTOMYCORPORATION ADDITION END +); + +.CrewManifest { + @each $department-name, $color-value in $department_map { + &--#{$department-name} { + .Section { + &__title { + border-color: $color-value; + } + &__titleText { + color: $color-value; + } + } + } + } + + &__Cell { + padding: 3px 0; + + &--Rank { + color: colors.$label; + } + } + + &__Icons { + padding: 3px 9px; + text-align: right; + } + + &__Icon { + color: colors.$label; + position: relative; + + &:not(:last-child) { + margin-right: 7px; + } + + &--Chevron { + padding-right: 2px; + } + + &--Command { + color: colors.$yellow; + } + } +} diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index 03fd832d574a..d6aa3fe82ef9 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -45,6 +45,7 @@ @include meta.load-css('./interfaces/ListInput.scss'); @include meta.load-css('./interfaces/AlertModal.scss'); @include meta.load-css('./interfaces/CameraConsole.scss'); +@include meta.load-css('./interfaces/CrewManifest.scss'); @include meta.load-css('./interfaces/NuclearBomb.scss'); @include meta.load-css('./interfaces/Paper.scss'); @include meta.load-css('./interfaces/Roulette.scss');