From 410c06cb6773e52c6fde1e006da0b4491e8a632a Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Tue, 5 Nov 2024 20:24:28 -0500 Subject: [PATCH 01/47] First commit --- .../tegu_mobs/lc13_blood_fiend.dm | 184 ++++++++++++++++++ lobotomy-corp13.dme | 1 + 2 files changed, 185 insertions(+) create mode 100644 ModularTegustation/tegu_mobs/lc13_blood_fiend.dm diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm new file mode 100644 index 000000000000..7f70543b10b7 --- /dev/null +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -0,0 +1,184 @@ +/mob/living/simple_animal/hostile/humanoid/blood + faction = list("hostile") + + +/mob/living/simple_animal/hostile/humanoid/blood/fiend + name = "Blood Fiend" + desc = "Blood Fiend Desc" + icon = 'ModularTegustation/Teguicons/tegumobs.dmi' + icon_state = "humanoid_hostile" + icon_living = "humanoid_hostile" + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 1, BLACK_DAMAGE = 1, PALE_DAMAGE = 2) + melee_damage_lower = 5 + melee_damage_upper = 6 + melee_damage_type = RED_DAMAGE + maxHealth = 100 + health = 100 + ranged = TRUE + var/leap_sound = 'sound/abnormalities/ichthys/hammer2.ogg' + var/blood_feast = 100 + var/max_blood_feast = 100 + var/can_act = TRUE + var/leap_damage = 10 + + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/AdjustBloodFeast(amount) + adjustBruteLoss(-amount/2) + blood_feast += amount + if (blood_feast > max_blood_feast) + blood_feast = max_blood_feast + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/Leap(mob/living/target) + if(!isliving(target) && !ismecha(target) || !can_act) + return + var/dist = get_dist(target, src) + if(dist > 1) + blood_feast = 0 + can_act = FALSE + //icon_state = enraged ? "headless_ichthys_charging_enraged" : "headless_ichthys_charging" + SLEEP_CHECK_DEATH(0.25 SECONDS) + animate(src, alpha = 1,pixel_x = 0, pixel_z = 16, time = 0.1 SECONDS) + src.pixel_z = 16 + playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) + var/turf/target_turf = get_turf(target) + SLEEP_CHECK_DEATH(1 SECONDS) + if(target_turf) + forceMove(target_turf) //look out, someone is rushing you! + playsound(src, leap_sound, 50, FALSE, 4) + animate(src, alpha = 255,pixel_x = 0, pixel_z = -16, time = 0.1 SECONDS) + src.pixel_z = 0 + SLEEP_CHECK_DEATH(0.1 SECONDS) + //icon_state = enraged ? "headless_ichthys_enraged" : "headless_ichthys" + for(var/turf/T in view(1, src)) + var/obj/effect/temp_visual/small_smoke/halfsecond/FX = new(T) + FX.color = "#b52e19" + for(var/mob/living/L in T) + if(faction_check_mob(L)) + continue + L.deal_damage(leap_damage, RED_DAMAGE) + for(var/obj/vehicle/sealed/mecha/V in T) + V.take_damage(leap_damage, RED_DAMAGE) + SLEEP_CHECK_DEATH(1.5 SECONDS) + + target_turf = get_turf(target) + var/list/hit_mob = list() + do_shaky_animation(2) + if(do_after(src, 1 SECONDS, target = src)) + var/turf/wallcheck = get_turf(src) + var/enemy_direction = get_dir(src, target_turf) + for(var/i = 0 to 7) + if(get_turf(src) != wallcheck || stat == DEAD) + break + wallcheck = get_step(src, enemy_direction) + if(!ClearSky(wallcheck)) + break + //without this the attack happens instantly + sleep(1) + forceMove(wallcheck) + playsound(wallcheck, 'sound/abnormalities/doomsdaycalendar/Lor_Slash_Generic.ogg', 20, 0, 4) + for(var/turf/T in orange(get_turf(src), 1)) + if(isclosedturf(T)) + continue + new /obj/effect/temp_visual/slice(T) + hit_mob = HurtInTurf(T, hit_mob, 50, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) + can_act = TRUE + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/ClearSky(turf/T) + . = ..() + if(.) + if(locate(/obj/structure/table) in T.contents) + return FALSE + if(locate(/obj/structure/railing) in T.contents) + return FALSE + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/AttackingTarget() + if(!can_act) + return + if(blood_feast == max_blood_feast && !client) + Leap(target) + return + return ..() + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/OpenFire() + if(!can_act) + return FALSE + if(max_blood_feast == blood_feast) + Leap(target) + return + + + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/Move() + if(!can_act) + return FALSE + var/turf/T = get_turf(src) + if(!T) + ..() + return + if (health != maxHealth || blood_feast != max_blood_feast) + for(var/obj/effect/decal/cleanable/blood/B in view(T, 2)) //will clean up any blood, but only heals from human blood + if(B.blood_state == BLOOD_STATE_HUMAN) + playsound(T, 'sound/abnormalities/nosferatu/bloodcollect.ogg', 25, 3) + if(B.bloodiness == 100) //Bonus for "pristine" bloodpools, also to prevent footprint spam + AdjustBloodFeast(30) + else + AdjustBloodFeast(max((B.bloodiness**2)/800,1)) + qdel(B) + ..() + + +/mob/living/simple_animal/hostile/humanoid/blood/bag + name = "Blood Bag" + desc = "Blood Bag Desc" + icon = 'ModularTegustation/Teguicons/tegumobs.dmi' + icon_state = "humanoid_hostile" + icon_living = "humanoid_hostile" + icon_dead = "humanoid_hostile" + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 1, BLACK_DAMAGE = 1, PALE_DAMAGE = 2) + melee_damage_lower = 5 + melee_damage_upper = 6 + melee_damage_type = RED_DAMAGE + maxHealth = 100 + health = 100 + var/self_damage = 10 + var/self_damage_type = RED_DAMAGE + +/mob/living/simple_animal/hostile/humanoid/blood/bag/AttackingTarget(atom/attacked_target) + . = ..() + deal_damage(self_damage, self_damage_type) + +/mob/living/simple_animal/hostile/humanoid/blood/bag/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + . = ..() + var/turf/origin = get_turf(src) + var/list/all_turfs = RANGE_TURFS(1, origin) + for(var/turf/T in shuffle(all_turfs)) + if (T.is_blocked_turf(exclude_mobs = TRUE)) + continue; + var/obj/effect/decal/cleanable/blood/B = locate() in T + if(!B) + B = new /obj/effect/decal/cleanable/blood(T) + B.bloodiness = 100 + break; + +/mob/living/simple_animal/hostile/humanoid/blood/bag/death(gibbed) + walk_to(src, 0) + say("FOR G CORP!!!") + animate(src, transform = matrix()*1.8, color = "#FF0000", time = 15) + addtimer(CALLBACK(src, PROC_REF(DeathExplosion)), 15) + QDEL_IN(src, 15) + ..() + +/mob/living/simple_animal/hostile/humanoid/blood/bag/proc/DeathExplosion() + new /obj/effect/temp_visual/explosion(get_turf(src)) + playsound(loc, 'sound/effects/ordeals/steel/gcorp_boom.ogg', 60, TRUE) + for(var/mob/living/L in view(3, src)) + L.deal_damage(60, RED_DAMAGE) + var/turf/origin = get_turf(src) + var/list/all_turfs = RANGE_TURFS(1, origin) + for(var/turf/T in shuffle(all_turfs)) + if (T.is_blocked_turf(exclude_mobs = TRUE)) + continue; + var/obj/effect/decal/cleanable/blood/B = locate() in T + if(!B) + B = new /obj/effect/decal/cleanable/blood(T) + B.bloodiness = 100 diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index 78d9863b5f7e..35cdf494e223 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -4305,6 +4305,7 @@ #include "ModularTegustation\tegu_mobs\apostle_antag.dm" #include "ModularTegustation\tegu_mobs\butcher.dm" #include "ModularTegustation\tegu_mobs\chaos_marine.dm" +#include "ModularTegustation\tegu_mobs\lc13_blood_fiend.dm" #include "ModularTegustation\tegu_mobs\lc13_bongy.dm" #include "ModularTegustation\tegu_mobs\lc13_corrosions.dm" #include "ModularTegustation\tegu_mobs\lc13_humanoids.dm" From 2ef16e4dbc3c2c413d26671b974146809d24acaf Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 5 Nov 2024 22:58:40 -0500 Subject: [PATCH 02/47] blood_fiend updates --- .../tegu_mobs/lc13_blood_fiend.dm | 199 ++++++++++-------- 1 file changed, 112 insertions(+), 87 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 7f70543b10b7..32d7c52919c6 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -3,23 +3,30 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend - name = "Blood Fiend" - desc = "Blood Fiend Desc" + name = "bloodfiend" + desc = "Desc" icon = 'ModularTegustation/Teguicons/tegumobs.dmi' icon_state = "humanoid_hostile" icon_living = "humanoid_hostile" - damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 1, BLACK_DAMAGE = 1, PALE_DAMAGE = 2) - melee_damage_lower = 5 - melee_damage_upper = 6 + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) + melee_damage_lower = 13 + melee_damage_upper = 15 melee_damage_type = RED_DAMAGE - maxHealth = 100 - health = 100 + attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' + attack_verb_continuous = "slices" + attack_verb_simple = "slice" + maxHealth = 1200 + health = 1200 + color = "#b52e19" ranged = TRUE - var/leap_sound = 'sound/abnormalities/ichthys/hammer2.ogg' - var/blood_feast = 100 - var/max_blood_feast = 100 + var/leap_sound = 'sound/abnormalities/nosferatu/attack_special.ogg' + var/blood_feast = 400 + var/max_blood_feast = 400 var/can_act = TRUE - var/leap_damage = 10 + var/leap_damage = 50 + var/slash_damage = 25 + var/drain_cooldown = 0 + var/drain_cooldown_time = 50 /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/AdjustBloodFeast(amount) @@ -28,60 +35,76 @@ if (blood_feast > max_blood_feast) blood_feast = max_blood_feast +/mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/Drain() + var/turf/T = get_turf(src) + if(!T) + return + if (health != maxHealth || blood_feast != max_blood_feast) + for(var/obj/effect/decal/cleanable/blood/B in view(T, 2)) //will clean up any blood, but only heals from human blood + if (health != maxHealth || blood_feast != max_blood_feast) + if(B.blood_state == BLOOD_STATE_HUMAN) + playsound(T, 'sound/abnormalities/nosferatu/bloodcollect.ogg', 25, 3) + if(B.bloodiness == 100) //Bonus for "pristine" bloodpools, also to prevent footprint spam + AdjustBloodFeast(30) + else + AdjustBloodFeast(max((B.bloodiness**2)/800,1)) + qdel(B) + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/Dash(target_turf) + target_turf = get_turf(target) + var/list/hit_mob = list() + do_shaky_animation(1) + if(do_after(src, 0.5 SECONDS, target = src)) + var/turf/wallcheck = get_turf(src) + var/enemy_direction = get_dir(src, target_turf) + for(var/i = 0 to 4) + if(get_turf(src) != wallcheck || stat == DEAD) + break + wallcheck = get_step(src, enemy_direction) + if(!ClearSky(wallcheck)) + break + //without this the attack happens instantly + forceMove(wallcheck) + playsound(wallcheck, 'sound/abnormalities/doomsdaycalendar/Lor_Slash_Generic.ogg', 20, 0, 4) + for(var/turf/T in orange(get_turf(src), 1)) + if(isclosedturf(T)) + continue + var/obj/effect/temp_visual/slice/blood = new(T) + blood.color = "#b52e19" + hit_mob = HurtInTurf(T, hit_mob, slash_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) + /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/Leap(mob/living/target) if(!isliving(target) && !ismecha(target) || !can_act) return - var/dist = get_dist(target, src) - if(dist > 1) - blood_feast = 0 - can_act = FALSE - //icon_state = enraged ? "headless_ichthys_charging_enraged" : "headless_ichthys_charging" - SLEEP_CHECK_DEATH(0.25 SECONDS) - animate(src, alpha = 1,pixel_x = 0, pixel_z = 16, time = 0.1 SECONDS) - src.pixel_z = 16 - playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) - var/turf/target_turf = get_turf(target) - SLEEP_CHECK_DEATH(1 SECONDS) - if(target_turf) - forceMove(target_turf) //look out, someone is rushing you! - playsound(src, leap_sound, 50, FALSE, 4) - animate(src, alpha = 255,pixel_x = 0, pixel_z = -16, time = 0.1 SECONDS) - src.pixel_z = 0 - SLEEP_CHECK_DEATH(0.1 SECONDS) - //icon_state = enraged ? "headless_ichthys_enraged" : "headless_ichthys" - for(var/turf/T in view(1, src)) - var/obj/effect/temp_visual/small_smoke/halfsecond/FX = new(T) - FX.color = "#b52e19" - for(var/mob/living/L in T) - if(faction_check_mob(L)) - continue - L.deal_damage(leap_damage, RED_DAMAGE) - for(var/obj/vehicle/sealed/mecha/V in T) - V.take_damage(leap_damage, RED_DAMAGE) - SLEEP_CHECK_DEATH(1.5 SECONDS) - - target_turf = get_turf(target) - var/list/hit_mob = list() - do_shaky_animation(2) - if(do_after(src, 1 SECONDS, target = src)) - var/turf/wallcheck = get_turf(src) - var/enemy_direction = get_dir(src, target_turf) - for(var/i = 0 to 7) - if(get_turf(src) != wallcheck || stat == DEAD) - break - wallcheck = get_step(src, enemy_direction) - if(!ClearSky(wallcheck)) - break - //without this the attack happens instantly - sleep(1) - forceMove(wallcheck) - playsound(wallcheck, 'sound/abnormalities/doomsdaycalendar/Lor_Slash_Generic.ogg', 20, 0, 4) - for(var/turf/T in orange(get_turf(src), 1)) - if(isclosedturf(T)) - continue - new /obj/effect/temp_visual/slice(T) - hit_mob = HurtInTurf(T, hit_mob, 50, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) - can_act = TRUE + blood_feast = 0 + can_act = FALSE + SLEEP_CHECK_DEATH(0.25 SECONDS) + animate(src, alpha = 1,pixel_x = 0, pixel_z = 16, time = 0.1 SECONDS) + src.pixel_z = 16 + playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) + var/turf/target_turf = get_turf(target) + SLEEP_CHECK_DEATH(1 SECONDS) + if(target_turf) + forceMove(target_turf) //look out, someone is rushing you! + playsound(src, leap_sound, 50, FALSE, 4) + animate(src, alpha = 255,pixel_x = 0, pixel_z = -16, time = 0.1 SECONDS) + src.pixel_z = 0 + SLEEP_CHECK_DEATH(0.1 SECONDS) + for(var/turf/T in view(1, src)) + var/obj/effect/temp_visual/small_smoke/halfsecond/FX = new(T) + FX.color = "#b52e19" + for(var/mob/living/L in T) + if(faction_check_mob(L)) + continue + L.deal_damage(leap_damage, RED_DAMAGE) + for(var/obj/vehicle/sealed/mecha/V in T) + V.take_damage(leap_damage, RED_DAMAGE) + SLEEP_CHECK_DEATH(0.5 SECONDS) + say("No... I NEED MORE!!!") + SLEEP_CHECK_DEATH(1.5 SECONDS) + Dash(target_turf) + Dash(target_turf) + can_act = TRUE /mob/living/simple_animal/hostile/humanoid/blood/fiend/ClearSky(turf/T) . = ..() @@ -91,6 +114,15 @@ if(locate(/obj/structure/railing) in T.contents) return FALSE +/mob/living/simple_animal/hostile/humanoid/blood/fiend/Life() + . = ..() + if(drain_cooldown > world.time) + return FALSE + if(stat == DEAD) + return FALSE + drain_cooldown = world.time + drain_cooldown_time + Drain() + /mob/living/simple_animal/hostile/humanoid/blood/fiend/AttackingTarget() if(!can_act) return @@ -106,42 +138,33 @@ Leap(target) return - - /mob/living/simple_animal/hostile/humanoid/blood/fiend/Move() if(!can_act) return FALSE - var/turf/T = get_turf(src) - if(!T) - ..() - return - if (health != maxHealth || blood_feast != max_blood_feast) - for(var/obj/effect/decal/cleanable/blood/B in view(T, 2)) //will clean up any blood, but only heals from human blood - if(B.blood_state == BLOOD_STATE_HUMAN) - playsound(T, 'sound/abnormalities/nosferatu/bloodcollect.ogg', 25, 3) - if(B.bloodiness == 100) //Bonus for "pristine" bloodpools, also to prevent footprint spam - AdjustBloodFeast(30) - else - AdjustBloodFeast(max((B.bloodiness**2)/800,1)) - qdel(B) + Drain() ..() /mob/living/simple_animal/hostile/humanoid/blood/bag - name = "Blood Bag" - desc = "Blood Bag Desc" + name = "bloodbag" + desc = "Desc" icon = 'ModularTegustation/Teguicons/tegumobs.dmi' icon_state = "humanoid_hostile" icon_living = "humanoid_hostile" icon_dead = "humanoid_hostile" - damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 1, BLACK_DAMAGE = 1, PALE_DAMAGE = 2) + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.6, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1.5) melee_damage_lower = 5 melee_damage_upper = 6 melee_damage_type = RED_DAMAGE - maxHealth = 100 - health = 100 - var/self_damage = 10 + attack_sound = 'sound/effects/ordeals/brown/flea_attack.ogg' + attack_verb_continuous = "slashes" + attack_verb_simple = "slash" + maxHealth = 260 + health = 260 + var/self_damage = 20 var/self_damage_type = RED_DAMAGE + var/blood_drop_cooldown = 0 + var/blood_drop_cooldown_time = 0.5 /mob/living/simple_animal/hostile/humanoid/blood/bag/AttackingTarget(atom/attacked_target) . = ..() @@ -149,6 +172,9 @@ /mob/living/simple_animal/hostile/humanoid/blood/bag/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() + if(blood_drop_cooldown > world.time) + return FALSE + blood_drop_cooldown = world.time + blood_drop_cooldown_time var/turf/origin = get_turf(src) var/list/all_turfs = RANGE_TURFS(1, origin) for(var/turf/T in shuffle(all_turfs)) @@ -162,7 +188,6 @@ /mob/living/simple_animal/hostile/humanoid/blood/bag/death(gibbed) walk_to(src, 0) - say("FOR G CORP!!!") animate(src, transform = matrix()*1.8, color = "#FF0000", time = 15) addtimer(CALLBACK(src, PROC_REF(DeathExplosion)), 15) QDEL_IN(src, 15) @@ -170,9 +195,9 @@ /mob/living/simple_animal/hostile/humanoid/blood/bag/proc/DeathExplosion() new /obj/effect/temp_visual/explosion(get_turf(src)) - playsound(loc, 'sound/effects/ordeals/steel/gcorp_boom.ogg', 60, TRUE) - for(var/mob/living/L in view(3, src)) - L.deal_damage(60, RED_DAMAGE) + playsound(loc, 'sound/effects/ordeals/crimson/dusk_dead.ogg', 60, TRUE) + for(var/mob/living/L in view(1, src)) + L.deal_damage(10, RED_DAMAGE) var/turf/origin = get_turf(src) var/list/all_turfs = RANGE_TURFS(1, origin) for(var/turf/T in shuffle(all_turfs)) From e66e5ec4c5c606a84b99ef4e67cde6c9bd667e63 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 5 Nov 2024 23:15:50 -0500 Subject: [PATCH 03/47] Adding Icons --- .../Teguicons/blood_fiends_32x32.dmi | Bin 0 -> 2860 bytes .../Teguicons/blood_fiends_32x48.dmi | Bin 0 -> 1582 bytes ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 15 +++++++-------- 3 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 ModularTegustation/Teguicons/blood_fiends_32x32.dmi create mode 100644 ModularTegustation/Teguicons/blood_fiends_32x48.dmi diff --git a/ModularTegustation/Teguicons/blood_fiends_32x32.dmi b/ModularTegustation/Teguicons/blood_fiends_32x32.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3b54eab20b965c7690ef96d27543b30eb4843779 GIT binary patch literal 2860 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 KMNUMnLSTZ1M{ODa literal 0 HcmV?d00001 diff --git a/ModularTegustation/Teguicons/blood_fiends_32x48.dmi b/ModularTegustation/Teguicons/blood_fiends_32x48.dmi new file mode 100644 index 0000000000000000000000000000000000000000..6924bb83a1bc21ae1c86d9c29eeeb7aed80afd4e GIT binary patch literal 1582 zcmV+}2GRM6P)vJ4?I0i^8Wk0unw+;B9s1(p^y=&O_4V%E-4hcN^XKR?4i4Xqjp0yG zNC^sS8yo}x07nxOM-dUM8yrFr5it%984V4#939_#do3Ish!z(j4iBjt9O1LII1UaM z4Ganh2y_({P81Xh1O>~>%QX%UB?<~N0s@Bz1_c2D6%Y`%wzdKS0+B8)L=h1S2?)Tz zz$6C;eFg;!0s=P_7Rt)X$;rvh&CO967oP_Pw6wH`92$8B1t1s~fd&Pl8XE@%1;xe1 zP7@Pn6&5894<{ZS3j000L8 z0i78dWf&PS6c#BE5v>~>kQp0u78g(w6N(oYH53*x5D~K+9Ul%3!Dpa600001bW%=J z06^y0W&i*HdwNt@bVOxyV{&P5bZKvH004NLQ&ws!+> z6vlh3A{8(3if)RW38DzX0j4sPSuY^PqNspOMC2wQ;6S`0;GKWlG#k@xX_EO(AI|on z%X{9pX`1lxv#jmfuK%gsCwN&|37@5k5~ ztf`eLwKaGqhC2UQjKvV^WUsLf1MRFP;N1CGto}knV{n~&7viF^;X-{ZcK)0u0N`R% zGqvzz6OH~3h(`H93pF=g)E=iOw6-BP$K!dO5RdZ^Y-u8z7my1z2(OMv<+nt842?E$qJ2<6-aJUSZ1&izq&XUeBFww6<0!XY>8+CG^Ds z@g7C+KG+54(Xrt^M(7?Q#QPxY_kCga#jhX$`gy~s-dIC<05QiUI zna-h%PXzdWb{f1!2CkE4;*Pm{E^?rnU|*FJA}>uWUmX*DwX(fbgV0AId( z-@gAK&-=MqID^ffo<~2vfAhY6(f^~gUEB4KmkAFjnv8fr!4qaY5Y7{3JfPqSGagXz zgdq=v^MoM}D0sq*2NXPE$O8(VFyw(yo-pKraGo&Z0Xa{UzyngAD1`^4JYki<0}`Gn zjR%T(qBI_m@Pr8u{;sF&;81aCLCyaPN#S=z6pyCM=9#HXw2@j}v!h{DDJYmEG gDxNUo0U1yH0ypX-{9@Q_ivR!s07*qoM6N<$f;stqi~s-t literal 0 HcmV?d00001 diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 32d7c52919c6..a3ca21751974 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -5,9 +5,9 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend name = "bloodfiend" desc = "Desc" - icon = 'ModularTegustation/Teguicons/tegumobs.dmi' - icon_state = "humanoid_hostile" - icon_living = "humanoid_hostile" + icon = 'ModularTegustation/Teguicons/blood_fiends_32x48.dmi' + icon_state = "Fashionista_Bloodfiend" + icon_living = "Fashionista_Bloodfiend" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) melee_damage_lower = 13 melee_damage_upper = 15 @@ -17,7 +17,6 @@ attack_verb_simple = "slice" maxHealth = 1200 health = 1200 - color = "#b52e19" ranged = TRUE var/leap_sound = 'sound/abnormalities/nosferatu/attack_special.ogg' var/blood_feast = 400 @@ -148,10 +147,10 @@ /mob/living/simple_animal/hostile/humanoid/blood/bag name = "bloodbag" desc = "Desc" - icon = 'ModularTegustation/Teguicons/tegumobs.dmi' - icon_state = "humanoid_hostile" - icon_living = "humanoid_hostile" - icon_dead = "humanoid_hostile" + icon = 'ModularTegustation/Teguicons/blood_fiends_32x32.dmi' + icon_state = "BloodBag" + icon_living = "BloodBag" + icon_dead = "BloodBag" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.6, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1.5) melee_damage_lower = 5 melee_damage_upper = 6 From 7f4b9d9b128108450b0c539c88cce331385bd07a Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 5 Nov 2024 23:46:18 -0500 Subject: [PATCH 04/47] Cosmetic Changes --- .../tegu_mobs/lc13_blood_fiend.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index a3ca21751974..34157aa10510 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -15,8 +15,8 @@ attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' attack_verb_continuous = "slices" attack_verb_simple = "slice" - maxHealth = 1200 - health = 1200 + maxHealth = 1000 + health = 1000 ranged = TRUE var/leap_sound = 'sound/abnormalities/nosferatu/attack_special.ogg' var/blood_feast = 400 @@ -62,7 +62,7 @@ wallcheck = get_step(src, enemy_direction) if(!ClearSky(wallcheck)) break - //without this the attack happens instantly + sleep(0.25)//without this the attack happens instantly forceMove(wallcheck) playsound(wallcheck, 'sound/abnormalities/doomsdaycalendar/Lor_Slash_Generic.ogg', 20, 0, 4) for(var/turf/T in orange(get_turf(src), 1)) @@ -78,16 +78,16 @@ blood_feast = 0 can_act = FALSE SLEEP_CHECK_DEATH(0.25 SECONDS) - animate(src, alpha = 1,pixel_x = 0, pixel_z = 16, time = 0.1 SECONDS) - src.pixel_z = 16 + animate(src, alpha = 1,pixel_x = 16, pixel_z = 0, time = 0.1 SECONDS) + src.pixel_x = 16 playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) var/turf/target_turf = get_turf(target) SLEEP_CHECK_DEATH(1 SECONDS) if(target_turf) forceMove(target_turf) //look out, someone is rushing you! playsound(src, leap_sound, 50, FALSE, 4) - animate(src, alpha = 255,pixel_x = 0, pixel_z = -16, time = 0.1 SECONDS) - src.pixel_z = 0 + animate(src, alpha = 255,pixel_x = -16, pixel_z = 0, time = 0.1 SECONDS) + src.pixel_x = 0 SLEEP_CHECK_DEATH(0.1 SECONDS) for(var/turf/T in view(1, src)) var/obj/effect/temp_visual/small_smoke/halfsecond/FX = new(T) @@ -154,6 +154,7 @@ damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.6, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1.5) melee_damage_lower = 5 melee_damage_upper = 6 + rapid_melee = 3 melee_damage_type = RED_DAMAGE attack_sound = 'sound/effects/ordeals/brown/flea_attack.ogg' attack_verb_continuous = "slashes" @@ -163,7 +164,7 @@ var/self_damage = 20 var/self_damage_type = RED_DAMAGE var/blood_drop_cooldown = 0 - var/blood_drop_cooldown_time = 0.5 + var/blood_drop_cooldown_time = 1 /mob/living/simple_animal/hostile/humanoid/blood/bag/AttackingTarget(atom/attacked_target) . = ..() @@ -193,7 +194,6 @@ ..() /mob/living/simple_animal/hostile/humanoid/blood/bag/proc/DeathExplosion() - new /obj/effect/temp_visual/explosion(get_turf(src)) playsound(loc, 'sound/effects/ordeals/crimson/dusk_dead.ogg', 60, TRUE) for(var/mob/living/L in view(1, src)) L.deal_damage(10, RED_DAMAGE) From 5d4e61d10be1955e61f912917a6803800dd4c1fd Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Wed, 6 Nov 2024 18:12:56 -0500 Subject: [PATCH 05/47] TIME FOR BLEED!!! --- .../tegu_mobs/lc13_blood_fiend.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 34157aa10510..dce893f73149 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -26,6 +26,8 @@ var/slash_damage = 25 var/drain_cooldown = 0 var/drain_cooldown_time = 50 + var/bleed_stacks = 3 + var/leap_bleed_stacks = 10 /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/AdjustBloodFeast(amount) @@ -95,6 +97,7 @@ for(var/mob/living/L in T) if(faction_check_mob(L)) continue + L.apply_lc_bleed(leap_bleed_stacks) L.deal_damage(leap_damage, RED_DAMAGE) for(var/obj/vehicle/sealed/mecha/V in T) V.take_damage(leap_damage, RED_DAMAGE) @@ -128,7 +131,10 @@ if(blood_feast == max_blood_feast && !client) Leap(target) return - return ..() + . = ..() + if (istype(target, /mob/living)) + var/mob/living/L = target + L.apply_lc_bleed(bleed_stacks) /mob/living/simple_animal/hostile/humanoid/blood/fiend/OpenFire() if(!can_act) @@ -165,9 +171,15 @@ var/self_damage_type = RED_DAMAGE var/blood_drop_cooldown = 0 var/blood_drop_cooldown_time = 1 + var/bleed_stacks = 1 + var/explosion_damage = 10 + var/explosion_bleed = 5 /mob/living/simple_animal/hostile/humanoid/blood/bag/AttackingTarget(atom/attacked_target) . = ..() + if (istype(target, /mob/living)) + var/mob/living/L = target + L.apply_lc_bleed(bleed_stacks) deal_damage(self_damage, self_damage_type) /mob/living/simple_animal/hostile/humanoid/blood/bag/adjustHealth(amount, updating_health = TRUE, forced = FALSE) @@ -196,7 +208,8 @@ /mob/living/simple_animal/hostile/humanoid/blood/bag/proc/DeathExplosion() playsound(loc, 'sound/effects/ordeals/crimson/dusk_dead.ogg', 60, TRUE) for(var/mob/living/L in view(1, src)) - L.deal_damage(10, RED_DAMAGE) + L.deal_damage(explosion_damage, RED_DAMAGE) + L.apply_lc_bleed(explosion_bleed) var/turf/origin = get_turf(src) var/list/all_turfs = RANGE_TURFS(1, origin) for(var/turf/T in shuffle(all_turfs)) From 52c536d3d0d36ad4ddaee8af6fe7eec111391b66 Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Wed, 6 Nov 2024 19:11:07 -0500 Subject: [PATCH 06/47] boss blood fiend --- .../tegu_mobs/lc13_blood_fiend.dm | 79 +++++++++++++++++-- 1 file changed, 74 insertions(+), 5 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index dce893f73149..ffe25b726b6c 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -28,7 +28,7 @@ var/drain_cooldown_time = 50 var/bleed_stacks = 3 var/leap_bleed_stacks = 10 - + var/boss = FALSE /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/AdjustBloodFeast(amount) adjustBruteLoss(-amount/2) @@ -79,10 +79,6 @@ return blood_feast = 0 can_act = FALSE - SLEEP_CHECK_DEATH(0.25 SECONDS) - animate(src, alpha = 1,pixel_x = 16, pixel_z = 0, time = 0.1 SECONDS) - src.pixel_x = 16 - playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) var/turf/target_turf = get_turf(target) SLEEP_CHECK_DEATH(1 SECONDS) if(target_turf) @@ -149,6 +145,79 @@ Drain() ..() +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss + name = "bloodfiendboss" + desc = "Desc" + icon = 'ModularTegustation/Teguicons/blood_fiends_32x48.dmi' + icon_state = "Fashionista_Bloodfiend" + icon_living = "Fashionista_Bloodfiend" + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) + melee_damage_lower = 13 + melee_damage_upper = 15 + melee_damage_type = RED_DAMAGE + attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' + attack_verb_continuous = "slices" + attack_verb_simple = "slice" + maxHealth = 1000 + health = 1000 + ranged = TRUE + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Leap(mob/living/target) + if(!isliving(target) && !ismecha(target) || !can_act) + return + blood_feast = 0 + can_act = FALSE + var/list/dirs_to_land = shuffle(list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) + var/list/dir_overlays = list() + for (var/i in 1 to 3) + var/dir_to_land = dirs_to_land[i] + // add overlay + var/x + var/y + if (dir_to_land == NORTH) + x = 0 + y = 32 + else if (dir_to_land == SOUTH) + x = 0 + y = -32 + else if (dir_to_land == EAST) + x = 32 + y = 0 + else if (dir_to_land == SOUTH) + x = -32 + y = 0 + else if (dir_to_land == NORTHEAST) + x = 32 + y = 32 + else if (dir_to_land == NORTHWEST) + x = 32 + y = -32 + else if (dir_to_land == SOUTHEAST) + x = 32 + y = -32 + else + x = -32 + y = -32 + var/image/O = image(icon='ModularTegustation/Teguicons/tegu_effects.dmi',icon_state="target_field", pixel_x = x, pixel_y = y) + target.add_overlay(O) + dir_overlays.Add(O) + SLEEP_CHECK_DEATH(1 SECONDS) + for (var/i in 1 to 3) + SLEEP_CHECK_DEATH(0.25 SECONDS) + target.cut_overlay(dir_overlays[i]) + animate(src, alpha = 1,pixel_x = 16, pixel_z = 0, time = 0.1 SECONDS) + src.pixel_x = 16 + playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) + var/turf/target_turf = get_step(get_turf(target), dirs_to_land[i]) + if(target_turf) + forceMove(target_turf) //look out, someone is rushing you! + playsound(src, leap_sound, 50, FALSE, 4) + animate(src, alpha = 255,pixel_x = -16, pixel_z = 0, time = 0.1 SECONDS) + src.pixel_x = 0 + SLEEP_CHECK_DEATH(0.5 SECONDS) + Dash(target) + can_act = TRUE + /mob/living/simple_animal/hostile/humanoid/blood/bag name = "bloodbag" From 98ad21b17393508b0e08d3a403edb34ff30410ce Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Wed, 6 Nov 2024 22:26:43 -0500 Subject: [PATCH 07/47] Better Icons --- ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index ffe25b726b6c..b9558944048c 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -198,9 +198,10 @@ else x = -32 y = -32 - var/image/O = image(icon='ModularTegustation/Teguicons/tegu_effects.dmi',icon_state="target_field", pixel_x = x, pixel_y = y) + var/image/O = image(icon='icons/effects/cult_effects.dmi',icon_state="bloodsparkles", pixel_x = x, pixel_y = y) target.add_overlay(O) dir_overlays.Add(O) + playsound(target, 'ModularTegustation/Tegusounds/claw/eviscerate1.ogg', 100, 1) SLEEP_CHECK_DEATH(1 SECONDS) for (var/i in 1 to 3) SLEEP_CHECK_DEATH(0.25 SECONDS) @@ -214,7 +215,6 @@ playsound(src, leap_sound, 50, FALSE, 4) animate(src, alpha = 255,pixel_x = -16, pixel_z = 0, time = 0.1 SECONDS) src.pixel_x = 0 - SLEEP_CHECK_DEATH(0.5 SECONDS) Dash(target) can_act = TRUE From 313d09a4b5abcbde1152c281729552f84727df49 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Wed, 6 Nov 2024 22:57:19 -0500 Subject: [PATCH 08/47] Blood Slowdown --- .../tegu_mobs/lc13_blood_fiend.dm | 1 + code/datums/status_effects/debuffs.dm | 24 +++++++++++++++++++ code/modules/movespeed/modifiers/mobs.dm | 4 ++++ 3 files changed, 29 insertions(+) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index b9558944048c..5a9b72e5e3e5 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -165,6 +165,7 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Leap(mob/living/target) if(!isliving(target) && !ismecha(target) || !can_act) return + target.apply_status_effect(/datum/status_effect/bloodhold) blood_feast = 0 can_act = FALSE var/list/dirs_to_land = shuffle(list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 4c80c8a62911..a9ec8f2ef603 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1005,6 +1005,30 @@ owner.cut_overlay(statuseffectvisual) return ..() +#define MOB_QUARTERSPEED /datum/movespeed_modifier/bloodhold +/datum/status_effect/bloodhold + id = "bloodhold" + duration = 8 SECONDS + alert_type = null + status_type = STATUS_EFFECT_REFRESH + var/statuseffectvisual + +/datum/status_effect/bloodhold/on_apply() + . = ..() + owner.add_movespeed_modifier(MOB_QUARTERSPEED) + to_chat(owner, "You are slowed down as your own blood resist your movement!") + var/mutable_appearance/effectvisual = mutable_appearance('icons/obj/clockwork_objects.dmi', "hateful_manacles") + effectvisual.pixel_x = -owner.pixel_x + effectvisual.pixel_y = -owner.pixel_y + statuseffectvisual = effectvisual + owner.add_overlay(statuseffectvisual) + +/datum/status_effect/bloodhold/on_remove() + owner.remove_movespeed_modifier(MOB_QUARTERSPEED) + + owner.cut_overlay(statuseffectvisual) + return ..() + //update_stamina() is move_to_delay = (initial(move_to_delay) + (staminaloss * 0.06)) // 100 stamina damage equals 6 additional move_to_delay. So 167*0.06 = 10.02 diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index e1b8dae8c977..4cc7a6e03ce5 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -139,3 +139,7 @@ /datum/movespeed_modifier/qliphothoverload flags = IS_ACTUALLY_MULTIPLICATIVE multiplicative_slowdown = 2 + +/datum/movespeed_modifier/bloodhold + flags = IS_ACTUALLY_MULTIPLICATIVE + multiplicative_slowdown = 4 From 126b6fcd2d5143ecfd28f5305a98982a455ab836 Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Thu, 7 Nov 2024 22:57:09 -0500 Subject: [PATCH 09/47] slash update --- .../tegu_mobs/lc13_blood_fiend.dm | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 5a9b72e5e3e5..8c59182fddb1 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -203,10 +203,14 @@ target.add_overlay(O) dir_overlays.Add(O) playsound(target, 'ModularTegustation/Tegusounds/claw/eviscerate1.ogg', 100, 1) - SLEEP_CHECK_DEATH(1 SECONDS) + if (stat != DEAD) + SLEEP(1 SECONDS) + else + break for (var/i in 1 to 3) - SLEEP_CHECK_DEATH(0.25 SECONDS) target.cut_overlay(dir_overlays[i]) + if (stat == DEAD) + continue animate(src, alpha = 1,pixel_x = 16, pixel_z = 0, time = 0.1 SECONDS) src.pixel_x = 16 playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) @@ -217,8 +221,44 @@ animate(src, alpha = 255,pixel_x = -16, pixel_z = 0, time = 0.1 SECONDS) src.pixel_x = 0 Dash(target) + SLEEP(0.25 SECONDS) can_act = TRUE +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Dash(target_turf) + target_turf = get_turf(target) + var/list/hit_mob = list() + do_shaky_animation(1) + var/dx = src.x - target.x + var/dy = src.y - target.y + var/turf/safe_turf = locate(target.x - dx, target.y - dy, target.z) + var/list/warning_overlays = list() + var/list/warning_turfs = list() + for(var/turf/T in view(target_turf, 2)) + if (T == safe_turf) + continue; + // put marker + var/image/O = image(icon='icons/effects/cult_effects.dmi',icon_state="floorglow") + T.add_overlay(O) + warning_overlays.Add(O) + warning_turfs.Add(T) + + + SLEEP(25) + for (var/i in 1 to 24) + var/turf/T = warning_turfs[i] + T.cut_overlay(warning_overlays[i]) + + if (stat == DEAD) + return + playsound(target, 'sound/abnormalities/doomsdaycalendar/Lor_Slash_Generic.ogg', 20, 0, 4) + for(var/turf/T in view(target_turf, 2)) + if (T == safe_turf) + continue; + var/obj/effect/temp_visual/slice/blood = new(T) + blood.color = "#b52e19" + hit_mob = HurtInTurf(T, hit_mob, slash_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) + + /mob/living/simple_animal/hostile/humanoid/blood/bag name = "bloodbag" From c4afd191d8af5e17bd50d7080524fc08ec229274 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Thu, 7 Nov 2024 23:20:30 -0500 Subject: [PATCH 10/47] Diffrent Icon/Sleep Fix --- ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 10 +++++----- code/datums/status_effects/debuffs.dm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 8c59182fddb1..eb51fa0d3b02 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -204,7 +204,7 @@ dir_overlays.Add(O) playsound(target, 'ModularTegustation/Tegusounds/claw/eviscerate1.ogg', 100, 1) if (stat != DEAD) - SLEEP(1 SECONDS) + sleep(1 SECONDS) else break for (var/i in 1 to 3) @@ -221,7 +221,7 @@ animate(src, alpha = 255,pixel_x = -16, pixel_z = 0, time = 0.1 SECONDS) src.pixel_x = 0 Dash(target) - SLEEP(0.25 SECONDS) + sleep(0.25 SECONDS) can_act = TRUE /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Dash(target_turf) @@ -236,14 +236,14 @@ for(var/turf/T in view(target_turf, 2)) if (T == safe_turf) continue; - // put marker - var/image/O = image(icon='icons/effects/cult_effects.dmi',icon_state="floorglow") + var/image/O = image(icon='icons/effects/eldritch.dmi',icon_state="cloud_swirl") T.add_overlay(O) warning_overlays.Add(O) + O.color = "#b52e19" warning_turfs.Add(T) - SLEEP(25) + sleep(15) for (var/i in 1 to 24) var/turf/T = warning_turfs[i] T.cut_overlay(warning_overlays[i]) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index a9ec8f2ef603..1e4129c7dcca 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1008,7 +1008,7 @@ #define MOB_QUARTERSPEED /datum/movespeed_modifier/bloodhold /datum/status_effect/bloodhold id = "bloodhold" - duration = 8 SECONDS + duration = 12 SECONDS alert_type = null status_type = STATUS_EFFECT_REFRESH var/statuseffectvisual From 633c1215f1fb578abecc0cb90b41399cf07c4613 Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Fri, 8 Nov 2024 13:32:15 -0500 Subject: [PATCH 11/47] Red Mist (Real?!?) --- .../tegu_mobs/lc13_blood_fiend.dm | 10 ++++------ code/datums/status_effects/debuffs.dm | 2 +- icons/effects/eldritch.dmi | Bin 26277 -> 27973 bytes 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index eb51fa0d3b02..ffc8a9073dc2 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -1,7 +1,6 @@ /mob/living/simple_animal/hostile/humanoid/blood faction = list("hostile") - /mob/living/simple_animal/hostile/humanoid/blood/fiend name = "bloodfiend" desc = "Desc" @@ -161,6 +160,7 @@ maxHealth = 1000 health = 1000 ranged = TRUE + var/cutter_bleed_stacks = 15 /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Leap(mob/living/target) if(!isliving(target) && !ismecha(target) || !can_act) @@ -236,10 +236,9 @@ for(var/turf/T in view(target_turf, 2)) if (T == safe_turf) continue; - var/image/O = image(icon='icons/effects/eldritch.dmi',icon_state="cloud_swirl") + var/image/O = image(icon='icons/effects/eldritch.dmi',icon_state="blood_cloud_swirl") T.add_overlay(O) warning_overlays.Add(O) - O.color = "#b52e19" warning_turfs.Add(T) @@ -257,8 +256,7 @@ var/obj/effect/temp_visual/slice/blood = new(T) blood.color = "#b52e19" hit_mob = HurtInTurf(T, hit_mob, slash_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) - - + hit_mob.apply_lc_bleed(cutter_bleed_stacks) /mob/living/simple_animal/hostile/humanoid/blood/bag name = "bloodbag" @@ -280,7 +278,7 @@ var/self_damage = 20 var/self_damage_type = RED_DAMAGE var/blood_drop_cooldown = 0 - var/blood_drop_cooldown_time = 1 + var/blood_drop_cooldown_time = 1.5 var/bleed_stacks = 1 var/explosion_damage = 10 var/explosion_bleed = 5 diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 1e4129c7dcca..049824935687 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1008,7 +1008,7 @@ #define MOB_QUARTERSPEED /datum/movespeed_modifier/bloodhold /datum/status_effect/bloodhold id = "bloodhold" - duration = 12 SECONDS + duration = 10 SECONDS alert_type = null status_type = STATUS_EFFECT_REFRESH var/statuseffectvisual diff --git a/icons/effects/eldritch.dmi b/icons/effects/eldritch.dmi index 82549dccf081142febeca9522df0b0d69032f787..5c7dadcb69f5372d68fc2c001da7724c7f2fd933 100644 GIT binary patch delta 6340 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

!AheChTStqzNDxF7bNe{s0b)&^Y#E4vk$}? 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 From 2377ff75c1d5ce97126be03f392bc0ab299232a3 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Fri, 8 Nov 2024 22:07:04 -0500 Subject: [PATCH 12/47] Number Changes --- ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 13 ++++++++++--- code/datums/status_effects/debuffs.dm | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index ffc8a9073dc2..722f024118ba 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -78,6 +78,10 @@ return blood_feast = 0 can_act = FALSE + SLEEP_CHECK_DEATH(0.25 SECONDS) + animate(src, alpha = 1,pixel_x = 16, pixel_z = 0, time = 0.1 SECONDS) + src.pixel_x = 16 + playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) var/turf/target_turf = get_turf(target) SLEEP_CHECK_DEATH(1 SECONDS) if(target_turf) @@ -235,6 +239,10 @@ var/list/warning_turfs = list() for(var/turf/T in view(target_turf, 2)) if (T == safe_turf) + var/image/S = image(icon='icons/effects/eldritch.dmi',icon_state="cloud_swirl") + T.add_overlay(S) + warning_overlays.Add(S) + warning_turfs.Add(T) continue; var/image/O = image(icon='icons/effects/eldritch.dmi',icon_state="blood_cloud_swirl") T.add_overlay(O) @@ -243,7 +251,7 @@ sleep(15) - for (var/i in 1 to 24) + for (var/i in 1 to 25) var/turf/T = warning_turfs[i] T.cut_overlay(warning_overlays[i]) @@ -256,7 +264,6 @@ var/obj/effect/temp_visual/slice/blood = new(T) blood.color = "#b52e19" hit_mob = HurtInTurf(T, hit_mob, slash_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) - hit_mob.apply_lc_bleed(cutter_bleed_stacks) /mob/living/simple_animal/hostile/humanoid/blood/bag name = "bloodbag" @@ -278,7 +285,7 @@ var/self_damage = 20 var/self_damage_type = RED_DAMAGE var/blood_drop_cooldown = 0 - var/blood_drop_cooldown_time = 1.5 + var/blood_drop_cooldown_time = 2 var/bleed_stacks = 1 var/explosion_damage = 10 var/explosion_bleed = 5 diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 049824935687..888cdb422b3d 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1008,7 +1008,7 @@ #define MOB_QUARTERSPEED /datum/movespeed_modifier/bloodhold /datum/status_effect/bloodhold id = "bloodhold" - duration = 10 SECONDS + duration = 8 SECONDS alert_type = null status_type = STATUS_EFFECT_REFRESH var/statuseffectvisual @@ -1016,7 +1016,7 @@ /datum/status_effect/bloodhold/on_apply() . = ..() owner.add_movespeed_modifier(MOB_QUARTERSPEED) - to_chat(owner, "You are slowed down as your own blood resist your movement!") + to_chat(owner, "You are slowed down as your own blood resists your movement!") var/mutable_appearance/effectvisual = mutable_appearance('icons/obj/clockwork_objects.dmi', "hateful_manacles") effectvisual.pixel_x = -owner.pixel_x effectvisual.pixel_y = -owner.pixel_y From 294011a445bacfde27052af60204d93cacc03277 Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Fri, 8 Nov 2024 22:38:18 -0500 Subject: [PATCH 13/47] minions --- .../tegu_mobs/lc13_blood_fiend.dm | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 722f024118ba..3ffc913500eb 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -165,6 +165,11 @@ health = 1000 ranged = TRUE var/cutter_bleed_stacks = 15 + var/readyToSpawn75 = TRUE + var/timeToSpawn75 + var/readyToSpawn25 = TRUE + var/timeToSpawn25 + var/cooldownToSpawn = 10 SECONDS /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Leap(mob/living/target) if(!isliving(target) && !ismecha(target) || !can_act) @@ -230,7 +235,7 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Dash(target_turf) target_turf = get_turf(target) - var/list/hit_mob = list() + do_shaky_animation(1) var/dx = src.x - target.x var/dy = src.y - target.y @@ -258,12 +263,46 @@ if (stat == DEAD) return playsound(target, 'sound/abnormalities/doomsdaycalendar/Lor_Slash_Generic.ogg', 20, 0, 4) + var/list/hit_list = list() for(var/turf/T in view(target_turf, 2)) if (T == safe_turf) continue; var/obj/effect/temp_visual/slice/blood = new(T) blood.color = "#b52e19" - hit_mob = HurtInTurf(T, hit_mob, slash_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) + hit_list = HurtInTurf(T, hit_list, slash_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) + for (var/hit in hit_list) + if (istype(hit, /mob/living)) + var/mob/living/L = hit + L.apply_lc_bleed(cutter_bleed_stacks) + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/adjustHealth(amount, updating_health = TRUE, forced = FALSE) + if (health/maxHealth > 0.75) + readyToSpawn75 = TRUE + if (health/maxHealth > 0.25) + readyToSpawn25 = TRUE + . = ..() + if (health/maxHealth < 0.75 && readyToSpawn75 && world.time > timeToSpawn75) + // spawn + spawnbags() + readyToSpawn75 = FALSE + timeToSpawn75 = world.time + cooldownToSpawn + if (health/maxHealth < 0.25 && readyToSpawn25 && world.time > timeToSpawn25) + // spawn + spawnbags() + readyToSpawn25 = FALSE + timeToSpawn25 = world.time + cooldownToSpawn + +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/proc/spawnbags() + var/list/turfs = shuffle(orange(1, src)) + for(var/i in 1 to 3) + new /obj/effect/sweeperspawn/bagspawn(turfs[i]) + +/obj/effect/sweeperspawn/bagspawn + +/obj/effect/sweeperspawn/bagspawn/spawnscout() + new /mob/living/simple_animal/hostile/humanoid/blood/bag(get_turf(src)) + qdel(src) + /mob/living/simple_animal/hostile/humanoid/blood/bag name = "bloodbag" From fe1341cb9cfb1ff68bfaa16ec2acca634dcc9b45 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Sun, 29 Dec 2024 20:13:03 -0500 Subject: [PATCH 14/47] Blood Icon update --- .../Teguicons/blood_fiends_32x32.dmi | Bin 2860 -> 6926 bytes .../Teguicons/blood_fiends_32x48.dmi | Bin 1582 -> 0 bytes .../tegu_mobs/lc13_blood_fiend.dm | 28 +++++++++++------- 3 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 ModularTegustation/Teguicons/blood_fiends_32x48.dmi diff --git a/ModularTegustation/Teguicons/blood_fiends_32x32.dmi b/ModularTegustation/Teguicons/blood_fiends_32x32.dmi index 3b54eab20b965c7690ef96d27543b30eb4843779..5d87d04641409c704d44b4e918176ea3766c93df 100644 GIT binary patch literal 6926 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 IRj>^IAI;FNs{jB1 literal 2860 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 KMNUMnLSTZ1M{ODa diff --git a/ModularTegustation/Teguicons/blood_fiends_32x48.dmi b/ModularTegustation/Teguicons/blood_fiends_32x48.dmi deleted file mode 100644 index 6924bb83a1bc21ae1c86d9c29eeeb7aed80afd4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1582 zcmV+}2GRM6P)vJ4?I0i^8Wk0unw+;B9s1(p^y=&O_4V%E-4hcN^XKR?4i4Xqjp0yG zNC^sS8yo}x07nxOM-dUM8yrFr5it%984V4#939_#do3Ish!z(j4iBjt9O1LII1UaM z4Ganh2y_({P81Xh1O>~>%QX%UB?<~N0s@Bz1_c2D6%Y`%wzdKS0+B8)L=h1S2?)Tz zz$6C;eFg;!0s=P_7Rt)X$;rvh&CO967oP_Pw6wH`92$8B1t1s~fd&Pl8XE@%1;xe1 zP7@Pn6&5894<{ZS3j000L8 z0i78dWf&PS6c#BE5v>~>kQp0u78g(w6N(oYH53*x5D~K+9Ul%3!Dpa600001bW%=J z06^y0W&i*HdwNt@bVOxyV{&P5bZKvH004NLQ&ws!+> z6vlh3A{8(3if)RW38DzX0j4sPSuY^PqNspOMC2wQ;6S`0;GKWlG#k@xX_EO(AI|on z%X{9pX`1lxv#jmfuK%gsCwN&|37@5k5~ ztf`eLwKaGqhC2UQjKvV^WUsLf1MRFP;N1CGto}knV{n~&7viF^;X-{ZcK)0u0N`R% zGqvzz6OH~3h(`H93pF=g)E=iOw6-BP$K!dO5RdZ^Y-u8z7my1z2(OMv<+nt842?E$qJ2<6-aJUSZ1&izq&XUeBFww6<0!XY>8+CG^Ds z@g7C+KG+54(Xrt^M(7?Q#QPxY_kCga#jhX$`gy~s-dIC<05QiUI zna-h%PXzdWb{f1!2CkE4;*Pm{E^?rnU|*FJA}>uWUmX*DwX(fbgV0AId( z-@gAK&-=MqID^ffo<~2vfAhY6(f^~gUEB4KmkAFjnv8fr!4qaY5Y7{3JfPqSGagXz zgdq=v^MoM}D0sq*2NXPE$O8(VFyw(yo-pKraGo&Z0Xa{UzyngAD1`^4JYki<0}`Gn zjR%T(qBI_m@Pr8u{;sF&;81aCLCyaPN#S=z6pyCM=9#HXw2@j}v!h{DDJYmEG gDxNUo0U1yH0ypX-{9@Q_ivR!s07*qoM6N<$f;stqi~s-t diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 3ffc913500eb..60d8bbb6cde6 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -3,10 +3,11 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend name = "bloodfiend" - desc = "Desc" - icon = 'ModularTegustation/Teguicons/blood_fiends_32x48.dmi' - icon_state = "Fashionista_Bloodfiend" - icon_living = "Fashionista_Bloodfiend" + desc = "A humanoid wearing a bloody dress and a bird mask." + icon = 'ModularTegustation/Teguicons/blood_fiends_32x32.dmi' + icon_state = "bloodfiend" + icon_living = "bloodfiend" + icon_dead = "bloodfiend_dead" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) melee_damage_lower = 13 melee_damage_upper = 15 @@ -151,9 +152,10 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss name = "bloodfiendboss" desc = "Desc" - icon = 'ModularTegustation/Teguicons/blood_fiends_32x48.dmi' - icon_state = "Fashionista_Bloodfiend" - icon_living = "Fashionista_Bloodfiend" + icon = 'ModularTegustation/Teguicons/blood_fiends_32x32.dmi' + icon_state = "bloodfiend" + icon_living = "bloodfiend" + icon_dead = "bloodfiend_dead" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) melee_damage_lower = 13 melee_damage_upper = 15 @@ -164,6 +166,9 @@ maxHealth = 1000 health = 1000 ranged = TRUE + butcher_results = list(/obj/item/food/meat/slab/crimson = 1) + guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 1) + silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 1) var/cutter_bleed_stacks = 15 var/readyToSpawn75 = TRUE var/timeToSpawn75 @@ -308,9 +313,9 @@ name = "bloodbag" desc = "Desc" icon = 'ModularTegustation/Teguicons/blood_fiends_32x32.dmi' - icon_state = "BloodBag" - icon_living = "BloodBag" - icon_dead = "BloodBag" + icon_state = "bloodbag" + icon_living = "bloodbag" + icon_dead = "bloodbag_dead" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.6, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1.5) melee_damage_lower = 5 melee_damage_upper = 6 @@ -321,6 +326,9 @@ attack_verb_simple = "slash" maxHealth = 260 health = 260 + butcher_results = list(/obj/item/food/meat/slab/crimson = 1) + guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 1) + silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 1) var/self_damage = 20 var/self_damage_type = RED_DAMAGE var/blood_drop_cooldown = 0 From 23f205e77e18a99002b973d552f69279edfedf86 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Mon, 30 Dec 2024 12:56:46 -0500 Subject: [PATCH 15/47] Adding Bloodfiend Gear --- .../Teguicons/blood_fiend_gear.dmi | Bin 0 -> 709 bytes .../Teguicons/blood_fiend_gear_worn.dmi | Bin 0 -> 892 bytes .../tegu_items/associations/machines.dm | 1 + .../tegu_mobs/lc13_blood_fiend.dm | 9 ++-- .../ego_gear/non_abnormality/bloodfiend.dm | 41 ++++++++++++++++++ lobotomy-corp13.dme | 1 + 6 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 ModularTegustation/Teguicons/blood_fiend_gear.dmi create mode 100644 ModularTegustation/Teguicons/blood_fiend_gear_worn.dmi create mode 100644 code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm diff --git a/ModularTegustation/Teguicons/blood_fiend_gear.dmi b/ModularTegustation/Teguicons/blood_fiend_gear.dmi new file mode 100644 index 0000000000000000000000000000000000000000..23c5e8751effa4aeb1376ec911e934380cd74d26 GIT binary patch literal 709 zcmV;$0y_PPP)P)t-sz`(%b z)YS3m=^_9CIRF6BzP|nS_1MeHS^xlQ00000080P>3=9kk3JMPo4{BUoW?5NpV`Fe; zW@}$xb!uvRa&mTUZGw7we06mUp%z*I0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS zoZ^zil2jm5DLFqey)*~NNr_L&$gDzZBf{yoXhB+P2wU@tLi>3iIdQ(I`rQZL@)VIB20*B8{iECM9};2 z*Wn!zVrtH3M9|)gy;Xt(zyy2xscqY*5da~~ev5#{(IPaBOR!<63j`ZKA#{yPm{lOe z)CofFLP)VpSP`WRGKqpvLW*cQS43T?r>GrJb4*b`6k~*WI!gcxA!ZE`%l0)$86Y8| zbt83--4Jj^$m1Ig@nl&z03}$ICj|6E)Oql|KEMdg1_B0j8}3aFNTrt5q;FZ$#)0$I<3P6*{55EvV83pe>wPL>A&40f!1mG$(|I#4A r`NP8FwD_kHEd^iGIJaHyL%a0__YM_Hl7{u@00000NkvXXu0mjfhw>-1 literal 0 HcmV?d00001 diff --git a/ModularTegustation/Teguicons/blood_fiend_gear_worn.dmi b/ModularTegustation/Teguicons/blood_fiend_gear_worn.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5229e841a708bf40f9bf3c587920a26bda3e8ed0 GIT binary patch literal 892 zcmV-?1B3jDP)C0000vP)t-sz`(#u z003G50672vA^-sK>FNFT_2Sgj0000C3=9ei3J(ttZ)0O?Ute`;huq>O4qe z-0kW8&S_PcnR^w*$H_1N0RB%-9W77fg;P7dSXp-nSo&wC^=vvY1FrQ={nPofYP{q& zL*Q&%oNIAAxFE}~^>bFXU=`l_UIna{M%X<)t^Z<%000000001f0B-P3?i<9uYpxRH zR!f%PM#+KmqYGxP6=V^{(Rt7Hc<;thH!xNMdXVkFWf%v(v>T;!t~Y~h2Z3`?^n+PC zWCM@tX9LB;%0bz&aFBt@)(?RR6_)x+i3bg22P6pe87RXTr7`d!Qj*4?Cdcf*{9|IK;^VYu5As(>p|f9mnOvvfmHYV8Ay@=?eI|?76yjxwVGRQ28cZe>I`BTsMC$mzc3*7 zYtsPTL^J~}@O}g4L^K-^XUeD>h;4+vJQKz=?WAg;#3*~%&cv@7Xc5ZYOb=+Mr#M+3 zW8n4Q8JL8BiHD%?W~A!tA=BjYc3nH%z%;qM*D&rn=`^6~t1;8F%-e01H!mCL(O06H z=*Mznt3Tfo#W8xoz_j@MYirpb7Za5@My9?Q_FGHMkoZtq9ydGmYnf+0S_1&UcPB_M zmWQ!}zV>~A2>=M00000--|ygc_eB% Sg6`)40000 Date: Mon, 30 Dec 2024 16:58:24 -0500 Subject: [PATCH 16/47] Adding in a Stun --- .../Teguicons/blood_fiends_32x32.dmi | Bin 6926 -> 7416 bytes .../tegu_mobs/lc13_blood_fiend.dm | 72 +++++++++++------- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/ModularTegustation/Teguicons/blood_fiends_32x32.dmi b/ModularTegustation/Teguicons/blood_fiends_32x32.dmi index 5d87d04641409c704d44b4e918176ea3766c93df..cdc35d31ee4143231b4f6f5153ea57a35b317f58 100644 GIT binary patch literal 7416 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 G*#84slU}U= literal 6926 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 IRj>^IAI;FNs{jB1 diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 23571ad815eb..a72eda39c7cd 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -8,15 +8,15 @@ icon_state = "bloodfiend" icon_living = "bloodfiend" icon_dead = "bloodfiend_dead" - damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1.2, WHITE_DAMAGE = 0.8, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) melee_damage_lower = 13 melee_damage_upper = 15 melee_damage_type = RED_DAMAGE attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' attack_verb_continuous = "slices" attack_verb_simple = "slice" - maxHealth = 1000 - health = 1000 + maxHealth = 800 + health = 800 ranged = TRUE butcher_results = list(/obj/item/food/meat/slab/crimson = 1) guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 2) @@ -158,17 +158,17 @@ icon_state = "bloodfiend" icon_living = "bloodfiend" icon_dead = "bloodfiend_dead" - damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5) melee_damage_lower = 13 melee_damage_upper = 15 melee_damage_type = RED_DAMAGE attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' attack_verb_continuous = "slices" attack_verb_simple = "slice" - maxHealth = 1000 - health = 1000 + maxHealth = 1200 + health = 1200 ranged = TRUE - guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 3) + guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 3, /obj/item/stack/spacecash/c1000 = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 4, /obj/item/stack/sheet/silk/crimson_advanced = 2, /obj/item/stack/sheet/silk/crimson_elegant = 1) var/cutter_bleed_stacks = 15 var/readyToSpawn75 = TRUE @@ -176,18 +176,24 @@ var/readyToSpawn25 = TRUE var/timeToSpawn25 var/cooldownToSpawn = 10 SECONDS + var/cutter_hit = FALSE + var/stun_duration = 3 SECONDS + var/mob/living/blood_target /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Leap(mob/living/target) if(!isliving(target) && !ismecha(target) || !can_act) return - target.apply_status_effect(/datum/status_effect/bloodhold) + cutter_hit = FALSE + ChangeResistances(list(RED_DAMAGE = 0.3, WHITE_DAMAGE = 0.3, BLACK_DAMAGE = 0.3, PALE_DAMAGE = 0.3)) + blood_target = target + blood_target.apply_status_effect(/datum/status_effect/bloodhold) + blood_target.faction += "city" blood_feast = 0 can_act = FALSE var/list/dirs_to_land = shuffle(list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) var/list/dir_overlays = list() for (var/i in 1 to 3) var/dir_to_land = dirs_to_land[i] - // add overlay var/x var/y if (dir_to_land == NORTH) @@ -215,37 +221,46 @@ x = -32 y = -32 var/image/O = image(icon='icons/effects/cult_effects.dmi',icon_state="bloodsparkles", pixel_x = x, pixel_y = y) - target.add_overlay(O) + blood_target.add_overlay(O) dir_overlays.Add(O) - playsound(target, 'ModularTegustation/Tegusounds/claw/eviscerate1.ogg', 100, 1) + playsound(blood_target, 'ModularTegustation/Tegusounds/claw/eviscerate1.ogg', 100, 1) if (stat != DEAD) sleep(1 SECONDS) else break for (var/i in 1 to 3) - target.cut_overlay(dir_overlays[i]) + blood_target.cut_overlay(dir_overlays[i]) if (stat == DEAD) + blood_target.faction -= "city" continue animate(src, alpha = 1,pixel_x = 16, pixel_z = 0, time = 0.1 SECONDS) src.pixel_x = 16 playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) - var/turf/target_turf = get_step(get_turf(target), dirs_to_land[i]) + var/turf/target_turf = get_step(get_turf(blood_target), dirs_to_land[i]) if(target_turf) forceMove(target_turf) //look out, someone is rushing you! playsound(src, leap_sound, 50, FALSE, 4) animate(src, alpha = 255,pixel_x = -16, pixel_z = 0, time = 0.1 SECONDS) src.pixel_x = 0 - Dash(target) + Dash(blood_target) sleep(0.25 SECONDS) + blood_target.faction -= "city" + if (!cutter_hit) + var/mutable_appearance/colored_overlay = mutable_appearance(icon, "small_stagger", layer + 0.1) + add_overlay(colored_overlay) + ChangeResistances(list(RED_DAMAGE = 2, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 1, PALE_DAMAGE = 3)) + sleep(stun_duration) + cut_overlays() + ChangeResistances(list(RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5)) can_act = TRUE /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Dash(target_turf) - target_turf = get_turf(target) + target_turf = get_turf(blood_target) do_shaky_animation(1) - var/dx = src.x - target.x - var/dy = src.y - target.y - var/turf/safe_turf = locate(target.x - dx, target.y - dy, target.z) + var/dx = src.x - blood_target.x + var/dy = src.y - blood_target.y + var/turf/safe_turf = locate(blood_target.x - dx, blood_target.y - dy, blood_target.z) var/list/warning_overlays = list() var/list/warning_turfs = list() for(var/turf/T in view(target_turf, 2)) @@ -268,17 +283,18 @@ if (stat == DEAD) return - playsound(target, 'sound/abnormalities/doomsdaycalendar/Lor_Slash_Generic.ogg', 20, 0, 4) + playsound(blood_target, 'sound/abnormalities/doomsdaycalendar/Lor_Slash_Generic.ogg', 20, 0, 4) var/list/hit_list = list() - for(var/turf/T in view(target_turf, 2)) + for(var/turf/T in range(target_turf, 2)) if (T == safe_turf) continue; var/obj/effect/temp_visual/slice/blood = new(T) blood.color = "#b52e19" - hit_list = HurtInTurf(T, hit_list, slash_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) + hit_list = HurtInTurf(T, hit_list, slash_damage, RED_DAMAGE, null, TRUE, TRUE, TRUE, hurt_structure = TRUE) for (var/hit in hit_list) if (istype(hit, /mob/living)) var/mob/living/L = hit + cutter_hit = TRUE L.apply_lc_bleed(cutter_bleed_stacks) /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/adjustHealth(amount, updating_health = TRUE, forced = FALSE) @@ -300,7 +316,7 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/proc/spawnbags() var/list/turfs = shuffle(orange(1, src)) - for(var/i in 1 to 3) + for(var/i in 1 to 2) new /obj/effect/sweeperspawn/bagspawn(turfs[i]) /obj/effect/sweeperspawn/bagspawn @@ -317,7 +333,7 @@ icon_state = "bloodbag" icon_living = "bloodbag" icon_dead = "bloodbag_dead" - damage_coeff = list(BRUTE = 1, RED_DAMAGE = 0.6, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1.5) + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1.5) melee_damage_lower = 5 melee_damage_upper = 6 rapid_melee = 3 @@ -325,15 +341,15 @@ attack_sound = 'sound/effects/ordeals/brown/flea_attack.ogg' attack_verb_continuous = "slashes" attack_verb_simple = "slash" - maxHealth = 260 - health = 260 + maxHealth = 500 + health = 500 butcher_results = list(/obj/item/food/meat/slab/crimson = 1) guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 1) - var/self_damage = 20 + var/self_damage = 10 var/self_damage_type = RED_DAMAGE var/blood_drop_cooldown = 0 - var/blood_drop_cooldown_time = 2 + var/blood_drop_cooldown_time = 2 SECONDS var/bleed_stacks = 1 var/explosion_damage = 10 var/explosion_bleed = 5 @@ -365,6 +381,8 @@ walk_to(src, 0) animate(src, transform = matrix()*1.8, color = "#FF0000", time = 15) addtimer(CALLBACK(src, PROC_REF(DeathExplosion)), 15) + new /obj/item/food/meat/slab/crimson (get_turf(src)) + new /obj/item/food/meat/slab/crimson (get_turf(src)) QDEL_IN(src, 15) ..() From 8b833fe92a87161d04df49ad80f32e2c00872f94 Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Tue, 31 Dec 2024 12:12:35 -0500 Subject: [PATCH 17/47] fix --- ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index a72eda39c7cd..b8d465756595 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -277,7 +277,7 @@ sleep(15) - for (var/i in 1 to 25) + for (var/i in 1 to warning_turfs.len) var/turf/T = warning_turfs[i] T.cut_overlay(warning_overlays[i]) From 0b37b3593a216a6799306e604773a46d414b1007 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 31 Dec 2024 13:58:41 -0500 Subject: [PATCH 18/47] Polishing them up --- .../tegu_mobs/lc13_blood_fiend.dm | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index b8d465756595..5e2ac07b7b7c 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -19,21 +19,21 @@ health = 800 ranged = TRUE butcher_results = list(/obj/item/food/meat/slab/crimson = 1) - guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 2) + guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 3) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 2, /obj/item/stack/sheet/silk/crimson_advanced = 1) var/leap_sound = 'sound/abnormalities/nosferatu/attack_special.ogg' - var/blood_feast = 400 - var/max_blood_feast = 400 + var/blood_feast = 300 + var/max_blood_feast = 500 var/can_act = TRUE - var/leap_damage = 50 + var/leap_damage = 30 var/slash_damage = 25 var/drain_cooldown = 0 var/drain_cooldown_time = 50 var/bleed_stacks = 3 - var/leap_bleed_stacks = 10 + var/leap_bleed_stacks = 5 /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/AdjustBloodFeast(amount) - adjustBruteLoss(-amount/2) + adjustBruteLoss(-amount/4) blood_feast += amount if (blood_feast > max_blood_feast) blood_feast = max_blood_feast @@ -152,8 +152,8 @@ ..() /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss - name = "bloodfiendboss" - desc = "Desc" + name = "royal bloodfiend" + desc = "A humanoid wearing a bloody dress and a bird mask..." icon = 'ModularTegustation/Teguicons/blood_fiends_32x32.dmi' icon_state = "bloodfiend" icon_living = "bloodfiend" @@ -168,14 +168,17 @@ maxHealth = 1200 health = 1200 ranged = TRUE - guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 3, /obj/item/stack/spacecash/c1000 = 1) + guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 6, /obj/item/stack/spacecash/c1000 = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 4, /obj/item/stack/sheet/silk/crimson_advanced = 2, /obj/item/stack/sheet/silk/crimson_elegant = 1) + slash_damage = 20 + blood_feast = 500 + max_blood_feast = 750 var/cutter_bleed_stacks = 15 var/readyToSpawn75 = TRUE var/timeToSpawn75 var/readyToSpawn25 = TRUE var/timeToSpawn25 - var/cooldownToSpawn = 10 SECONDS + var/cooldownToSpawn = 30 SECONDS var/cutter_hit = FALSE var/stun_duration = 3 SECONDS var/mob/living/blood_target @@ -184,6 +187,7 @@ if(!isliving(target) && !ismecha(target) || !can_act) return cutter_hit = FALSE + say("Hardblood Arts 5...") ChangeResistances(list(RED_DAMAGE = 0.3, WHITE_DAMAGE = 0.3, BLACK_DAMAGE = 0.3, PALE_DAMAGE = 0.3)) blood_target = target blood_target.apply_status_effect(/datum/status_effect/bloodhold) @@ -228,6 +232,7 @@ sleep(1 SECONDS) else break + say("Blood Snare!!!") for (var/i in 1 to 3) blood_target.cut_overlay(dir_overlays[i]) if (stat == DEAD) @@ -242,14 +247,20 @@ playsound(src, leap_sound, 50, FALSE, 4) animate(src, alpha = 255,pixel_x = -16, pixel_z = 0, time = 0.1 SECONDS) src.pixel_x = 0 + if (i == 2) + say("Just...") + if (i == 3) + say("ROT AWAY!!!") Dash(blood_target) sleep(0.25 SECONDS) blood_target.faction -= "city" if (!cutter_hit) var/mutable_appearance/colored_overlay = mutable_appearance(icon, "small_stagger", layer + 0.1) add_overlay(colored_overlay) + manual_emote("kneels on the floor...") ChangeResistances(list(RED_DAMAGE = 2, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 1, PALE_DAMAGE = 3)) sleep(stun_duration) + manual_emote("rises back up...") cut_overlays() ChangeResistances(list(RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5)) can_act = TRUE @@ -308,13 +319,20 @@ spawnbags() readyToSpawn75 = FALSE timeToSpawn75 = world.time + cooldownToSpawn + can_act = FALSE + sleep(20) + can_act = TRUE if (health/maxHealth < 0.25 && readyToSpawn25 && world.time > timeToSpawn25) // spawn spawnbags() readyToSpawn25 = FALSE timeToSpawn25 = world.time + cooldownToSpawn + can_act = FALSE + sleep(20) + can_act = TRUE /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/proc/spawnbags() + say("Rise... Bloodbags...") var/list/turfs = shuffle(orange(1, src)) for(var/i in 1 to 2) new /obj/effect/sweeperspawn/bagspawn(turfs[i]) @@ -328,7 +346,7 @@ /mob/living/simple_animal/hostile/humanoid/blood/bag name = "bloodbag" - desc = "Desc" + desc = "A blood bag created by some bloodfiends." icon = 'ModularTegustation/Teguicons/blood_fiends_32x32.dmi' icon_state = "bloodbag" icon_living = "bloodbag" From 329b4bef4129c807726e95dff2c74bc4b1b02261 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 31 Dec 2024 14:28:54 -0500 Subject: [PATCH 19/47] QoL changes --- .../tegu_mobs/lc13_blood_fiend.dm | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 5e2ac07b7b7c..d44f534e6aac 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -18,7 +18,7 @@ maxHealth = 800 health = 800 ranged = TRUE - butcher_results = list(/obj/item/food/meat/slab/crimson = 1) + butcher_results = list(/obj/item/food/meat/slab/crimson = 1, /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak = 1) guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 3) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 2, /obj/item/stack/sheet/silk/crimson_advanced = 1) var/leap_sound = 'sound/abnormalities/nosferatu/attack_special.ogg' @@ -168,7 +168,7 @@ maxHealth = 1200 health = 1200 ranged = TRUE - guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 6, /obj/item/stack/spacecash/c1000 = 1) + guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 5, /obj/item/stack/spacecash/c1000 = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 4, /obj/item/stack/sheet/silk/crimson_advanced = 2, /obj/item/stack/sheet/silk/crimson_elegant = 1) slash_damage = 20 blood_feast = 500 @@ -182,10 +182,13 @@ var/cutter_hit = FALSE var/stun_duration = 3 SECONDS var/mob/living/blood_target + var/summon_cost = 25 + var/slashing = FALSE /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Leap(mob/living/target) if(!isliving(target) && !ismecha(target) || !can_act) return + slashing = TRUE cutter_hit = FALSE say("Hardblood Arts 5...") ChangeResistances(list(RED_DAMAGE = 0.3, WHITE_DAMAGE = 0.3, BLACK_DAMAGE = 0.3, PALE_DAMAGE = 0.3)) @@ -263,6 +266,7 @@ manual_emote("rises back up...") cut_overlays() ChangeResistances(list(RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5)) + slashing = FALSE can_act = TRUE /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Dash(target_turf) @@ -272,6 +276,8 @@ var/dx = src.x - blood_target.x var/dy = src.y - blood_target.y var/turf/safe_turf = locate(blood_target.x - dx, blood_target.y - dy, blood_target.z) + if (safe_turf.density) + safe_turf = locate(blood_target.x, blood_target.y, blood_target.z) var/list/warning_overlays = list() var/list/warning_turfs = list() for(var/turf/T in view(target_turf, 2)) @@ -314,27 +320,29 @@ if (health/maxHealth > 0.25) readyToSpawn25 = TRUE . = ..() - if (health/maxHealth < 0.75 && readyToSpawn75 && world.time > timeToSpawn75) - // spawn - spawnbags() - readyToSpawn75 = FALSE - timeToSpawn75 = world.time + cooldownToSpawn - can_act = FALSE - sleep(20) - can_act = TRUE - if (health/maxHealth < 0.25 && readyToSpawn25 && world.time > timeToSpawn25) - // spawn - spawnbags() - readyToSpawn25 = FALSE - timeToSpawn25 = world.time + cooldownToSpawn - can_act = FALSE - sleep(20) - can_act = TRUE + if(!slashing) + if (health/maxHealth < 0.75 && readyToSpawn75 && world.time > timeToSpawn75) + // spawn + spawnbags() + readyToSpawn75 = FALSE + timeToSpawn75 = world.time + cooldownToSpawn + can_act = FALSE + sleep(20) + can_act = TRUE + if (health/maxHealth < 0.25 && readyToSpawn25 && world.time > timeToSpawn25) + // spawn + spawnbags() + readyToSpawn25 = FALSE + timeToSpawn25 = world.time + cooldownToSpawn + can_act = FALSE + sleep(20) + can_act = TRUE /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/proc/spawnbags() say("Rise... Bloodbags...") var/list/turfs = shuffle(orange(1, src)) for(var/i in 1 to 2) + blood_feast -= summon_cost new /obj/effect/sweeperspawn/bagspawn(turfs[i]) /obj/effect/sweeperspawn/bagspawn @@ -343,7 +351,6 @@ new /mob/living/simple_animal/hostile/humanoid/blood/bag(get_turf(src)) qdel(src) - /mob/living/simple_animal/hostile/humanoid/blood/bag name = "bloodbag" desc = "A blood bag created by some bloodfiends." From ac7dfee1cdad3033329d095765e4567b484077cd Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 31 Dec 2024 20:35:17 -0500 Subject: [PATCH 20/47] Small Nerf --- .../tegu_mobs/lc13_blood_fiend.dm | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index d44f534e6aac..63c4e2d43455 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -9,14 +9,14 @@ icon_living = "bloodfiend" icon_dead = "bloodfiend_dead" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1.2, WHITE_DAMAGE = 0.8, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) - melee_damage_lower = 13 - melee_damage_upper = 15 + melee_damage_lower = 8 + melee_damage_upper = 10 melee_damage_type = RED_DAMAGE attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' attack_verb_continuous = "slices" attack_verb_simple = "slice" - maxHealth = 800 - health = 800 + maxHealth = 600 + health = 600 ranged = TRUE butcher_results = list(/obj/item/food/meat/slab/crimson = 1, /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak = 1) guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 3) @@ -29,7 +29,7 @@ var/slash_damage = 25 var/drain_cooldown = 0 var/drain_cooldown_time = 50 - var/bleed_stacks = 3 + var/bleed_stacks = 2 var/leap_bleed_stacks = 5 /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/AdjustBloodFeast(amount) @@ -159,14 +159,14 @@ icon_living = "bloodfiend" icon_dead = "bloodfiend_dead" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5) - melee_damage_lower = 13 - melee_damage_upper = 15 + melee_damage_lower = 7 + melee_damage_upper = 8 melee_damage_type = RED_DAMAGE attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' attack_verb_continuous = "slices" attack_verb_simple = "slice" - maxHealth = 1200 - health = 1200 + maxHealth = 1000 + health = 1000 ranged = TRUE guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 5, /obj/item/stack/spacecash/c1000 = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 4, /obj/item/stack/sheet/silk/crimson_advanced = 2, /obj/item/stack/sheet/silk/crimson_elegant = 1) @@ -359,15 +359,15 @@ icon_living = "bloodbag" icon_dead = "bloodbag_dead" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1.4, WHITE_DAMAGE = 1, BLACK_DAMAGE = 0.8, PALE_DAMAGE = 1.5) - melee_damage_lower = 5 - melee_damage_upper = 6 + melee_damage_lower = 2 + melee_damage_upper = 3 rapid_melee = 3 melee_damage_type = RED_DAMAGE attack_sound = 'sound/effects/ordeals/brown/flea_attack.ogg' attack_verb_continuous = "slashes" attack_verb_simple = "slash" - maxHealth = 500 - health = 500 + maxHealth = 350 + health = 350 butcher_results = list(/obj/item/food/meat/slab/crimson = 1) guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 1) From 8817e89af1267d28f4acd891934d9d319ab2e6e0 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Wed, 1 Jan 2025 12:42:11 -0500 Subject: [PATCH 21/47] Small Buffs --- .../tegu_mobs/lc13_blood_fiend.dm | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 63c4e2d43455..08960e6d4386 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -15,17 +15,17 @@ attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' attack_verb_continuous = "slices" attack_verb_simple = "slice" - maxHealth = 600 - health = 600 + maxHealth = 1000 + health = 1000 ranged = TRUE - butcher_results = list(/obj/item/food/meat/slab/crimson = 1, /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak = 1) + butcher_results = list(/obj/item/food/meat/slab/crimson = 1) guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 3) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 2, /obj/item/stack/sheet/silk/crimson_advanced = 1) var/leap_sound = 'sound/abnormalities/nosferatu/attack_special.ogg' - var/blood_feast = 300 + var/blood_feast = 450 var/max_blood_feast = 500 var/can_act = TRUE - var/leap_damage = 30 + var/leap_damage = 50 var/slash_damage = 25 var/drain_cooldown = 0 var/drain_cooldown_time = 50 @@ -38,6 +38,11 @@ if (blood_feast > max_blood_feast) blood_feast = max_blood_feast +/mob/living/simple_animal/hostile/humanoid/blood/fiend/death(gibbed) + if(prob(30)) + new /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak (get_turf(src)) + . = ..() + /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/Drain() var/turf/T = get_turf(src) if(!T) @@ -165,13 +170,13 @@ attack_sound = 'sound/abnormalities/nosferatu/attack.ogg' attack_verb_continuous = "slices" attack_verb_simple = "slice" - maxHealth = 1000 - health = 1000 + maxHealth = 2300 + health = 2300 ranged = TRUE guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 5, /obj/item/stack/spacecash/c1000 = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 4, /obj/item/stack/sheet/silk/crimson_advanced = 2, /obj/item/stack/sheet/silk/crimson_elegant = 1) - slash_damage = 20 - blood_feast = 500 + slash_damage = 50 + blood_feast = 700 max_blood_feast = 750 var/cutter_bleed_stacks = 15 var/readyToSpawn75 = TRUE @@ -366,8 +371,8 @@ attack_sound = 'sound/effects/ordeals/brown/flea_attack.ogg' attack_verb_continuous = "slashes" attack_verb_simple = "slash" - maxHealth = 350 - health = 350 + maxHealth = 500 + health = 500 butcher_results = list(/obj/item/food/meat/slab/crimson = 1) guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 1) From e1636606dba555422aaa067ebdf3b62c8e8c5afb Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Wed, 1 Jan 2025 13:19:21 -0500 Subject: [PATCH 22/47] Armor while summoning --- ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 08960e6d4386..01703bcc91d6 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -332,7 +332,9 @@ readyToSpawn75 = FALSE timeToSpawn75 = world.time + cooldownToSpawn can_act = FALSE + ChangeResistances(list(RED_DAMAGE = 0.3, WHITE_DAMAGE = 0.3, BLACK_DAMAGE = 0.3, PALE_DAMAGE = 0.3)) sleep(20) + ChangeResistances(list(RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5)) can_act = TRUE if (health/maxHealth < 0.25 && readyToSpawn25 && world.time > timeToSpawn25) // spawn @@ -340,7 +342,9 @@ readyToSpawn25 = FALSE timeToSpawn25 = world.time + cooldownToSpawn can_act = FALSE + ChangeResistances(list(RED_DAMAGE = 0.3, WHITE_DAMAGE = 0.3, BLACK_DAMAGE = 0.3, PALE_DAMAGE = 0.3)) sleep(20) + ChangeResistances(list(RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5)) can_act = TRUE /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/proc/spawnbags() From c55f4febe8ec4640d87d35bfe8e3652644c1e2ea Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Wed, 1 Jan 2025 19:34:27 -0500 Subject: [PATCH 23/47] Adding Bloodfiends to ruinned_la_mancha_land --- .../ruinned_la_mancha_land.dmm | 645 +++++++++--------- 1 file changed, 339 insertions(+), 306 deletions(-) diff --git a/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm b/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm index 3b07dc2e2de0..0c5a8641c744 100644 --- a/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm +++ b/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm @@ -3,6 +3,7 @@ /obj/structure/chair/pew/left{ dir = 1 }, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, /turf/open/floor/material, /area/city/backstreets_alley) "as" = ( @@ -112,9 +113,9 @@ }, /area/city/backstreets_alley) "cm" = ( -/obj/structure/chair/pew, -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, -/turf/open/floor/material, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/humanoid/blood/bag, +/turf/open/floor/carpet/black, /area/city/backstreets_alley) "cv" = ( /turf/open/floor/plasteel/sepia{ @@ -187,10 +188,9 @@ /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 - }, +/obj/effect/decal/cleanable/blood, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/turf/open/floor/carpet/red, /area/city/backstreets_alley) "eI" = ( /obj/effect/decal/cleanable/blood, @@ -312,11 +312,10 @@ }, /area/city/backstreets_alley) "in" = ( -/obj/effect/decal/cleanable/blood/tracks{ - dir = 8 +/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/turf/open/floor/wood{ + color = "#990012" }, -/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, @@ -333,14 +332,12 @@ }, /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, +/obj/effect/decal/cleanable/blood, +/mob/living/simple_animal/hostile/humanoid/blood/bag, +/turf/open/floor/carpet/red, /area/city/backstreets_alley) "iw" = ( -/mob/living/simple_animal/hostile/ordeal/indigo_dawn/skirmisher, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/carpet/red, /area/city/backstreets_alley) "iA" = ( @@ -388,8 +385,8 @@ /turf/open/floor/stone, /area/city/backstreets_alley) "jU" = ( -/obj/effect/landmark/backstreetspawnwest, -/turf/open/floor/carpet/red, +/mob/living/simple_animal/hostile/humanoid/blood/bag, +/turf/open/floor/mineral/plastitanium/red, /area/city/backstreets_alley) "kg" = ( /obj/effect/rune, @@ -452,7 +449,6 @@ /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) @@ -466,7 +462,8 @@ }, /area/city/backstreets_alley) "ml" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/plasteel/dark, /area/city/backstreets_alley) "mv" = ( @@ -499,7 +496,7 @@ /area/city/backstreets_alley) "mO" = ( /obj/structure/chair/pew/left, -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/material, /area/city/backstreets_alley) "mP" = ( @@ -526,15 +523,26 @@ /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 +/obj/structure/railing{ + dir = 1 }, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/turf/open/floor/material, /area/city/backstreets_alley) "nM" = ( /obj/effect/spawner/room/backstreets/medium_north, /turf/closed/indestructible/necropolis, /area/city/backstreets_alley) +"nP" = ( +/obj/structure/chair/pew/left{ + dir = 8 + }, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/turf/open/floor/plasteel/chapel{ + dir = 1 + }, +/area/city/backstreets_alley) "ok" = ( /obj/structure/curtain, /obj/effect/decal/cleanable/dirt/dust, @@ -732,6 +740,7 @@ /obj/structure/chair/office{ dir = 8 }, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/carpet/black, /area/city/backstreets_alley) "tV" = ( @@ -817,12 +826,9 @@ /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 +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss, +/turf/open/floor/stone{ + color = "#e29eff" }, /area/city/backstreets_alley) "wr" = ( @@ -897,6 +903,7 @@ /obj/structure/chair/office{ dir = 4 }, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/carpet/black, /area/city/backstreets_alley) "yP" = ( @@ -921,7 +928,7 @@ }, /area/city/backstreets_alley) "zm" = ( -/obj/effect/landmark/backstreetspawneast, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/stone, /area/city/backstreets_alley) "zn" = ( @@ -966,11 +973,10 @@ }, /area/city/backstreets_alley) "Ae" = ( -/obj/structure/chair/pew/right{ - dir = 8 +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss, +/turf/open/floor/plasteel/chapel{ + dir = 1 }, -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, -/turf/open/floor/plasteel/chapel, /area/city/backstreets_alley) "Ai" = ( /obj/structure/curtain, @@ -1047,18 +1053,19 @@ }, /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, +/mob/living/simple_animal/hostile/humanoid/blood/bag, +/turf/open/floor/stone{ + color = "#f06979" + }, /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, +/obj/structure/chair/pew, +/mob/living/simple_animal/hostile/humanoid/blood/bag, +/turf/open/floor/material, /area/city/backstreets_alley) "BH" = ( /mob/living/simple_animal/hostile/carp/megacarp{ @@ -1080,9 +1087,13 @@ /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, +/obj/structure/chair/pew{ + dir = 8 + }, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/turf/open/floor/plasteel/chapel{ + dir = 4 + }, /area/city/backstreets_alley) "Cd" = ( /obj/structure/table/wood/fancy/red, @@ -1111,6 +1122,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/black, /area/city/backstreets_alley) +"CX" = ( +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss, +/turf/open/floor/mineral/plastitanium/red, +/area/city/backstreets_alley) "Dj" = ( /obj/structure/headpike, /turf/open/floor/plating/ashplanet/ash{ @@ -1136,7 +1151,7 @@ }, /area/city/backstreets_alley) "EA" = ( -/obj/effect/landmark/backstreetspawnwest, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/wood{ color = "#990012" }, @@ -1213,8 +1228,11 @@ }, /area/city/backstreets_alley) "Gp" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn, -/turf/open/floor/carpet/black, +/obj/structure/chair/pew{ + dir = 1 + }, +/mob/living/simple_animal/hostile/humanoid/blood/bag, +/turf/open/floor/material, /area/city/backstreets_alley) "Ha" = ( /obj/structure/spirit_board, @@ -1252,8 +1270,7 @@ /turf/open/floor/carpet/red, /area/city/backstreets_alley) "It" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/carpet/black, /area/city/backstreets_alley) "IN" = ( @@ -1387,6 +1404,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, /turf/open/floor/material, /area/city/backstreets_alley) "LB" = ( @@ -1493,12 +1511,9 @@ /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 +/mob/living/simple_animal/hostile/humanoid/blood/bag, +/turf/open/floor/plating/ashplanet/ash{ + color = "#787878" }, /area/city/backstreets_alley) "Oo" = ( @@ -1584,7 +1599,6 @@ /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" = ( @@ -1603,7 +1617,7 @@ }, /area/city/backstreets_alley) "Rp" = ( -/obj/effect/landmark/backstreetspawn, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/stone{ color = "#e29eff" }, @@ -1615,8 +1629,7 @@ }, /area/city/backstreets_alley) "RG" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/plasteel/dark, /area/city/backstreets_alley) "RN" = ( @@ -1734,7 +1747,7 @@ /area/city/backstreets_alley) "Vp" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, /turf/open/floor/plasteel/dark, /area/city/backstreets_alley) "Vz" = ( @@ -1790,7 +1803,7 @@ /turf/open/floor/carpet/black, /area/city/backstreets_alley) "WW" = ( -/mob/living/simple_animal/hostile/ordeal/indigo_noon, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, /turf/open/floor/carpet/red, /area/city/backstreets_alley) "WX" = ( @@ -1841,9 +1854,9 @@ }, /area/city/backstreets_alley) "XT" = ( -/mob/living/simple_animal/hostile/ordeal/indigo_noon, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, /turf/open/floor/stone{ - color = "#f06979" + color = "#e29eff" }, /area/city/backstreets_alley) "Yr" = ( @@ -1862,6 +1875,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/plasteel/chapel{ dir = 8 }, @@ -1888,8 +1902,8 @@ }, /area/city/backstreets_alley) "Zp" = ( -/mob/living/simple_animal/hostile/ordeal/steel_dawn, -/turf/open/floor/plasteel/dark, +/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/turf/open/floor/stone, /area/city/backstreets_alley) "Zt" = ( /obj/structure/flora/ash/cacti, @@ -2375,6 +2389,7 @@ DC DC DC DC +zm DC DC DC @@ -2383,8 +2398,7 @@ DC DC DC DC -DC -DC +zm DC DC DC @@ -2487,9 +2501,9 @@ DC DC DC DC -zm DC DC +Zp DC DC DC @@ -2528,12 +2542,12 @@ re BM PD PD -BO +kg RN RN aU Tg -Tg +iw Tg Lp Tg @@ -2612,7 +2626,7 @@ DC DC DC DC -DC +zm DC YG vm @@ -2631,31 +2645,31 @@ tL PD Ld PD -PD +jU re re Rl -XT +re re PD PD Ld -PD +jU PD aU PD Tg Tg -WW +Tg Tg IU -WW +Tg Tg aU -IU +it Tg Tg -IU +it Lp Tg aU @@ -2739,8 +2753,8 @@ re re aU cy -TK PD +CX PD PD re @@ -2765,7 +2779,7 @@ Tg aU Tg Tg -iw +Tg Tg Tg Tg @@ -2855,29 +2869,29 @@ PD kg PD re +Bo re re -XT -re -PD +Bo PD PD +jU PD PD aU PD -WW +iw Tg Tg WW -Tg +iw Tg Tg aU Tg Tg Tg -Tg +WW IU Tg mv @@ -2923,7 +2937,7 @@ YG YG DC DC -DC +zm DC YG YG @@ -2972,7 +2986,7 @@ re PD PD uC -Bt +PD RN RN aU @@ -3100,7 +3114,7 @@ aU aU Tg Tg -WW +Tg Tg mv jn @@ -3209,9 +3223,9 @@ oQ Tg RN aU -iw Tg Tg +iw Tg aU wr @@ -3266,8 +3280,8 @@ AF vP gu Yr -gE -ev +Ae +Yr gE Pp hF @@ -3306,7 +3320,7 @@ Tg Tg Tg Tg -Tg +iw Tg Tg Tg @@ -3315,9 +3329,9 @@ Tg AW IU Tg -iw Tg Tg +iw Tg aU Tg @@ -3389,7 +3403,7 @@ YG YG DC DC -zm +DC DC YG vm @@ -3405,9 +3419,9 @@ re re aU Tg -WW Tg -IU +Tg +ev Tg IU IU @@ -3417,18 +3431,18 @@ Tg IU IU IU +WW Tg Tg -iw Tg Tg -IU +it LB -WW Tg Tg Tg -WW +Tg +Tg IU aU Tg @@ -3493,7 +3507,7 @@ Yr rw Yr hF -it +sP Qa vm YG @@ -3515,10 +3529,10 @@ re re re aU +iw Tg Tg -Tg -WW +iw Tg IU aU @@ -3536,14 +3550,14 @@ Tg Tg aU Tg -Tg -Tg +iw +WW mb Tg Tg aU Tg -IU +it IU My aU @@ -3601,8 +3615,8 @@ KQ iA Aa iA -Aa -Ae +BO +NS hF sP bz @@ -3611,7 +3625,7 @@ YG YG DC DC -DC +Zp DC YG YG @@ -3660,9 +3674,9 @@ Tg aU re re +in jn jn -EA jn re re @@ -3706,16 +3720,16 @@ YG YG vm bz -cm +JJ vP -wq +bj Yz pM Os pM pF hF -it +sP bz vm YG @@ -3812,12 +3826,12 @@ YG DC DC DC -DC +zm YG YG vm AF -JJ +Bt vP CB iA @@ -3826,7 +3840,7 @@ kW yk NS hF -sP +Gp AF vm YG @@ -3930,11 +3944,11 @@ vm AF Jf jk -bj +nP Os pM -Og -pM +Os +TK pF hF tC @@ -3994,7 +4008,7 @@ aU aU sb jn -jn +EA jn jn re @@ -4186,13 +4200,13 @@ jn jn jn jn +EA jn jn jn jn jn jn -EA jn jn jn @@ -4265,19 +4279,19 @@ hA hA Jj cI -ns +Jj cI Jj cI hA -Zp +hA hA vm YG YG DC DC -DC +zm DC YG YG @@ -4364,8 +4378,8 @@ DC DC DC DC -zm DC +Zp DC DC YG @@ -4422,6 +4436,7 @@ jn jn jn jn +EA jn jn jn @@ -4470,7 +4485,7 @@ DC DC DC DC -DC +zm DC DC DC @@ -4491,7 +4506,7 @@ ur cN cN ur -ur +cm ur cN vm @@ -4588,7 +4603,7 @@ DC DC DC DC -DC +zm DC YG YG @@ -4602,7 +4617,7 @@ ur cN cN cN -Gp +cN ur cN Xf @@ -4708,7 +4723,7 @@ le hA cX cN -It +ur cN cN cN @@ -4796,7 +4811,7 @@ YG YG vm YG -DC +zm DC DC DC @@ -4820,8 +4835,8 @@ hA vm hA CE -cN -Zp +It +hA vm vm vm @@ -4927,7 +4942,7 @@ YG YG vm ji -Vp +WD vm hA ur @@ -4958,7 +4973,7 @@ re aU re jn -jn +EA jn jn re @@ -5046,7 +5061,7 @@ cN fs vm hA -Vp +WD Zu AF vm @@ -5105,7 +5120,7 @@ aU re jn jn -jn +EA jn re re @@ -5149,7 +5164,7 @@ YG YG vm MH -hA +RG vm hA cN @@ -5265,11 +5280,11 @@ vm hA cN cN -in +fs Le -WD +ml LY -on +ns IN vm YG @@ -5379,7 +5394,7 @@ cN fs vm hA -ml +hA on yK vm @@ -5403,7 +5418,7 @@ aU re jn jn -jn +in jn sb re @@ -5483,13 +5498,13 @@ DC Xf cN ur -ur -Gp +cm +cN ur cN fs vm -ml +hA hA Zu QG @@ -5600,7 +5615,7 @@ cN cN Jt WP -hA +RG WD on tV @@ -5658,7 +5673,7 @@ jn jn jn jn -jn +EA jn jn jn @@ -5686,7 +5701,7 @@ YG YG DC DC -zm +DC DC YG YG @@ -5712,7 +5727,7 @@ cN hA vm hA -Bo +LY Lu tV vm @@ -5744,6 +5759,8 @@ jn jn jn jn +EA +EA jn jn jn @@ -5759,6 +5776,7 @@ jn jn jn jn +EA jn jn jn @@ -5766,8 +5784,6 @@ jn jn jn jn -EA -jn jn jn jn @@ -5820,7 +5836,7 @@ vm vm hA cN -RG +WD vm hA WD @@ -5864,7 +5880,7 @@ re re re sb -jn +EA jn jn jn @@ -5907,7 +5923,7 @@ vm vm YG DC -DC +zm DC DC YG @@ -5920,17 +5936,17 @@ YG mH DC DC -DC +zm DC YG YG vm hA -hA +RG LM vm hA -ur +cm WD vm vm @@ -5942,7 +5958,7 @@ YG YG DC DC -DC +zm DC vm vm @@ -5957,7 +5973,7 @@ re aU re jn -jn +EA jn jn re @@ -6036,8 +6052,8 @@ DC YG YG vm +ml WD -Vp Tc vm hA @@ -6148,11 +6164,11 @@ YG YG vm WD -WD +Vp xg vm hA -Gp +cN cN Le vm @@ -6240,7 +6256,7 @@ YG vm YG DC -DC +Zp DC DC YG @@ -6258,7 +6274,7 @@ DC YG YG vm -ml +hA hA wp vm @@ -6586,7 +6602,7 @@ vm vm DC DC -DC +Zp DC YG YG @@ -6717,7 +6733,7 @@ YG YG YG YG -zm +DC DC DC DC @@ -6847,7 +6863,7 @@ re jn jn jn -jn +EA re re re @@ -6919,6 +6935,7 @@ YG YG DC DC +zm DC DC DC @@ -6932,14 +6949,13 @@ DC DC DC DC +zm DC DC DC DC DC -DC -DC -DC +zm DC DC DC @@ -7128,6 +7144,7 @@ vm zJ YG DC +zm DC DC DC @@ -7152,8 +7169,7 @@ DC DC DC DC -DC -DC +Zp DC DC DC @@ -7247,7 +7263,7 @@ zm DC DC DC -DC +zm DC DC DC @@ -7586,7 +7602,7 @@ YG DC DC DC -DC +zm YG vm YG @@ -7752,7 +7768,7 @@ aU re re jn -jn +EA jn jn re @@ -8066,7 +8082,7 @@ re aU re jn -jn +EA jn jn re @@ -8155,7 +8171,7 @@ YG YG DC DC -DC +zm DC YG YG @@ -8236,7 +8252,7 @@ aU YG vm YG -DC +zm DC vm vm @@ -8486,7 +8502,7 @@ vm vm vm YG -DC +zm DC DC DC @@ -9265,7 +9281,7 @@ vm DC DC DC -zm +DC DC YG vm @@ -9582,7 +9598,7 @@ vm YG YG DC -DC +zm DC DC YG @@ -9621,7 +9637,7 @@ aU re jn jn -jn +EA jn aU aU @@ -9930,7 +9946,7 @@ YG YG YG DC -DC +zm DC DC YG @@ -10171,6 +10187,7 @@ DC vQ jn jn +in jn jn jn @@ -10252,6 +10269,7 @@ DC DC DC DC +zm DC DC DC @@ -10261,6 +10279,7 @@ DC DC DC DC +zm DC DC DC @@ -10268,8 +10287,7 @@ DC DC DC DC -DC -DC +zm DC DC DC @@ -10352,6 +10370,7 @@ DC DC DC DC +zm DC DC DC @@ -10375,6 +10394,7 @@ DC DC DC DC +Zp DC DC DC @@ -10404,6 +10424,7 @@ jn jn jn jn +EA jn jn jn @@ -10412,8 +10433,7 @@ jn jn jn jn -jn -jn +EA jn jn jn @@ -10982,7 +11002,7 @@ jn jn jn jn -jn +EA jn jn jn @@ -11015,7 +11035,7 @@ vm YG YG DC -DC +zm DC DC DC @@ -11150,7 +11170,7 @@ vm vm YG DC -DC +zm DC DC DC @@ -11348,7 +11368,7 @@ vm YG YG DC -zm +DC DC DC YG @@ -12127,9 +12147,7 @@ YG DC DC DC -DC -DC -DC +zm DC DC DC @@ -12147,11 +12165,13 @@ DC DC DC DC +zm DC DC DC DC DC +zm DC DC DC @@ -12300,7 +12320,7 @@ jn jn jn jn -jn +EA jn jn jn @@ -12424,7 +12444,7 @@ jn jn jn jn -jn +EA jn jn re @@ -12459,7 +12479,7 @@ YG YG DC DC -DC +Zp DC YG YG @@ -12489,7 +12509,7 @@ DC DC DC DC -zm +DC YG vm vm @@ -12517,7 +12537,7 @@ jn jn sb jn -jn +in jn jn jn @@ -12571,7 +12591,7 @@ YG DC DC DC -DC +zm YG vm vm @@ -12619,7 +12639,7 @@ aU re re jn -jn +EA re re re @@ -12931,7 +12951,7 @@ vm YG DC DC -DC +zm DC DC YG @@ -13174,7 +13194,7 @@ aU re re jn -jn +in re re re @@ -13930,7 +13950,7 @@ vm YG DC DC -DC +zm DC DC YG @@ -14344,7 +14364,7 @@ YG vm YG YG -DC +zm DC DC DC @@ -14422,7 +14442,7 @@ re re re jn -jn +EA jn jn jn @@ -14571,14 +14591,13 @@ DC DC DC DC -zm -DC DC DC DC DC DC DC +zm DC DC DC @@ -14590,6 +14609,7 @@ DC DC DC DC +Zp DC DC DC @@ -14696,14 +14716,15 @@ DC DC DC DC +zm DC DC -zm DC DC DC DC DC +zm DC DC DC @@ -14740,6 +14761,7 @@ jn jn jn jn +in jn jn jn @@ -14857,7 +14879,7 @@ jn jn jn jn -jn +EA jn jn jn @@ -15506,7 +15528,7 @@ aU Tg Tg Tg -jU +Tg Tg Tg Tg @@ -15618,7 +15640,7 @@ RN Tg Lp Tg -Tg +iw Tg Tg Tg @@ -15726,12 +15748,12 @@ re re aU Tg -Tg -jU +iw Tg Tg Tg Tg +WW Tg Tg aU @@ -15754,7 +15776,7 @@ aU aU re jn -jn +in re re re @@ -15813,7 +15835,7 @@ DC Xf DC DC -zm +DC DC DC YG @@ -15960,7 +15982,7 @@ aU re re jn -jn +EA jn jn jn @@ -16080,7 +16102,7 @@ jn jn jn jn -jn +EA jn jn jn @@ -16121,7 +16143,7 @@ YG YG YG DC -DC +Zp DC DC DC @@ -16147,7 +16169,7 @@ mc Uj DC DC -DC +zm DC YG vm @@ -16174,7 +16196,7 @@ Tg Tg aU Ha -jU +Tg Tg Tg Cd @@ -16344,7 +16366,7 @@ YG YG DC DC -zm +DC DC DC DC @@ -16508,7 +16530,7 @@ Tg Tg Tg Tg -jU +Tg Tg Tg aU @@ -16616,11 +16638,11 @@ aU Tg Tg Tg +iw Tg Tg Tg -Tg -Tg +iw Tg LB jn @@ -16726,10 +16748,10 @@ re aU RN Tg -jU Tg Tg Tg +WW Tg Lp Tg @@ -16737,7 +16759,7 @@ aU jn jn jn -EA +jn jn jn re @@ -16841,7 +16863,7 @@ Tg Tg Tg Tg -jU +Tg RN Tg aU @@ -16898,7 +16920,7 @@ vm YG YG DC -DC +zm DC DC YG @@ -17478,7 +17500,7 @@ vm vm YG DC -DC +zm DC DC DC @@ -17695,7 +17717,7 @@ DC DC DC DC -zm +DC DC DC DC @@ -17788,7 +17810,7 @@ YG DC DC DC -DC +zm DC DC DC @@ -17918,13 +17940,14 @@ DC DC DC DC +zm DC DC DC DC DC DC -DC +Zp YG vm vm @@ -18129,7 +18152,7 @@ YG YG YG YG -YG +Og YG YG YG @@ -19064,7 +19087,7 @@ UG UG tJ tJ -Rp +tJ tJ UG ay @@ -19286,7 +19309,7 @@ ay UG tJ tJ -tJ +Rp tJ UG UG @@ -19357,6 +19380,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -19365,7 +19389,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -19534,7 +19557,7 @@ ay UG UG tJ -tJ +Rp tJ tJ UG @@ -19571,7 +19594,6 @@ UG tJ tJ tJ -Rp tJ tJ tJ @@ -19583,6 +19605,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -19592,6 +19615,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -19646,7 +19670,7 @@ UG UG tJ tJ -Rp +tJ tJ UG UG @@ -19682,6 +19706,7 @@ UG tJ tJ tJ +Rp tJ tJ tJ @@ -19707,8 +19732,7 @@ tJ tJ tJ tJ -tJ -tJ +Rp tJ UG UG @@ -19951,7 +19975,7 @@ tJ tJ tJ tJ -tJ +Rp tJ tJ UG @@ -19979,7 +20003,7 @@ bG UG tJ tJ -tJ +XT tJ UG UG @@ -20039,7 +20063,7 @@ ay ay ay UG -tJ +XT tJ tJ tJ @@ -20637,7 +20661,7 @@ tJ tJ tJ tJ -tJ +Rp tJ tJ tJ @@ -20729,7 +20753,7 @@ UG UG tJ tJ -tJ +Rp tJ UG UG @@ -20758,6 +20782,7 @@ tJ tJ tJ tJ +tJ mw ay UG @@ -20818,7 +20843,7 @@ ay UG tJ tJ -tJ +Rp tJ UG UG @@ -21151,7 +21176,7 @@ Vl tJ tJ tJ -Rp +tJ tJ tJ ay @@ -21273,7 +21298,7 @@ ay UG UG ay -Rp +tJ tJ ay ay @@ -21345,7 +21370,7 @@ ay UG mw tJ -tJ +Rp tJ tJ tJ @@ -21483,7 +21508,7 @@ mE ay UG tJ -tJ +Rp tJ tJ UG @@ -21753,7 +21778,7 @@ UG ay UG UG -tJ +Rp tJ tJ tJ @@ -21838,7 +21863,7 @@ ay ay UG tJ -tJ +XT tJ tJ UG @@ -21901,7 +21926,7 @@ ay tJ tJ tJ -tJ +Rp tJ UG UG @@ -22267,7 +22292,7 @@ tJ tJ tJ tJ -tJ +Rp tJ tJ tJ @@ -22387,7 +22412,7 @@ tJ tJ tJ tJ -tJ +Rp tJ tJ tJ @@ -22754,7 +22779,7 @@ ay UG tJ tJ -tJ +Rp tJ UG UG @@ -22899,7 +22924,7 @@ ay UG UG tJ -tJ +Rp tJ tJ UG @@ -23149,7 +23174,7 @@ ay tJ tJ tJ -tJ +Rp tJ tJ ay @@ -23281,7 +23306,7 @@ ay ay UG tJ -tJ +Rp tJ tJ Dj @@ -23455,10 +23480,9 @@ ay UG tJ tJ -Rp -tJ tJ tJ +Rp tJ tJ tJ @@ -23467,6 +23491,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -23836,7 +23861,7 @@ ay ay UG tJ -Rp +tJ tJ tJ UG @@ -23862,6 +23887,7 @@ ay ay ay UG +Rp tJ tJ tJ @@ -23900,7 +23926,7 @@ ay ay tJ tJ -tJ +Rp tJ ay ay @@ -24148,7 +24174,7 @@ ay UG tJ tJ -tJ +Rp tJ UG ay @@ -24246,7 +24272,7 @@ ay ay bG tJ -tJ +Rp tJ tJ tJ @@ -24362,6 +24388,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -24369,7 +24396,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -24467,7 +24493,7 @@ ay ay ay ay -tJ +XT ay ay ay @@ -24529,7 +24555,7 @@ ay ay UG tJ -tJ +Rp tJ tJ UG @@ -24642,7 +24668,7 @@ UG tJ tJ tJ -tJ +XT UG UG ay @@ -24678,7 +24704,7 @@ UG tJ tJ tJ -tJ +Rp ay ay ay @@ -24724,7 +24750,7 @@ ay ay tJ tJ -tJ +Rp tJ tJ UG @@ -24904,6 +24930,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -25067,7 +25094,7 @@ tJ tJ tJ tJ -tJ +Rp tJ tJ tJ @@ -25120,7 +25147,7 @@ ay UG tJ tJ -Rp +tJ tJ UG ay @@ -25189,10 +25216,12 @@ tJ tJ tJ tJ +Rp tJ tJ tJ tJ +Rp tJ tJ tJ @@ -25266,6 +25295,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -25278,6 +25308,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -25303,8 +25334,6 @@ tJ tJ tJ tJ -Rp -tJ tJ tJ tJ @@ -25340,7 +25369,7 @@ ay ay ay tJ -tJ +Rp tJ tJ tJ @@ -25368,6 +25397,7 @@ ay UG UG tJ +Rp tJ tJ tJ @@ -25381,7 +25411,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -25897,7 +25926,7 @@ ay UG tJ tJ -tJ +Rp tJ UG ay @@ -26674,7 +26703,7 @@ tJ tJ tJ tJ -tJ +XT tJ tJ tJ @@ -26778,7 +26807,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -26814,6 +26842,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -26821,6 +26850,8 @@ tJ tJ tJ tJ +Rp +tJ tJ tJ tJ @@ -26834,7 +26865,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -26889,6 +26919,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -26903,13 +26934,11 @@ tJ tJ tJ tJ +Rp tJ tJ tJ tJ -Rp -tJ -tJ tJ tJ tJ @@ -26922,6 +26951,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -26947,9 +26977,11 @@ tJ tJ tJ tJ +Rp tJ tJ tJ +wq tJ tJ ay @@ -27022,7 +27054,7 @@ tJ tJ tJ tJ -tJ +Rp tJ tJ tJ @@ -27050,7 +27082,7 @@ tJ tJ tJ tJ -tJ +Rp tJ tJ tJ @@ -27118,7 +27150,7 @@ UG UG tJ tJ -tJ +Rp tJ UG ay @@ -27700,7 +27732,7 @@ ay UG tJ tJ -Rp +tJ tJ UG ay @@ -27812,7 +27844,7 @@ UG tJ tJ tJ -tJ +Rp UG ay UG @@ -28005,7 +28037,7 @@ ay ay UG tJ -tJ +Rp tJ tJ UG @@ -28214,7 +28246,7 @@ SJ (238,1,1) = {" aU UG -UG +ay ay ay ay @@ -28325,7 +28357,7 @@ SJ (239,1,1) = {" aU UG -UG +ay UG tJ tJ @@ -28436,7 +28468,7 @@ SJ (240,1,1) = {" aU UG -UG +ay UG UG tJ @@ -28547,7 +28579,7 @@ SJ (241,1,1) = {" aU UG -UG +ay ay ay ay @@ -28586,7 +28618,7 @@ ay ay ay UG -tJ +Rp tJ tJ tJ @@ -28783,7 +28815,7 @@ ay UG tJ tJ -tJ +Rp tJ tJ ay @@ -28803,6 +28835,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -29032,7 +29065,7 @@ qh UG tJ tJ -tJ +XT tJ UG UG @@ -29115,7 +29148,7 @@ ay ay UG tJ -Rp +XT tJ tJ UG @@ -29254,7 +29287,7 @@ ay UG tJ tJ -Rp +tJ tJ mw UG @@ -29364,7 +29397,7 @@ ay ay UG tJ -tJ +Rp tJ tJ UG @@ -29447,7 +29480,7 @@ ay tJ tJ tJ -tJ +Rp tJ tJ tJ From 1b6075d08cf123fd9354d5c7c9c7ddd992aa31fa Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 7 Jan 2025 22:44:41 -0500 Subject: [PATCH 24/47] Room Updates --- .../backstreets/bossroom/clan_stronghold.dmm | 8 +++- .../backstreets/bossroom/flame_fixer.dmm | 17 ++++++-- .../backstreets/bossroom/gcorp.dmm | 8 +++- .../backstreets/bossroom/jacques.dmm | 16 ++++++-- .../backstreets/bossroom/metal_fixer.dmm | 17 ++++++-- .../backstreets/bossroom/robot.dmm | 8 +++- .../backstreets/bossroom/slime_office.dmm | 8 +++- .../backstreets/connector/apartments_ca.dmm | 36 +++++++++++------ .../backstreets/connector/fort_knox.dmm | 20 +++++---- .../backstreets/connector/mountain_ca.dmm | 34 +++++++++++++--- .../backstreets/connector/rat_cave.dmm | 33 +++++++++------ .../backstreets/connector/sweeper_ca.dmm | 21 +++++++--- .../backstreets/large_north/apartment_lna.dmm | 8 +++- .../backstreets/large_north/apartment_lnb.dmm | 12 ++++-- .../large_north/blade_lineage_ln.dmm | 12 ++++-- .../backstreets/large_north/electric_room.dmm | 8 +++- .../large_north/kcorp_warehouse.dmm | 2 + .../backstreets/large_north/limbus_lna.dmm | 8 +++- .../backstreets/large_north/robot_lna.dmm | 2 + .../backstreets/large_north/robot_lnb.dmm | 32 ++++++++++----- .../backstreets/large_north/scorp.dmm | 8 +++- .../large_north/scorp_warehouse.dmm | 8 +++- .../backstreets/large_north/town_lna.dmm | 13 +++++- .../backstreets/large_south/apartment_lsa.dmm | 8 +++- .../backstreets/large_south/apartment_lsb.dmm | 14 +++++-- .../backstreets/large_south/bongy.dmm | 9 ++++- .../backstreets/large_south/gcorp_armory.dmm | 8 +++- .../large_south/prosthetic_factory.dmm | 8 +++- .../backstreets/large_south/robot_castle.dmm | 12 +++++- .../backstreets/large_south/supermarket.dmm | 15 ++++--- .../backstreets/medium_east/church.dmm | 8 +++- .../backstreets/medium_east/clan_mechs.dmm | 8 +++- .../backstreets/medium_east/kcorp_storage.dmm | 8 +++- .../backstreets/medium_east/roach_mafia.dmm | 8 +++- .../backstreets/medium_east/robot_mea.dmm | 8 +++- .../backstreets/medium_east/shrimp_office.dmm | 8 +++- .../backstreets/medium_east/workshop_me.dmm | 8 +++- .../backstreets/medium_east/worm_cave.dmm | 8 +++- .../medium_east/zwei_office_mea.dmm | 12 ++++-- .../medium_east/zwei_office_meb.dmm | 8 +++- .../backstreets/medium_north/buffet.dmm | 12 ++++-- .../medium_north/clan_outskirts.dmm | 6 ++- .../backstreets/medium_north/fairies.dmm | 8 +++- .../backstreets/medium_north/fishing_mn.dmm | 9 ++++- .../medium_north/gmanager_house.dmm | 8 +++- .../medium_north/hana_office_mn.dmm | 8 +++- .../backstreets/medium_north/rage_cage.dmm | 8 +++- .../backstreets/medium_north/rat_mna.dmm | 9 +++-- .../backstreets/medium_north/shrimp_gym.dmm | 12 ++++-- .../backstreets/medium_north/slime_hut.dmm | 11 ++++- .../backstreets/medium_north/workshop_mn.dmm | 8 +++- .../backstreets/medium_south/apartmentmsa.dmm | 8 +++- .../backstreets/medium_south/clan_storage.dmm | 8 +++- .../backstreets/medium_south/eyes_temple.dmm | 12 +++++- .../backstreets/medium_south/lcorp_ruin.dmm | 8 +++- .../backstreets/medium_south/rat_msa.dmm | 8 +++- .../medium_south/seven_office_msa.dmm | 11 +++-- .../backstreets/medium_south/theatre.dmm | 6 ++- .../backstreets/medium_south/town_msa.dmm | 8 +++- .../medium_west/butcher_medium.dmm | 8 +++- .../backstreets/medium_west/clan_cages.dmm | 8 +++- .../backstreets/medium_west/lcorp_office.dmm | 8 +++- .../backstreets/medium_west/mini_beach.dmm | 19 +++++---- .../backstreets/medium_west/sweeper_pen.dmm | 38 +++++++++++++----- .../backstreets/medium_west/town_mwa.dmm | 31 +++++++++----- .../backstreets/medium_west/town_mwb.dmm | 17 ++++++-- .../backstreets/small_east/limbus_sea.dmm | 8 +++- .../backstreets/small_east/noodlebar.dmm | 8 +++- .../backstreets/small_east/oceanic_se.dmm | 8 +++- .../backstreets/small_east/paper_pushed.dmm | 8 +++- .../backstreets/small_east/rat_sea.dmm | 10 ++++- .../backstreets/small_north/apartment_sna.dmm | 8 +++- .../backstreets/small_north/apartment_snb.dmm | 10 +++-- .../backstreets/small_north/bird_box.dmm | 8 +++- .../backstreets/small_north/coffee_break.dmm | 8 +++- .../small_north/kcorp_stash_sna.dmm | 8 +++- .../backstreets/small_north/pet_store.dmm | 8 +++- .../small_north/small_clan_hideout.dmm | 8 +++- .../backstreets/small_north/snow_forest.dmm | 37 +++++++++++------ .../backstreets/small_north/sweeper_solo.dmm | 10 ++++- .../small_south/candlelit_dinner.dmm | 23 +++++++---- .../small_south/human_experiment.dmm | 8 +++- .../small_south/jumpscare_closet.dmm | 14 ++++++- .../backstreets/small_south/lcorp_tomb.dmm | 8 +++- .../backstreets/small_south/robot_ssa.dmm | 8 +++- .../small_south/wcorp_base_ssa.dmm | 10 +++-- .../backstreets/small_west/dry_cleaners.dmm | 8 +++- .../backstreets/small_west/freezer_sw.dmm | 11 ++++- .../backstreets/small_west/gcorp_swa.dmm | 8 +++- .../backstreets/small_west/rat_swa.dmm | 8 +++- .../backstreets/small_west/rat_swb.dmm | 8 +++- .../small_west/risk_rain_reference_robot.dmm | 8 +++- .../backstreets/small_west/robot_swa.dmm | 8 +++- .../backstreets/small_west/robot_swb.dmm | 19 ++++++--- .../backstreets/small_west/runaway_bird.dmm | 8 +++- .../objects/structures/signs/signs_warning.dm | 26 ++++++++++++ icons/obj/decals.dmi | Bin 39694 -> 40790 bytes 97 files changed, 831 insertions(+), 293 deletions(-) diff --git a/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm b/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm index 35be703d23ac..85184e0c298f 100644 --- a/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm @@ -647,6 +647,10 @@ /obj/structure/statue/custom, /turf/open/floor/carpet/black, /area/city/backstreets_room) +"Am" = ( +/obj/structure/sign/warning/backstreets_4, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_room) "Az" = ( /obj/machinery/light{ dir = 8 @@ -1255,7 +1259,7 @@ nA mI mI mI -xO +Am "} (10,1,1) = {" xO @@ -1321,7 +1325,7 @@ qR pg vL vL -xO +Am "} (13,1,1) = {" xO diff --git a/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm b/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm index f4db0135de61..95c754c9a128 100644 --- a/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm @@ -311,6 +311,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/beach/sand, /area/city/backstreets_room) +"IP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/mineral_door/wood, +/turf/open/floor/carpet/red, +/area/city/backstreets_room) "Ki" = ( /obj/structure/table/wood/fancy/red, /obj/effect/decal/cleanable/dirt/dust, @@ -335,6 +340,10 @@ }, /turf/open/floor/holofloor/carpet, /area/city/backstreets_room) +"Lp" = ( +/obj/structure/sign/warning/backstreets_4, +/turf/closed/indestructible/wood, +/area/city/backstreets_room) "LY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wood{ @@ -712,7 +721,7 @@ fZ TB LY KZ -KZ +Lp "} (10,1,1) = {" Eo @@ -734,7 +743,7 @@ rO PJ Zt PJ -PJ +IP "} (11,1,1) = {" Eo @@ -756,7 +765,7 @@ rO PJ Zt PJ -PJ +IP "} (12,1,1) = {" Eo @@ -778,7 +787,7 @@ Gc Pn qG KZ -KZ +Lp "} (13,1,1) = {" Eo diff --git a/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm b/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm index 7578e946d880..38b2597e9ecc 100644 --- a/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm @@ -65,6 +65,10 @@ /obj/item/stack/spacecash/c200, /turf/open/floor/engine, /area/city/backstreets_room) +"lr" = ( +/obj/structure/sign/warning/backstreets_4, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "oq" = ( /obj/item/workshop_mod/curing/pale, /turf/open/floor/plasteel/dark, @@ -419,7 +423,7 @@ An ZT ZT ZT -An +lr "} (11,1,1) = {" An @@ -441,7 +445,7 @@ An ZT ZT ZT -An +lr "} (12,1,1) = {" An diff --git a/_maps/RandomRooms/backstreets/bossroom/jacques.dmm b/_maps/RandomRooms/backstreets/bossroom/jacques.dmm index dfd40bdd09e7..75e3739befc5 100644 --- a/_maps/RandomRooms/backstreets/bossroom/jacques.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/jacques.dmm @@ -101,6 +101,10 @@ /obj/item/stack/spacecash/c100, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) +"tF" = ( +/obj/machinery/door/airlock/cult/unruned/glass/friendly, +/turf/open/floor/plasteel/cult, +/area/city/backstreets_room) "us" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -430,6 +434,10 @@ }, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) +"Qz" = ( +/obj/structure/sign/warning/backstreets_4, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "Rb" = ( /obj/structure/chair/pew{ dir = 1 @@ -761,7 +769,7 @@ gQ Am Bh do -EP +Qz "} (10,1,1) = {" An @@ -782,8 +790,8 @@ gQ gQ gQ OJ -EP Fy +tF "} (11,1,1) = {" An @@ -804,8 +812,8 @@ gQ gQ gQ OJ -EP Fy +tF "} (12,1,1) = {" An @@ -827,7 +835,7 @@ gQ AI cb do -EP +Qz "} (13,1,1) = {" An diff --git a/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm b/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm index 7e403f988b92..2bb11868480b 100644 --- a/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm @@ -81,6 +81,10 @@ }, /turf/open/floor/stone, /area/city/backstreets_room) +"o" = ( +/obj/structure/sign/warning/backstreets_4, +/turf/closed/wall/mineral/iron, +/area/city/backstreets_room) "p" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wideplating/dark/corner{ @@ -126,6 +130,11 @@ }, /turf/open/floor/stone, /area/city/backstreets_room) +"z" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/mineral_door/iron, +/turf/open/floor/carpet/royalblack, +/area/city/backstreets_room) "A" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ordeal/green_bot{ @@ -484,7 +493,7 @@ P H g b -b +o "} (10,1,1) = {" r @@ -506,7 +515,7 @@ V A V V -V +z "} (11,1,1) = {" r @@ -528,7 +537,7 @@ V A V V -V +z "} (12,1,1) = {" r @@ -550,7 +559,7 @@ I K g b -b +o "} (13,1,1) = {" T diff --git a/_maps/RandomRooms/backstreets/bossroom/robot.dmm b/_maps/RandomRooms/backstreets/bossroom/robot.dmm index 60d7bc7c01cc..f6fedfbee21d 100644 --- a/_maps/RandomRooms/backstreets/bossroom/robot.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/robot.dmm @@ -1,4 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"bJ" = ( +/obj/structure/sign/warning/backstreets_4, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "co" = ( /obj/effect/landmark/cratespawn/corpo, /turf/open/floor/plasteel/dark, @@ -392,7 +396,7 @@ SY ZT An ZT -An +bJ "} (11,1,1) = {" An @@ -414,7 +418,7 @@ SY ZT An ZT -An +bJ "} (12,1,1) = {" An diff --git a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm index f7ba036930f1..c973777988cc 100644 --- a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm @@ -1599,6 +1599,12 @@ /obj/structure/spider/stickyweb/genetic, /turf/open/floor/carpet/green, /area/city/backstreets_room) +"SS" = ( +/obj/structure/sign/warning/backstreets_4, +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) "Tb" = ( /obj/structure/table/wood/fancy/green, /obj/effect/turf_decal/siding/green{ @@ -2039,7 +2045,7 @@ tG Tb oN Tp -Fi +SS "} (13,1,1) = {" us diff --git a/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm b/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm index f5a505753c91..5691f1f84cd7 100644 --- a/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm @@ -19,6 +19,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/city/backstreets_room) +"g" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/rock, +/area/city/backstreets_room) "j" = ( /obj/structure/dresser, /turf/open/floor/wood, @@ -50,6 +54,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/city/backstreets_room) +"r" = ( +/obj/structure/mineral_door/iron, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) "t" = ( /obj/structure/bed/maint, /obj/effect/decal/cleanable/dirt/dust, @@ -90,6 +98,10 @@ /obj/item/kitchen/knife, /turf/open/floor/wood, /area/city/backstreets_room) +"F" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "G" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -159,9 +171,9 @@ a a a a -Q -Q -Q +F +r +g e e e @@ -238,7 +250,7 @@ a a "} (6,1,1) = {" -Q +F Q a W @@ -252,10 +264,10 @@ a Q Q Q -Q +F "} (7,1,1) = {" -Q +r U a m @@ -269,10 +281,10 @@ a Q Q Q -Q +r "} (8,1,1) = {" -Q +g Q A W @@ -286,7 +298,7 @@ Q Q O Q -Q +g "} (9,1,1) = {" e @@ -363,9 +375,9 @@ e e e e -Q -Q -Q +g +r +g e e a diff --git a/_maps/RandomRooms/backstreets/connector/fort_knox.dmm b/_maps/RandomRooms/backstreets/connector/fort_knox.dmm index cd339ccd54c1..ad6f3c4e4900 100644 --- a/_maps/RandomRooms/backstreets/connector/fort_knox.dmm +++ b/_maps/RandomRooms/backstreets/connector/fort_knox.dmm @@ -296,6 +296,10 @@ /obj/effect/turf_decal/delivery/white, /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) +"U" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "W" = ( /obj/structure/railing{ dir = 4 @@ -343,11 +347,11 @@ a a a a -a +U Q f l -a +U a a a @@ -406,7 +410,7 @@ a a "} (5,1,1) = {" -a +U a Q Q @@ -420,7 +424,7 @@ Y w M a -a +U "} (6,1,1) = {" Q @@ -474,7 +478,7 @@ Q Q "} (9,1,1) = {" -a +U a Q Q @@ -488,7 +492,7 @@ l Q Q a -a +U "} (10,1,1) = {" a @@ -547,11 +551,11 @@ a a a a -a +U Q Q Q -a +U a a a diff --git a/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm b/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm index bbd2058cf6f4..b4a39cf87791 100644 --- a/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm @@ -24,6 +24,7 @@ /obj/effect/decal/cleanable/blood/tracks{ dir = 6 }, +/obj/structure/mineral_door/iron, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "dA" = ( @@ -137,6 +138,11 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"jL" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "kv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/gibs/up, @@ -228,7 +234,8 @@ pixel_x = -3; pixel_y = -8 }, -/turf/open/floor/plating/dirt/jungle/dark, +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, /area/city/backstreets_room) "rP" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -299,6 +306,10 @@ }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"yd" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "yf" = ( /obj/structure/flora/rock/jungle, /turf/open/floor/plating/dirt/jungle/dark, @@ -327,6 +338,11 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"BJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/mineral_door/iron, +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_room) "Cz" = ( /mob/living/simple_animal/hostile/ordeal/indigo_dawn{ name = "sweeper scout" @@ -571,6 +587,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"VN" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "VO" = ( /mob/living/simple_animal/hostile/ordeal/indigo_noon, /turf/open/floor/plating/dirt/jungle/dark, @@ -619,9 +641,9 @@ dA dA dA dA -XV -XV -VO +jL +BJ +yd dA dA dA @@ -657,7 +679,7 @@ Tq on Rd XV -Rd +VO yo dA XA @@ -825,7 +847,7 @@ dA eM rO bh -rP +VN dA dA dA diff --git a/_maps/RandomRooms/backstreets/connector/rat_cave.dmm b/_maps/RandomRooms/backstreets/connector/rat_cave.dmm index 2bfef9152a63..1a2dace3a4c0 100644 --- a/_maps/RandomRooms/backstreets/connector/rat_cave.dmm +++ b/_maps/RandomRooms/backstreets/connector/rat_cave.dmm @@ -2,6 +2,10 @@ "a" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"c" = ( +/obj/structure/mineral_door/iron, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) "e" = ( /turf/closed/mineral/ash_rock, /area/city/backstreets_room) @@ -38,6 +42,10 @@ /obj/item/trash/can/food/peaches, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) +"C" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "D" = ( /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) @@ -60,7 +68,6 @@ /area/city/backstreets_room) "K" = ( /obj/structure/bed/maint, -/obj/item/reagent_containers/food/drinks/soda_cans/oceanwave/spacedrugs, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "Q" = ( @@ -88,9 +95,9 @@ e e a a -D -D -D +C +c +C a a a @@ -167,7 +174,7 @@ e a "} (6,1,1) = {" -D +C D D h @@ -181,10 +188,10 @@ D D D D -D +C "} (7,1,1) = {" -D +c D D e @@ -198,10 +205,10 @@ D D y D -D +c "} (8,1,1) = {" -D +e e e e @@ -215,7 +222,7 @@ D D D D -D +C "} (9,1,1) = {" e @@ -292,9 +299,9 @@ a e e e -Q -D -D +e +c +C a a a diff --git a/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm b/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm index eb137b4e3683..3069fd458af8 100644 --- a/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm @@ -67,6 +67,11 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"s" = ( +/obj/structure/stone_tile/slab/cracked, +/obj/structure/mineral_door/iron, +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/city/backstreets_room) "t" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/plating/dirt/jungle/dark, @@ -129,6 +134,10 @@ /obj/structure/stone_tile/slab/cracked, /turf/open/floor/plating/dirt/jungle/wasteland, /area/city/backstreets_room) +"K" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "L" = ( /obj/effect/decal/cleanable/blood/footprints{ dir = 3 @@ -222,9 +231,9 @@ U U U a -I -I -S +K +s +K a U U @@ -426,9 +435,9 @@ U U U a -S -I -S +K +s +K a U U diff --git a/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm b/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm index 987f1adbef3f..5f81f3cea83b 100644 --- a/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm @@ -226,6 +226,10 @@ "L" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"M" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "N" = ( /obj/structure/mineral_door/wood, /turf/open/indestructible/hoteltile, @@ -431,7 +435,7 @@ p b b A -L +M "} (11,1,1) = {" L @@ -451,7 +455,7 @@ L A k b -L +M "} (13,1,1) = {" L diff --git a/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm b/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm index 6534af04c76a..024203d98bc4 100644 --- a/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm +++ b/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm @@ -4,6 +4,10 @@ /obj/item/storage/firstaid/revival, /turf/open/floor/wood, /area/city/backstreets_room) +"b" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "e" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -222,7 +226,7 @@ Q L x Z -L +b "} (3,1,1) = {" L @@ -242,7 +246,7 @@ C L F U -L +b "} (5,1,1) = {" L @@ -332,7 +336,7 @@ L O V I -L +b "} (14,1,1) = {" L @@ -352,7 +356,7 @@ L z V w -L +b "} (16,1,1) = {" L diff --git a/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm b/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm index 1c28a119be90..1c844703cb7d 100644 --- a/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm +++ b/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm @@ -113,6 +113,10 @@ /obj/structure/lootcrate/money, /turf/open/floor/wood, /area/city/backstreets_room) +"GD" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "HL" = ( /obj/structure/lootcrate/syndicate, /turf/open/floor/wood, @@ -262,7 +266,7 @@ Ti Ti Ti Ti -gl +GD "} (2,1,1) = {" Ti @@ -292,7 +296,7 @@ tH tH Jj tH -gl +GD "} (5,1,1) = {" Ti @@ -382,7 +386,7 @@ tH Qu Jj tH -gl +GD "} (14,1,1) = {" Ti @@ -412,5 +416,5 @@ Ti Ti Ti Ti -gl +GD "} diff --git a/_maps/RandomRooms/backstreets/large_north/electric_room.dmm b/_maps/RandomRooms/backstreets/large_north/electric_room.dmm index 06130a32fc0d..322029bd9cb2 100644 --- a/_maps/RandomRooms/backstreets/large_north/electric_room.dmm +++ b/_maps/RandomRooms/backstreets/large_north/electric_room.dmm @@ -292,6 +292,10 @@ /obj/effect/landmark/cratespawn/corpo, /turf/open/floor/facility/dark, /area/city/backstreets_room) +"Lh" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "ND" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/blue{ @@ -459,7 +463,7 @@ eF Kl uW og -yN +Lh "} (3,1,1) = {" yN @@ -489,7 +493,7 @@ BS NF Oe qd -yN +Lh "} (6,1,1) = {" yN diff --git a/_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm b/_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm index 3525b4f0f337..99c1d78641b0 100644 --- a/_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm +++ b/_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm @@ -90,6 +90,7 @@ pixel_x = 16; pixel_y = -3 }, +/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "o" = ( @@ -98,6 +99,7 @@ pixel_x = -9; pixel_y = -3 }, +/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "p" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm b/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm index fbef14fe7f26..6c074bd14a94 100644 --- a/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm @@ -1,4 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "c" = ( /obj/structure/rack, /obj/item/ego_weapon/shield/lccb, @@ -190,9 +194,9 @@ L L L L -L +a u -L +a L "} (11,1,1) = {" diff --git a/_maps/RandomRooms/backstreets/large_north/robot_lna.dmm b/_maps/RandomRooms/backstreets/large_north/robot_lna.dmm index 9a4b3ac2e9c6..f7feea0cdbbd 100644 --- a/_maps/RandomRooms/backstreets/large_north/robot_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/robot_lna.dmm @@ -85,6 +85,7 @@ pixel_x = 16; pixel_y = -3 }, +/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "o" = ( @@ -93,6 +94,7 @@ pixel_x = -9; pixel_y = -3 }, +/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "p" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm b/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm index ba311e35a67c..92d8a3dd1851 100644 --- a/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm +++ b/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm @@ -7,7 +7,9 @@ /turf/open/floor/plating, /area/city/backstreets_room) "k" = ( -/obj/structure/fence/door, +/obj/structure/fence/door{ + resistance_flags = 64 + }, /turf/open/floor/plating/rust, /area/city/backstreets_room) "n" = ( @@ -23,6 +25,10 @@ /obj/effect/decal/cleanable/robot_debris, /turf/open/floor/plating, /area/city/backstreets_room) +"u" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "x" = ( /obj/effect/landmark/cratespawn/corpo, /turf/open/floor/plating, @@ -75,9 +81,15 @@ /obj/structure/lootcrate/tres, /turf/open/floor/plating/rust, /area/city/backstreets_room) +"U" = ( +/obj/structure/lootcrate/money, +/obj/structure/lootcrate/money, +/turf/open/floor/plating, +/area/city/backstreets_room) "Y" = ( /obj/structure/fence{ - dir = 8 + dir = 8; + resistance_flags = 64 }, /turf/open/floor/plating/rust, /area/city/backstreets_room) @@ -90,7 +102,7 @@ L L L L -L +u "} (2,1,1) = {" L @@ -114,8 +126,8 @@ O "} (4,1,1) = {" L -a -a +b +U N D n @@ -125,7 +137,7 @@ O (5,1,1) = {" L r -b +D n n n @@ -140,7 +152,7 @@ L L L L -L +u "} (7,1,1) = {" L @@ -174,7 +186,7 @@ O "} (10,1,1) = {" L -b +U S a a @@ -190,7 +202,7 @@ L L L L -L +u "} (12,1,1) = {" L @@ -240,5 +252,5 @@ L L L L -L +u "} diff --git a/_maps/RandomRooms/backstreets/large_north/scorp.dmm b/_maps/RandomRooms/backstreets/large_north/scorp.dmm index 2719b15bd792..8271c8fd5adc 100644 --- a/_maps/RandomRooms/backstreets/large_north/scorp.dmm +++ b/_maps/RandomRooms/backstreets/large_north/scorp.dmm @@ -164,6 +164,10 @@ /obj/item/ego_weapon/ranged/shrimp/assault, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) +"B" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "C" = ( /obj/machinery/door/airlock/silver/glass, /turf/open/floor/plasteel/rockvault/alien{ @@ -321,7 +325,7 @@ W W q Z -L +B "} (3,1,1) = {" L @@ -341,7 +345,7 @@ x x x P -L +B "} (5,1,1) = {" L diff --git a/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm b/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm index bab5a6c8750a..616206eb1bc5 100644 --- a/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm +++ b/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm @@ -48,6 +48,10 @@ /mob/living/simple_animal/hostile/shrimp, /turf/open/floor/carpet/purple, /area/city/backstreets_room) +"s" = ( +/obj/structure/sign/warning/backstreets_4, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "t" = ( /obj/effect/turf_decal/siding/purple{ dir = 6 @@ -168,7 +172,7 @@ L L L L -L +s "} (2,1,1) = {" L @@ -208,7 +212,7 @@ L L L L -L +s "} (6,1,1) = {" L diff --git a/_maps/RandomRooms/backstreets/large_north/town_lna.dmm b/_maps/RandomRooms/backstreets/large_north/town_lna.dmm index 978f255fb202..eab6c1b1e4a0 100644 --- a/_maps/RandomRooms/backstreets/large_north/town_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/town_lna.dmm @@ -1,4 +1,8 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"av" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "bk" = ( /obj/structure/meatfloor, /mob/living/simple_animal/hostile/lovetown, @@ -246,6 +250,11 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/rust, /area/city/backstreets_room) +"EF" = ( +/obj/effect/rune/manifest, +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "FA" = ( /obj/structure/meatfloor, /obj/item/food/meat/slab/monkey, @@ -426,7 +435,7 @@ Eu lB hG br -Vw +EF "} (8,1,1) = {" ta @@ -456,7 +465,7 @@ Ol wr Ks cA -ta +av "} (11,1,1) = {" ta diff --git a/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm b/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm index a3e57d50939b..69d33c99f2b2 100644 --- a/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm +++ b/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm @@ -63,6 +63,10 @@ }, /turf/open/floor/wood, /area/city/backstreets_room) +"eM" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "ga" = ( /obj/structure/chair/sofa/left{ dir = 4 @@ -417,7 +421,7 @@ /area/city/backstreets_room) (1,1,1) = {" -zv +eM zv zv CK @@ -457,7 +461,7 @@ IG zv "} (5,1,1) = {" -zv +eM zv zv zv diff --git a/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm b/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm index ed3a2390f6b7..dcfec217bee2 100644 --- a/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm +++ b/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm @@ -20,6 +20,7 @@ /obj/item/shard, /obj/item/stack/sheet/silk, /obj/item/weaponcrafting/silkstring, +/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/city/backstreets_room) "cX" = ( @@ -57,6 +58,10 @@ }, /turf/open/floor/carpet/black, /area/city/backstreets_room) +"hj" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "hx" = ( /obj/effect/turf_decal/weather/dirt{ dir = 3 @@ -202,6 +207,7 @@ /area/city/backstreets_room) "CK" = ( /obj/item/stack/sheet/mineral/wood, +/obj/structure/mineral_door/wood, /turf/open/floor/wood, /area/city/backstreets_room) "CM" = ( @@ -393,7 +399,7 @@ hQ zv "} (3,1,1) = {" -zv +hj bS YJ jR @@ -413,7 +419,7 @@ IG zv "} (5,1,1) = {" -zv +hj dh dR iL @@ -473,7 +479,7 @@ zv zv "} (11,1,1) = {" -zv +hj WL Cx QG @@ -513,7 +519,7 @@ cf zv "} (15,1,1) = {" -zv +hj Lg Cx QG diff --git a/_maps/RandomRooms/backstreets/large_south/bongy.dmm b/_maps/RandomRooms/backstreets/large_south/bongy.dmm index aed2ccf94d41..d45dfe05b8df 100644 --- a/_maps/RandomRooms/backstreets/large_south/bongy.dmm +++ b/_maps/RandomRooms/backstreets/large_south/bongy.dmm @@ -211,6 +211,11 @@ /obj/item/kitchen/rollingpin, /turf/open/floor/facility/white, /area/city/backstreets_room) +"F" = ( +/obj/effect/spawner/structure/window, +/obj/structure/sign/warning/backstreets_2, +/turf/open/floor/plating, +/area/city/backstreets_room) "G" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ @@ -421,7 +426,7 @@ R L "} (3,1,1) = {" -n +F a w z @@ -441,7 +446,7 @@ P L "} (5,1,1) = {" -n +F r b O diff --git a/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm b/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm index 12be8170a45b..7fecb1f532a7 100644 --- a/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm +++ b/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm @@ -43,6 +43,10 @@ /obj/machinery/bsa/back, /turf/open/floor/plating, /area/city/backstreets_room) +"G" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "J" = ( /obj/structure/table, /obj/item/documents, @@ -202,7 +206,7 @@ O L "} (14,1,1) = {" -L +G L L L @@ -222,7 +226,7 @@ O L "} (16,1,1) = {" -L +G L L L diff --git a/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm b/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm index 816e18285086..bbc0e4bc2f91 100644 --- a/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm +++ b/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm @@ -315,6 +315,10 @@ "R" = ( /turf/open/floor/holofloor/dark, /area/city/backstreets_room) +"S" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "T" = ( /mob/living/simple_animal/hostile/ordeal/green_bot{ name = "guard bot" @@ -464,7 +468,7 @@ L L "} (12,1,1) = {" -L +S i y R @@ -494,7 +498,7 @@ X L "} (15,1,1) = {" -L +S y T R diff --git a/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm b/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm index 3c64b76f42be..e08e2198a391 100644 --- a/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm +++ b/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm @@ -130,6 +130,7 @@ pixel_x = -9; pixel_y = -3 }, +/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "ig" = ( @@ -564,6 +565,15 @@ }, /turf/open/floor/stone, /area/city/backstreets_room) +"JM" = ( +/obj/structure/fence{ + dir = 4; + pixel_x = 23; + pixel_y = -3 + }, +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "JU" = ( /obj/effect/decal/cleanable/blood{ pixel_x = 7; @@ -890,7 +900,7 @@ Vr Xe "} (5,1,1) = {" -ng +JM Xi yS Ht diff --git a/_maps/RandomRooms/backstreets/large_south/supermarket.dmm b/_maps/RandomRooms/backstreets/large_south/supermarket.dmm index 143f83dd6f02..0d44c66d7df0 100644 --- a/_maps/RandomRooms/backstreets/large_south/supermarket.dmm +++ b/_maps/RandomRooms/backstreets/large_south/supermarket.dmm @@ -41,8 +41,7 @@ /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "n" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/shuttle, +/turf/closed/indestructible/fakeglass, /area/city/backstreets_room) "o" = ( /obj/structure/table/reinforced, @@ -54,6 +53,10 @@ /obj/item/dice/d6/space, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) +"r" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) "t" = ( /obj/structure/rack, /obj/item/vending_refill/medical, @@ -118,7 +121,9 @@ /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "U" = ( -/obj/machinery/door/airlock/glass_large, +/obj/machinery/door/airlock/glass_large{ + resistance_flags = 64 + }, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "V" = ( @@ -196,7 +201,7 @@ G L "} (7,1,1) = {" -n +r b b b @@ -226,7 +231,7 @@ X L "} (10,1,1) = {" -n +r b b b diff --git a/_maps/RandomRooms/backstreets/medium_east/church.dmm b/_maps/RandomRooms/backstreets/medium_east/church.dmm index 3cb0e45ff615..d029fffa15d2 100644 --- a/_maps/RandomRooms/backstreets/medium_east/church.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/church.dmm @@ -96,6 +96,10 @@ dir = 4 }, /area/city/backstreets_room) +"E" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "H" = ( /obj/structure/mineral_door/iron, /turf/open/floor/plasteel/dark, @@ -158,9 +162,9 @@ x x x x -x +E H -x +E "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm b/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm index 9e8fbc4f823d..4ef3dfb11807 100644 --- a/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm @@ -73,6 +73,10 @@ "E" = ( /turf/open/floor/carpet/red, /area/city/backstreets_room) +"F" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "H" = ( /obj/structure/mecha_wreckage/reticence, /obj/structure/window/reinforced/spawner/east, @@ -137,9 +141,9 @@ a a a a -a +F n -a +F a a a diff --git a/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm b/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm index fdaf109a1699..b2271643ea30 100644 --- a/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm @@ -57,6 +57,10 @@ /obj/structure/chair/office, /turf/open/floor/carpet/green, /area/city/backstreets_room) +"w" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -179,7 +183,7 @@ x f P P -x +w L c S @@ -203,7 +207,7 @@ x g H l -x +w Y a A diff --git a/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm b/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm index 043f05708322..950edd45c36b 100644 --- a/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm @@ -31,6 +31,10 @@ /obj/structure/mineral_door/wood, /turf/open/floor/carpet/orange, /area/city/backstreets_room) +"N" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "O" = ( /obj/structure/table/wood/fancy, /obj/item/toy/cards/deck/cas, @@ -55,10 +59,10 @@ x x x -x +N H H -x +N x x x diff --git a/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm b/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm index e0d9d143e674..49d8553c1574 100644 --- a/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm @@ -34,6 +34,10 @@ "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"y" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "C" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/indestructible/reinforced, @@ -124,9 +128,9 @@ x x x x -x +y H -x +y "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm b/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm index 3a55ec5893a2..79ff0c56acda 100644 --- a/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm @@ -34,6 +34,10 @@ /mob/living/simple_animal/hostile/shrimp, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) +"B" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "C" = ( /obj/structure/lootcrate/money, /turf/open/floor/carpet/royalblack, @@ -75,10 +79,10 @@ x x x -x +B H H -x +B x x x diff --git a/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm b/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm index 13c964a01667..b2bae09b34a1 100644 --- a/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm @@ -55,6 +55,10 @@ "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"A" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "D" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/humanoid/rat/hammer, @@ -101,10 +105,10 @@ x x x x -x +A H H -x +A "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm b/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm index c80a4b5ccd2e..2e3819f409f2 100644 --- a/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm @@ -54,6 +54,10 @@ /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) +"Q" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "Y" = ( /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) @@ -66,9 +70,9 @@ x H x a -x +Q E -x +Q "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm b/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm index 8c5e2c1b87f3..bbe0ff9e1dde 100644 --- a/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm @@ -33,6 +33,10 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/carpet/blue, /area/city/backstreets_room) +"D" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "H" = ( /obj/machinery/door/airlock/command, /turf/open/floor/carpet/blue, @@ -81,16 +85,16 @@ /area/city/backstreets_room) (1,1,1) = {" -x +D H H +D x x -x -x +D H H -x +D "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm b/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm index 9cea27c99000..465b35eaddd1 100644 --- a/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm @@ -46,6 +46,10 @@ "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"z" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "A" = ( /obj/structure/table/wood, /turf/open/floor/carpet/blue, @@ -128,10 +132,10 @@ x x x x -x +z H H -x +z "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_north/buffet.dmm b/_maps/RandomRooms/backstreets/medium_north/buffet.dmm index 5569e731fa6f..12dafcd0eb95 100644 --- a/_maps/RandomRooms/backstreets/medium_north/buffet.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/buffet.dmm @@ -25,6 +25,10 @@ /obj/item/food/crab_rangoon, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) +"o" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "p" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/burger/bigbite, @@ -137,7 +141,7 @@ E M Y U -Q +o "} (3,1,1) = {" Q @@ -153,7 +157,7 @@ O U D x -Q +o "} (5,1,1) = {" Q @@ -177,7 +181,7 @@ H U N U -Q +o "} (8,1,1) = {" Q @@ -193,7 +197,7 @@ z j r x -Q +o "} (10,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm b/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm index d92d5e06634f..4ceebeab1278 100644 --- a/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm @@ -33,6 +33,10 @@ /mob/living/simple_animal/hostile/clan/scout, /turf/open/floor/wood, /area/city/backstreets_room) +"y" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/wood, +/area/city/backstreets_room) "C" = ( /turf/open/floor/grass/fakebasalt, /area/city/backstreets_room) @@ -78,7 +82,7 @@ C u p E -u +y c c "} diff --git a/_maps/RandomRooms/backstreets/medium_north/fairies.dmm b/_maps/RandomRooms/backstreets/medium_north/fairies.dmm index b4f039486291..5b35c68f2934 100644 --- a/_maps/RandomRooms/backstreets/medium_north/fairies.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/fairies.dmm @@ -48,6 +48,10 @@ /obj/structure/flora/ausbushes/grassybush, /turf/open/floor/grass/fairy, /area/city/backstreets_room) +"N" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "Q" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -96,7 +100,7 @@ x Y t c -Q +N "} (5,1,1) = {" Q @@ -120,7 +124,7 @@ t t t t -Q +N "} (8,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm index d7f52f5a0dcc..22c41ff1a68a 100644 --- a/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm @@ -1,5 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( +/obj/machinery/door/airlock/vault, /turf/open/floor/facility/halls, /area/city/backstreets_room) "j" = ( @@ -7,6 +8,10 @@ /obj/item/fishing_rod/gold, /turf/open/water/deep/polluted, /area/city/backstreets_room) +"o" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "u" = ( /obj/structure/lattice/catwalk, /obj/item/fishing_net/hicap, @@ -100,7 +105,7 @@ B x x x -Q +o "} (9,1,1) = {" Q @@ -116,5 +121,5 @@ Q Q Q Q -Q +o "} diff --git a/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm b/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm index 83fb6d0c106d..a76438df00d6 100644 --- a/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm @@ -46,6 +46,10 @@ /obj/item/paper_bin, /turf/open/floor/carpet/purple, /area/city/backstreets_room) +"z" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "B" = ( /obj/structure/chair/wood, /turf/open/floor/carpet/purple, @@ -137,7 +141,7 @@ B x f k -Q +z "} (9,1,1) = {" Q @@ -153,5 +157,5 @@ Q Q Q Q -Q +z "} diff --git a/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm index f20ccaaa5fdb..e0c99ecba062 100644 --- a/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm @@ -43,6 +43,10 @@ /obj/structure/table/reinforced, /turf/open/floor/facility/white, /area/city/backstreets_room) +"y" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/wall/mineral/plastitanium/nosmooth, +/area/city/backstreets_room) "B" = ( /mob/living/simple_animal/hostile/ordeal/green_bot_big, /turf/open/floor/facility/white, @@ -120,7 +124,7 @@ s x t B -c +y "} (5,1,1) = {" Q @@ -144,7 +148,7 @@ P x B k -c +y "} (8,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm b/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm index a0a878fb43a9..8d672077f49d 100644 --- a/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm @@ -12,6 +12,10 @@ /obj/effect/spawner/lootdrop/cigbutt, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) +"e" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "k" = ( /mob/living/simple_animal/hostile/humanoid/rat/pipe, /turf/open/floor/plating/asteroid/basalt, @@ -95,7 +99,7 @@ Q Q Q Q -Q +e "} (2,1,1) = {" Q @@ -167,5 +171,5 @@ Q Q Q Q -Q +e "} diff --git a/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm b/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm index c7da7d54ba81..d5e8d81ce715 100644 --- a/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm @@ -31,13 +31,16 @@ /obj/effect/spawner/lootdrop/cigbutt, /turf/open/floor/wood, /area/city/backstreets_room) +"n" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "t" = ( /obj/item/trash/can/food/peaches/maint, /turf/open/floor/wood, /area/city/backstreets_room) "u" = ( /obj/structure/table/anvil, -/obj/item/reagent_containers/food/drinks/soda_cans/oceanwave/spacedrugs, /turf/open/floor/wood, /area/city/backstreets_room) "w" = ( @@ -151,7 +154,7 @@ f l c c -Q +n "} (9,1,1) = {" Q @@ -167,5 +170,5 @@ Q Q Q Q -Q +n "} diff --git a/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm b/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm index 8d12790a14d8..2bc7a309d6ed 100644 --- a/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm @@ -34,6 +34,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/facility/dark, /area/city/backstreets_room) +"f" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "k" = ( /obj/item/stack/spacecash/c50{ pixel_x = 6; @@ -199,7 +203,7 @@ B B B r -Q +f "} (3,1,1) = {" Q @@ -215,7 +219,7 @@ d z K b -Q +f "} (5,1,1) = {" Q @@ -239,7 +243,7 @@ s Y Z m -Q +f "} (8,1,1) = {" Q @@ -255,7 +259,7 @@ C D q q -Q +f "} (10,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm b/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm index f43ebcd9545c..0c5808628cd3 100644 --- a/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm @@ -119,6 +119,13 @@ }, /turf/open/floor/carpet/green, /area/city/backstreets_room) +"G" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced{ + color = "#42f545" + }, +/area/city/backstreets_room) "J" = ( /turf/closed/indestructible/reinforced{ color = "#42f545" @@ -236,7 +243,7 @@ s L O U -u +G "} (5,1,1) = {" J @@ -260,7 +267,7 @@ s n L s -u +G "} (8,1,1) = {" J diff --git a/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm index 3cfeeacbd66e..a6e3cc08df9c 100644 --- a/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm @@ -44,6 +44,10 @@ "B" = ( /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"D" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "L" = ( /obj/structure/forge, /turf/open/floor/plasteel/dark, @@ -106,7 +110,7 @@ T U B t -Q +D "} (5,1,1) = {" Q @@ -130,7 +134,7 @@ Q Q Q B -Q +D "} (8,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm b/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm index 6fd8f8a2175e..12dc33ccf6f0 100644 --- a/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm @@ -18,6 +18,10 @@ /mob/living/simple_animal/hostile/ordeal/green_bot/factory, /turf/open/floor/carpet/green, /area/city/backstreets_room) +"m" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "o" = ( /obj/structure/lootcrate/backstreets, /turf/open/floor/carpet/green, @@ -119,7 +123,7 @@ Q Q "} (8,1,1) = {" -Q +m x Q f @@ -135,7 +139,7 @@ r Q "} (10,1,1) = {" -Q +m Q Q Q diff --git a/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm b/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm index 94f137679771..694da83a73ff 100644 --- a/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm @@ -119,6 +119,10 @@ /obj/structure/fluff/paper/stack, /turf/open/floor/sepia, /area/city/backstreets_room) +"K" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "L" = ( /obj/structure/table/bronze, /obj/item/tape/resurgence/temple_of_motus, @@ -202,7 +206,7 @@ w a "} (5,1,1) = {" -a +K J G G @@ -218,7 +222,7 @@ D a "} (7,1,1) = {" -a +K p k S diff --git a/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm b/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm index 836969c88714..cf2b80bbe117 100644 --- a/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm @@ -20,6 +20,10 @@ /mob/living/simple_animal/hostile/ordeal/bigBirdEye, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) +"x" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/wall/mineral/cult, +/area/city/backstreets_room) "z" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt/dust, @@ -67,6 +71,10 @@ "Q" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"V" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "X" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/cult, @@ -76,7 +84,7 @@ /area/city/backstreets_room) (1,1,1) = {" -Y +x Y Y Y @@ -92,7 +100,7 @@ E Y "} (3,1,1) = {" -Q +V K Y Y diff --git a/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm b/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm index dd4920f3b1a2..19f7c4bbe9e1 100644 --- a/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm @@ -62,6 +62,10 @@ }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"A" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "B" = ( /turf/closed/mineral/ash_rock, /area/city/backstreets_room) @@ -133,7 +137,7 @@ B B "} (3,1,1) = {" -Q +A U B B @@ -173,7 +177,7 @@ B Q "} (8,1,1) = {" -Q +A O i B diff --git a/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm index 0fd581fe0982..68317d12ba96 100644 --- a/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm @@ -119,6 +119,10 @@ /obj/structure/fermenting_barrel, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) +"O" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "Q" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -169,7 +173,7 @@ V Q "} (4,1,1) = {" -Q +O q F r @@ -193,7 +197,7 @@ S Q "} (7,1,1) = {" -Q +O c C B diff --git a/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm index f1ab97575908..b767d265ac4d 100644 --- a/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm @@ -1,7 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/structure/window/reinforced/fulltile/indestructable, -/turf/open/space/basic, +/turf/closed/indestructible/fakeglass, /area/city/backstreets_room) "c" = ( /mob/living/simple_animal/hostile/ordeal/green_bot, @@ -31,7 +30,7 @@ "r" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/crude, -/turf/open/floor/plating/ashplanet/wateryrock, +/turf/closed/indestructible/fakeglass, /area/city/backstreets_room) "t" = ( /obj/structure/filingcabinet, @@ -46,8 +45,8 @@ /turf/open/floor/carpet/green, /area/city/backstreets_room) "y" = ( -/obj/structure/window/reinforced/fulltile/indestructable, -/turf/closed/indestructible/fakedoor, +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/fakeglass, /area/city/backstreets_room) "z" = ( /mob/living/simple_animal/hostile/ordeal/green_bot_big, @@ -128,7 +127,7 @@ t Q "} (7,1,1) = {" -a +y l Z m diff --git a/_maps/RandomRooms/backstreets/medium_south/theatre.dmm b/_maps/RandomRooms/backstreets/medium_south/theatre.dmm index e0b08fdfa0b9..43c516687378 100644 --- a/_maps/RandomRooms/backstreets/medium_south/theatre.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/theatre.dmm @@ -97,6 +97,10 @@ /obj/effect/landmark/cratespawn, /turf/open/floor/carpet/stellar, /area/city/backstreets_room) +"G" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "H" = ( /obj/structure/lootcrate/money, /turf/open/floor/carpet/stellar, @@ -181,7 +185,7 @@ d Q "} (7,1,1) = {" -Q +G M m e diff --git a/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm index dda7465e24aa..edebb61d995d 100644 --- a/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm @@ -85,6 +85,10 @@ "x" = ( /turf/open/floor/wood, /area/city/backstreets_room) +"y" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "B" = ( /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/wood{ @@ -194,7 +198,7 @@ r Q "} (5,1,1) = {" -Q +y V x k @@ -210,7 +214,7 @@ m Q "} (7,1,1) = {" -Q +y f x F diff --git a/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm b/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm index 7428d468e83d..4bfe760124f3 100644 --- a/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm @@ -20,6 +20,10 @@ /obj/item/food/meat/slab/human, /turf/open/floor/plasteel/sepia, /area/city/backstreets_room) +"m" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "n" = ( /obj/structure/lootcrate/money, /turf/open/floor/plasteel/sepia, @@ -160,9 +164,9 @@ x "} (6,1,1) = {" x -x +m W -x +m x x x diff --git a/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm b/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm index 909023da2c03..fd4706c71c9a 100644 --- a/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm @@ -10,6 +10,10 @@ }, /turf/open/floor/plasteel/grimy, /area/city/backstreets_room) +"c" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "d" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/blood, @@ -215,9 +219,9 @@ H H H H -H +c E -H +c H H H diff --git a/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm b/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm index 4872a10ae7ac..8638dfcfd72b 100644 --- a/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm @@ -70,6 +70,10 @@ /obj/structure/sign/poster/contraband/eat, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"u" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -251,8 +255,8 @@ x x x x -x +u i -x +u x "} diff --git a/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm b/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm index 4249525bd97d..5a062827f4fd 100644 --- a/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm @@ -14,9 +14,14 @@ "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"H" = ( +"G" = ( +/obj/structure/mineral_door/sandstone, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) +"H" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "P" = ( /obj/effect/mermaid_water, /turf/open/floor/plating, @@ -88,13 +93,13 @@ x "} (6,1,1) = {" x +x +x H +G +G H -H -H -H -H -H -H +x +x x "} diff --git a/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm b/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm index f8d239993396..f253614de4a2 100644 --- a/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm @@ -10,7 +10,8 @@ /area/city/backstreets_room) "b" = ( /obj/structure/fence/door{ - dir = 4 + dir = 4; + resistance_flags = 64 }, /obj/effect/decal/cleanable/blood/footprints{ dir = 8; @@ -40,7 +41,8 @@ /area/city/backstreets_room) "m" = ( /obj/structure/fence/corner{ - dir = 1 + dir = 1; + resistance_flags = 64 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) @@ -61,19 +63,28 @@ /obj/item/toy/beach_ball/holoball/dodgeball, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"u" = ( +/obj/structure/fence/end{ + resistance_flags = 64 + }, +/obj/structure/sign/warning/backstreets_3, +/turf/open/floor/plating/dirt/jungle/dark, +/area/city/backstreets_room) "v" = ( /obj/item/toy/beach_ball/holoball/dodgeball, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "x" = ( /obj/structure/fence/corner{ - dir = 8 + dir = 8; + resistance_flags = 64 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "y" = ( /obj/structure/fence/door{ - dir = 4 + dir = 4; + resistance_flags = 64 }, /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -82,8 +93,10 @@ /area/city/backstreets_room) "z" = ( /obj/structure/fence/corner{ - dir = 7 + dir = 7; + resistance_flags = 64 }, +/obj/structure/sign/warning/backstreets_3, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "C" = ( @@ -101,12 +114,15 @@ /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "H" = ( -/obj/structure/fence/end, +/obj/structure/fence/end{ + resistance_flags = 64 + }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "N" = ( /obj/structure/fence{ - dir = 4 + dir = 4; + resistance_flags = 64 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) @@ -139,8 +155,10 @@ /area/city/backstreets_room) "X" = ( /obj/structure/fence/corner{ - dir = 4 + dir = 4; + resistance_flags = 64 }, +/obj/structure/sign/warning/backstreets_3, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "Y" = ( @@ -222,12 +240,12 @@ N (6,1,1) = {" X b +u H H H H -H -H +u y z "} diff --git a/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm b/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm index 273cef173849..f7c1267bca31 100644 --- a/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm @@ -7,6 +7,11 @@ }, /turf/open/floor/plating/rust, /area/city/backstreets_room) +"b" = ( +/obj/effect/decal/cleanable/blood/tracks, +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_room) "d" = ( /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plating/rust, @@ -29,6 +34,9 @@ "j" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood/tracks, +/obj/machinery/door/airlock/cult/unruned/friendly{ + resistance_flags = 64 + }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "l" = ( @@ -104,7 +112,7 @@ /area/city/backstreets_room) "H" = ( /obj/effect/decal/cleanable/blood/tracks, -/turf/open/floor/plating/asteroid/basalt, +/turf/closed/indestructible/necropolis, /area/city/backstreets_room) "I" = ( /mob/living/simple_animal/hostile/lovetown/slasher, @@ -118,7 +126,7 @@ /obj/effect/decal/cleanable/blood/tracks{ dir = 5 }, -/turf/open/floor/plating/asteroid/basalt, +/turf/closed/indestructible/necropolis, /area/city/backstreets_room) "M" = ( /obj/effect/decal/cleanable/blood/footprints, @@ -154,7 +162,7 @@ /area/city/backstreets_room) "S" = ( /obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/plating/asteroid/basalt, +/turf/closed/indestructible/necropolis, /area/city/backstreets_room) "U" = ( /obj/structure/lootcrate/money, @@ -170,6 +178,9 @@ /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/plating/rust, /area/city/backstreets_room) +"Z" = ( +/turf/closed/indestructible/necropolis, +/area/city/backstreets_room) (1,1,1) = {" x @@ -208,7 +219,7 @@ U x "} (4,1,1) = {" -x +Z X v o @@ -220,7 +231,7 @@ M x "} (5,1,1) = {" -x +Z R e N @@ -229,17 +240,17 @@ n f e o -x +Z "} (6,1,1) = {" -x +Z S J -H +b j +b H H H -H -x +Z "} diff --git a/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm b/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm index 1e1c366da7e9..e23a5157fa1b 100644 --- a/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm @@ -37,6 +37,10 @@ /obj/structure/lootcrate/money, /turf/open/indestructible/necropolis/air, /area/city/backstreets_room) +"D" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/necropolis, +/area/city/backstreets_room) "H" = ( /obj/structure/meatfloor, /turf/closed/indestructible/necropolis, @@ -45,6 +49,13 @@ /obj/structure/meatfloor, /turf/open/indestructible/necropolis/air, /area/city/backstreets_room) +"U" = ( +/obj/structure/meatfloor, +/obj/machinery/door/airlock/cult/unruned/friendly{ + resistance_flags = 64 + }, +/turf/open/indestructible/necropolis/air, +/area/city/backstreets_room) "Y" = ( /obj/structure/meatfloor, /obj/effect/gibspawner/human, @@ -107,8 +118,8 @@ p P P d -P -l +U +D l "} (6,1,1) = {" @@ -118,7 +129,7 @@ H l H H -l +D P z l diff --git a/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm b/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm index 1bdfac75f1a1..e263afc1f704 100644 --- a/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm +++ b/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm @@ -19,6 +19,10 @@ /obj/structure/grille, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) +"j" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "k" = ( /obj/structure/rack, /turf/open/floor/plasteel/dark, @@ -71,9 +75,9 @@ a a a -a +j X -a +j a "} (2,1,1) = {" diff --git a/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm b/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm index 8467efc46881..e857cbfde742 100644 --- a/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm +++ b/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm @@ -54,6 +54,10 @@ /mob/living/simple_animal/hostile/ordeal/amber_bug/spawned, /turf/open/floor/plasteel, /area/city/backstreets_room) +"J" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "M" = ( /obj/structure/sink/kitchen, /turf/open/floor/plasteel, @@ -81,9 +85,9 @@ U s s -U +J X -U +J U "} (2,1,1) = {" diff --git a/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm b/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm index 000fd32e5e99..bbf0cabda7ba 100644 --- a/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm +++ b/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm @@ -44,6 +44,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/facility/dark, /area/city/backstreets_room) +"D" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "J" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bottle, @@ -93,9 +97,9 @@ a a a a -a +D X -a +D "} (2,1,1) = {" a diff --git a/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm b/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm index eb782aa3bd76..e7ccd81d8fc2 100644 --- a/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm +++ b/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm @@ -16,6 +16,10 @@ /obj/item/clothing/head/papersack, /turf/open/indestructible/paper, /area/city/backstreets_room) +"q" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/paper, +/area/city/backstreets_room) "t" = ( /obj/structure/mineral_door/silver, /turf/open/indestructible/paper, @@ -79,9 +83,9 @@ (1,1,1) = {" X X -X +q t -X +q X X "} diff --git a/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm b/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm index 543f6c3414ac..67a1720cd303 100644 --- a/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm +++ b/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm @@ -2,6 +2,12 @@ "a" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"e" = ( +/obj/effect/spawner/structure/window, +/obj/structure/barricade/wooden/crude, +/obj/structure/sign/warning/backstreets_1, +/turf/open/floor/wood, +/area/city/backstreets_room) "s" = ( /obj/structure/mineral_door/wood, /turf/open/floor/wood, @@ -39,9 +45,9 @@ (1,1,1) = {" a X -X +e s -X +e X a "} diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm index 4cea0e21b0ab..38a21ea9d562 100644 --- a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm +++ b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm @@ -6,6 +6,10 @@ /obj/structure/spider/stickyweb, /turf/open/floor/wood, /area/city/backstreets_room) +"h" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "j" = ( /obj/structure/spider/stickyweb, /mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, @@ -65,7 +69,7 @@ U a t K -U +h "} (3,1,1) = {" U @@ -93,7 +97,7 @@ U O j R -U +h "} (7,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm index 6f87fc4807dd..638ae7ca12be 100644 --- a/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm +++ b/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm @@ -9,6 +9,10 @@ }, /turf/open/floor/wood, /area/city/backstreets_room) +"o" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "t" = ( /obj/structure/closet/cabinet, /turf/open/floor/wood, @@ -77,7 +81,7 @@ U t M K -U +o "} (3,1,1) = {" U @@ -91,7 +95,7 @@ U U U U -U +o "} (5,1,1) = {" U @@ -105,7 +109,7 @@ U O j A -U +o "} (7,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/bird_box.dmm b/_maps/RandomRooms/backstreets/small_north/bird_box.dmm index 6d6515b9c30c..a8b3283d82ff 100644 --- a/_maps/RandomRooms/backstreets/small_north/bird_box.dmm +++ b/_maps/RandomRooms/backstreets/small_north/bird_box.dmm @@ -3,6 +3,10 @@ /mob/living/simple_animal/hostile/ordeal/bigBirdEye, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) +"p" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/wall/mineral/cult, +/area/city/backstreets_room) "t" = ( /obj/machinery/door/airlock/cult/friendly, /turf/open/floor/plasteel/cult, @@ -37,7 +41,7 @@ P a a R -P +p "} (4,1,1) = {" P @@ -51,7 +55,7 @@ P a a R -P +p "} (6,1,1) = {" P diff --git a/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm b/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm index 0a4749c83018..d32ac8cc4634 100644 --- a/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm +++ b/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm @@ -9,6 +9,10 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/wood, /area/city/backstreets_room) +"p" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "q" = ( /obj/effect/landmark/cratespawn, /turf/open/floor/wood, @@ -50,7 +54,7 @@ U R W W -U +p "} (3,1,1) = {" U @@ -64,7 +68,7 @@ U M f W -U +p "} (5,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm b/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm index 05fd46f90781..af89a2478ec6 100644 --- a/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm +++ b/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm @@ -16,6 +16,10 @@ "x" = ( /turf/open/floor/circuit/green, /area/city/backstreets_room) +"B" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "P" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden, @@ -64,7 +68,7 @@ U a a x -U +B "} (4,1,1) = {" Q @@ -78,7 +82,7 @@ U t t x -U +B "} (6,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/pet_store.dmm b/_maps/RandomRooms/backstreets/small_north/pet_store.dmm index 9b775934da0b..373c65b08d32 100644 --- a/_maps/RandomRooms/backstreets/small_north/pet_store.dmm +++ b/_maps/RandomRooms/backstreets/small_north/pet_store.dmm @@ -117,13 +117,17 @@ "U" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"Y" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) (1,1,1) = {" U U U U -U +Y "} (2,1,1) = {" U @@ -137,7 +141,7 @@ U M u R -U +Y "} (4,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm b/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm index 9542c17396b9..2e0fbdbcb78f 100644 --- a/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm +++ b/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm @@ -14,6 +14,10 @@ /obj/structure/chair/greyscale, /turf/open/floor/plating/rust, /area/city/backstreets_room) +"A" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/wall/rust, +/area/city/backstreets_room) "I" = ( /obj/effect/landmark/cratespawn, /turf/open/floor/plating/rust, @@ -45,7 +49,7 @@ a W k W -a +A "} (4,1,1) = {" a @@ -59,7 +63,7 @@ a W k W -a +A "} (6,1,1) = {" a diff --git a/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm b/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm index dd62494f8dbe..5782a506732d 100644 --- a/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm +++ b/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm @@ -6,6 +6,10 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) +"l" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/wood, +/area/city/backstreets_room) "t" = ( /turf/open/floor/grass/snow/safe, /area/city/backstreets_room) @@ -15,10 +19,17 @@ }, /turf/open/floor/grass/snow/safe, /area/city/backstreets_room) +"D" = ( +/turf/closed/indestructible/wood, +/area/city/backstreets_room) "J" = ( /obj/item/food/sundae/jbird, /turf/open/floor/grass/snow/safe, /area/city/backstreets_room) +"K" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/grass/snow/safe, +/area/city/backstreets_room) "M" = ( /obj/effect/landmark/cratespawn, /turf/open/floor/plating/asteroid/basalt, @@ -37,49 +48,49 @@ (1,1,1) = {" U U -U -U -U +D +D +D "} (2,1,1) = {" U J R x -P +l "} (3,1,1) = {" U M t -R t +K "} (4,1,1) = {" U t x -P -t +R +l "} (5,1,1) = {" U t -t -x P +x +D "} (6,1,1) = {" U t a R -P +D "} (7,1,1) = {" U U -U -U -U +D +D +D "} diff --git a/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm b/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm index 429afb89b242..ba18cc47231d 100644 --- a/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm +++ b/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm @@ -47,6 +47,8 @@ /obj/structure/grille/broken, /obj/item/shard, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/structure/window/reinforced/indestructable, +/obj/structure/sign/warning/backstreets_2, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "q" = ( @@ -78,6 +80,10 @@ }, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) +"E" = ( +/obj/machinery/door/airlock/alarmlock, +/turf/open/floor/plasteel/shuttle, +/area/city/backstreets_room) "J" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/gibs/torso, @@ -103,6 +109,8 @@ /obj/item/shard, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks, +/obj/effect/spawner/structure/window/reinforced/indestructable, +/obj/structure/sign/warning/backstreets_2, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "R" = ( @@ -143,7 +151,7 @@ U d f W -W +E "} (5,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm b/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm index 0a995570d5ba..e9b43223ab4a 100644 --- a/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm +++ b/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm @@ -2,11 +2,18 @@ "a" = ( /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) +"q" = ( +/turf/closed/indestructible/fakeglass, +/area/city/backstreets_room) "t" = ( /obj/structure/table/wood/fancy/black, /obj/item/stack/spacecash/c200, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) +"u" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "x" = ( /obj/structure/table/wood/fancy/black, /obj/item/reagent_containers/food/drinks/bottle/lizardwine, @@ -20,12 +27,14 @@ /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) "N" = ( -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + resistance_flags = 64 + }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "P" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating/asteroid/basalt, +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/fakeglass, /area/city/backstreets_room) "R" = ( /obj/item/candle/infinite{ @@ -52,21 +61,21 @@ U U "} (2,1,1) = {" -P +q a a t U "} (3,1,1) = {" -P +q R S R U "} (4,1,1) = {" -P +q a x a @@ -87,7 +96,7 @@ a U "} (7,1,1) = {" -U +u U U U diff --git a/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm b/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm index d9cd66fdebfd..b099e6dcb3ee 100644 --- a/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm +++ b/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm @@ -46,6 +46,10 @@ /obj/structure/fence, /turf/open/floor/mineral/titanium/tiled/white, /area/city/backstreets_room) +"N" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "P" = ( /obj/machinery/door/airlock/centcom, /turf/open/floor/mineral/titanium/tiled/white, @@ -82,7 +86,7 @@ R U "} (3,1,1) = {" -U +N M M M @@ -96,7 +100,7 @@ I U "} (5,1,1) = {" -U +N t C x diff --git a/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm b/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm index 744059bfb10d..3fc2a2f25543 100644 --- a/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm +++ b/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm @@ -13,6 +13,10 @@ "f" = ( /turf/open/floor/wood, /area/city/backstreets_room) +"p" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "r" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/barricade/wooden/crude, @@ -22,6 +26,12 @@ /obj/structure/bed/maint, /turf/open/floor/wood, /area/city/backstreets_room) +"v" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/barricade/wooden/crude, +/obj/structure/sign/warning/backstreets_2, +/turf/open/floor/plating, +/area/city/backstreets_room) "w" = ( /obj/machinery/door/airlock/wood, /turf/open/floor/wood, @@ -89,7 +99,7 @@ U U "} (4,1,1) = {" -r +v c f D @@ -103,7 +113,7 @@ c U "} (6,1,1) = {" -U +p c e s diff --git a/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm b/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm index 1c653cc4286d..f28569b11968 100644 --- a/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm +++ b/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm @@ -34,6 +34,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) +"K" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "M" = ( /turf/closed/mineral/ash_rock, /area/city/backstreets_room) @@ -97,7 +101,7 @@ S U "} (5,1,1) = {" -U +K t a x @@ -111,7 +115,7 @@ N U "} (7,1,1) = {" -U +K U U U diff --git a/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm b/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm index 5535b84955ff..e29278efeed4 100644 --- a/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm +++ b/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm @@ -39,6 +39,10 @@ "U" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) +"Z" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) (1,1,1) = {" U @@ -55,7 +59,7 @@ a U "} (3,1,1) = {" -U +Z t t x @@ -69,7 +73,7 @@ t U "} (5,1,1) = {" -U +Z t t x diff --git a/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm b/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm index 900700bbb19c..8d669c771c3f 100644 --- a/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm +++ b/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm @@ -4,6 +4,7 @@ /area/city/backstreets_alley) "m" = ( /obj/machinery/light/red, +/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) "t" = ( @@ -13,13 +14,16 @@ "x" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/suit/lobotomy/wcorp, -/obj/item/clothing/head/wcorp, /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) "y" = ( /obj/item/ego_weapon/city/wcorp, /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) +"J" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_alley) "M" = ( /mob/living/simple_animal/hostile/ordeal/indigo_dawn, /turf/open/floor/carpet/stellar, @@ -37,7 +41,7 @@ /area/city/backstreets_alley) (1,1,1) = {" -U +J U U U @@ -79,7 +83,7 @@ t U "} (7,1,1) = {" -U +J U U U diff --git a/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm b/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm index bbe534624b8a..d9942e1cccae 100644 --- a/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm +++ b/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm @@ -7,6 +7,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/city/backstreets_room) +"d" = ( +/obj/structure/sign/warning/backstreets_3, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "v" = ( /obj/machinery/washing_machine, /turf/open/floor/plasteel/white, @@ -84,8 +88,8 @@ a a a a -a +d X -a +d a "} diff --git a/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm b/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm index d990ed1d8c7c..1486c9d7cf9d 100644 --- a/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm +++ b/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm @@ -56,6 +56,13 @@ }, /turf/open/floor/plasteel/freezer, /area/city/backstreets_alley) +"I" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_alley) "J" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) @@ -134,9 +141,9 @@ J (5,1,1) = {" l l -l +I X -l +I l l "} diff --git a/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm b/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm index ceb28668d792..0c4466939832 100644 --- a/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm @@ -16,6 +16,10 @@ /obj/item/stack/spacecash/c100, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"y" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "z" = ( /obj/structure/bed/maint, /obj/effect/decal/cleanable/dirt, @@ -89,10 +93,10 @@ U a "} (5,1,1) = {" -a +y X Q -a +y a a a diff --git a/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm b/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm index e1ca99f7124e..60bc8955d67d 100644 --- a/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm @@ -22,6 +22,10 @@ /mob/living/simple_animal/hostile/humanoid/rat/hammer, /turf/open/floor/wood, /area/city/backstreets_room) +"H" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "J" = ( /obj/structure/closet/cabinet, /obj/item/ego_weapon/city/rats/brick, @@ -81,9 +85,9 @@ a (5,1,1) = {" a a -a +H X -a +H a a "} diff --git a/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm b/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm index 35de79b17238..19cedefe0e0e 100644 --- a/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm +++ b/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm @@ -32,6 +32,10 @@ /obj/effect/landmark/cratespawn, /turf/open/floor/plating/ice, /area/city/backstreets_room) +"R" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "T" = ( /obj/structure/flora/iceshards, /mob/living/simple_animal/hostile/humanoid/rat/zippy, @@ -79,9 +83,9 @@ s a "} (5,1,1) = {" -a +R X -a +R a a a diff --git a/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm b/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm index 7850da972c50..ff7801ae2456 100644 --- a/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm +++ b/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm @@ -6,6 +6,10 @@ /obj/structure/lootcrate/money, /turf/open/floor/wood, /area/city/backstreets_room) +"t" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "u" = ( /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/wood, @@ -88,9 +92,9 @@ u a "} (5,1,1) = {" -a +t X -a +t a a a diff --git a/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm b/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm index 4da01f9520cf..3db0304a6991 100644 --- a/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm @@ -57,6 +57,10 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) +"Z" = ( +/obj/structure/sign/warning/backstreets_1, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) (1,1,1) = {" a @@ -95,11 +99,11 @@ N a "} (5,1,1) = {" -a +Z X X X U -a +Z a "} diff --git a/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm b/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm index a27d99b0a0e3..6a4d3dafcebf 100644 --- a/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm +++ b/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm @@ -42,6 +42,10 @@ /obj/structure/lootcrate/money, /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) +"s" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_room) "v" = ( /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) @@ -67,6 +71,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) +"z" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/mineral_door/iron, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_room) "D" = ( /mob/living/simple_animal/hostile/price, /obj/effect/decal/cleanable/dirt/dust, @@ -163,10 +172,10 @@ a "} (5,1,1) = {" a -X -v -X -v -v +h +s +z +s +a a "} diff --git a/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm b/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm index ce8118afd9bd..0cb1f8740376 100644 --- a/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm +++ b/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm @@ -10,6 +10,10 @@ "x" = ( /turf/open/floor/wood, /area/city/backstreets_room) +"z" = ( +/obj/structure/sign/warning/backstreets_2, +/turf/closed/indestructible/wood, +/area/city/backstreets_room) "J" = ( /mob/living/simple_animal/hostile/runawaybird, /turf/open/floor/wood, @@ -69,9 +73,9 @@ X (5,1,1) = {" X X -X +z n -X +z X X "} diff --git a/code/game/objects/structures/signs/signs_warning.dm b/code/game/objects/structures/signs/signs_warning.dm index d22886da2da5..b4b9ab4cb432 100644 --- a/code/game/objects/structures/signs/signs_warning.dm +++ b/code/game/objects/structures/signs/signs_warning.dm @@ -179,3 +179,29 @@ desc = "A warning sign which reads 'ESCAPE PODS'." icon_state = "pods" is_editable = TRUE + +////LC13 WARNING SIGNS + +/obj/structure/sign/warning/backstreets_1 + name = "\improper ROOM DANGER RATING: 1 sign" + sign_change_name = "Location - Backstreets Room, Level 1" + desc = "A warning sign which warns fixers of how dangerous the next room is." + icon_state = "backstreets_warn_1" + +/obj/structure/sign/warning/backstreets_2 + name = "\improper ROOM DANGER RATING: 2 sign" + sign_change_name = "Location - Backstreets Room, Level 2" + desc = "A warning sign which warns fixers of how dangerous the next room is." + icon_state = "backstreets_warn_2" + +/obj/structure/sign/warning/backstreets_3 + name = "\improper ROOM DANGER RATING: 3 sign" + sign_change_name = "Location - Backstreets Room, Level 3" + desc = "A warning sign which warns fixers of how dangerous the next room is." + icon_state = "backstreets_warn_3" + +/obj/structure/sign/warning/backstreets_4 + name = "\improper ROOM DANGER RATING: 4 sign" + sign_change_name = "Location - Backstreets Room, Level 4" + desc = "A warning sign which warns fixers of how dangerous the next room is." + icon_state = "backstreets_warn_4" diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 0e55b137d526bf5036dcfa8bac45b5be23b3f4c9..f701dd4a8820efa924fd28c93ab28ec5e80c7a64 100644 GIT binary patch delta 20505 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 delta 19449 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 e^piH6`GE+IyNUkMZe Date: Wed, 8 Jan 2025 19:28:26 -0500 Subject: [PATCH 25/47] Removing all signs --- _maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm | 1 - _maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm | 1 - _maps/RandomRooms/backstreets/bossroom/gcorp.dmm | 1 - _maps/RandomRooms/backstreets/bossroom/jacques.dmm | 1 - _maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm | 1 - _maps/RandomRooms/backstreets/bossroom/robot.dmm | 1 - _maps/RandomRooms/backstreets/bossroom/slime_office.dmm | 1 - _maps/RandomRooms/backstreets/connector/apartments_ca.dmm | 2 -- _maps/RandomRooms/backstreets/connector/fort_knox.dmm | 1 - _maps/RandomRooms/backstreets/connector/mountain_ca.dmm | 4 ---- _maps/RandomRooms/backstreets/connector/rat_cave.dmm | 1 - _maps/RandomRooms/backstreets/connector/sweeper_ca.dmm | 1 - _maps/RandomRooms/backstreets/large_north/apartment_lna.dmm | 1 - _maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm | 1 - .../RandomRooms/backstreets/large_north/blade_lineage_ln.dmm | 1 - _maps/RandomRooms/backstreets/large_north/electric_room.dmm | 1 - _maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm | 2 -- _maps/RandomRooms/backstreets/large_north/limbus_lna.dmm | 1 - _maps/RandomRooms/backstreets/large_north/robot_lna.dmm | 2 -- _maps/RandomRooms/backstreets/large_north/robot_lnb.dmm | 1 - _maps/RandomRooms/backstreets/large_north/scorp.dmm | 1 - _maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm | 1 - _maps/RandomRooms/backstreets/large_north/town_lna.dmm | 2 -- _maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm | 1 - _maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm | 1 - _maps/RandomRooms/backstreets/large_south/bongy.dmm | 1 - _maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm | 1 - .../backstreets/large_south/prosthetic_factory.dmm | 1 - _maps/RandomRooms/backstreets/large_south/robot_castle.dmm | 2 -- _maps/RandomRooms/backstreets/large_south/supermarket.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/church.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/robot_mea.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/workshop_me.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/worm_cave.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm | 1 - _maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/buffet.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/fairies.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/rage_cage.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/rat_mna.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/slime_hut.dmm | 1 - _maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm | 1 - _maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm | 1 - _maps/RandomRooms/backstreets/medium_south/clan_storage.dmm | 1 - _maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm | 2 -- _maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm | 1 - _maps/RandomRooms/backstreets/medium_south/rat_msa.dmm | 1 - .../RandomRooms/backstreets/medium_south/seven_office_msa.dmm | 1 - _maps/RandomRooms/backstreets/medium_south/theatre.dmm | 1 - _maps/RandomRooms/backstreets/medium_south/town_msa.dmm | 1 - _maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm | 1 - _maps/RandomRooms/backstreets/medium_west/clan_cages.dmm | 1 - _maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm | 1 - _maps/RandomRooms/backstreets/medium_west/mini_beach.dmm | 1 - _maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm | 3 --- _maps/RandomRooms/backstreets/medium_west/town_mwa.dmm | 1 - _maps/RandomRooms/backstreets/medium_west/town_mwb.dmm | 1 - _maps/RandomRooms/backstreets/small_east/limbus_sea.dmm | 1 - _maps/RandomRooms/backstreets/small_east/noodlebar.dmm | 1 - _maps/RandomRooms/backstreets/small_east/oceanic_se.dmm | 1 - _maps/RandomRooms/backstreets/small_east/paper_pushed.dmm | 1 - _maps/RandomRooms/backstreets/small_east/rat_sea.dmm | 1 - _maps/RandomRooms/backstreets/small_north/apartment_sna.dmm | 1 - _maps/RandomRooms/backstreets/small_north/apartment_snb.dmm | 1 - _maps/RandomRooms/backstreets/small_north/bird_box.dmm | 1 - _maps/RandomRooms/backstreets/small_north/coffee_break.dmm | 1 - _maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm | 1 - _maps/RandomRooms/backstreets/small_north/pet_store.dmm | 1 - .../backstreets/small_north/small_clan_hideout.dmm | 1 - _maps/RandomRooms/backstreets/small_north/snow_forest.dmm | 1 - _maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm | 2 -- .../RandomRooms/backstreets/small_south/candlelit_dinner.dmm | 2 -- .../RandomRooms/backstreets/small_south/human_experiment.dmm | 1 - .../RandomRooms/backstreets/small_south/jumpscare_closet.dmm | 2 -- _maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm | 1 - _maps/RandomRooms/backstreets/small_south/robot_ssa.dmm | 1 - _maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm | 2 -- _maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm | 1 - _maps/RandomRooms/backstreets/small_west/freezer_sw.dmm | 1 - _maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm | 1 - _maps/RandomRooms/backstreets/small_west/rat_swa.dmm | 1 - _maps/RandomRooms/backstreets/small_west/rat_swb.dmm | 1 - .../backstreets/small_west/risk_rain_reference_robot.dmm | 1 - _maps/RandomRooms/backstreets/small_west/robot_swa.dmm | 1 - _maps/RandomRooms/backstreets/small_west/robot_swb.dmm | 1 - _maps/RandomRooms/backstreets/small_west/runaway_bird.dmm | 1 - 95 files changed, 110 deletions(-) diff --git a/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm b/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm index 85184e0c298f..ce038082c4ee 100644 --- a/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm @@ -648,7 +648,6 @@ /turf/open/floor/carpet/black, /area/city/backstreets_room) "Am" = ( -/obj/structure/sign/warning/backstreets_4, /turf/closed/wall/mineral/iron, /area/city/backstreets_room) "Az" = ( diff --git a/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm b/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm index 95c754c9a128..6e0490c65806 100644 --- a/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm @@ -341,7 +341,6 @@ /turf/open/floor/holofloor/carpet, /area/city/backstreets_room) "Lp" = ( -/obj/structure/sign/warning/backstreets_4, /turf/closed/indestructible/wood, /area/city/backstreets_room) "LY" = ( diff --git a/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm b/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm index 38b2597e9ecc..9c1780ddfb60 100644 --- a/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm @@ -66,7 +66,6 @@ /turf/open/floor/engine, /area/city/backstreets_room) "lr" = ( -/obj/structure/sign/warning/backstreets_4, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "oq" = ( diff --git a/_maps/RandomRooms/backstreets/bossroom/jacques.dmm b/_maps/RandomRooms/backstreets/bossroom/jacques.dmm index 75e3739befc5..b004e8854ae8 100644 --- a/_maps/RandomRooms/backstreets/bossroom/jacques.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/jacques.dmm @@ -435,7 +435,6 @@ /turf/open/floor/plasteel/cult, /area/city/backstreets_room) "Qz" = ( -/obj/structure/sign/warning/backstreets_4, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "Rb" = ( diff --git a/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm b/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm index 2bb11868480b..d48275da5872 100644 --- a/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm @@ -82,7 +82,6 @@ /turf/open/floor/stone, /area/city/backstreets_room) "o" = ( -/obj/structure/sign/warning/backstreets_4, /turf/closed/wall/mineral/iron, /area/city/backstreets_room) "p" = ( diff --git a/_maps/RandomRooms/backstreets/bossroom/robot.dmm b/_maps/RandomRooms/backstreets/bossroom/robot.dmm index f6fedfbee21d..5a3f28c5c0e6 100644 --- a/_maps/RandomRooms/backstreets/bossroom/robot.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/robot.dmm @@ -1,6 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bJ" = ( -/obj/structure/sign/warning/backstreets_4, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "co" = ( diff --git a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm index c973777988cc..9477aa8d1f2f 100644 --- a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm @@ -1600,7 +1600,6 @@ /turf/open/floor/carpet/green, /area/city/backstreets_room) "SS" = ( -/obj/structure/sign/warning/backstreets_4, /turf/closed/indestructible/reinforced{ color = "#42f545" }, diff --git a/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm b/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm index 5691f1f84cd7..fd9fbdb09329 100644 --- a/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm @@ -20,7 +20,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "g" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/rock, /area/city/backstreets_room) "j" = ( @@ -99,7 +98,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "F" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "G" = ( diff --git a/_maps/RandomRooms/backstreets/connector/fort_knox.dmm b/_maps/RandomRooms/backstreets/connector/fort_knox.dmm index ad6f3c4e4900..55a93cc45f8b 100644 --- a/_maps/RandomRooms/backstreets/connector/fort_knox.dmm +++ b/_maps/RandomRooms/backstreets/connector/fort_knox.dmm @@ -297,7 +297,6 @@ /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) "U" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "W" = ( diff --git a/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm b/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm index b4a39cf87791..082b9b701ee6 100644 --- a/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm @@ -140,7 +140,6 @@ /area/city/backstreets_room) "jL" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "kv" = ( @@ -234,7 +233,6 @@ pixel_x = -3; pixel_y = -8 }, -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "rP" = ( @@ -307,7 +305,6 @@ /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "yd" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "yf" = ( @@ -590,7 +587,6 @@ "VN" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "VO" = ( diff --git a/_maps/RandomRooms/backstreets/connector/rat_cave.dmm b/_maps/RandomRooms/backstreets/connector/rat_cave.dmm index 1a2dace3a4c0..f64272087475 100644 --- a/_maps/RandomRooms/backstreets/connector/rat_cave.dmm +++ b/_maps/RandomRooms/backstreets/connector/rat_cave.dmm @@ -43,7 +43,6 @@ /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "C" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "D" = ( diff --git a/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm b/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm index 3069fd458af8..e5ed795bef0e 100644 --- a/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm @@ -135,7 +135,6 @@ /turf/open/floor/plating/dirt/jungle/wasteland, /area/city/backstreets_room) "K" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "L" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm b/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm index 5f81f3cea83b..85fe8f758ffd 100644 --- a/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm @@ -227,7 +227,6 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "M" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "N" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm b/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm index 024203d98bc4..ca092170e7ff 100644 --- a/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm +++ b/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm @@ -5,7 +5,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "b" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "e" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm b/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm index 1c844703cb7d..f0af47b497d4 100644 --- a/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm +++ b/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm @@ -114,7 +114,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "GD" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "HL" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/electric_room.dmm b/_maps/RandomRooms/backstreets/large_north/electric_room.dmm index 322029bd9cb2..33dbbe47b1d1 100644 --- a/_maps/RandomRooms/backstreets/large_north/electric_room.dmm +++ b/_maps/RandomRooms/backstreets/large_north/electric_room.dmm @@ -293,7 +293,6 @@ /turf/open/floor/facility/dark, /area/city/backstreets_room) "Lh" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "ND" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm b/_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm index 99c1d78641b0..3525b4f0f337 100644 --- a/_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm +++ b/_maps/RandomRooms/backstreets/large_north/kcorp_warehouse.dmm @@ -90,7 +90,6 @@ pixel_x = 16; pixel_y = -3 }, -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "o" = ( @@ -99,7 +98,6 @@ pixel_x = -9; pixel_y = -3 }, -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "p" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm b/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm index 6c074bd14a94..83e38dfa915f 100644 --- a/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm @@ -1,6 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "c" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/robot_lna.dmm b/_maps/RandomRooms/backstreets/large_north/robot_lna.dmm index f7feea0cdbbd..9a4b3ac2e9c6 100644 --- a/_maps/RandomRooms/backstreets/large_north/robot_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/robot_lna.dmm @@ -85,7 +85,6 @@ pixel_x = 16; pixel_y = -3 }, -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "o" = ( @@ -94,7 +93,6 @@ pixel_x = -9; pixel_y = -3 }, -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "p" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm b/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm index 92d8a3dd1851..93b683a289bd 100644 --- a/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm +++ b/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm @@ -26,7 +26,6 @@ /turf/open/floor/plating, /area/city/backstreets_room) "u" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "x" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/scorp.dmm b/_maps/RandomRooms/backstreets/large_north/scorp.dmm index 8271c8fd5adc..3cd4d026d300 100644 --- a/_maps/RandomRooms/backstreets/large_north/scorp.dmm +++ b/_maps/RandomRooms/backstreets/large_north/scorp.dmm @@ -165,7 +165,6 @@ /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) "B" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "C" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm b/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm index 616206eb1bc5..15ef28ee6c04 100644 --- a/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm +++ b/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm @@ -49,7 +49,6 @@ /turf/open/floor/carpet/purple, /area/city/backstreets_room) "s" = ( -/obj/structure/sign/warning/backstreets_4, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "t" = ( diff --git a/_maps/RandomRooms/backstreets/large_north/town_lna.dmm b/_maps/RandomRooms/backstreets/large_north/town_lna.dmm index eab6c1b1e4a0..6894bab81d69 100644 --- a/_maps/RandomRooms/backstreets/large_north/town_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/town_lna.dmm @@ -1,6 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "av" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "bk" = ( @@ -252,7 +251,6 @@ /area/city/backstreets_room) "EF" = ( /obj/effect/rune/manifest, -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "FA" = ( diff --git a/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm b/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm index 69d33c99f2b2..4927405008cd 100644 --- a/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm +++ b/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm @@ -64,7 +64,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "eM" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "ga" = ( diff --git a/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm b/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm index dcfec217bee2..76764936956e 100644 --- a/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm +++ b/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm @@ -59,7 +59,6 @@ /turf/open/floor/carpet/black, /area/city/backstreets_room) "hj" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "hx" = ( diff --git a/_maps/RandomRooms/backstreets/large_south/bongy.dmm b/_maps/RandomRooms/backstreets/large_south/bongy.dmm index d45dfe05b8df..0b374255f669 100644 --- a/_maps/RandomRooms/backstreets/large_south/bongy.dmm +++ b/_maps/RandomRooms/backstreets/large_south/bongy.dmm @@ -213,7 +213,6 @@ /area/city/backstreets_room) "F" = ( /obj/effect/spawner/structure/window, -/obj/structure/sign/warning/backstreets_2, /turf/open/floor/plating, /area/city/backstreets_room) "G" = ( diff --git a/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm b/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm index 7fecb1f532a7..1ef79c4d5e97 100644 --- a/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm +++ b/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm @@ -44,7 +44,6 @@ /turf/open/floor/plating, /area/city/backstreets_room) "G" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "J" = ( diff --git a/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm b/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm index bbc0e4bc2f91..a8a5cf5b8320 100644 --- a/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm +++ b/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm @@ -316,7 +316,6 @@ /turf/open/floor/holofloor/dark, /area/city/backstreets_room) "S" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "T" = ( diff --git a/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm b/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm index e08e2198a391..34cd3a765217 100644 --- a/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm +++ b/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm @@ -130,7 +130,6 @@ pixel_x = -9; pixel_y = -3 }, -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "ig" = ( @@ -571,7 +570,6 @@ pixel_x = 23; pixel_y = -3 }, -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "JU" = ( diff --git a/_maps/RandomRooms/backstreets/large_south/supermarket.dmm b/_maps/RandomRooms/backstreets/large_south/supermarket.dmm index 0d44c66d7df0..9ffd5bd87422 100644 --- a/_maps/RandomRooms/backstreets/large_south/supermarket.dmm +++ b/_maps/RandomRooms/backstreets/large_south/supermarket.dmm @@ -54,7 +54,6 @@ /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "r" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/fakeglass, /area/city/backstreets_room) "t" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/church.dmm b/_maps/RandomRooms/backstreets/medium_east/church.dmm index d029fffa15d2..7a492b2a9099 100644 --- a/_maps/RandomRooms/backstreets/medium_east/church.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/church.dmm @@ -97,7 +97,6 @@ }, /area/city/backstreets_room) "E" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "H" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm b/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm index 4ef3dfb11807..e6d40975b93b 100644 --- a/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm @@ -74,7 +74,6 @@ /turf/open/floor/carpet/red, /area/city/backstreets_room) "F" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "H" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm b/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm index b2271643ea30..67a6c425404a 100644 --- a/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm @@ -58,7 +58,6 @@ /turf/open/floor/carpet/green, /area/city/backstreets_room) "w" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "x" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm b/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm index 950edd45c36b..91dc694e73c2 100644 --- a/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm @@ -32,7 +32,6 @@ /turf/open/floor/carpet/orange, /area/city/backstreets_room) "N" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "O" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm b/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm index 49d8553c1574..170d246a0c1b 100644 --- a/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm @@ -35,7 +35,6 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "y" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "C" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm b/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm index 79ff0c56acda..d93201bbe49f 100644 --- a/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm @@ -35,7 +35,6 @@ /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) "B" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "C" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm b/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm index b2bae09b34a1..bbe156cb49f3 100644 --- a/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm @@ -56,7 +56,6 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "A" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "D" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm b/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm index 2e3819f409f2..8c5a3a050e0a 100644 --- a/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm @@ -55,7 +55,6 @@ /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "Q" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "Y" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm b/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm index bbe0ff9e1dde..d0f3a9da4db3 100644 --- a/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm @@ -34,7 +34,6 @@ /turf/open/floor/carpet/blue, /area/city/backstreets_room) "D" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "H" = ( diff --git a/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm b/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm index 465b35eaddd1..8f7853b1db71 100644 --- a/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm @@ -47,7 +47,6 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "z" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "A" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/buffet.dmm b/_maps/RandomRooms/backstreets/medium_north/buffet.dmm index 12dafcd0eb95..ea0edf666f43 100644 --- a/_maps/RandomRooms/backstreets/medium_north/buffet.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/buffet.dmm @@ -26,7 +26,6 @@ /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) "o" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "p" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm b/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm index 4ceebeab1278..95271f6cf896 100644 --- a/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm @@ -34,7 +34,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "y" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/wood, /area/city/backstreets_room) "C" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/fairies.dmm b/_maps/RandomRooms/backstreets/medium_north/fairies.dmm index 5b35c68f2934..2b91fc291be1 100644 --- a/_maps/RandomRooms/backstreets/medium_north/fairies.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/fairies.dmm @@ -49,7 +49,6 @@ /turf/open/floor/grass/fairy, /area/city/backstreets_room) "N" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "Q" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm index 22c41ff1a68a..489fce7a4b62 100644 --- a/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm @@ -9,7 +9,6 @@ /turf/open/water/deep/polluted, /area/city/backstreets_room) "o" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "u" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm b/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm index a76438df00d6..529030ea12f9 100644 --- a/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm @@ -47,7 +47,6 @@ /turf/open/floor/carpet/purple, /area/city/backstreets_room) "z" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "B" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm index e0c99ecba062..9c3dd09a43df 100644 --- a/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm @@ -44,7 +44,6 @@ /turf/open/floor/facility/white, /area/city/backstreets_room) "y" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/wall/mineral/plastitanium/nosmooth, /area/city/backstreets_room) "B" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm b/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm index 8d672077f49d..ef61abe7bdcb 100644 --- a/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm @@ -13,7 +13,6 @@ /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "e" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "k" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm b/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm index d5e8d81ce715..91c23ba438ac 100644 --- a/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm @@ -32,7 +32,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "n" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "t" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm b/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm index 2bc7a309d6ed..4e816ba6bb32 100644 --- a/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm @@ -35,7 +35,6 @@ /turf/open/floor/facility/dark, /area/city/backstreets_room) "f" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "k" = ( diff --git a/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm b/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm index 0c5808628cd3..e1aaac97a5af 100644 --- a/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm @@ -121,7 +121,6 @@ /area/city/backstreets_room) "G" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced{ color = "#42f545" }, diff --git a/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm index a6e3cc08df9c..8023b10e5342 100644 --- a/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm @@ -45,7 +45,6 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "D" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "L" = ( diff --git a/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm b/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm index 12dc33ccf6f0..07e1133d8e03 100644 --- a/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm @@ -19,7 +19,6 @@ /turf/open/floor/carpet/green, /area/city/backstreets_room) "m" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "o" = ( diff --git a/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm b/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm index 694da83a73ff..6cc39cc4d0f5 100644 --- a/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm @@ -120,7 +120,6 @@ /turf/open/floor/sepia, /area/city/backstreets_room) "K" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "L" = ( diff --git a/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm b/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm index cf2b80bbe117..936e832a9fd0 100644 --- a/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm @@ -21,7 +21,6 @@ /turf/open/floor/plasteel/cult, /area/city/backstreets_room) "x" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/wall/mineral/cult, /area/city/backstreets_room) "z" = ( @@ -72,7 +71,6 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "V" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "X" = ( diff --git a/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm b/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm index 19f7c4bbe9e1..d16efc947b72 100644 --- a/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm @@ -63,7 +63,6 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "A" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "B" = ( diff --git a/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm index 68317d12ba96..ea310546d983 100644 --- a/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm @@ -120,7 +120,6 @@ /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) "O" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "Q" = ( diff --git a/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm index b767d265ac4d..42d9b25ffc3b 100644 --- a/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm @@ -45,7 +45,6 @@ /turf/open/floor/carpet/green, /area/city/backstreets_room) "y" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/fakeglass, /area/city/backstreets_room) "z" = ( diff --git a/_maps/RandomRooms/backstreets/medium_south/theatre.dmm b/_maps/RandomRooms/backstreets/medium_south/theatre.dmm index 43c516687378..abcec2b53bd7 100644 --- a/_maps/RandomRooms/backstreets/medium_south/theatre.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/theatre.dmm @@ -98,7 +98,6 @@ /turf/open/floor/carpet/stellar, /area/city/backstreets_room) "G" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "H" = ( diff --git a/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm index edebb61d995d..4b040b06dcea 100644 --- a/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm @@ -86,7 +86,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "y" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "B" = ( diff --git a/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm b/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm index 4bfe760124f3..a772f8adf2e0 100644 --- a/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm @@ -21,7 +21,6 @@ /turf/open/floor/plasteel/sepia, /area/city/backstreets_room) "m" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "n" = ( diff --git a/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm b/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm index fd4706c71c9a..f70ff4fa472e 100644 --- a/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm @@ -11,7 +11,6 @@ /turf/open/floor/plasteel/grimy, /area/city/backstreets_room) "c" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "d" = ( diff --git a/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm b/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm index 8638dfcfd72b..d9ab6bd55c71 100644 --- a/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm @@ -71,7 +71,6 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "u" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "x" = ( diff --git a/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm b/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm index 5a062827f4fd..723106818f11 100644 --- a/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm @@ -19,7 +19,6 @@ /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "H" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "P" = ( diff --git a/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm b/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm index f253614de4a2..e5de33bfccdd 100644 --- a/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm @@ -67,7 +67,6 @@ /obj/structure/fence/end{ resistance_flags = 64 }, -/obj/structure/sign/warning/backstreets_3, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "v" = ( @@ -96,7 +95,6 @@ dir = 7; resistance_flags = 64 }, -/obj/structure/sign/warning/backstreets_3, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "C" = ( @@ -158,7 +156,6 @@ dir = 4; resistance_flags = 64 }, -/obj/structure/sign/warning/backstreets_3, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "Y" = ( diff --git a/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm b/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm index f7c1267bca31..287fd5358955 100644 --- a/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm @@ -9,7 +9,6 @@ /area/city/backstreets_room) "b" = ( /obj/effect/decal/cleanable/blood/tracks, -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/necropolis, /area/city/backstreets_room) "d" = ( diff --git a/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm b/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm index e23a5157fa1b..75ba26544149 100644 --- a/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm @@ -38,7 +38,6 @@ /turf/open/indestructible/necropolis/air, /area/city/backstreets_room) "D" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/necropolis, /area/city/backstreets_room) "H" = ( diff --git a/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm b/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm index e263afc1f704..51e967d5871d 100644 --- a/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm +++ b/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm @@ -20,7 +20,6 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_room) "j" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "k" = ( diff --git a/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm b/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm index e857cbfde742..68afe3fd5104 100644 --- a/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm +++ b/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm @@ -55,7 +55,6 @@ /turf/open/floor/plasteel, /area/city/backstreets_room) "J" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "M" = ( diff --git a/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm b/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm index bbf0cabda7ba..e95158a09d8d 100644 --- a/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm +++ b/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm @@ -45,7 +45,6 @@ /turf/open/floor/facility/dark, /area/city/backstreets_room) "D" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "J" = ( diff --git a/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm b/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm index e7ccd81d8fc2..2f9628e54a73 100644 --- a/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm +++ b/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm @@ -17,7 +17,6 @@ /turf/open/indestructible/paper, /area/city/backstreets_room) "q" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/paper, /area/city/backstreets_room) "t" = ( diff --git a/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm b/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm index 67a1720cd303..5a8fcbd173a7 100644 --- a/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm +++ b/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm @@ -5,7 +5,6 @@ "e" = ( /obj/effect/spawner/structure/window, /obj/structure/barricade/wooden/crude, -/obj/structure/sign/warning/backstreets_1, /turf/open/floor/wood, /area/city/backstreets_room) "s" = ( diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm index 38a21ea9d562..a4bce78d5cbb 100644 --- a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm +++ b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm @@ -7,7 +7,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "h" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "j" = ( diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm index 638ae7ca12be..e36e7935bef0 100644 --- a/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm +++ b/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm @@ -10,7 +10,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "o" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "t" = ( diff --git a/_maps/RandomRooms/backstreets/small_north/bird_box.dmm b/_maps/RandomRooms/backstreets/small_north/bird_box.dmm index a8b3283d82ff..7910616623d4 100644 --- a/_maps/RandomRooms/backstreets/small_north/bird_box.dmm +++ b/_maps/RandomRooms/backstreets/small_north/bird_box.dmm @@ -4,7 +4,6 @@ /turf/open/floor/plasteel/cult, /area/city/backstreets_room) "p" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/wall/mineral/cult, /area/city/backstreets_room) "t" = ( diff --git a/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm b/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm index d32ac8cc4634..ff57db13929c 100644 --- a/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm +++ b/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm @@ -10,7 +10,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "p" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "q" = ( diff --git a/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm b/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm index af89a2478ec6..498838fafd02 100644 --- a/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm +++ b/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm @@ -17,7 +17,6 @@ /turf/open/floor/circuit/green, /area/city/backstreets_room) "B" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "P" = ( diff --git a/_maps/RandomRooms/backstreets/small_north/pet_store.dmm b/_maps/RandomRooms/backstreets/small_north/pet_store.dmm index 373c65b08d32..f911bcd9bdf5 100644 --- a/_maps/RandomRooms/backstreets/small_north/pet_store.dmm +++ b/_maps/RandomRooms/backstreets/small_north/pet_store.dmm @@ -118,7 +118,6 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "Y" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) diff --git a/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm b/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm index 2e0fbdbcb78f..189d132f3252 100644 --- a/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm +++ b/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm @@ -15,7 +15,6 @@ /turf/open/floor/plating/rust, /area/city/backstreets_room) "A" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/wall/rust, /area/city/backstreets_room) "I" = ( diff --git a/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm b/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm index 5782a506732d..390c6ecdae89 100644 --- a/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm +++ b/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm @@ -7,7 +7,6 @@ /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "l" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/wood, /area/city/backstreets_room) "t" = ( diff --git a/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm b/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm index ba18cc47231d..5d102d4d6db6 100644 --- a/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm +++ b/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm @@ -48,7 +48,6 @@ /obj/item/shard, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/structure/window/reinforced/indestructable, -/obj/structure/sign/warning/backstreets_2, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "q" = ( @@ -110,7 +109,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks, /obj/effect/spawner/structure/window/reinforced/indestructable, -/obj/structure/sign/warning/backstreets_2, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "R" = ( diff --git a/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm b/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm index e9b43223ab4a..008b6ee3851b 100644 --- a/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm +++ b/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm @@ -11,7 +11,6 @@ /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) "u" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "x" = ( @@ -33,7 +32,6 @@ /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "P" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/fakeglass, /area/city/backstreets_room) "R" = ( diff --git a/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm b/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm index b099e6dcb3ee..8c0d292a572c 100644 --- a/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm +++ b/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm @@ -47,7 +47,6 @@ /turf/open/floor/mineral/titanium/tiled/white, /area/city/backstreets_room) "N" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "P" = ( diff --git a/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm b/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm index 3fc2a2f25543..f7097571da9a 100644 --- a/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm +++ b/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm @@ -14,7 +14,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "p" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "r" = ( @@ -29,7 +28,6 @@ "v" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/barricade/wooden/crude, -/obj/structure/sign/warning/backstreets_2, /turf/open/floor/plating, /area/city/backstreets_room) "w" = ( diff --git a/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm b/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm index f28569b11968..899b3cf43aff 100644 --- a/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm +++ b/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm @@ -35,7 +35,6 @@ /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) "K" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "M" = ( diff --git a/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm b/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm index e29278efeed4..fac3c57d5e9a 100644 --- a/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm +++ b/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm @@ -40,7 +40,6 @@ /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "Z" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) diff --git a/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm b/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm index 8d669c771c3f..bc7a75226e35 100644 --- a/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm +++ b/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm @@ -4,7 +4,6 @@ /area/city/backstreets_alley) "m" = ( /obj/machinery/light/red, -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) "t" = ( @@ -21,7 +20,6 @@ /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) "J" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) "M" = ( diff --git a/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm b/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm index d9942e1cccae..be3aa0ae0345 100644 --- a/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm +++ b/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm @@ -8,7 +8,6 @@ /turf/open/floor/plasteel/white, /area/city/backstreets_room) "d" = ( -/obj/structure/sign/warning/backstreets_3, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "v" = ( diff --git a/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm b/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm index 1486c9d7cf9d..5a59900bd23b 100644 --- a/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm +++ b/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm @@ -60,7 +60,6 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) "J" = ( diff --git a/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm b/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm index 0c4466939832..0735142d5144 100644 --- a/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm @@ -17,7 +17,6 @@ /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "y" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "z" = ( diff --git a/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm b/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm index 60bc8955d67d..ead47338b0b9 100644 --- a/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm @@ -23,7 +23,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "H" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "J" = ( diff --git a/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm b/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm index 19cedefe0e0e..1f967f134f43 100644 --- a/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm +++ b/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm @@ -33,7 +33,6 @@ /turf/open/floor/plating/ice, /area/city/backstreets_room) "R" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "T" = ( diff --git a/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm b/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm index ff7801ae2456..1880fd1fa091 100644 --- a/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm +++ b/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm @@ -7,7 +7,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "t" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "u" = ( diff --git a/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm b/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm index 3db0304a6991..de46528d89e3 100644 --- a/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm @@ -58,7 +58,6 @@ /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "Z" = ( -/obj/structure/sign/warning/backstreets_1, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) diff --git a/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm b/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm index 6a4d3dafcebf..d19a7eaabdcc 100644 --- a/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm +++ b/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm @@ -43,7 +43,6 @@ /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) "s" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) "v" = ( diff --git a/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm b/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm index 0cb1f8740376..a4e5cbe55e56 100644 --- a/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm +++ b/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm @@ -11,7 +11,6 @@ /turf/open/floor/wood, /area/city/backstreets_room) "z" = ( -/obj/structure/sign/warning/backstreets_2, /turf/closed/indestructible/wood, /area/city/backstreets_room) "J" = ( From 4e377db18ad2d480133abe23884063168cc67791 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Thu, 9 Jan 2025 23:03:14 -0500 Subject: [PATCH 26/47] Revert "Adding Bloodfiends to ruinned_la_mancha_land" This reverts commit e34bc5ce4a67a75163c5620a91ba07251488a244. --- .../ruinned_la_mancha_land.dmm | 702 +++++++++--------- 1 file changed, 352 insertions(+), 350 deletions(-) diff --git a/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm b/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm index 0c5a8641c744..f30783086b81 100644 --- a/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm +++ b/_maps/RandomRooms/backstreetlayout/ruinned_la_mancha_land.dmm @@ -3,7 +3,6 @@ /obj/structure/chair/pew/left{ dir = 1 }, -/mob/living/simple_animal/hostile/humanoid/blood/fiend, /turf/open/floor/material, /area/city/backstreets_alley) "as" = ( @@ -113,9 +112,9 @@ }, /area/city/backstreets_alley) "cm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/humanoid/blood/bag, -/turf/open/floor/carpet/black, +/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{ @@ -188,9 +187,10 @@ /turf/open/floor/carpet/purple, /area/city/backstreets_alley) "ev" = ( -/obj/effect/decal/cleanable/blood, -/mob/living/simple_animal/hostile/humanoid/blood/fiend, -/turf/open/floor/carpet/red, +/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, @@ -312,10 +312,11 @@ }, /area/city/backstreets_alley) "in" = ( -/mob/living/simple_animal/hostile/humanoid/blood/fiend, -/turf/open/floor/wood{ - color = "#990012" +/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, @@ -332,12 +333,14 @@ }, /area/city/backstreets_alley) "it" = ( -/obj/effect/decal/cleanable/blood, -/mob/living/simple_animal/hostile/humanoid/blood/bag, -/turf/open/floor/carpet/red, +/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/humanoid/blood/bag, +/mob/living/simple_animal/hostile/ordeal/indigo_dawn/skirmisher, /turf/open/floor/carpet/red, /area/city/backstreets_alley) "iA" = ( @@ -385,8 +388,8 @@ /turf/open/floor/stone, /area/city/backstreets_alley) "jU" = ( -/mob/living/simple_animal/hostile/humanoid/blood/bag, -/turf/open/floor/mineral/plastitanium/red, +/obj/effect/landmark/backstreetspawnwest, +/turf/open/floor/carpet/red, /area/city/backstreets_alley) "kg" = ( /obj/effect/rune, @@ -449,6 +452,7 @@ /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) @@ -462,8 +466,7 @@ }, /area/city/backstreets_alley) "ml" = ( -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/humanoid/blood/bag, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, /turf/open/floor/plasteel/dark, /area/city/backstreets_alley) "mv" = ( @@ -496,7 +499,7 @@ /area/city/backstreets_alley) "mO" = ( /obj/structure/chair/pew/left, -/mob/living/simple_animal/hostile/humanoid/blood/bag, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, /turf/open/floor/material, /area/city/backstreets_alley) "mP" = ( @@ -523,26 +526,15 @@ /turf/open/floor/plasteel/showroomfloor, /area/city/backstreets_alley) "ns" = ( -/obj/structure/railing{ - dir = 1 +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/chapel{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/humanoid/blood/fiend, -/turf/open/floor/material, /area/city/backstreets_alley) "nM" = ( /obj/effect/spawner/room/backstreets/medium_north, /turf/closed/indestructible/necropolis, /area/city/backstreets_alley) -"nP" = ( -/obj/structure/chair/pew/left{ - dir = 8 - }, -/mob/living/simple_animal/hostile/humanoid/blood/fiend, -/turf/open/floor/plasteel/chapel{ - dir = 1 - }, -/area/city/backstreets_alley) "ok" = ( /obj/structure/curtain, /obj/effect/decal/cleanable/dirt/dust, @@ -740,7 +732,6 @@ /obj/structure/chair/office{ dir = 8 }, -/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/carpet/black, /area/city/backstreets_alley) "tV" = ( @@ -826,9 +817,12 @@ /turf/open/floor/plasteel/dark, /area/city/backstreets_alley) "wq" = ( -/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss, -/turf/open/floor/stone{ - color = "#e29eff" +/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" = ( @@ -903,7 +897,6 @@ /obj/structure/chair/office{ dir = 4 }, -/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/carpet/black, /area/city/backstreets_alley) "yP" = ( @@ -928,7 +921,7 @@ }, /area/city/backstreets_alley) "zm" = ( -/mob/living/simple_animal/hostile/humanoid/blood/bag, +/obj/effect/landmark/backstreetspawneast, /turf/open/floor/stone, /area/city/backstreets_alley) "zn" = ( @@ -973,10 +966,11 @@ }, /area/city/backstreets_alley) "Ae" = ( -/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss, -/turf/open/floor/plasteel/chapel{ - dir = 1 +/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, @@ -1053,19 +1047,18 @@ }, /area/city/backstreets_alley) "Bo" = ( -/mob/living/simple_animal/hostile/humanoid/blood/bag, -/turf/open/floor/stone{ - color = "#f06979" - }, +/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" = ( -/obj/structure/chair/pew, -/mob/living/simple_animal/hostile/humanoid/blood/bag, -/turf/open/floor/material, +/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{ @@ -1087,13 +1080,9 @@ /turf/open/floor/mineral/plastitanium/red, /area/city/backstreets_alley) "BO" = ( -/obj/structure/chair/pew{ - dir = 8 - }, -/mob/living/simple_animal/hostile/humanoid/blood/fiend, -/turf/open/floor/plasteel/chapel{ - dir = 4 - }, +/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, @@ -1122,10 +1111,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet/black, /area/city/backstreets_alley) -"CX" = ( -/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss, -/turf/open/floor/mineral/plastitanium/red, -/area/city/backstreets_alley) "Dj" = ( /obj/structure/headpike, /turf/open/floor/plating/ashplanet/ash{ @@ -1151,7 +1136,7 @@ }, /area/city/backstreets_alley) "EA" = ( -/mob/living/simple_animal/hostile/humanoid/blood/bag, +/obj/effect/landmark/backstreetspawnwest, /turf/open/floor/wood{ color = "#990012" }, @@ -1228,11 +1213,8 @@ }, /area/city/backstreets_alley) "Gp" = ( -/obj/structure/chair/pew{ - dir = 1 - }, -/mob/living/simple_animal/hostile/humanoid/blood/bag, -/turf/open/floor/material, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/carpet/black, /area/city/backstreets_alley) "Ha" = ( /obj/structure/spirit_board, @@ -1270,7 +1252,8 @@ /turf/open/floor/carpet/red, /area/city/backstreets_alley) "It" = ( -/mob/living/simple_animal/hostile/humanoid/blood/bag, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, /turf/open/floor/carpet/black, /area/city/backstreets_alley) "IN" = ( @@ -1404,7 +1387,6 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/humanoid/blood/fiend, /turf/open/floor/material, /area/city/backstreets_alley) "LB" = ( @@ -1511,9 +1493,12 @@ /turf/open/floor/plasteel/showroomfloor, /area/city/backstreets_alley) "Og" = ( -/mob/living/simple_animal/hostile/humanoid/blood/bag, -/turf/open/floor/plating/ashplanet/ash{ - color = "#787878" +/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" = ( @@ -1599,6 +1584,7 @@ /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" = ( @@ -1617,7 +1603,7 @@ }, /area/city/backstreets_alley) "Rp" = ( -/mob/living/simple_animal/hostile/humanoid/blood/bag, +/obj/effect/landmark/backstreetspawn, /turf/open/floor/stone{ color = "#e29eff" }, @@ -1629,7 +1615,8 @@ }, /area/city/backstreets_alley) "RG" = ( -/mob/living/simple_animal/hostile/humanoid/blood/bag, +/obj/effect/decal/cleanable/dirt/dust, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, /turf/open/floor/plasteel/dark, /area/city/backstreets_alley) "RN" = ( @@ -1747,7 +1734,7 @@ /area/city/backstreets_alley) "Vp" = ( /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon, /turf/open/floor/plasteel/dark, /area/city/backstreets_alley) "Vz" = ( @@ -1803,7 +1790,7 @@ /turf/open/floor/carpet/black, /area/city/backstreets_alley) "WW" = ( -/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/mob/living/simple_animal/hostile/ordeal/indigo_noon, /turf/open/floor/carpet/red, /area/city/backstreets_alley) "WX" = ( @@ -1854,9 +1841,9 @@ }, /area/city/backstreets_alley) "XT" = ( -/mob/living/simple_animal/hostile/humanoid/blood/fiend, +/mob/living/simple_animal/hostile/ordeal/indigo_noon, /turf/open/floor/stone{ - color = "#e29eff" + color = "#f06979" }, /area/city/backstreets_alley) "Yr" = ( @@ -1875,7 +1862,6 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt/dust, -/mob/living/simple_animal/hostile/humanoid/blood/bag, /turf/open/floor/plasteel/chapel{ dir = 8 }, @@ -1902,8 +1888,8 @@ }, /area/city/backstreets_alley) "Zp" = ( -/mob/living/simple_animal/hostile/humanoid/blood/fiend, -/turf/open/floor/stone, +/mob/living/simple_animal/hostile/ordeal/steel_dawn, +/turf/open/floor/plasteel/dark, /area/city/backstreets_alley) "Zt" = ( /obj/structure/flora/ash/cacti, @@ -2389,7 +2375,6 @@ DC DC DC DC -zm DC DC DC @@ -2398,7 +2383,8 @@ DC DC DC DC -zm +DC +DC DC DC DC @@ -2501,9 +2487,9 @@ DC DC DC DC +zm DC DC -Zp DC DC DC @@ -2542,12 +2528,12 @@ re BM PD PD -kg +BO RN RN aU Tg -iw +Tg Tg Lp Tg @@ -2626,7 +2612,7 @@ DC DC DC DC -zm +DC DC YG vm @@ -2645,31 +2631,31 @@ tL PD Ld PD -jU +PD re re Rl -re +XT re PD PD Ld -jU +PD PD aU PD Tg Tg -Tg +WW Tg IU -Tg +WW Tg aU -it +IU Tg Tg -it +IU Lp Tg aU @@ -2753,8 +2739,8 @@ re re aU cy +TK PD -CX PD PD re @@ -2779,7 +2765,7 @@ Tg aU Tg Tg -Tg +iw Tg Tg Tg @@ -2869,29 +2855,29 @@ PD kg PD re -Bo re re -Bo +XT +re +PD PD PD -jU PD PD aU PD -iw +WW Tg Tg WW -iw +Tg Tg Tg aU Tg Tg Tg -WW +Tg IU Tg mv @@ -2937,7 +2923,7 @@ YG YG DC DC -zm +DC DC YG YG @@ -2986,7 +2972,7 @@ re PD PD uC -PD +Bt RN RN aU @@ -3114,7 +3100,7 @@ aU aU Tg Tg -Tg +WW Tg mv jn @@ -3223,9 +3209,9 @@ oQ Tg RN aU +iw Tg Tg -iw Tg aU wr @@ -3280,8 +3266,8 @@ AF vP gu Yr -Ae -Yr +gE +ev gE Pp hF @@ -3320,7 +3306,7 @@ Tg Tg Tg Tg -iw +Tg Tg Tg Tg @@ -3329,9 +3315,9 @@ Tg AW IU Tg +iw Tg Tg -iw Tg aU Tg @@ -3403,7 +3389,7 @@ YG YG DC DC -DC +zm DC YG vm @@ -3419,9 +3405,9 @@ re re aU Tg +WW Tg -Tg -ev +IU Tg IU IU @@ -3431,18 +3417,18 @@ Tg IU IU IU -WW Tg Tg +iw Tg Tg -it +IU LB +WW Tg Tg Tg -Tg -Tg +WW IU aU Tg @@ -3507,7 +3493,7 @@ Yr rw Yr hF -sP +it Qa vm YG @@ -3529,10 +3515,10 @@ re re re aU -iw Tg Tg -iw +Tg +WW Tg IU aU @@ -3550,14 +3536,14 @@ Tg Tg aU Tg -iw -WW +Tg +Tg mb Tg Tg aU Tg -it +IU IU My aU @@ -3615,8 +3601,8 @@ KQ iA Aa iA -BO -NS +Aa +Ae hF sP bz @@ -3625,7 +3611,7 @@ YG YG DC DC -Zp +DC DC YG YG @@ -3674,9 +3660,9 @@ Tg aU re re -in jn jn +EA jn re re @@ -3720,16 +3706,16 @@ YG YG vm bz -JJ +cm vP -bj +wq Yz pM Os pM pF hF -sP +it bz vm YG @@ -3826,12 +3812,12 @@ YG DC DC DC -zm +DC YG YG vm AF -Bt +JJ vP CB iA @@ -3840,7 +3826,7 @@ kW yk NS hF -Gp +sP AF vm YG @@ -3944,11 +3930,11 @@ vm AF Jf jk -nP +bj Os pM -Os -TK +Og +pM pF hF tC @@ -4008,7 +3994,7 @@ aU aU sb jn -EA +jn jn jn re @@ -4200,13 +4186,13 @@ jn jn jn jn -EA jn jn jn jn jn jn +EA jn jn jn @@ -4279,19 +4265,19 @@ hA hA Jj cI -Jj +ns cI Jj cI hA -hA +Zp hA vm YG YG DC DC -zm +DC DC YG YG @@ -4378,8 +4364,8 @@ DC DC DC DC +zm DC -Zp DC DC YG @@ -4420,6 +4406,7 @@ jn jn jn jn +EA jn jn jn @@ -4485,7 +4472,7 @@ DC DC DC DC -zm +DC DC DC DC @@ -4506,7 +4493,7 @@ ur cN cN ur -cm +ur ur cN vm @@ -4603,7 +4590,7 @@ DC DC DC DC -zm +DC DC YG YG @@ -4617,7 +4604,7 @@ ur cN cN cN -cN +Gp ur cN Xf @@ -4626,7 +4613,7 @@ DC DC DC DC -DC +zm YG YG vm @@ -4723,7 +4710,7 @@ le hA cX cN -ur +It cN cN cN @@ -4771,7 +4758,7 @@ re re jn jn -jn +EA jn re aU @@ -4811,7 +4798,7 @@ YG YG vm YG -zm +DC DC DC DC @@ -4835,8 +4822,8 @@ hA vm hA CE -It -hA +cN +Zp vm vm vm @@ -4942,7 +4929,7 @@ YG YG vm ji -WD +Vp vm hA ur @@ -4973,7 +4960,7 @@ re aU re jn -EA +jn jn jn re @@ -5061,7 +5048,7 @@ cN fs vm hA -WD +Vp Zu AF vm @@ -5120,7 +5107,7 @@ aU re jn jn -EA +jn jn re re @@ -5164,7 +5151,7 @@ YG YG vm MH -RG +hA vm hA cN @@ -5280,11 +5267,11 @@ vm hA cN cN -fs +in Le -ml +WD LY -ns +on IN vm YG @@ -5394,7 +5381,7 @@ cN fs vm hA -hA +ml on yK vm @@ -5418,7 +5405,7 @@ aU re jn jn -in +jn jn sb re @@ -5498,13 +5485,13 @@ DC Xf cN ur -cm -cN +ur +Gp ur cN fs vm -hA +ml hA Zu QG @@ -5615,7 +5602,7 @@ cN cN Jt WP -RG +hA WD on tV @@ -5673,7 +5660,7 @@ jn jn jn jn -EA +jn jn jn jn @@ -5701,7 +5688,7 @@ YG YG DC DC -DC +zm DC YG YG @@ -5713,7 +5700,7 @@ YG YG DC DC -DC +zm DC YG Uj @@ -5727,7 +5714,7 @@ cN hA vm hA -LY +Bo Lu tV vm @@ -5771,12 +5758,12 @@ jn jn jn jn +EA jn jn jn jn jn -EA jn jn jn @@ -5784,6 +5771,8 @@ jn jn jn jn +EA +jn jn jn jn @@ -5836,7 +5825,7 @@ vm vm hA cN -WD +RG vm hA WD @@ -5880,7 +5869,7 @@ re re re sb -EA +jn jn jn jn @@ -5923,7 +5912,7 @@ vm vm YG DC -zm +DC DC DC YG @@ -5936,17 +5925,17 @@ YG mH DC DC -zm +DC DC YG YG vm hA -RG +hA LM vm hA -cm +ur WD vm vm @@ -5958,7 +5947,7 @@ YG YG DC DC -zm +DC DC vm vm @@ -5973,7 +5962,7 @@ re aU re jn -EA +jn jn jn re @@ -6052,8 +6041,8 @@ DC YG YG vm -ml WD +Vp Tc vm hA @@ -6164,11 +6153,11 @@ YG YG vm WD -Vp +WD xg vm hA -cN +Gp cN Le vm @@ -6256,7 +6245,7 @@ YG vm YG DC -Zp +DC DC DC YG @@ -6274,7 +6263,7 @@ DC YG YG vm -hA +ml hA wp vm @@ -6418,7 +6407,7 @@ aU re jn jn -jn +EA jn jn aU @@ -6602,7 +6591,7 @@ vm vm DC DC -Zp +DC DC YG YG @@ -6733,7 +6722,7 @@ YG YG YG YG -DC +zm DC DC DC @@ -6863,7 +6852,7 @@ re jn jn jn -EA +jn re re re @@ -6935,7 +6924,6 @@ YG YG DC DC -zm DC DC DC @@ -6949,13 +6937,14 @@ DC DC DC DC -zm DC DC DC DC DC -zm +DC +DC +DC DC DC DC @@ -7045,7 +7034,7 @@ DC DC DC DC -DC +zm DC DC DC @@ -7144,7 +7133,6 @@ vm zJ YG DC -zm DC DC DC @@ -7169,7 +7157,8 @@ DC DC DC DC -Zp +DC +DC DC DC DC @@ -7263,7 +7252,7 @@ zm DC DC DC -zm +DC DC DC DC @@ -7283,7 +7272,7 @@ YG YG DC DC -DC +zm DC YG YG @@ -7602,7 +7591,7 @@ YG DC DC DC -zm +DC YG vm YG @@ -7768,7 +7757,7 @@ aU re re jn -EA +jn jn jn re @@ -7861,7 +7850,7 @@ aU re jn jn -jn +EA jn re re @@ -7880,7 +7869,7 @@ re re jn jn -jn +EA jn re re @@ -8082,7 +8071,7 @@ re aU re jn -EA +jn jn jn re @@ -8171,7 +8160,7 @@ YG YG DC DC -zm +DC DC YG YG @@ -8252,7 +8241,7 @@ aU YG vm YG -zm +DC DC vm vm @@ -8502,7 +8491,7 @@ vm vm vm YG -zm +DC DC DC DC @@ -9193,7 +9182,7 @@ aU re jn jn -jn +EA jn aU aU @@ -9281,7 +9270,7 @@ vm DC DC DC -DC +zm DC YG vm @@ -9598,7 +9587,7 @@ vm YG YG DC -zm +DC DC DC YG @@ -9637,7 +9626,7 @@ aU re jn jn -EA +jn jn aU aU @@ -9946,7 +9935,7 @@ YG YG YG DC -zm +DC DC DC YG @@ -10115,7 +10104,7 @@ jn jn jn jn -jn +EA jn jn jn @@ -10201,6 +10190,7 @@ jn jn jn jn +EA jn jn jn @@ -10211,7 +10201,7 @@ jn jn jn jn -jn +EA jn jn jn @@ -10263,13 +10253,13 @@ DC DC DC DC +zm DC DC DC DC DC DC -zm DC DC DC @@ -10279,7 +10269,6 @@ DC DC DC DC -zm DC DC DC @@ -10370,7 +10359,6 @@ DC DC DC DC -zm DC DC DC @@ -10400,6 +10388,8 @@ DC DC DC DC +zm +DC DC DC DC @@ -10424,7 +10414,6 @@ jn jn jn jn -EA jn jn jn @@ -10433,7 +10422,8 @@ jn jn jn jn -EA +jn +jn jn jn jn @@ -11002,7 +10992,7 @@ jn jn jn jn -EA +jn jn jn jn @@ -11035,7 +11025,7 @@ vm YG YG DC -zm +DC DC DC DC @@ -11170,7 +11160,7 @@ vm vm YG DC -zm +DC DC DC DC @@ -11225,7 +11215,7 @@ jn jn jn jn -jn +EA jn jn aU @@ -11368,7 +11358,7 @@ vm YG YG DC -DC +zm DC DC YG @@ -12147,7 +12137,9 @@ YG DC DC DC -zm +DC +DC +DC DC DC DC @@ -12165,13 +12157,11 @@ DC DC DC DC -zm DC DC DC DC DC -zm DC DC DC @@ -12320,7 +12310,7 @@ jn jn jn jn -EA +jn jn jn jn @@ -12444,7 +12434,7 @@ jn jn jn jn -EA +jn jn jn re @@ -12479,7 +12469,7 @@ YG YG DC DC -Zp +DC DC YG YG @@ -12509,7 +12499,7 @@ DC DC DC DC -DC +zm YG vm vm @@ -12537,7 +12527,7 @@ jn jn sb jn -in +jn jn jn jn @@ -12555,7 +12545,7 @@ re re sb jn -jn +EA jn jn re @@ -12591,7 +12581,7 @@ YG DC DC DC -zm +DC YG vm vm @@ -12639,7 +12629,7 @@ aU re re jn -EA +jn re re re @@ -12951,7 +12941,7 @@ vm YG DC DC -zm +DC DC DC YG @@ -13033,7 +13023,7 @@ vm YG YG DC -DC +zm DC DC YG @@ -13194,7 +13184,7 @@ aU re re jn -in +jn re re re @@ -13778,7 +13768,7 @@ re jn jn jn -jn +EA re aU re @@ -13838,7 +13828,7 @@ vm vm YG DC -DC +zm DC DC DC @@ -13950,7 +13940,7 @@ vm YG DC DC -zm +DC DC DC YG @@ -14364,7 +14354,7 @@ YG vm YG YG -zm +DC DC DC DC @@ -14442,7 +14432,7 @@ re re re jn -EA +jn jn jn jn @@ -14591,13 +14581,14 @@ DC DC DC DC +zm +DC DC DC DC DC DC DC -zm DC DC DC @@ -14609,7 +14600,6 @@ DC DC DC DC -Zp DC DC DC @@ -14664,7 +14654,7 @@ jn jn jn jn -jn +EA jn jn re @@ -14711,15 +14701,16 @@ DC DC DC DC +zm DC DC DC DC DC -zm DC DC DC +zm DC DC DC @@ -14879,7 +14870,7 @@ jn jn jn jn -EA +jn jn jn jn @@ -15426,7 +15417,7 @@ Tg aU re re -jn +EA jn jn jn @@ -15528,7 +15519,7 @@ aU Tg Tg Tg -Tg +jU Tg Tg Tg @@ -15640,7 +15631,7 @@ RN Tg Lp Tg -iw +Tg Tg Tg Tg @@ -15748,12 +15739,12 @@ re re aU Tg -iw +Tg +jU Tg Tg Tg Tg -WW Tg Tg aU @@ -15776,7 +15767,7 @@ aU aU re jn -in +jn re re re @@ -15835,7 +15826,7 @@ DC Xf DC DC -DC +zm DC DC YG @@ -15982,7 +15973,7 @@ aU re re jn -EA +jn jn jn jn @@ -16102,7 +16093,7 @@ jn jn jn jn -EA +jn jn jn jn @@ -16143,7 +16134,7 @@ YG YG YG DC -Zp +DC DC DC DC @@ -16169,7 +16160,7 @@ mc Uj DC DC -zm +DC DC YG vm @@ -16196,7 +16187,7 @@ Tg Tg aU Ha -Tg +jU Tg Tg Cd @@ -16205,7 +16196,7 @@ re re jn jn -jn +EA jn sb jn @@ -16366,7 +16357,7 @@ YG YG DC DC -DC +zm DC DC DC @@ -16530,7 +16521,7 @@ Tg Tg Tg Tg -Tg +jU Tg Tg aU @@ -16638,11 +16629,11 @@ aU Tg Tg Tg -iw Tg Tg Tg -iw +Tg +Tg Tg LB jn @@ -16748,10 +16739,10 @@ re aU RN Tg +jU Tg Tg Tg -WW Tg Lp Tg @@ -16759,7 +16750,7 @@ aU jn jn jn -jn +EA jn jn re @@ -16863,7 +16854,7 @@ Tg Tg Tg Tg -Tg +jU RN Tg aU @@ -16920,7 +16911,7 @@ vm YG YG DC -zm +DC DC DC YG @@ -17056,7 +17047,7 @@ vm vm YG DC -DC +zm DC DC YG @@ -17500,7 +17491,7 @@ vm vm YG DC -zm +DC DC DC DC @@ -17717,7 +17708,7 @@ DC DC DC DC -DC +zm DC DC DC @@ -17810,7 +17801,7 @@ YG DC DC DC -zm +DC DC DC DC @@ -17946,8 +17937,9 @@ DC DC DC DC +zm +DC DC -Zp YG vm vm @@ -18036,7 +18028,7 @@ DC DC DC DC -DC +zm DC DC DC @@ -18152,7 +18144,7 @@ YG YG YG YG -Og +YG YG YG YG @@ -19087,7 +19079,7 @@ UG UG tJ tJ -tJ +Rp tJ UG ay @@ -19309,7 +19301,7 @@ ay UG tJ tJ -Rp +tJ tJ UG UG @@ -19380,7 +19372,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -19389,6 +19380,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -19557,7 +19549,7 @@ ay UG UG tJ -Rp +tJ tJ tJ UG @@ -19594,18 +19586,19 @@ UG tJ tJ tJ +Rp tJ tJ tJ tJ tJ +Rp tJ tJ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -19619,7 +19612,7 @@ Rp tJ tJ tJ -tJ +Rp tJ tJ tJ @@ -19670,7 +19663,7 @@ UG UG tJ tJ -tJ +Rp tJ UG UG @@ -19706,7 +19699,6 @@ UG tJ tJ tJ -Rp tJ tJ tJ @@ -19732,7 +19724,8 @@ tJ tJ tJ tJ -Rp +tJ +tJ tJ UG UG @@ -19975,7 +19968,7 @@ tJ tJ tJ tJ -Rp +tJ tJ tJ UG @@ -20003,7 +19996,7 @@ bG UG tJ tJ -XT +tJ tJ UG UG @@ -20063,7 +20056,7 @@ ay ay ay UG -XT +tJ tJ tJ tJ @@ -20661,7 +20654,7 @@ tJ tJ tJ tJ -Rp +tJ tJ tJ tJ @@ -20753,7 +20746,7 @@ UG UG tJ tJ -Rp +tJ tJ UG UG @@ -20782,7 +20775,6 @@ tJ tJ tJ tJ -tJ mw ay UG @@ -20843,7 +20835,7 @@ ay UG tJ tJ -Rp +tJ tJ UG UG @@ -20976,7 +20968,7 @@ tJ tJ tJ tJ -tJ +Rp tJ UG UG @@ -21176,7 +21168,7 @@ Vl tJ tJ tJ -tJ +Rp tJ tJ ay @@ -21298,7 +21290,7 @@ ay UG UG ay -tJ +Rp tJ ay ay @@ -21336,7 +21328,7 @@ ay UG tJ tJ -tJ +Rp tJ UG ay @@ -21370,7 +21362,7 @@ ay UG mw tJ -Rp +tJ tJ tJ tJ @@ -21508,7 +21500,7 @@ mE ay UG tJ -Rp +tJ tJ tJ UG @@ -21778,7 +21770,7 @@ UG ay UG UG -Rp +tJ tJ tJ tJ @@ -21863,7 +21855,7 @@ ay ay UG tJ -XT +tJ tJ tJ UG @@ -21926,7 +21918,7 @@ ay tJ tJ tJ -Rp +tJ tJ UG UG @@ -22036,7 +22028,7 @@ ay ay Dj tJ -tJ +Rp tJ tJ UG @@ -22292,7 +22284,7 @@ tJ tJ tJ tJ -Rp +tJ tJ tJ tJ @@ -22407,6 +22399,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -22667,7 +22660,7 @@ ay ay UG tJ -tJ +Rp tJ tJ UG @@ -22779,7 +22772,7 @@ ay UG tJ tJ -Rp +tJ tJ UG UG @@ -22924,7 +22917,7 @@ ay UG UG tJ -Rp +tJ tJ tJ UG @@ -23174,7 +23167,7 @@ ay tJ tJ tJ -Rp +tJ tJ tJ ay @@ -23306,7 +23299,7 @@ ay ay UG tJ -Rp +tJ tJ tJ Dj @@ -23381,7 +23374,7 @@ tJ tJ tJ tJ -tJ +Rp tJ UG UG @@ -23480,9 +23473,10 @@ ay UG tJ tJ +Rp +tJ tJ tJ -Rp tJ tJ tJ @@ -23491,7 +23485,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -23861,7 +23854,7 @@ ay ay UG tJ -tJ +Rp tJ tJ UG @@ -23891,6 +23884,7 @@ Rp tJ tJ tJ +Rp tJ UG ay @@ -23926,7 +23920,7 @@ ay ay tJ tJ -Rp +tJ tJ ay ay @@ -24149,7 +24143,7 @@ ay tJ tJ tJ -tJ +Rp ay ay ay @@ -24174,7 +24168,7 @@ ay UG tJ tJ -Rp +tJ tJ UG ay @@ -24272,7 +24266,7 @@ ay ay bG tJ -Rp +tJ tJ tJ tJ @@ -24396,6 +24390,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -24493,7 +24488,7 @@ ay ay ay ay -XT +tJ ay ay ay @@ -24555,7 +24550,7 @@ ay ay UG tJ -Rp +tJ tJ tJ UG @@ -24668,7 +24663,7 @@ UG tJ tJ tJ -XT +tJ UG UG ay @@ -24704,7 +24699,7 @@ UG tJ tJ tJ -Rp +tJ ay ay ay @@ -24750,7 +24745,7 @@ ay ay tJ tJ -Rp +tJ tJ tJ UG @@ -24934,6 +24929,7 @@ Rp tJ tJ tJ +Rp tJ tJ tJ @@ -25094,7 +25090,7 @@ tJ tJ tJ tJ -Rp +tJ tJ tJ tJ @@ -25147,7 +25143,7 @@ ay UG tJ tJ -tJ +Rp tJ UG ay @@ -25179,6 +25175,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -25205,6 +25202,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -25216,7 +25214,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -25295,7 +25292,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -25308,7 +25304,6 @@ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -25334,6 +25329,8 @@ tJ tJ tJ tJ +Rp +tJ tJ tJ tJ @@ -25369,7 +25366,7 @@ ay ay ay tJ -Rp +tJ tJ tJ tJ @@ -25397,7 +25394,6 @@ ay UG UG tJ -Rp tJ tJ tJ @@ -25411,6 +25407,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -25926,7 +25923,7 @@ ay UG tJ tJ -Rp +tJ tJ UG ay @@ -26036,7 +26033,7 @@ ay ay UG tJ -tJ +Rp tJ tJ UG @@ -26064,7 +26061,7 @@ Br tJ tJ tJ -tJ +Rp tJ UG ay @@ -26703,7 +26700,7 @@ tJ tJ tJ tJ -XT +tJ tJ tJ tJ @@ -26807,6 +26804,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -26866,6 +26864,8 @@ tJ tJ tJ tJ +Rp +tJ tJ tJ tJ @@ -26919,13 +26919,13 @@ tJ tJ tJ tJ -Rp tJ tJ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -26941,17 +26941,20 @@ tJ tJ tJ tJ +Rp tJ tJ tJ tJ tJ tJ +Rp +tJ +tJ tJ tJ tJ tJ -Rp tJ tJ tJ @@ -26977,11 +26980,9 @@ tJ tJ tJ tJ -Rp tJ tJ tJ -wq tJ tJ ay @@ -27054,7 +27055,7 @@ tJ tJ tJ tJ -Rp +tJ tJ tJ tJ @@ -27082,7 +27083,7 @@ tJ tJ tJ tJ -Rp +tJ tJ tJ tJ @@ -27150,7 +27151,7 @@ UG UG tJ tJ -Rp +tJ tJ UG ay @@ -27732,7 +27733,7 @@ ay UG tJ tJ -tJ +Rp tJ UG ay @@ -27816,7 +27817,7 @@ ay UG tJ tJ -tJ +Rp tJ UG UG @@ -27844,7 +27845,7 @@ UG tJ tJ tJ -Rp +tJ UG ay UG @@ -28037,7 +28038,7 @@ ay ay UG tJ -Rp +tJ tJ tJ UG @@ -28246,7 +28247,7 @@ SJ (238,1,1) = {" aU UG -ay +UG ay ay ay @@ -28357,7 +28358,7 @@ SJ (239,1,1) = {" aU UG -ay +UG UG tJ tJ @@ -28468,7 +28469,7 @@ SJ (240,1,1) = {" aU UG -ay +UG UG UG tJ @@ -28579,7 +28580,7 @@ SJ (241,1,1) = {" aU UG -ay +UG ay ay ay @@ -28618,7 +28619,7 @@ ay ay ay UG -Rp +tJ tJ tJ tJ @@ -28815,7 +28816,7 @@ ay UG tJ tJ -Rp +tJ tJ tJ ay @@ -28840,6 +28841,7 @@ tJ tJ tJ tJ +Rp tJ tJ tJ @@ -29065,7 +29067,7 @@ qh UG tJ tJ -XT +tJ tJ UG UG @@ -29148,7 +29150,7 @@ ay ay UG tJ -XT +Rp tJ tJ UG @@ -29287,7 +29289,7 @@ ay UG tJ tJ -tJ +Rp tJ mw UG @@ -29397,7 +29399,7 @@ ay ay UG tJ -Rp +tJ tJ tJ UG @@ -29480,7 +29482,7 @@ ay tJ tJ tJ -Rp +tJ tJ tJ tJ From a7f455b0a80c7ba94a4412dfa70c0b0d9e9ff79c Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Fri, 10 Jan 2025 18:20:03 -0500 Subject: [PATCH 27/47] Please birds, don't die --- .../backstreets/small_north/snow_forest.dmm | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm b/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm index 390c6ecdae89..b89f56cf83b5 100644 --- a/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm +++ b/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm @@ -16,10 +16,7 @@ /mob/living/simple_animal/hostile/runawaybird{ name = "crow" }, -/turf/open/floor/grass/snow/safe, -/area/city/backstreets_room) -"D" = ( -/turf/closed/indestructible/wood, +/turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "J" = ( /obj/item/food/sundae/jbird, @@ -47,9 +44,9 @@ (1,1,1) = {" U U -D -D -D +l +l +l "} (2,1,1) = {" U @@ -77,19 +74,19 @@ U t P x -D +l "} (6,1,1) = {" U t a R -D +l "} (7,1,1) = {" U U -D -D -D +l +l +l "} From e1811a4ba6ff3d18f16ae4198b387ba9e2c4c00c Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Fri, 10 Jan 2025 09:29:19 -0500 Subject: [PATCH 28/47] Rolling Back Amber --- .../mob/living/simple_animal/hostile/ordeal/amber.dm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 302132d92216..5c2f2c036905 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/amber.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/amber.dm @@ -203,8 +203,6 @@ var/burrowing = FALSE /// List of currently spawned dawns, so we don't create too many var/list/spawned_mobs = list() - //If they can burrow or not. - var/can_burrow = TRUE var/datum/looping_sound/amberdusk/soundloop @@ -260,10 +258,9 @@ . = ..() if(!.) // Dead return FALSE - if(can_burrow) - if(!burrowing && world.time > burrow_cooldown) - AttemptBirth() - BurrowIn() + if(!burrowing && world.time > burrow_cooldown) + AttemptBirth() + BurrowIn() /mob/living/simple_animal/hostile/ordeal/amber_dusk/death(gibbed) if(LAZYLEN(butcher_results)) From d420f812c02072978954ed7641b3dcb2cea654b8 Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Fri, 10 Jan 2025 09:33:44 -0500 Subject: [PATCH 29/47] Rolling Back Amber spawning --- .../tegu_items/associations/cityspawners.dm | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/ModularTegustation/tegu_items/associations/cityspawners.dm b/ModularTegustation/tegu_items/associations/cityspawners.dm index e797895a2613..2be6635e1f53 100644 --- a/ModularTegustation/tegu_items/associations/cityspawners.dm +++ b/ModularTegustation/tegu_items/associations/cityspawners.dm @@ -77,7 +77,6 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) "gcorp", "sweeper", "bots", - "worms", ) /obj/effect/landmark/backstreetspawn/Initialize() @@ -100,15 +99,10 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot if(prob(30)) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big + new spawning(get_turf(src)) + - if("worms") - spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug - if(prob(30)) - spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk - new spawning(get_turf(src)) - if (GLOB.city_center_enemies == "worms") - new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src)) /obj/effect/landmark/backstreetspawnwest name = "cityspawn landmark" @@ -117,7 +111,6 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) "gcorp", "sweeper", "bots", - "worms", ) /obj/effect/landmark/backstreetspawnwest/Initialize() @@ -141,15 +134,7 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot if(prob(30)) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big - - if("worms") - spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug - if(prob(30)) - spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk - new spawning(get_turf(src)) - if (GLOB.city_west_enemies == "worms") - new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src)) /obj/effect/landmark/backstreetspawneast @@ -159,7 +144,6 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) "gcorp", "sweeper", "bots", - "worms", ) /obj/effect/landmark/backstreetspawneast/Initialize() @@ -182,12 +166,4 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot if(prob(30)) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big - - if("worms") - spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug - if(prob(30)) - spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk - new spawning(get_turf(src)) - if (GLOB.city_east_enemies == "worms") - new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src)) From 3638cb77f55a48f77de81c1576feeac2ea0bd77b Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Fri, 10 Jan 2025 09:34:49 -0500 Subject: [PATCH 30/47] Adding back a space --- ModularTegustation/tegu_items/associations/cityspawners.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/ModularTegustation/tegu_items/associations/cityspawners.dm b/ModularTegustation/tegu_items/associations/cityspawners.dm index 2be6635e1f53..215c61cb5d67 100644 --- a/ModularTegustation/tegu_items/associations/cityspawners.dm +++ b/ModularTegustation/tegu_items/associations/cityspawners.dm @@ -167,3 +167,4 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) if(prob(30)) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big new spawning(get_turf(src)) + From a7d97d1e1c2e4516bbcc38bcb6bac98d02e2a738 Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Fri, 10 Jan 2025 13:28:57 -0500 Subject: [PATCH 31/47] Removing flame_fixer room changes --- .../backstreets/bossroom/flame_fixer.dmm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm b/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm index 6e0490c65806..f4db0135de61 100644 --- a/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/flame_fixer.dmm @@ -311,11 +311,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/beach/sand, /area/city/backstreets_room) -"IP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/mineral_door/wood, -/turf/open/floor/carpet/red, -/area/city/backstreets_room) "Ki" = ( /obj/structure/table/wood/fancy/red, /obj/effect/decal/cleanable/dirt/dust, @@ -340,9 +335,6 @@ }, /turf/open/floor/holofloor/carpet, /area/city/backstreets_room) -"Lp" = ( -/turf/closed/indestructible/wood, -/area/city/backstreets_room) "LY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wood{ @@ -720,7 +712,7 @@ fZ TB LY KZ -Lp +KZ "} (10,1,1) = {" Eo @@ -742,7 +734,7 @@ rO PJ Zt PJ -IP +PJ "} (11,1,1) = {" Eo @@ -764,7 +756,7 @@ rO PJ Zt PJ -IP +PJ "} (12,1,1) = {" Eo @@ -786,7 +778,7 @@ Gc Pn qG KZ -Lp +KZ "} (13,1,1) = {" Eo From 941cbb7548779cb56097d3c3a67b2a80466eb8ff Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Fri, 10 Jan 2025 13:30:57 -0500 Subject: [PATCH 32/47] Removing Metal Fixer changes --- .../backstreets/bossroom/metal_fixer.dmm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm b/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm index d48275da5872..7e403f988b92 100644 --- a/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/metal_fixer.dmm @@ -81,9 +81,6 @@ }, /turf/open/floor/stone, /area/city/backstreets_room) -"o" = ( -/turf/closed/wall/mineral/iron, -/area/city/backstreets_room) "p" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/wideplating/dark/corner{ @@ -129,11 +126,6 @@ }, /turf/open/floor/stone, /area/city/backstreets_room) -"z" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/mineral_door/iron, -/turf/open/floor/carpet/royalblack, -/area/city/backstreets_room) "A" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/ordeal/green_bot{ @@ -492,7 +484,7 @@ P H g b -o +b "} (10,1,1) = {" r @@ -514,7 +506,7 @@ V A V V -z +V "} (11,1,1) = {" r @@ -536,7 +528,7 @@ V A V V -z +V "} (12,1,1) = {" r @@ -558,7 +550,7 @@ I K g b -o +b "} (13,1,1) = {" T From c95a050ffa5f7b94c39d1594a833a5731bf80f2e Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Sun, 12 Jan 2025 22:50:33 -0500 Subject: [PATCH 33/47] Adding Icons --- .../Teguicons/blood_fiend_gear.dmi | Bin 709 -> 1050 bytes .../Teguicons/blood_fiend_gear_worn.dmi | Bin 892 -> 1880 bytes .../Teguicons/blood_fiends_32x32.dmi | Bin 7416 -> 19650 bytes .../tegu_mobs/lc13_blood_fiend.dm | 56 ++++++++++++++---- 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/ModularTegustation/Teguicons/blood_fiend_gear.dmi b/ModularTegustation/Teguicons/blood_fiend_gear.dmi index 23c5e8751effa4aeb1376ec911e934380cd74d26..4efc991e824f2b3622db051463dde8b2ad66393b 100644 GIT binary patch delta 1036 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 delta 806 zcmV+>1KIr84*UjxiBL{Q4GJ0x0000DNk~Le0001h0001h2m=5B0QBII`2YX_IZ#Yg zMZmzoO8@{`0021v03rYY@#*RP_4VS^)Bpeg3=9kk3JMPo4{u{*YhPb=YHDz1W_E3D zdvbDob#=r&%whll00DGTPE!Ct=GbNc0057AR9JLGWpiVZyJUZoGK*5;a}$fR391At zDooDFPb5xdNoFc8b;=5^elB3&0RRVpLe)5sU#$QD0#->xK~#90?V1aBqaYB4O%p(d zZXf&qf9wKc;_5s|W8CfO{myAsn3;PO#mC7o0090^P8}^zXj-uhkztd>UDJw2`eVukDM}XNj8q_}TK=fSNcB@9@(g7}K>1EnaYm-^)L z5fBt^`kKRRAab9ms=kZW0H0p#*CF5)mikJG2MuHgBnb2wD8m?~G4LT$lE$DW$LzoS zV`8S_v%G&&qd1Vhlt$8$V>^VYu5As(>p|f9mnOvvfmHYV8Ay@=?eI|?76yjxwVGRQ z28cZe>I`BTsMC$mzc3*7YtsPTL^J~}@O}g4L^K-^XUeD>h;4+vJQKz=?WAg;#3*~% z&cv@7Xc5ZYOb=+Mr#M+3W8n4Q8JL8BiHD%?W~6`W>mk$R@^)Q2+`u%syw@=9I_Wf^ z>Z>u+v&`FVl{YUN=+RfAn&`)JW2-;k62&okz`(Tl{A+939~TpqI7X(v8TMOC&5-y| zS{^q$^lO=CK3W3+z;`D|FP4X~gTD5Cz)WU;esVAJ>$#n~%Md(bVA$gqB=Yxx9g24$ keIFh;N*@3K007^MKPq`7YB_@L=Kufz07*qoM6N<$f@2nG6#xJL diff --git a/ModularTegustation/Teguicons/blood_fiends_32x32.dmi b/ModularTegustation/Teguicons/blood_fiends_32x32.dmi index cdc35d31ee4143231b4f6f5153ea57a35b317f58..27da885dde7b8f41c7010f4736931cbd464df0db 100644 GIT binary patch literal 19650 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 LNkvXXu0mjfktq-( literal 7416 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 G*#84slU}U= diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 01703bcc91d6..a090f8fe8da5 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -5,9 +5,9 @@ name = "bloodfiend" desc = "A humanoid wearing a bloody dress and a bird mask." icon = 'ModularTegustation/Teguicons/blood_fiends_32x32.dmi' - icon_state = "bloodfiend" - icon_living = "bloodfiend" - icon_dead = "bloodfiend_dead" + icon_state = "test_meifiend" + icon_living = "test_meifiend" + icon_dead = "test_meifiend_dead" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1.2, WHITE_DAMAGE = 0.8, BLACK_DAMAGE = 0.6, PALE_DAMAGE = 1.3) melee_damage_lower = 8 melee_damage_upper = 10 @@ -33,10 +33,13 @@ var/leap_bleed_stacks = 5 /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/AdjustBloodFeast(amount) - adjustBruteLoss(-amount/4) - blood_feast += amount - if (blood_feast > max_blood_feast) - blood_feast = max_blood_feast + if(stat != DEAD) + adjustBruteLoss(-amount/4) + blood_feast += amount + if (blood_feast > max_blood_feast) + blood_feast = max_blood_feast + else + return /mob/living/simple_animal/hostile/humanoid/blood/fiend/death(gibbed) if(prob(30)) @@ -81,6 +84,9 @@ blood.color = "#b52e19" hit_mob = HurtInTurf(T, hit_mob, slash_damage, RED_DAMAGE, null, TRUE, FALSE, TRUE, hurt_structure = TRUE) +/obj/effect/temp_visual/warning3x3/bloodfiend + duration = 1.5 SECONDS + /mob/living/simple_animal/hostile/humanoid/blood/fiend/proc/Leap(mob/living/target) if(!isliving(target) && !ismecha(target) || !can_act) return @@ -91,7 +97,9 @@ src.pixel_x = 16 playsound(src, 'sound/abnormalities/ichthys/jump.ogg', 50, FALSE, 4) var/turf/target_turf = get_turf(target) - SLEEP_CHECK_DEATH(1 SECONDS) + var/obj/effect/temp_visual/warning3x3/W = new(target_turf) + W.color = "#fa3217ac" + SLEEP_CHECK_DEATH(1.5 SECONDS) if(target_turf) forceMove(target_turf) //look out, someone is rushing you! playsound(src, leap_sound, 50, FALSE, 4) @@ -158,11 +166,14 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss name = "royal bloodfiend" - desc = "A humanoid wearing a bloody dress and a bird mask..." + desc = "A humanoid wearing a bloody suit and a bird mask. They appear to hold themselves in high regard." icon = 'ModularTegustation/Teguicons/blood_fiends_32x32.dmi' - icon_state = "bloodfiend" - icon_living = "bloodfiend" - icon_dead = "bloodfiend_dead" + icon_state = "b_boss" + icon_living = "b_boss" + icon_dead = "b_boss_dead" + var/normal_state = "b_boss" + var/hardblood_state = "b_boss_hardblood" + var/exhausted_state = "b_boss_exhausted" damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5) melee_damage_lower = 7 melee_damage_upper = 8 @@ -190,6 +201,22 @@ var/summon_cost = 25 var/slashing = FALSE +/mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/AdjustBloodFeast(amount) + . = ..() + if (slashing) + return + + if (blood_feast > max_blood_feast * 0.5) + icon_state = hardblood_state + melee_damage_lower = 10 + melee_damage_upper = 12 + melee_damage_type = BLACK_DAMAGE + else + icon_state = normal_state + melee_damage_lower = 7 + melee_damage_upper = 8 + melee_damage_type = RED_DAMAGE + /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss/Leap(mob/living/target) if(!isliving(target) && !ismecha(target) || !can_act) return @@ -200,7 +227,6 @@ blood_target = target blood_target.apply_status_effect(/datum/status_effect/bloodhold) blood_target.faction += "city" - blood_feast = 0 can_act = FALSE var/list/dirs_to_land = shuffle(list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) var/list/dir_overlays = list() @@ -266,10 +292,13 @@ var/mutable_appearance/colored_overlay = mutable_appearance(icon, "small_stagger", layer + 0.1) add_overlay(colored_overlay) manual_emote("kneels on the floor...") + icon_state = exhausted_state ChangeResistances(list(RED_DAMAGE = 2, WHITE_DAMAGE = 1.2, BLACK_DAMAGE = 1, PALE_DAMAGE = 3)) sleep(stun_duration) manual_emote("rises back up...") cut_overlays() + blood_feast = 0 + icon_state = normal_state ChangeResistances(list(RED_DAMAGE = 1, WHITE_DAMAGE = 0.6, BLACK_DAMAGE = 0.4, PALE_DAMAGE = 1.5)) slashing = FALSE can_act = TRUE @@ -375,6 +404,7 @@ attack_sound = 'sound/effects/ordeals/brown/flea_attack.ogg' attack_verb_continuous = "slashes" attack_verb_simple = "slash" + move_to_delay = 2.5 maxHealth = 500 health = 500 butcher_results = list(/obj/item/food/meat/slab/crimson = 1) From 0c5790a4886f5749eecb5a071afe4b846bb1fed4 Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Mon, 13 Jan 2025 10:21:59 -0500 Subject: [PATCH 34/47] adding the coat --- ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 4 +++- .../suits/ego_gear/non_abnormality/bloodfiend.dm | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index a090f8fe8da5..9bfc303b0de0 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -42,7 +42,7 @@ return /mob/living/simple_animal/hostile/humanoid/blood/fiend/death(gibbed) - if(prob(30)) + if(prob(20)) new /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak (get_turf(src)) . = ..() @@ -447,6 +447,8 @@ addtimer(CALLBACK(src, PROC_REF(DeathExplosion)), 15) new /obj/item/food/meat/slab/crimson (get_turf(src)) new /obj/item/food/meat/slab/crimson (get_turf(src)) + if(prob(10)) + new /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/masquerade_coat (get_turf(src)) QDEL_IN(src, 15) ..() diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm index 6a75fdcff32c..a9c2e40eb162 100644 --- a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm +++ b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm @@ -1,6 +1,6 @@ /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak name = "masquerade cloak" - desc = "A wloak worn by the bloodfiends, worn in celebration of something..." + desc = "A cloak worn by the bloodfiends, worn in celebration of something..." icon_state = "masqcloak" icon = 'ModularTegustation/Teguicons/blood_fiend_gear.dmi' worn_icon = 'ModularTegustation/Teguicons/blood_fiend_gear_worn.dmi' @@ -13,6 +13,16 @@ TEMPERANCE_ATTRIBUTE = 60, JUSTICE_ATTRIBUTE = 60 ) + +/obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/masquerade_coat + name = "masquerade coat" + desc = "A cloat worn by the bloodbags, worn in celebration of something..." + icon_state = "Driedcoat" + armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 10, BLACK_DAMAGE = 20, PALE_DAMAGE = 0) + hat = null + neck = null + attribute_requirements = list() + /obj/item/clothing/ego_neck/blood_fiend icon = 'ModularTegustation/Teguicons/blood_fiend_gear.dmi' worn_icon = 'ModularTegustation/Teguicons/blood_fiend_gear_worn.dmi' From fa49ebc2a244a923311f3ab2469287a267728506 Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Mon, 13 Jan 2025 16:49:09 -0500 Subject: [PATCH 35/47] Updating Outfits --- .../ego_gear/non_abnormality/bloodfiend.dm | 76 ++++++++++++++++++- 1 file changed, 73 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm index a9c2e40eb162..d3cb57b7deb8 100644 --- a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm +++ b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm @@ -2,11 +2,17 @@ name = "masquerade cloak" desc = "A cloak worn by the bloodfiends, worn in celebration of something..." icon_state = "masqcloak" + var/normal_state = "masqcloak" + var/hardblood_state = null icon = 'ModularTegustation/Teguicons/blood_fiend_gear.dmi' worn_icon = 'ModularTegustation/Teguicons/blood_fiend_gear_worn.dmi' - armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 20, BLACK_DAMAGE = 40, PALE_DAMAGE = 30) + armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 10, BLACK_DAMAGE = 30, PALE_DAMAGE = 20) + var/list/normal_armor = list(red = 30, white = 10, black = 30, pale = 20) + var/list/hardblood_armor = list(red = 60, white = 40, black = 60, pale = 50) hat = /obj/item/clothing/head/ego_hat/blood_fiend/bird_mask neck = /obj/item/clothing/ego_neck/blood_fiend/coagulated_blood + var/bloodfeast = 0 + var/bloodfeast_max = 200 attribute_requirements = list( FORTITUDE_ATTRIBUTE = 60, PRUDENCE_ATTRIBUTE = 60, @@ -14,11 +20,75 @@ JUSTICE_ATTRIBUTE = 60 ) +/obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/Initialize() + . = ..() + var/obj/effect/proc_holder/ability/AS = new /obj/effect/proc_holder/ability/bloodfeast + var/datum/action/spell_action/ability/item/A = AS.action + A.SetItem(src) + + var/obj/effect/proc_holder/ability/BS = new /obj/effect/proc_holder/ability/bloodart + var/datum/action/spell_action/ability/item/B = BS.action + B.SetItem(src) + + +/obj/effect/proc_holder/ability/bloodfeast + name = "Bloodfeast" + desc = "An ability that lets the user drain nearby blood to increase the armor's bloodfeast." + action_icon = 'ModularTegustation/Teguicons/status_sprites.dmi' + action_icon_state = "lc_bleed" + base_icon_state = "lc_bleed" + cooldown_time = 5 SECONDS + +/obj/effect/proc_holder/ability/bloodfeast/Perform(target, mob/user) + playsound(get_turf(user), 'sound/abnormalities/nosferatu/bloodcollect.ogg', 25, 0, 4) + if (ishuman(user)) + var/mob/living/carbon/human/wielder = user + var/obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/S = wielder.get_item_by_slot(ITEM_SLOT_OCLOTHING) + for(var/obj/effect/decal/cleanable/blood/B in view(wielder, 2)) //will clean up any blood, but only heals from human blood + if(B.blood_state == BLOOD_STATE_HUMAN) + if(B.bloodiness == 100) //Bonus for "pristine" bloodpools, also to prevent footprint spam + S.bloodfeast += 30 + else + S.bloodfeast += (max((B.bloodiness**2)/800,1)) + qdel(B) + if(S.bloodfeast >= S.bloodfeast_max) + S.bloodfeast = S.bloodfeast_max + return ..() + +/obj/effect/proc_holder/ability/bloodart + name = "Blood Art" + desc = "An ability that lets the user spend the armor's bloodfeast to heal. When spending max bloodfeast, the armor's resistances are buffed for a short time." + action_icon = 'ModularTegustation/Teguicons/status_sprites.dmi' + action_icon_state = "lc_bleed" + base_icon_state = "lc_bleed" + cooldown_time = 10 SECONDS + +/obj/effect/proc_holder/ability/bloodart/Perform(target, mob/user) + playsound(get_turf(user), 'sound/abnormalities/nosferatu/bloodcollect.ogg', 25, 0, 4) + if (ishuman(user)) + var/mob/living/carbon/human/wielder = user + var/obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/S = wielder.get_item_by_slot(ITEM_SLOT_OCLOTHING) + wielder.adjustBruteLoss(-(S.bloodfeast/4)) + if (S.bloodfeast == S.bloodfeast_max) + S.armor = new S.hardblood_armor + if (S.hardblood_state) + S.icon_state = S.hardblood_state + addtimer(CALLBACK(src, PROC_REF(ResetArmor), S), 100) + S.bloodfeast = 0 + +/obj/effect/proc_holder/ability/bloodart/proc/ResetArmor(obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/A) + A.armor = new A.normal_armor + A.icon_state = A.normal_state + /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/masquerade_coat name = "masquerade coat" - desc = "A cloat worn by the bloodbags, worn in celebration of something..." + desc = "A coat worn by the bloodbags, worn in celebration of something..." icon_state = "Driedcoat" - armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 10, BLACK_DAMAGE = 20, PALE_DAMAGE = 0) + normal_state = "Driedcoat" + hardblood_state = "Bloodcoat" + armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = 20, BLACK_DAMAGE = 10, PALE_DAMAGE = 0) + normal_armor = list(red = 10, white = 20, black = 10, pale = 0) + hardblood_armor = list(red = 40, white = 20, black = 40, pale = 40) hat = null neck = null attribute_requirements = list() From 44bec52ec0226a2378c85e27c8be65829650dd93 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 14 Jan 2025 17:23:00 -0500 Subject: [PATCH 36/47] Removing Armor Buff --- .../suits/ego_gear/non_abnormality/bloodfiend.dm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm index d3cb57b7deb8..ece8acd2a3db 100644 --- a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm +++ b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm @@ -6,9 +6,7 @@ var/hardblood_state = null icon = 'ModularTegustation/Teguicons/blood_fiend_gear.dmi' worn_icon = 'ModularTegustation/Teguicons/blood_fiend_gear_worn.dmi' - armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 10, BLACK_DAMAGE = 30, PALE_DAMAGE = 20) - var/list/normal_armor = list(red = 30, white = 10, black = 30, pale = 20) - var/list/hardblood_armor = list(red = 60, white = 40, black = 60, pale = 50) + armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 20, BLACK_DAMAGE = 40, PALE_DAMAGE = 20) hat = /obj/item/clothing/head/ego_hat/blood_fiend/bird_mask neck = /obj/item/clothing/ego_neck/blood_fiend/coagulated_blood var/bloodfeast = 0 @@ -57,7 +55,7 @@ /obj/effect/proc_holder/ability/bloodart name = "Blood Art" - desc = "An ability that lets the user spend the armor's bloodfeast to heal. When spending max bloodfeast, the armor's resistances are buffed for a short time." + desc = "An ability that lets the user spend the armor's bloodfeast to heal." action_icon = 'ModularTegustation/Teguicons/status_sprites.dmi' action_icon_state = "lc_bleed" base_icon_state = "lc_bleed" @@ -70,14 +68,13 @@ var/obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/S = wielder.get_item_by_slot(ITEM_SLOT_OCLOTHING) wielder.adjustBruteLoss(-(S.bloodfeast/4)) if (S.bloodfeast == S.bloodfeast_max) - S.armor = new S.hardblood_armor if (S.hardblood_state) S.icon_state = S.hardblood_state addtimer(CALLBACK(src, PROC_REF(ResetArmor), S), 100) S.bloodfeast = 0 + return ..() /obj/effect/proc_holder/ability/bloodart/proc/ResetArmor(obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/A) - A.armor = new A.normal_armor A.icon_state = A.normal_state /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/masquerade_coat @@ -86,9 +83,8 @@ icon_state = "Driedcoat" normal_state = "Driedcoat" hardblood_state = "Bloodcoat" - armor = list(RED_DAMAGE = 10, WHITE_DAMAGE = 20, BLACK_DAMAGE = 10, PALE_DAMAGE = 0) - normal_armor = list(red = 10, white = 20, black = 10, pale = 0) - hardblood_armor = list(red = 40, white = 20, black = 40, pale = 40) + bloodfeast_max = 100 + armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 20, BLACK_DAMAGE = 10, PALE_DAMAGE = 0) hat = null neck = null attribute_requirements = list() From 6c9040f78dc4df13f78c1db67d47a1897b608a0f Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Wed, 15 Jan 2025 10:13:19 -0500 Subject: [PATCH 37/47] Bloodfeast Info --- .../clothing/suits/ego_gear/non_abnormality/bloodfiend.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm index ece8acd2a3db..4d0a55a77e3e 100644 --- a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm +++ b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm @@ -28,6 +28,9 @@ var/datum/action/spell_action/ability/item/B = BS.action B.SetItem(src) +/obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/examine(mob/user) + . = ..() + . += span_notice("This outfit currently has [bloodfeast] bloodfeast out of [bloodfeast_max] maximum bloodfeast.") /obj/effect/proc_holder/ability/bloodfeast name = "Bloodfeast" @@ -59,7 +62,7 @@ action_icon = 'ModularTegustation/Teguicons/status_sprites.dmi' action_icon_state = "lc_bleed" base_icon_state = "lc_bleed" - cooldown_time = 10 SECONDS + cooldown_time = 20 SECONDS /obj/effect/proc_holder/ability/bloodart/Perform(target, mob/user) playsound(get_turf(user), 'sound/abnormalities/nosferatu/bloodcollect.ogg', 25, 0, 4) From 9f38bec8d485ac43a023a81782082f0b7e854a3c Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Thu, 16 Jan 2025 21:51:48 -0500 Subject: [PATCH 38/47] Bloodfiend Fixes --- ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 3 ++- .../clothing/suits/ego_gear/non_abnormality/bloodfiend.dm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 9bfc303b0de0..7e8ed599678c 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -161,7 +161,8 @@ /mob/living/simple_animal/hostile/humanoid/blood/fiend/Move() if(!can_act) return FALSE - Drain() + if(stat != DEAD) + Drain() ..() /mob/living/simple_animal/hostile/humanoid/blood/fiend/boss diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm index 4d0a55a77e3e..c8fd937d6b1f 100644 --- a/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm +++ b/code/modules/clothing/suits/ego_gear/non_abnormality/bloodfiend.dm @@ -69,11 +69,11 @@ if (ishuman(user)) var/mob/living/carbon/human/wielder = user var/obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/S = wielder.get_item_by_slot(ITEM_SLOT_OCLOTHING) - wielder.adjustBruteLoss(-(S.bloodfeast/4)) + wielder.adjustBruteLoss(-(S.bloodfeast/2)) if (S.bloodfeast == S.bloodfeast_max) if (S.hardblood_state) S.icon_state = S.hardblood_state - addtimer(CALLBACK(src, PROC_REF(ResetArmor), S), 100) + addtimer(CALLBACK(src, PROC_REF(ResetArmor), S), 600) S.bloodfeast = 0 return ..() From b3bcfb53d544726d53ffb10a6549b1434f284d84 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 21 Jan 2025 16:23:26 -0500 Subject: [PATCH 39/47] Adding a new Book --- .../tegu_items/associations/vending.dm | 1 + .../armor_weaving/carnival_bloodfiend.dm | 28 +++++++++++++++++++ code/game/objects/items/granters.dm | 14 ++++++++++ 3 files changed, 43 insertions(+) create mode 100644 code/datums/components/crafting/recipes/carnival_silk/armor_weaving/carnival_bloodfiend.dm diff --git a/ModularTegustation/tegu_items/associations/vending.dm b/ModularTegustation/tegu_items/associations/vending.dm index 48591e7236bd..e99d2966d21a 100644 --- a/ModularTegustation/tegu_items/associations/vending.dm +++ b/ModularTegustation/tegu_items/associations/vending.dm @@ -100,6 +100,7 @@ /obj/item/book/granter/crafting_recipe/carnival/weaving_wedge = 1, /obj/item/book/granter/crafting_recipe/carnival/weaving_molar_boatworks = 1, /obj/item/book/granter/crafting_recipe/carnival/weaving_rosespanner = 1, + /obj/item/book/granter/crafting_recipe/carnival/weaving_masquerade = 1, ) default_price = 100 diff --git a/code/datums/components/crafting/recipes/carnival_silk/armor_weaving/carnival_bloodfiend.dm b/code/datums/components/crafting/recipes/carnival_silk/armor_weaving/carnival_bloodfiend.dm new file mode 100644 index 000000000000..68948a26f4b4 --- /dev/null +++ b/code/datums/components/crafting/recipes/carnival_silk/armor_weaving/carnival_bloodfiend.dm @@ -0,0 +1,28 @@ +//Bloodfiend Recipes +/datum/crafting_recipe/bloodfiend_coat + name = "Masquerade Coat" + result = /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak/masquerade_coat + reqs = list( + /obj/item/stack/sheet/silk/crimson_simple = 2, + /obj/item/stack/sheet/silk/green_advanced = 1, + /obj/item/stack/sheet/silk/human_simple = 1 + ) + tools = list(/obj/item/silkknife = 1) + time = 15 + always_available = FALSE + category = CAT_SILK + subcategory = CAT_ARMOR + +/datum/crafting_recipe/bloodfiend_cloak + name = "Masquerade Cloak" + result = /obj/item/clothing/suit/armor/ego_gear/city/masquerade_cloak + reqs = list( + /obj/item/stack/sheet/silk/crimson_simple = 4, + /obj/item/stack/sheet/silk/green_advanced = 2, + /obj/item/stack/sheet/silk/human_advanced = 1 + ) + tools = list(/obj/item/silkknife = 1) + time = 15 + always_available = FALSE + category = CAT_SILK + subcategory = CAT_ARMOR diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index e8495d1c0ee2..9af4ffb7d40d 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -741,6 +741,20 @@ icon_state = "boatworks_book" remarks = list("Make sure that you always have your weaving knife on you? I already knew that.", "Using sweepers as silk? That is brand new...", "Huh, it says here that 'Be careful around the fixer association...' ", "This book smells quite well, Like it was just made just for me!", "A rookie must have made this page, or they forgot to spell check it before printing...", "Wait, how will this turn a profit? I spent like 1000 ahn for this book!") +/obj/item/book/granter/crafting_recipe/carnival/weaving_masquerade + name = "Weaving Armor: The Masquerade Edition" + desc = "A weaving book that teaches you how to weave masquerade armor. Carnival approved!
\ + On the back, it says that reading this book will teach how to make:
\ + -Masquerade Coat: RED = 30%, WHITE = 20%, BLACK = 10%, PALE = 0%
\ + -Masquerade Cloak: RED = 40%, WHITE = 20%, BLACK = 40%, PALE = 20%.
\ + There is a small note which also says: (All armors made in this book act like blood sponges, letting you drain blood to heal.)" + crafting_recipe_types = list( + /datum/crafting_recipe/bloodfiend_coat, + /datum/crafting_recipe/bloodfiend_cloak, + ) + icon_state = "masq_book" + remarks = list("Make sure that you always have your weaving knife on you? I already knew that.", "Using sweepers as silk? That is brand new...", "Huh, it says here that 'Be careful around the fixer association...' ", "This book smells quite well, Like it was just made just for me!", "A rookie must have made this page, or they forgot to spell check it before printing...", "Wait, how will this turn a profit? I spent like 1000 ahn for this book!") + /obj/item/book/granter/crafting_recipe/carnival/weaving_j_corp_gangs name = "Weaving Armor: J Corp Gangs Edition" desc = "A weaving book that teaches you how to weave armor used by gangs in J-Corp. Carnival approved!
\ From 617a297e003dab580ece27d9a1962d1c4736bd9b Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 21 Jan 2025 16:53:00 -0500 Subject: [PATCH 40/47] adding new armor recipe --- lobotomy-corp13.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index e1508627a68d..050c26802ac1 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -587,6 +587,7 @@ #include "code\datums\components\crafting\recipes\tools.dm" #include "code\datums\components\crafting\recipes\weapons.dm" #include "code\datums\components\crafting\recipes\carnival_silk\armor_weaving\carnival_blade_lineage.dm" +#include "code\datums\components\crafting\recipes\carnival_silk\armor_weaving\carnival_bloodfiend.dm" #include "code\datums\components\crafting\recipes\carnival_silk\armor_weaving\carnival_boatworks.dm" #include "code\datums\components\crafting\recipes\carnival_silk\armor_weaving\carnival_custom_armor.dm" #include "code\datums\components\crafting\recipes\carnival_silk\armor_weaving\carnival_index.dm" From 2cc1fe8ea1fbdd1c9fc002041cc6e9ceee434e7a Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Tue, 21 Jan 2025 17:11:11 -0500 Subject: [PATCH 41/47] Making the self damage more clear --- ModularTegustation/tegu_mobs/lc13_blood_fiend.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm index 7e8ed599678c..fdbf31f4efec 100644 --- a/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm +++ b/ModularTegustation/tegu_mobs/lc13_blood_fiend.dm @@ -412,7 +412,6 @@ guaranteed_butcher_results = list(/obj/item/food/meat/slab/crimson = 1) silk_results = list(/obj/item/stack/sheet/silk/crimson_simple = 1) var/self_damage = 10 - var/self_damage_type = RED_DAMAGE var/blood_drop_cooldown = 0 var/blood_drop_cooldown_time = 2 SECONDS var/bleed_stacks = 1 @@ -424,7 +423,7 @@ if (istype(target, /mob/living)) var/mob/living/L = target L.apply_lc_bleed(bleed_stacks) - deal_damage(self_damage, self_damage_type) + adjustRedLoss(self_damage) /mob/living/simple_animal/hostile/humanoid/blood/bag/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() From 4946dd22ec2e350b3d0bd2f69f3a945522f34cd2 Mon Sep 17 00:00:00 2001 From: EnderMage99 <130017867+EnderMage99@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:38:27 -0500 Subject: [PATCH 42/47] Revert "Room Updates" This reverts commit 30603e5766584bd4c8b31a6cfd8f0854631b7edf. --- .../backstreets/bossroom/clan_stronghold.dmm | 7 +--- .../backstreets/bossroom/gcorp.dmm | 7 +--- .../backstreets/bossroom/jacques.dmm | 15 ++------ .../backstreets/bossroom/robot.dmm | 7 +--- .../backstreets/bossroom/slime_office.dmm | 5 ++- .../backstreets/connector/apartments_ca.dmm | 34 ++++++----------- .../backstreets/connector/fort_knox.dmm | 19 ++++------ .../backstreets/connector/mountain_ca.dmm | 30 +++------------ .../backstreets/connector/rat_cave.dmm | 32 +++++++--------- .../backstreets/connector/sweeper_ca.dmm | 20 +++------- .../backstreets/large_north/apartment_lna.dmm | 7 +--- .../backstreets/large_north/apartment_lnb.dmm | 11 ++---- .../large_north/blade_lineage_ln.dmm | 11 ++---- .../backstreets/large_north/electric_room.dmm | 7 +--- .../backstreets/large_north/limbus_lna.dmm | 7 +--- .../backstreets/large_north/robot_lnb.dmm | 31 +++++----------- .../backstreets/large_north/scorp.dmm | 7 +--- .../large_north/scorp_warehouse.dmm | 7 +--- .../backstreets/large_north/town_lna.dmm | 11 +----- .../backstreets/large_south/apartment_lsa.dmm | 7 +--- .../backstreets/large_south/apartment_lsb.dmm | 13 ++----- .../backstreets/large_south/bongy.dmm | 8 +--- .../backstreets/large_south/gcorp_armory.dmm | 7 +--- .../large_south/prosthetic_factory.dmm | 7 +--- .../backstreets/large_south/robot_castle.dmm | 10 +---- .../backstreets/large_south/supermarket.dmm | 14 +++---- .../backstreets/medium_east/church.dmm | 7 +--- .../backstreets/medium_east/clan_mechs.dmm | 7 +--- .../backstreets/medium_east/kcorp_storage.dmm | 7 +--- .../backstreets/medium_east/roach_mafia.dmm | 7 +--- .../backstreets/medium_east/robot_mea.dmm | 7 +--- .../backstreets/medium_east/shrimp_office.dmm | 7 +--- .../backstreets/medium_east/workshop_me.dmm | 7 +--- .../backstreets/medium_east/worm_cave.dmm | 7 +--- .../medium_east/zwei_office_mea.dmm | 11 ++---- .../medium_east/zwei_office_meb.dmm | 7 +--- .../backstreets/medium_north/buffet.dmm | 11 ++---- .../medium_north/clan_outskirts.dmm | 5 +-- .../backstreets/medium_north/fairies.dmm | 7 +--- .../backstreets/medium_north/fishing_mn.dmm | 8 +--- .../medium_north/gmanager_house.dmm | 7 +--- .../medium_north/hana_office_mn.dmm | 7 +--- .../backstreets/medium_north/rage_cage.dmm | 7 +--- .../backstreets/medium_north/rat_mna.dmm | 8 ++-- .../backstreets/medium_north/shrimp_gym.dmm | 11 ++---- .../backstreets/medium_north/slime_hut.dmm | 10 +---- .../backstreets/medium_north/workshop_mn.dmm | 7 +--- .../backstreets/medium_south/apartmentmsa.dmm | 7 +--- .../backstreets/medium_south/clan_storage.dmm | 7 +--- .../backstreets/medium_south/eyes_temple.dmm | 10 +---- .../backstreets/medium_south/lcorp_ruin.dmm | 7 +--- .../backstreets/medium_south/rat_msa.dmm | 7 +--- .../medium_south/seven_office_msa.dmm | 10 +++-- .../backstreets/medium_south/theatre.dmm | 5 +-- .../backstreets/medium_south/town_msa.dmm | 7 +--- .../medium_west/butcher_medium.dmm | 7 +--- .../backstreets/medium_west/clan_cages.dmm | 7 +--- .../backstreets/medium_west/lcorp_office.dmm | 7 +--- .../backstreets/medium_west/mini_beach.dmm | 18 ++++----- .../backstreets/medium_west/sweeper_pen.dmm | 35 +++++------------- .../backstreets/medium_west/town_mwa.dmm | 30 +++++---------- .../backstreets/medium_west/town_mwb.dmm | 16 ++------ .../backstreets/small_east/limbus_sea.dmm | 7 +--- .../backstreets/small_east/noodlebar.dmm | 7 +--- .../backstreets/small_east/oceanic_se.dmm | 7 +--- .../backstreets/small_east/paper_pushed.dmm | 7 +--- .../backstreets/small_east/rat_sea.dmm | 9 +---- .../backstreets/small_north/apartment_sna.dmm | 7 +--- .../backstreets/small_north/apartment_snb.dmm | 9 ++--- .../backstreets/small_north/bird_box.dmm | 7 +--- .../backstreets/small_north/coffee_break.dmm | 7 +--- .../small_north/kcorp_stash_sna.dmm | 7 +--- .../backstreets/small_north/pet_store.dmm | 7 +--- .../small_north/small_clan_hideout.dmm | 7 +--- .../backstreets/small_north/snow_forest.dmm | 35 +++++++----------- .../backstreets/small_north/sweeper_solo.dmm | 8 +--- .../small_south/candlelit_dinner.dmm | 21 ++++------- .../small_south/human_experiment.dmm | 7 +--- .../small_south/jumpscare_closet.dmm | 12 +----- .../backstreets/small_south/lcorp_tomb.dmm | 7 +--- .../backstreets/small_south/robot_ssa.dmm | 7 +--- .../small_south/wcorp_base_ssa.dmm | 8 ++-- .../backstreets/small_west/dry_cleaners.dmm | 7 +--- .../backstreets/small_west/freezer_sw.dmm | 10 +---- .../backstreets/small_west/gcorp_swa.dmm | 7 +--- .../backstreets/small_west/rat_swa.dmm | 7 +--- .../backstreets/small_west/rat_swb.dmm | 7 +--- .../small_west/risk_rain_reference_robot.dmm | 7 +--- .../backstreets/small_west/robot_swa.dmm | 7 +--- .../backstreets/small_west/robot_swb.dmm | 18 +++------ .../backstreets/small_west/runaway_bird.dmm | 7 +--- .../objects/structures/signs/signs_warning.dm | 26 ------------- icons/obj/decals.dmi | Bin 40790 -> 39694 bytes 93 files changed, 289 insertions(+), 690 deletions(-) diff --git a/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm b/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm index ce038082c4ee..35be703d23ac 100644 --- a/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/clan_stronghold.dmm @@ -647,9 +647,6 @@ /obj/structure/statue/custom, /turf/open/floor/carpet/black, /area/city/backstreets_room) -"Am" = ( -/turf/closed/wall/mineral/iron, -/area/city/backstreets_room) "Az" = ( /obj/machinery/light{ dir = 8 @@ -1258,7 +1255,7 @@ nA mI mI mI -Am +xO "} (10,1,1) = {" xO @@ -1324,7 +1321,7 @@ qR pg vL vL -Am +xO "} (13,1,1) = {" xO diff --git a/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm b/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm index 9c1780ddfb60..7578e946d880 100644 --- a/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/gcorp.dmm @@ -65,9 +65,6 @@ /obj/item/stack/spacecash/c200, /turf/open/floor/engine, /area/city/backstreets_room) -"lr" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "oq" = ( /obj/item/workshop_mod/curing/pale, /turf/open/floor/plasteel/dark, @@ -422,7 +419,7 @@ An ZT ZT ZT -lr +An "} (11,1,1) = {" An @@ -444,7 +441,7 @@ An ZT ZT ZT -lr +An "} (12,1,1) = {" An diff --git a/_maps/RandomRooms/backstreets/bossroom/jacques.dmm b/_maps/RandomRooms/backstreets/bossroom/jacques.dmm index b004e8854ae8..dfd40bdd09e7 100644 --- a/_maps/RandomRooms/backstreets/bossroom/jacques.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/jacques.dmm @@ -101,10 +101,6 @@ /obj/item/stack/spacecash/c100, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) -"tF" = ( -/obj/machinery/door/airlock/cult/unruned/glass/friendly, -/turf/open/floor/plasteel/cult, -/area/city/backstreets_room) "us" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -434,9 +430,6 @@ }, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) -"Qz" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "Rb" = ( /obj/structure/chair/pew{ dir = 1 @@ -768,7 +761,7 @@ gQ Am Bh do -Qz +EP "} (10,1,1) = {" An @@ -789,8 +782,8 @@ gQ gQ gQ OJ +EP Fy -tF "} (11,1,1) = {" An @@ -811,8 +804,8 @@ gQ gQ gQ OJ +EP Fy -tF "} (12,1,1) = {" An @@ -834,7 +827,7 @@ gQ AI cb do -Qz +EP "} (13,1,1) = {" An diff --git a/_maps/RandomRooms/backstreets/bossroom/robot.dmm b/_maps/RandomRooms/backstreets/bossroom/robot.dmm index 5a3f28c5c0e6..60d7bc7c01cc 100644 --- a/_maps/RandomRooms/backstreets/bossroom/robot.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/robot.dmm @@ -1,7 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"bJ" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "co" = ( /obj/effect/landmark/cratespawn/corpo, /turf/open/floor/plasteel/dark, @@ -395,7 +392,7 @@ SY ZT An ZT -bJ +An "} (11,1,1) = {" An @@ -417,7 +414,7 @@ SY ZT An ZT -bJ +An "} (12,1,1) = {" An diff --git a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm index 9477aa8d1f2f..14e6e77c3135 100644 --- a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm @@ -1599,11 +1599,14 @@ /obj/structure/spider/stickyweb/genetic, /turf/open/floor/carpet/green, /area/city/backstreets_room) +<<<<<<< HEAD "SS" = ( /turf/closed/indestructible/reinforced{ color = "#42f545" }, /area/city/backstreets_room) +======= +>>>>>>> parent of 30603e5766 (Room Updates) "Tb" = ( /obj/structure/table/wood/fancy/green, /obj/effect/turf_decal/siding/green{ @@ -2044,7 +2047,7 @@ tG Tb oN Tp -SS +Fi "} (13,1,1) = {" us diff --git a/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm b/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm index fd9fbdb09329..f5a505753c91 100644 --- a/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/apartments_ca.dmm @@ -19,9 +19,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/city/backstreets_room) -"g" = ( -/turf/closed/indestructible/rock, -/area/city/backstreets_room) "j" = ( /obj/structure/dresser, /turf/open/floor/wood, @@ -53,10 +50,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/city/backstreets_room) -"r" = ( -/obj/structure/mineral_door/iron, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_room) "t" = ( /obj/structure/bed/maint, /obj/effect/decal/cleanable/dirt/dust, @@ -97,9 +90,6 @@ /obj/item/kitchen/knife, /turf/open/floor/wood, /area/city/backstreets_room) -"F" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "G" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt/dust, @@ -169,9 +159,9 @@ a a a a -F -r -g +Q +Q +Q e e e @@ -248,7 +238,7 @@ a a "} (6,1,1) = {" -F +Q Q a W @@ -262,10 +252,10 @@ a Q Q Q -F +Q "} (7,1,1) = {" -r +Q U a m @@ -279,10 +269,10 @@ a Q Q Q -r +Q "} (8,1,1) = {" -g +Q Q A W @@ -296,7 +286,7 @@ Q Q O Q -g +Q "} (9,1,1) = {" e @@ -373,9 +363,9 @@ e e e e -g -r -g +Q +Q +Q e e a diff --git a/_maps/RandomRooms/backstreets/connector/fort_knox.dmm b/_maps/RandomRooms/backstreets/connector/fort_knox.dmm index 55a93cc45f8b..cd339ccd54c1 100644 --- a/_maps/RandomRooms/backstreets/connector/fort_knox.dmm +++ b/_maps/RandomRooms/backstreets/connector/fort_knox.dmm @@ -296,9 +296,6 @@ /obj/effect/turf_decal/delivery/white, /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) -"U" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "W" = ( /obj/structure/railing{ dir = 4 @@ -346,11 +343,11 @@ a a a a -U +a Q f l -U +a a a a @@ -409,7 +406,7 @@ a a "} (5,1,1) = {" -U +a a Q Q @@ -423,7 +420,7 @@ Y w M a -U +a "} (6,1,1) = {" Q @@ -477,7 +474,7 @@ Q Q "} (9,1,1) = {" -U +a a Q Q @@ -491,7 +488,7 @@ l Q Q a -U +a "} (10,1,1) = {" a @@ -550,11 +547,11 @@ a a a a -U +a Q Q Q -U +a a a a diff --git a/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm b/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm index 082b9b701ee6..bbd2058cf6f4 100644 --- a/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/mountain_ca.dmm @@ -24,7 +24,6 @@ /obj/effect/decal/cleanable/blood/tracks{ dir = 6 }, -/obj/structure/mineral_door/iron, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "dA" = ( @@ -138,10 +137,6 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"jL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "kv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/blood/gibs/up, @@ -233,7 +228,7 @@ pixel_x = -3; pixel_y = -8 }, -/turf/closed/indestructible/reinforced, +/turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "rP" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -304,9 +299,6 @@ }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"yd" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "yf" = ( /obj/structure/flora/rock/jungle, /turf/open/floor/plating/dirt/jungle/dark, @@ -335,11 +327,6 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"BJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/mineral_door/iron, -/turf/open/floor/plating/dirt/jungle/dark, -/area/city/backstreets_room) "Cz" = ( /mob/living/simple_animal/hostile/ordeal/indigo_dawn{ name = "sweeper scout" @@ -584,11 +571,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"VN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "VO" = ( /mob/living/simple_animal/hostile/ordeal/indigo_noon, /turf/open/floor/plating/dirt/jungle/dark, @@ -637,9 +619,9 @@ dA dA dA dA -jL -BJ -yd +XV +XV +VO dA dA dA @@ -675,7 +657,7 @@ Tq on Rd XV -VO +Rd yo dA XA @@ -843,7 +825,7 @@ dA eM rO bh -VN +rP dA dA dA diff --git a/_maps/RandomRooms/backstreets/connector/rat_cave.dmm b/_maps/RandomRooms/backstreets/connector/rat_cave.dmm index f64272087475..2bfef9152a63 100644 --- a/_maps/RandomRooms/backstreets/connector/rat_cave.dmm +++ b/_maps/RandomRooms/backstreets/connector/rat_cave.dmm @@ -2,10 +2,6 @@ "a" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"c" = ( -/obj/structure/mineral_door/iron, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_room) "e" = ( /turf/closed/mineral/ash_rock, /area/city/backstreets_room) @@ -42,9 +38,6 @@ /obj/item/trash/can/food/peaches, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) -"C" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "D" = ( /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) @@ -67,6 +60,7 @@ /area/city/backstreets_room) "K" = ( /obj/structure/bed/maint, +/obj/item/reagent_containers/food/drinks/soda_cans/oceanwave/spacedrugs, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "Q" = ( @@ -94,9 +88,9 @@ e e a a -C -c -C +D +D +D a a a @@ -173,7 +167,7 @@ e a "} (6,1,1) = {" -C +D D D h @@ -187,10 +181,10 @@ D D D D -C +D "} (7,1,1) = {" -c +D D D e @@ -204,10 +198,10 @@ D D y D -c +D "} (8,1,1) = {" -e +D e e e @@ -221,7 +215,7 @@ D D D D -C +D "} (9,1,1) = {" e @@ -298,9 +292,9 @@ a e e e -e -c -C +Q +D +D a a a diff --git a/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm b/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm index e5ed795bef0e..eb137b4e3683 100644 --- a/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm +++ b/_maps/RandomRooms/backstreets/connector/sweeper_ca.dmm @@ -67,11 +67,6 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"s" = ( -/obj/structure/stone_tile/slab/cracked, -/obj/structure/mineral_door/iron, -/turf/open/floor/plating/dirt/jungle/wasteland, -/area/city/backstreets_room) "t" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/plating/dirt/jungle/dark, @@ -134,9 +129,6 @@ /obj/structure/stone_tile/slab/cracked, /turf/open/floor/plating/dirt/jungle/wasteland, /area/city/backstreets_room) -"K" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "L" = ( /obj/effect/decal/cleanable/blood/footprints{ dir = 3 @@ -230,9 +222,9 @@ U U U a -K -s -K +I +I +S a U U @@ -434,9 +426,9 @@ U U U a -K -s -K +S +I +S a U U diff --git a/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm b/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm index 85fe8f758ffd..987f1adbef3f 100644 --- a/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/apartment_lna.dmm @@ -226,9 +226,6 @@ "L" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"M" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "N" = ( /obj/structure/mineral_door/wood, /turf/open/indestructible/hoteltile, @@ -434,7 +431,7 @@ p b b A -M +L "} (11,1,1) = {" L @@ -454,7 +451,7 @@ L A k b -M +L "} (13,1,1) = {" L diff --git a/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm b/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm index ca092170e7ff..6534af04c76a 100644 --- a/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm +++ b/_maps/RandomRooms/backstreets/large_north/apartment_lnb.dmm @@ -4,9 +4,6 @@ /obj/item/storage/firstaid/revival, /turf/open/floor/wood, /area/city/backstreets_room) -"b" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "e" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -225,7 +222,7 @@ Q L x Z -b +L "} (3,1,1) = {" L @@ -245,7 +242,7 @@ C L F U -b +L "} (5,1,1) = {" L @@ -335,7 +332,7 @@ L O V I -b +L "} (14,1,1) = {" L @@ -355,7 +352,7 @@ L z V w -b +L "} (16,1,1) = {" L diff --git a/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm b/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm index f0af47b497d4..1c28a119be90 100644 --- a/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm +++ b/_maps/RandomRooms/backstreets/large_north/blade_lineage_ln.dmm @@ -113,9 +113,6 @@ /obj/structure/lootcrate/money, /turf/open/floor/wood, /area/city/backstreets_room) -"GD" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "HL" = ( /obj/structure/lootcrate/syndicate, /turf/open/floor/wood, @@ -265,7 +262,7 @@ Ti Ti Ti Ti -GD +gl "} (2,1,1) = {" Ti @@ -295,7 +292,7 @@ tH tH Jj tH -GD +gl "} (5,1,1) = {" Ti @@ -385,7 +382,7 @@ tH Qu Jj tH -GD +gl "} (14,1,1) = {" Ti @@ -415,5 +412,5 @@ Ti Ti Ti Ti -GD +gl "} diff --git a/_maps/RandomRooms/backstreets/large_north/electric_room.dmm b/_maps/RandomRooms/backstreets/large_north/electric_room.dmm index 33dbbe47b1d1..06130a32fc0d 100644 --- a/_maps/RandomRooms/backstreets/large_north/electric_room.dmm +++ b/_maps/RandomRooms/backstreets/large_north/electric_room.dmm @@ -292,9 +292,6 @@ /obj/effect/landmark/cratespawn/corpo, /turf/open/floor/facility/dark, /area/city/backstreets_room) -"Lh" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "ND" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/siding/blue{ @@ -462,7 +459,7 @@ eF Kl uW og -Lh +yN "} (3,1,1) = {" yN @@ -492,7 +489,7 @@ BS NF Oe qd -Lh +yN "} (6,1,1) = {" yN diff --git a/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm b/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm index 83e38dfa915f..fbef14fe7f26 100644 --- a/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/limbus_lna.dmm @@ -1,7 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "c" = ( /obj/structure/rack, /obj/item/ego_weapon/shield/lccb, @@ -193,9 +190,9 @@ L L L L -a +L u -a +L L "} (11,1,1) = {" diff --git a/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm b/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm index 93b683a289bd..ba311e35a67c 100644 --- a/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm +++ b/_maps/RandomRooms/backstreets/large_north/robot_lnb.dmm @@ -7,9 +7,7 @@ /turf/open/floor/plating, /area/city/backstreets_room) "k" = ( -/obj/structure/fence/door{ - resistance_flags = 64 - }, +/obj/structure/fence/door, /turf/open/floor/plating/rust, /area/city/backstreets_room) "n" = ( @@ -25,9 +23,6 @@ /obj/effect/decal/cleanable/robot_debris, /turf/open/floor/plating, /area/city/backstreets_room) -"u" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "x" = ( /obj/effect/landmark/cratespawn/corpo, /turf/open/floor/plating, @@ -80,15 +75,9 @@ /obj/structure/lootcrate/tres, /turf/open/floor/plating/rust, /area/city/backstreets_room) -"U" = ( -/obj/structure/lootcrate/money, -/obj/structure/lootcrate/money, -/turf/open/floor/plating, -/area/city/backstreets_room) "Y" = ( /obj/structure/fence{ - dir = 8; - resistance_flags = 64 + dir = 8 }, /turf/open/floor/plating/rust, /area/city/backstreets_room) @@ -101,7 +90,7 @@ L L L L -u +L "} (2,1,1) = {" L @@ -125,8 +114,8 @@ O "} (4,1,1) = {" L -b -U +a +a N D n @@ -136,7 +125,7 @@ O (5,1,1) = {" L r -D +b n n n @@ -151,7 +140,7 @@ L L L L -u +L "} (7,1,1) = {" L @@ -185,7 +174,7 @@ O "} (10,1,1) = {" L -U +b S a a @@ -201,7 +190,7 @@ L L L L -u +L "} (12,1,1) = {" L @@ -251,5 +240,5 @@ L L L L -u +L "} diff --git a/_maps/RandomRooms/backstreets/large_north/scorp.dmm b/_maps/RandomRooms/backstreets/large_north/scorp.dmm index 3cd4d026d300..2719b15bd792 100644 --- a/_maps/RandomRooms/backstreets/large_north/scorp.dmm +++ b/_maps/RandomRooms/backstreets/large_north/scorp.dmm @@ -164,9 +164,6 @@ /obj/item/ego_weapon/ranged/shrimp/assault, /turf/open/floor/plasteel/vaporwave, /area/city/backstreets_room) -"B" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "C" = ( /obj/machinery/door/airlock/silver/glass, /turf/open/floor/plasteel/rockvault/alien{ @@ -324,7 +321,7 @@ W W q Z -B +L "} (3,1,1) = {" L @@ -344,7 +341,7 @@ x x x P -B +L "} (5,1,1) = {" L diff --git a/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm b/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm index 15ef28ee6c04..bab5a6c8750a 100644 --- a/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm +++ b/_maps/RandomRooms/backstreets/large_north/scorp_warehouse.dmm @@ -48,9 +48,6 @@ /mob/living/simple_animal/hostile/shrimp, /turf/open/floor/carpet/purple, /area/city/backstreets_room) -"s" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "t" = ( /obj/effect/turf_decal/siding/purple{ dir = 6 @@ -171,7 +168,7 @@ L L L L -s +L "} (2,1,1) = {" L @@ -211,7 +208,7 @@ L L L L -s +L "} (6,1,1) = {" L diff --git a/_maps/RandomRooms/backstreets/large_north/town_lna.dmm b/_maps/RandomRooms/backstreets/large_north/town_lna.dmm index 6894bab81d69..978f255fb202 100644 --- a/_maps/RandomRooms/backstreets/large_north/town_lna.dmm +++ b/_maps/RandomRooms/backstreets/large_north/town_lna.dmm @@ -1,7 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"av" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "bk" = ( /obj/structure/meatfloor, /mob/living/simple_animal/hostile/lovetown, @@ -249,10 +246,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/rust, /area/city/backstreets_room) -"EF" = ( -/obj/effect/rune/manifest, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "FA" = ( /obj/structure/meatfloor, /obj/item/food/meat/slab/monkey, @@ -433,7 +426,7 @@ Eu lB hG br -EF +Vw "} (8,1,1) = {" ta @@ -463,7 +456,7 @@ Ol wr Ks cA -av +ta "} (11,1,1) = {" ta diff --git a/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm b/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm index 4927405008cd..a3e57d50939b 100644 --- a/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm +++ b/_maps/RandomRooms/backstreets/large_south/apartment_lsa.dmm @@ -63,9 +63,6 @@ }, /turf/open/floor/wood, /area/city/backstreets_room) -"eM" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "ga" = ( /obj/structure/chair/sofa/left{ dir = 4 @@ -420,7 +417,7 @@ /area/city/backstreets_room) (1,1,1) = {" -eM +zv zv zv CK @@ -460,7 +457,7 @@ IG zv "} (5,1,1) = {" -eM +zv zv zv zv diff --git a/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm b/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm index 76764936956e..ed3a2390f6b7 100644 --- a/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm +++ b/_maps/RandomRooms/backstreets/large_south/apartment_lsb.dmm @@ -20,7 +20,6 @@ /obj/item/shard, /obj/item/stack/sheet/silk, /obj/item/weaponcrafting/silkstring, -/obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/city/backstreets_room) "cX" = ( @@ -58,9 +57,6 @@ }, /turf/open/floor/carpet/black, /area/city/backstreets_room) -"hj" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "hx" = ( /obj/effect/turf_decal/weather/dirt{ dir = 3 @@ -206,7 +202,6 @@ /area/city/backstreets_room) "CK" = ( /obj/item/stack/sheet/mineral/wood, -/obj/structure/mineral_door/wood, /turf/open/floor/wood, /area/city/backstreets_room) "CM" = ( @@ -398,7 +393,7 @@ hQ zv "} (3,1,1) = {" -hj +zv bS YJ jR @@ -418,7 +413,7 @@ IG zv "} (5,1,1) = {" -hj +zv dh dR iL @@ -478,7 +473,7 @@ zv zv "} (11,1,1) = {" -hj +zv WL Cx QG @@ -518,7 +513,7 @@ cf zv "} (15,1,1) = {" -hj +zv Lg Cx QG diff --git a/_maps/RandomRooms/backstreets/large_south/bongy.dmm b/_maps/RandomRooms/backstreets/large_south/bongy.dmm index 0b374255f669..aed2ccf94d41 100644 --- a/_maps/RandomRooms/backstreets/large_south/bongy.dmm +++ b/_maps/RandomRooms/backstreets/large_south/bongy.dmm @@ -211,10 +211,6 @@ /obj/item/kitchen/rollingpin, /turf/open/floor/facility/white, /area/city/backstreets_room) -"F" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/city/backstreets_room) "G" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks{ @@ -425,7 +421,7 @@ R L "} (3,1,1) = {" -F +n a w z @@ -445,7 +441,7 @@ P L "} (5,1,1) = {" -F +n r b O diff --git a/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm b/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm index 1ef79c4d5e97..12be8170a45b 100644 --- a/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm +++ b/_maps/RandomRooms/backstreets/large_south/gcorp_armory.dmm @@ -43,9 +43,6 @@ /obj/machinery/bsa/back, /turf/open/floor/plating, /area/city/backstreets_room) -"G" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "J" = ( /obj/structure/table, /obj/item/documents, @@ -205,7 +202,7 @@ O L "} (14,1,1) = {" -G +L L L L @@ -225,7 +222,7 @@ O L "} (16,1,1) = {" -G +L L L L diff --git a/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm b/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm index a8a5cf5b8320..816e18285086 100644 --- a/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm +++ b/_maps/RandomRooms/backstreets/large_south/prosthetic_factory.dmm @@ -315,9 +315,6 @@ "R" = ( /turf/open/floor/holofloor/dark, /area/city/backstreets_room) -"S" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "T" = ( /mob/living/simple_animal/hostile/ordeal/green_bot{ name = "guard bot" @@ -467,7 +464,7 @@ L L "} (12,1,1) = {" -S +L i y R @@ -497,7 +494,7 @@ X L "} (15,1,1) = {" -S +L y T R diff --git a/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm b/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm index 34cd3a765217..3c64b76f42be 100644 --- a/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm +++ b/_maps/RandomRooms/backstreets/large_south/robot_castle.dmm @@ -564,14 +564,6 @@ }, /turf/open/floor/stone, /area/city/backstreets_room) -"JM" = ( -/obj/structure/fence{ - dir = 4; - pixel_x = 23; - pixel_y = -3 - }, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "JU" = ( /obj/effect/decal/cleanable/blood{ pixel_x = 7; @@ -898,7 +890,7 @@ Vr Xe "} (5,1,1) = {" -JM +ng Xi yS Ht diff --git a/_maps/RandomRooms/backstreets/large_south/supermarket.dmm b/_maps/RandomRooms/backstreets/large_south/supermarket.dmm index 9ffd5bd87422..143f83dd6f02 100644 --- a/_maps/RandomRooms/backstreets/large_south/supermarket.dmm +++ b/_maps/RandomRooms/backstreets/large_south/supermarket.dmm @@ -41,7 +41,8 @@ /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "n" = ( -/turf/closed/indestructible/fakeglass, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "o" = ( /obj/structure/table/reinforced, @@ -53,9 +54,6 @@ /obj/item/dice/d6/space, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) -"r" = ( -/turf/closed/indestructible/fakeglass, -/area/city/backstreets_room) "t" = ( /obj/structure/rack, /obj/item/vending_refill/medical, @@ -120,9 +118,7 @@ /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "U" = ( -/obj/machinery/door/airlock/glass_large{ - resistance_flags = 64 - }, +/obj/machinery/door/airlock/glass_large, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "V" = ( @@ -200,7 +196,7 @@ G L "} (7,1,1) = {" -r +n b b b @@ -230,7 +226,7 @@ X L "} (10,1,1) = {" -r +n b b b diff --git a/_maps/RandomRooms/backstreets/medium_east/church.dmm b/_maps/RandomRooms/backstreets/medium_east/church.dmm index 7a492b2a9099..3cb0e45ff615 100644 --- a/_maps/RandomRooms/backstreets/medium_east/church.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/church.dmm @@ -96,9 +96,6 @@ dir = 4 }, /area/city/backstreets_room) -"E" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "H" = ( /obj/structure/mineral_door/iron, /turf/open/floor/plasteel/dark, @@ -161,9 +158,9 @@ x x x x -E +x H -E +x "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm b/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm index e6d40975b93b..9e8fbc4f823d 100644 --- a/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/clan_mechs.dmm @@ -73,9 +73,6 @@ "E" = ( /turf/open/floor/carpet/red, /area/city/backstreets_room) -"F" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "H" = ( /obj/structure/mecha_wreckage/reticence, /obj/structure/window/reinforced/spawner/east, @@ -140,9 +137,9 @@ a a a a -F +a n -F +a a a a diff --git a/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm b/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm index 67a6c425404a..fdaf109a1699 100644 --- a/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/kcorp_storage.dmm @@ -57,9 +57,6 @@ /obj/structure/chair/office, /turf/open/floor/carpet/green, /area/city/backstreets_room) -"w" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -182,7 +179,7 @@ x f P P -w +x L c S @@ -206,7 +203,7 @@ x g H l -w +x Y a A diff --git a/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm b/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm index 91dc694e73c2..043f05708322 100644 --- a/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/roach_mafia.dmm @@ -31,9 +31,6 @@ /obj/structure/mineral_door/wood, /turf/open/floor/carpet/orange, /area/city/backstreets_room) -"N" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "O" = ( /obj/structure/table/wood/fancy, /obj/item/toy/cards/deck/cas, @@ -58,10 +55,10 @@ x x x -N +x H H -N +x x x x diff --git a/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm b/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm index 170d246a0c1b..e0d9d143e674 100644 --- a/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/robot_mea.dmm @@ -34,9 +34,6 @@ "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"y" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "C" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/indestructible/reinforced, @@ -127,9 +124,9 @@ x x x x -y +x H -y +x "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm b/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm index d93201bbe49f..3a55ec5893a2 100644 --- a/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/shrimp_office.dmm @@ -34,9 +34,6 @@ /mob/living/simple_animal/hostile/shrimp, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) -"B" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "C" = ( /obj/structure/lootcrate/money, /turf/open/floor/carpet/royalblack, @@ -78,10 +75,10 @@ x x x -B +x H H -B +x x x x diff --git a/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm b/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm index bbe156cb49f3..13c964a01667 100644 --- a/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/workshop_me.dmm @@ -55,9 +55,6 @@ "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"A" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "D" = ( /obj/effect/decal/cleanable/dirt/dust, /mob/living/simple_animal/hostile/humanoid/rat/hammer, @@ -104,10 +101,10 @@ x x x x -A +x H H -A +x "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm b/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm index 8c5a3a050e0a..c80a4b5ccd2e 100644 --- a/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/worm_cave.dmm @@ -54,9 +54,6 @@ /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) -"Q" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "Y" = ( /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) @@ -69,9 +66,9 @@ x H x a -Q +x E -Q +x "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm b/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm index d0f3a9da4db3..8c5e2c1b87f3 100644 --- a/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/zwei_office_mea.dmm @@ -33,9 +33,6 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/carpet/blue, /area/city/backstreets_room) -"D" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "H" = ( /obj/machinery/door/airlock/command, /turf/open/floor/carpet/blue, @@ -84,16 +81,16 @@ /area/city/backstreets_room) (1,1,1) = {" -D +x H H -D x x -D +x +x H H -D +x "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm b/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm index 8f7853b1db71..9cea27c99000 100644 --- a/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm +++ b/_maps/RandomRooms/backstreets/medium_east/zwei_office_meb.dmm @@ -46,9 +46,6 @@ "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"z" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "A" = ( /obj/structure/table/wood, /turf/open/floor/carpet/blue, @@ -131,10 +128,10 @@ x x x x -z +x H H -z +x "} (2,1,1) = {" x diff --git a/_maps/RandomRooms/backstreets/medium_north/buffet.dmm b/_maps/RandomRooms/backstreets/medium_north/buffet.dmm index ea0edf666f43..5569e731fa6f 100644 --- a/_maps/RandomRooms/backstreets/medium_north/buffet.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/buffet.dmm @@ -25,9 +25,6 @@ /obj/item/food/crab_rangoon, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) -"o" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "p" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/burger/bigbite, @@ -140,7 +137,7 @@ E M Y U -o +Q "} (3,1,1) = {" Q @@ -156,7 +153,7 @@ O U D x -o +Q "} (5,1,1) = {" Q @@ -180,7 +177,7 @@ H U N U -o +Q "} (8,1,1) = {" Q @@ -196,7 +193,7 @@ z j r x -o +Q "} (10,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm b/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm index 95271f6cf896..d92d5e06634f 100644 --- a/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/clan_outskirts.dmm @@ -33,9 +33,6 @@ /mob/living/simple_animal/hostile/clan/scout, /turf/open/floor/wood, /area/city/backstreets_room) -"y" = ( -/turf/closed/indestructible/wood, -/area/city/backstreets_room) "C" = ( /turf/open/floor/grass/fakebasalt, /area/city/backstreets_room) @@ -81,7 +78,7 @@ C u p E -y +u c c "} diff --git a/_maps/RandomRooms/backstreets/medium_north/fairies.dmm b/_maps/RandomRooms/backstreets/medium_north/fairies.dmm index 2b91fc291be1..b4f039486291 100644 --- a/_maps/RandomRooms/backstreets/medium_north/fairies.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/fairies.dmm @@ -48,9 +48,6 @@ /obj/structure/flora/ausbushes/grassybush, /turf/open/floor/grass/fairy, /area/city/backstreets_room) -"N" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "Q" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -99,7 +96,7 @@ x Y t c -N +Q "} (5,1,1) = {" Q @@ -123,7 +120,7 @@ t t t t -N +Q "} (8,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm index 489fce7a4b62..d7f52f5a0dcc 100644 --- a/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/fishing_mn.dmm @@ -1,6 +1,5 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/machinery/door/airlock/vault, /turf/open/floor/facility/halls, /area/city/backstreets_room) "j" = ( @@ -8,9 +7,6 @@ /obj/item/fishing_rod/gold, /turf/open/water/deep/polluted, /area/city/backstreets_room) -"o" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "u" = ( /obj/structure/lattice/catwalk, /obj/item/fishing_net/hicap, @@ -104,7 +100,7 @@ B x x x -o +Q "} (9,1,1) = {" Q @@ -120,5 +116,5 @@ Q Q Q Q -o +Q "} diff --git a/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm b/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm index 529030ea12f9..83fb6d0c106d 100644 --- a/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/gmanager_house.dmm @@ -46,9 +46,6 @@ /obj/item/paper_bin, /turf/open/floor/carpet/purple, /area/city/backstreets_room) -"z" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "B" = ( /obj/structure/chair/wood, /turf/open/floor/carpet/purple, @@ -140,7 +137,7 @@ B x f k -z +Q "} (9,1,1) = {" Q @@ -156,5 +153,5 @@ Q Q Q Q -z +Q "} diff --git a/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm index 9c3dd09a43df..f20ccaaa5fdb 100644 --- a/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/hana_office_mn.dmm @@ -43,9 +43,6 @@ /obj/structure/table/reinforced, /turf/open/floor/facility/white, /area/city/backstreets_room) -"y" = ( -/turf/closed/wall/mineral/plastitanium/nosmooth, -/area/city/backstreets_room) "B" = ( /mob/living/simple_animal/hostile/ordeal/green_bot_big, /turf/open/floor/facility/white, @@ -123,7 +120,7 @@ s x t B -y +c "} (5,1,1) = {" Q @@ -147,7 +144,7 @@ P x B k -y +c "} (8,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm b/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm index ef61abe7bdcb..a0a878fb43a9 100644 --- a/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/rage_cage.dmm @@ -12,9 +12,6 @@ /obj/effect/spawner/lootdrop/cigbutt, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) -"e" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "k" = ( /mob/living/simple_animal/hostile/humanoid/rat/pipe, /turf/open/floor/plating/asteroid/basalt, @@ -98,7 +95,7 @@ Q Q Q Q -e +Q "} (2,1,1) = {" Q @@ -170,5 +167,5 @@ Q Q Q Q -e +Q "} diff --git a/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm b/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm index 91c23ba438ac..c7da7d54ba81 100644 --- a/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/rat_mna.dmm @@ -31,15 +31,13 @@ /obj/effect/spawner/lootdrop/cigbutt, /turf/open/floor/wood, /area/city/backstreets_room) -"n" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "t" = ( /obj/item/trash/can/food/peaches/maint, /turf/open/floor/wood, /area/city/backstreets_room) "u" = ( /obj/structure/table/anvil, +/obj/item/reagent_containers/food/drinks/soda_cans/oceanwave/spacedrugs, /turf/open/floor/wood, /area/city/backstreets_room) "w" = ( @@ -153,7 +151,7 @@ f l c c -n +Q "} (9,1,1) = {" Q @@ -169,5 +167,5 @@ Q Q Q Q -n +Q "} diff --git a/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm b/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm index 4e816ba6bb32..8d12790a14d8 100644 --- a/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/shrimp_gym.dmm @@ -34,9 +34,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/facility/dark, /area/city/backstreets_room) -"f" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "k" = ( /obj/item/stack/spacecash/c50{ pixel_x = 6; @@ -202,7 +199,7 @@ B B B r -f +Q "} (3,1,1) = {" Q @@ -218,7 +215,7 @@ d z K b -f +Q "} (5,1,1) = {" Q @@ -242,7 +239,7 @@ s Y Z m -f +Q "} (8,1,1) = {" Q @@ -258,7 +255,7 @@ C D q q -f +Q "} (10,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm b/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm index e1aaac97a5af..f43ebcd9545c 100644 --- a/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/slime_hut.dmm @@ -119,12 +119,6 @@ }, /turf/open/floor/carpet/green, /area/city/backstreets_room) -"G" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/indestructible/reinforced{ - color = "#42f545" - }, -/area/city/backstreets_room) "J" = ( /turf/closed/indestructible/reinforced{ color = "#42f545" @@ -242,7 +236,7 @@ s L O U -G +u "} (5,1,1) = {" J @@ -266,7 +260,7 @@ s n L s -G +u "} (8,1,1) = {" J diff --git a/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm b/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm index 8023b10e5342..3cfeeacbd66e 100644 --- a/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm +++ b/_maps/RandomRooms/backstreets/medium_north/workshop_mn.dmm @@ -44,9 +44,6 @@ "B" = ( /turf/open/floor/plasteel/dark, /area/city/backstreets_room) -"D" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "L" = ( /obj/structure/forge, /turf/open/floor/plasteel/dark, @@ -109,7 +106,7 @@ T U B t -D +Q "} (5,1,1) = {" Q @@ -133,7 +130,7 @@ Q Q Q B -D +Q "} (8,1,1) = {" Q diff --git a/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm b/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm index 07e1133d8e03..6fd8f8a2175e 100644 --- a/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/apartmentmsa.dmm @@ -18,9 +18,6 @@ /mob/living/simple_animal/hostile/ordeal/green_bot/factory, /turf/open/floor/carpet/green, /area/city/backstreets_room) -"m" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "o" = ( /obj/structure/lootcrate/backstreets, /turf/open/floor/carpet/green, @@ -122,7 +119,7 @@ Q Q "} (8,1,1) = {" -m +Q x Q f @@ -138,7 +135,7 @@ r Q "} (10,1,1) = {" -m +Q Q Q Q diff --git a/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm b/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm index 6cc39cc4d0f5..94f137679771 100644 --- a/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/clan_storage.dmm @@ -119,9 +119,6 @@ /obj/structure/fluff/paper/stack, /turf/open/floor/sepia, /area/city/backstreets_room) -"K" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "L" = ( /obj/structure/table/bronze, /obj/item/tape/resurgence/temple_of_motus, @@ -205,7 +202,7 @@ w a "} (5,1,1) = {" -K +a J G G @@ -221,7 +218,7 @@ D a "} (7,1,1) = {" -K +a p k S diff --git a/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm b/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm index 936e832a9fd0..836969c88714 100644 --- a/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/eyes_temple.dmm @@ -20,9 +20,6 @@ /mob/living/simple_animal/hostile/ordeal/bigBirdEye, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) -"x" = ( -/turf/closed/wall/mineral/cult, -/area/city/backstreets_room) "z" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt/dust, @@ -70,9 +67,6 @@ "Q" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"V" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "X" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/cult, @@ -82,7 +76,7 @@ /area/city/backstreets_room) (1,1,1) = {" -x +Y Y Y Y @@ -98,7 +92,7 @@ E Y "} (3,1,1) = {" -V +Q K Y Y diff --git a/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm b/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm index d16efc947b72..dd4920f3b1a2 100644 --- a/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/lcorp_ruin.dmm @@ -62,9 +62,6 @@ }, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) -"A" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "B" = ( /turf/closed/mineral/ash_rock, /area/city/backstreets_room) @@ -136,7 +133,7 @@ B B "} (3,1,1) = {" -A +Q U B B @@ -176,7 +173,7 @@ B Q "} (8,1,1) = {" -A +Q O i B diff --git a/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm index ea310546d983..0fd581fe0982 100644 --- a/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/rat_msa.dmm @@ -119,9 +119,6 @@ /obj/structure/fermenting_barrel, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) -"O" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "Q" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -172,7 +169,7 @@ V Q "} (4,1,1) = {" -O +Q q F r @@ -196,7 +193,7 @@ S Q "} (7,1,1) = {" -O +Q c C B diff --git a/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm index 42d9b25ffc3b..f1ab97575908 100644 --- a/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/seven_office_msa.dmm @@ -1,6 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/closed/indestructible/fakeglass, +/obj/structure/window/reinforced/fulltile/indestructable, +/turf/open/space/basic, /area/city/backstreets_room) "c" = ( /mob/living/simple_animal/hostile/ordeal/green_bot, @@ -30,7 +31,7 @@ "r" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/crude, -/turf/closed/indestructible/fakeglass, +/turf/open/floor/plating/ashplanet/wateryrock, /area/city/backstreets_room) "t" = ( /obj/structure/filingcabinet, @@ -45,7 +46,8 @@ /turf/open/floor/carpet/green, /area/city/backstreets_room) "y" = ( -/turf/closed/indestructible/fakeglass, +/obj/structure/window/reinforced/fulltile/indestructable, +/turf/closed/indestructible/fakedoor, /area/city/backstreets_room) "z" = ( /mob/living/simple_animal/hostile/ordeal/green_bot_big, @@ -126,7 +128,7 @@ t Q "} (7,1,1) = {" -y +a l Z m diff --git a/_maps/RandomRooms/backstreets/medium_south/theatre.dmm b/_maps/RandomRooms/backstreets/medium_south/theatre.dmm index abcec2b53bd7..e0b08fdfa0b9 100644 --- a/_maps/RandomRooms/backstreets/medium_south/theatre.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/theatre.dmm @@ -97,9 +97,6 @@ /obj/effect/landmark/cratespawn, /turf/open/floor/carpet/stellar, /area/city/backstreets_room) -"G" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "H" = ( /obj/structure/lootcrate/money, /turf/open/floor/carpet/stellar, @@ -184,7 +181,7 @@ d Q "} (7,1,1) = {" -G +Q M m e diff --git a/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm b/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm index 4b040b06dcea..dda7465e24aa 100644 --- a/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm +++ b/_maps/RandomRooms/backstreets/medium_south/town_msa.dmm @@ -85,9 +85,6 @@ "x" = ( /turf/open/floor/wood, /area/city/backstreets_room) -"y" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "B" = ( /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/wood{ @@ -197,7 +194,7 @@ r Q "} (5,1,1) = {" -y +Q V x k @@ -213,7 +210,7 @@ m Q "} (7,1,1) = {" -y +Q f x F diff --git a/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm b/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm index a772f8adf2e0..7428d468e83d 100644 --- a/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/butcher_medium.dmm @@ -20,9 +20,6 @@ /obj/item/food/meat/slab/human, /turf/open/floor/plasteel/sepia, /area/city/backstreets_room) -"m" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "n" = ( /obj/structure/lootcrate/money, /turf/open/floor/plasteel/sepia, @@ -163,9 +160,9 @@ x "} (6,1,1) = {" x -m +x W -m +x x x x diff --git a/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm b/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm index f70ff4fa472e..909023da2c03 100644 --- a/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/clan_cages.dmm @@ -10,9 +10,6 @@ }, /turf/open/floor/plasteel/grimy, /area/city/backstreets_room) -"c" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "d" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/blood, @@ -218,9 +215,9 @@ H H H H -c +H E -c +H H H H diff --git a/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm b/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm index d9ab6bd55c71..4872a10ae7ac 100644 --- a/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/lcorp_office.dmm @@ -70,9 +70,6 @@ /obj/structure/sign/poster/contraband/eat, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"u" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) @@ -254,8 +251,8 @@ x x x x -u +x i -u +x x "} diff --git a/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm b/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm index 723106818f11..4249525bd97d 100644 --- a/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/mini_beach.dmm @@ -14,12 +14,8 @@ "x" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"G" = ( -/obj/structure/mineral_door/sandstone, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_room) "H" = ( -/turf/closed/indestructible/reinforced, +/turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "P" = ( /obj/effect/mermaid_water, @@ -92,13 +88,13 @@ x "} (6,1,1) = {" x -x -x H -G -G H -x -x +H +H +H +H +H +H x "} diff --git a/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm b/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm index e5de33bfccdd..f8d239993396 100644 --- a/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/sweeper_pen.dmm @@ -10,8 +10,7 @@ /area/city/backstreets_room) "b" = ( /obj/structure/fence/door{ - dir = 4; - resistance_flags = 64 + dir = 4 }, /obj/effect/decal/cleanable/blood/footprints{ dir = 8; @@ -41,8 +40,7 @@ /area/city/backstreets_room) "m" = ( /obj/structure/fence/corner{ - dir = 1; - resistance_flags = 64 + dir = 1 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) @@ -63,27 +61,19 @@ /obj/item/toy/beach_ball/holoball/dodgeball, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"u" = ( -/obj/structure/fence/end{ - resistance_flags = 64 - }, -/turf/open/floor/plating/dirt/jungle/dark, -/area/city/backstreets_room) "v" = ( /obj/item/toy/beach_ball/holoball/dodgeball, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "x" = ( /obj/structure/fence/corner{ - dir = 8; - resistance_flags = 64 + dir = 8 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "y" = ( /obj/structure/fence/door{ - dir = 4; - resistance_flags = 64 + dir = 4 }, /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -92,8 +82,7 @@ /area/city/backstreets_room) "z" = ( /obj/structure/fence/corner{ - dir = 7; - resistance_flags = 64 + dir = 7 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) @@ -112,15 +101,12 @@ /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "H" = ( -/obj/structure/fence/end{ - resistance_flags = 64 - }, +/obj/structure/fence/end, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) "N" = ( /obj/structure/fence{ - dir = 4; - resistance_flags = 64 + dir = 4 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) @@ -153,8 +139,7 @@ /area/city/backstreets_room) "X" = ( /obj/structure/fence/corner{ - dir = 4; - resistance_flags = 64 + dir = 4 }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) @@ -237,12 +222,12 @@ N (6,1,1) = {" X b -u H H H H -u +H +H y z "} diff --git a/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm b/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm index 287fd5358955..273cef173849 100644 --- a/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/town_mwa.dmm @@ -7,10 +7,6 @@ }, /turf/open/floor/plating/rust, /area/city/backstreets_room) -"b" = ( -/obj/effect/decal/cleanable/blood/tracks, -/turf/closed/indestructible/necropolis, -/area/city/backstreets_room) "d" = ( /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plating/rust, @@ -33,9 +29,6 @@ "j" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood/tracks, -/obj/machinery/door/airlock/cult/unruned/friendly{ - resistance_flags = 64 - }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "l" = ( @@ -111,7 +104,7 @@ /area/city/backstreets_room) "H" = ( /obj/effect/decal/cleanable/blood/tracks, -/turf/closed/indestructible/necropolis, +/turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "I" = ( /mob/living/simple_animal/hostile/lovetown/slasher, @@ -125,7 +118,7 @@ /obj/effect/decal/cleanable/blood/tracks{ dir = 5 }, -/turf/closed/indestructible/necropolis, +/turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "M" = ( /obj/effect/decal/cleanable/blood/footprints, @@ -161,7 +154,7 @@ /area/city/backstreets_room) "S" = ( /obj/effect/decal/cleanable/blood/gibs/core, -/turf/closed/indestructible/necropolis, +/turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "U" = ( /obj/structure/lootcrate/money, @@ -177,9 +170,6 @@ /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/plating/rust, /area/city/backstreets_room) -"Z" = ( -/turf/closed/indestructible/necropolis, -/area/city/backstreets_room) (1,1,1) = {" x @@ -218,7 +208,7 @@ U x "} (4,1,1) = {" -Z +x X v o @@ -230,7 +220,7 @@ M x "} (5,1,1) = {" -Z +x R e N @@ -239,17 +229,17 @@ n f e o -Z +x "} (6,1,1) = {" -Z +x S J -b +H j -b H H H -Z +H +x "} diff --git a/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm b/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm index 75ba26544149..1e1c366da7e9 100644 --- a/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm +++ b/_maps/RandomRooms/backstreets/medium_west/town_mwb.dmm @@ -37,9 +37,6 @@ /obj/structure/lootcrate/money, /turf/open/indestructible/necropolis/air, /area/city/backstreets_room) -"D" = ( -/turf/closed/indestructible/necropolis, -/area/city/backstreets_room) "H" = ( /obj/structure/meatfloor, /turf/closed/indestructible/necropolis, @@ -48,13 +45,6 @@ /obj/structure/meatfloor, /turf/open/indestructible/necropolis/air, /area/city/backstreets_room) -"U" = ( -/obj/structure/meatfloor, -/obj/machinery/door/airlock/cult/unruned/friendly{ - resistance_flags = 64 - }, -/turf/open/indestructible/necropolis/air, -/area/city/backstreets_room) "Y" = ( /obj/structure/meatfloor, /obj/effect/gibspawner/human, @@ -117,8 +107,8 @@ p P P d -U -D +P +l l "} (6,1,1) = {" @@ -128,7 +118,7 @@ H l H H -D +l P z l diff --git a/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm b/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm index 51e967d5871d..1bdfac75f1a1 100644 --- a/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm +++ b/_maps/RandomRooms/backstreets/small_east/limbus_sea.dmm @@ -19,9 +19,6 @@ /obj/structure/grille, /turf/open/floor/plasteel/dark, /area/city/backstreets_room) -"j" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "k" = ( /obj/structure/rack, /turf/open/floor/plasteel/dark, @@ -74,9 +71,9 @@ a a a -j +a X -j +a a "} (2,1,1) = {" diff --git a/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm b/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm index 68afe3fd5104..8467efc46881 100644 --- a/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm +++ b/_maps/RandomRooms/backstreets/small_east/noodlebar.dmm @@ -54,9 +54,6 @@ /mob/living/simple_animal/hostile/ordeal/amber_bug/spawned, /turf/open/floor/plasteel, /area/city/backstreets_room) -"J" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "M" = ( /obj/structure/sink/kitchen, /turf/open/floor/plasteel, @@ -84,9 +81,9 @@ U s s -J +U X -J +U U "} (2,1,1) = {" diff --git a/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm b/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm index e95158a09d8d..000fd32e5e99 100644 --- a/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm +++ b/_maps/RandomRooms/backstreets/small_east/oceanic_se.dmm @@ -44,9 +44,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/facility/dark, /area/city/backstreets_room) -"D" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "J" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bottle, @@ -96,9 +93,9 @@ a a a a -D +a X -D +a "} (2,1,1) = {" a diff --git a/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm b/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm index 2f9628e54a73..eb782aa3bd76 100644 --- a/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm +++ b/_maps/RandomRooms/backstreets/small_east/paper_pushed.dmm @@ -16,9 +16,6 @@ /obj/item/clothing/head/papersack, /turf/open/indestructible/paper, /area/city/backstreets_room) -"q" = ( -/turf/closed/indestructible/paper, -/area/city/backstreets_room) "t" = ( /obj/structure/mineral_door/silver, /turf/open/indestructible/paper, @@ -82,9 +79,9 @@ (1,1,1) = {" X X -q +X t -q +X X X "} diff --git a/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm b/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm index 5a8fcbd173a7..543f6c3414ac 100644 --- a/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm +++ b/_maps/RandomRooms/backstreets/small_east/rat_sea.dmm @@ -2,11 +2,6 @@ "a" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"e" = ( -/obj/effect/spawner/structure/window, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/wood, -/area/city/backstreets_room) "s" = ( /obj/structure/mineral_door/wood, /turf/open/floor/wood, @@ -44,9 +39,9 @@ (1,1,1) = {" a X -e +X s -e +X X a "} diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm index a4bce78d5cbb..4cea0e21b0ab 100644 --- a/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm +++ b/_maps/RandomRooms/backstreets/small_north/apartment_sna.dmm @@ -6,9 +6,6 @@ /obj/structure/spider/stickyweb, /turf/open/floor/wood, /area/city/backstreets_room) -"h" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "j" = ( /obj/structure/spider/stickyweb, /mob/living/simple_animal/hostile/ordeal/steel_dawn/steel_noon/flying, @@ -68,7 +65,7 @@ U a t K -h +U "} (3,1,1) = {" U @@ -96,7 +93,7 @@ U O j R -h +U "} (7,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm b/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm index e36e7935bef0..6f87fc4807dd 100644 --- a/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm +++ b/_maps/RandomRooms/backstreets/small_north/apartment_snb.dmm @@ -9,9 +9,6 @@ }, /turf/open/floor/wood, /area/city/backstreets_room) -"o" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "t" = ( /obj/structure/closet/cabinet, /turf/open/floor/wood, @@ -80,7 +77,7 @@ U t M K -o +U "} (3,1,1) = {" U @@ -94,7 +91,7 @@ U U U U -o +U "} (5,1,1) = {" U @@ -108,7 +105,7 @@ U O j A -o +U "} (7,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/bird_box.dmm b/_maps/RandomRooms/backstreets/small_north/bird_box.dmm index 7910616623d4..6d6515b9c30c 100644 --- a/_maps/RandomRooms/backstreets/small_north/bird_box.dmm +++ b/_maps/RandomRooms/backstreets/small_north/bird_box.dmm @@ -3,9 +3,6 @@ /mob/living/simple_animal/hostile/ordeal/bigBirdEye, /turf/open/floor/plasteel/cult, /area/city/backstreets_room) -"p" = ( -/turf/closed/wall/mineral/cult, -/area/city/backstreets_room) "t" = ( /obj/machinery/door/airlock/cult/friendly, /turf/open/floor/plasteel/cult, @@ -40,7 +37,7 @@ P a a R -p +P "} (4,1,1) = {" P @@ -54,7 +51,7 @@ P a a R -p +P "} (6,1,1) = {" P diff --git a/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm b/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm index ff57db13929c..0a4749c83018 100644 --- a/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm +++ b/_maps/RandomRooms/backstreets/small_north/coffee_break.dmm @@ -9,9 +9,6 @@ /obj/item/flashlight/lamp/green, /turf/open/floor/wood, /area/city/backstreets_room) -"p" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "q" = ( /obj/effect/landmark/cratespawn, /turf/open/floor/wood, @@ -53,7 +50,7 @@ U R W W -p +U "} (3,1,1) = {" U @@ -67,7 +64,7 @@ U M f W -p +U "} (5,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm b/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm index 498838fafd02..05fd46f90781 100644 --- a/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm +++ b/_maps/RandomRooms/backstreets/small_north/kcorp_stash_sna.dmm @@ -16,9 +16,6 @@ "x" = ( /turf/open/floor/circuit/green, /area/city/backstreets_room) -"B" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "P" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden, @@ -67,7 +64,7 @@ U a a x -B +U "} (4,1,1) = {" Q @@ -81,7 +78,7 @@ U t t x -B +U "} (6,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/pet_store.dmm b/_maps/RandomRooms/backstreets/small_north/pet_store.dmm index f911bcd9bdf5..9b775934da0b 100644 --- a/_maps/RandomRooms/backstreets/small_north/pet_store.dmm +++ b/_maps/RandomRooms/backstreets/small_north/pet_store.dmm @@ -117,16 +117,13 @@ "U" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"Y" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) (1,1,1) = {" U U U U -Y +U "} (2,1,1) = {" U @@ -140,7 +137,7 @@ U M u R -Y +U "} (4,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm b/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm index 189d132f3252..9542c17396b9 100644 --- a/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm +++ b/_maps/RandomRooms/backstreets/small_north/small_clan_hideout.dmm @@ -14,9 +14,6 @@ /obj/structure/chair/greyscale, /turf/open/floor/plating/rust, /area/city/backstreets_room) -"A" = ( -/turf/closed/wall/rust, -/area/city/backstreets_room) "I" = ( /obj/effect/landmark/cratespawn, /turf/open/floor/plating/rust, @@ -48,7 +45,7 @@ a W k W -A +a "} (4,1,1) = {" a @@ -62,7 +59,7 @@ a W k W -A +a "} (6,1,1) = {" a diff --git a/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm b/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm index b89f56cf83b5..dd62494f8dbe 100644 --- a/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm +++ b/_maps/RandomRooms/backstreets/small_north/snow_forest.dmm @@ -6,9 +6,6 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) -"l" = ( -/turf/closed/indestructible/wood, -/area/city/backstreets_room) "t" = ( /turf/open/floor/grass/snow/safe, /area/city/backstreets_room) @@ -16,16 +13,12 @@ /mob/living/simple_animal/hostile/runawaybird{ name = "crow" }, -/turf/open/floor/plating/asteroid/basalt, +/turf/open/floor/grass/snow/safe, /area/city/backstreets_room) "J" = ( /obj/item/food/sundae/jbird, /turf/open/floor/grass/snow/safe, /area/city/backstreets_room) -"K" = ( -/obj/structure/mineral_door/wood, -/turf/open/floor/grass/snow/safe, -/area/city/backstreets_room) "M" = ( /obj/effect/landmark/cratespawn, /turf/open/floor/plating/asteroid/basalt, @@ -44,49 +37,49 @@ (1,1,1) = {" U U -l -l -l +U +U +U "} (2,1,1) = {" U J R x -l +P "} (3,1,1) = {" U M t +R t -K "} (4,1,1) = {" U t x -R -l +P +t "} (5,1,1) = {" U t -P +t x -l +P "} (6,1,1) = {" U t a R -l +P "} (7,1,1) = {" U U -l -l -l +U +U +U "} diff --git a/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm b/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm index 5d102d4d6db6..429afb89b242 100644 --- a/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm +++ b/_maps/RandomRooms/backstreets/small_north/sweeper_solo.dmm @@ -47,7 +47,6 @@ /obj/structure/grille/broken, /obj/item/shard, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/structure/window/reinforced/indestructable, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "q" = ( @@ -79,10 +78,6 @@ }, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) -"E" = ( -/obj/machinery/door/airlock/alarmlock, -/turf/open/floor/plasteel/shuttle, -/area/city/backstreets_room) "J" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/gibs/torso, @@ -108,7 +103,6 @@ /obj/item/shard, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks, -/obj/effect/spawner/structure/window/reinforced/indestructable, /turf/open/floor/plasteel/shuttle, /area/city/backstreets_room) "R" = ( @@ -149,7 +143,7 @@ U d f W -E +W "} (5,1,1) = {" U diff --git a/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm b/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm index 008b6ee3851b..0a995570d5ba 100644 --- a/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm +++ b/_maps/RandomRooms/backstreets/small_south/candlelit_dinner.dmm @@ -2,17 +2,11 @@ "a" = ( /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) -"q" = ( -/turf/closed/indestructible/fakeglass, -/area/city/backstreets_room) "t" = ( /obj/structure/table/wood/fancy/black, /obj/item/stack/spacecash/c200, /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) -"u" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "x" = ( /obj/structure/table/wood/fancy/black, /obj/item/reagent_containers/food/drinks/bottle/lizardwine, @@ -26,13 +20,12 @@ /turf/open/floor/carpet/royalblack, /area/city/backstreets_room) "N" = ( -/obj/machinery/door/airlock/public/glass{ - resistance_flags = 64 - }, +/obj/machinery/door/airlock/public/glass, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "P" = ( -/turf/closed/indestructible/fakeglass, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) "R" = ( /obj/item/candle/infinite{ @@ -59,21 +52,21 @@ U U "} (2,1,1) = {" -q +P a a t U "} (3,1,1) = {" -q +P R S R U "} (4,1,1) = {" -q +P a x a @@ -94,7 +87,7 @@ a U "} (7,1,1) = {" -u +U U U U diff --git a/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm b/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm index 8c0d292a572c..d9cd66fdebfd 100644 --- a/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm +++ b/_maps/RandomRooms/backstreets/small_south/human_experiment.dmm @@ -46,9 +46,6 @@ /obj/structure/fence, /turf/open/floor/mineral/titanium/tiled/white, /area/city/backstreets_room) -"N" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "P" = ( /obj/machinery/door/airlock/centcom, /turf/open/floor/mineral/titanium/tiled/white, @@ -85,7 +82,7 @@ R U "} (3,1,1) = {" -N +U M M M @@ -99,7 +96,7 @@ I U "} (5,1,1) = {" -N +U t C x diff --git a/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm b/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm index f7097571da9a..744059bfb10d 100644 --- a/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm +++ b/_maps/RandomRooms/backstreets/small_south/jumpscare_closet.dmm @@ -13,9 +13,6 @@ "f" = ( /turf/open/floor/wood, /area/city/backstreets_room) -"p" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "r" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/barricade/wooden/crude, @@ -25,11 +22,6 @@ /obj/structure/bed/maint, /turf/open/floor/wood, /area/city/backstreets_room) -"v" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/barricade/wooden/crude, -/turf/open/floor/plating, -/area/city/backstreets_room) "w" = ( /obj/machinery/door/airlock/wood, /turf/open/floor/wood, @@ -97,7 +89,7 @@ U U "} (4,1,1) = {" -v +r c f D @@ -111,7 +103,7 @@ c U "} (6,1,1) = {" -p +U c e s diff --git a/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm b/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm index 899b3cf43aff..1c653cc4286d 100644 --- a/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm +++ b/_maps/RandomRooms/backstreets/small_south/lcorp_tomb.dmm @@ -34,9 +34,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) -"K" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "M" = ( /turf/closed/mineral/ash_rock, /area/city/backstreets_room) @@ -100,7 +97,7 @@ S U "} (5,1,1) = {" -K +U t a x @@ -114,7 +111,7 @@ N U "} (7,1,1) = {" -K +U U U U diff --git a/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm b/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm index fac3c57d5e9a..5535b84955ff 100644 --- a/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm +++ b/_maps/RandomRooms/backstreets/small_south/robot_ssa.dmm @@ -39,9 +39,6 @@ "U" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"Z" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) (1,1,1) = {" U @@ -58,7 +55,7 @@ a U "} (3,1,1) = {" -Z +U t t x @@ -72,7 +69,7 @@ t U "} (5,1,1) = {" -Z +U t t x diff --git a/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm b/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm index bc7a75226e35..900700bbb19c 100644 --- a/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm +++ b/_maps/RandomRooms/backstreets/small_south/wcorp_base_ssa.dmm @@ -13,15 +13,13 @@ "x" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/suit/lobotomy/wcorp, +/obj/item/clothing/head/wcorp, /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) "y" = ( /obj/item/ego_weapon/city/wcorp, /turf/open/floor/carpet/stellar, /area/city/backstreets_alley) -"J" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_alley) "M" = ( /mob/living/simple_animal/hostile/ordeal/indigo_dawn, /turf/open/floor/carpet/stellar, @@ -39,7 +37,7 @@ /area/city/backstreets_alley) (1,1,1) = {" -J +U U U U @@ -81,7 +79,7 @@ t U "} (7,1,1) = {" -J +U U U U diff --git a/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm b/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm index be3aa0ae0345..bbe534624b8a 100644 --- a/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm +++ b/_maps/RandomRooms/backstreets/small_west/dry_cleaners.dmm @@ -7,9 +7,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/city/backstreets_room) -"d" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "v" = ( /obj/machinery/washing_machine, /turf/open/floor/plasteel/white, @@ -87,8 +84,8 @@ a a a a -d +a X -d +a a "} diff --git a/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm b/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm index 5a59900bd23b..d990ed1d8c7c 100644 --- a/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm +++ b/_maps/RandomRooms/backstreets/small_west/freezer_sw.dmm @@ -56,12 +56,6 @@ }, /turf/open/floor/plasteel/freezer, /area/city/backstreets_alley) -"I" = ( -/obj/effect/turf_decal/weather/snow/corner{ - dir = 4 - }, -/turf/closed/indestructible/reinforced, -/area/city/backstreets_alley) "J" = ( /turf/closed/indestructible/reinforced, /area/city/backstreets_alley) @@ -140,9 +134,9 @@ J (5,1,1) = {" l l -I +l X -I +l l l "} diff --git a/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm b/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm index 0735142d5144..ceb28668d792 100644 --- a/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/gcorp_swa.dmm @@ -16,9 +16,6 @@ /obj/item/stack/spacecash/c100, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"y" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "z" = ( /obj/structure/bed/maint, /obj/effect/decal/cleanable/dirt, @@ -92,10 +89,10 @@ U a "} (5,1,1) = {" -y +a X Q -y +a a a a diff --git a/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm b/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm index ead47338b0b9..e1ca99f7124e 100644 --- a/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/rat_swa.dmm @@ -22,9 +22,6 @@ /mob/living/simple_animal/hostile/humanoid/rat/hammer, /turf/open/floor/wood, /area/city/backstreets_room) -"H" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "J" = ( /obj/structure/closet/cabinet, /obj/item/ego_weapon/city/rats/brick, @@ -84,9 +81,9 @@ a (5,1,1) = {" a a -H +a X -H +a a a "} diff --git a/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm b/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm index 1f967f134f43..35de79b17238 100644 --- a/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm +++ b/_maps/RandomRooms/backstreets/small_west/rat_swb.dmm @@ -32,9 +32,6 @@ /obj/effect/landmark/cratespawn, /turf/open/floor/plating/ice, /area/city/backstreets_room) -"R" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "T" = ( /obj/structure/flora/iceshards, /mob/living/simple_animal/hostile/humanoid/rat/zippy, @@ -82,9 +79,9 @@ s a "} (5,1,1) = {" -R +a X -R +a a a a diff --git a/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm b/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm index 1880fd1fa091..7850da972c50 100644 --- a/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm +++ b/_maps/RandomRooms/backstreets/small_west/risk_rain_reference_robot.dmm @@ -6,9 +6,6 @@ /obj/structure/lootcrate/money, /turf/open/floor/wood, /area/city/backstreets_room) -"t" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "u" = ( /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/wood, @@ -91,9 +88,9 @@ u a "} (5,1,1) = {" -t +a X -t +a a a a diff --git a/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm b/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm index de46528d89e3..4da01f9520cf 100644 --- a/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm +++ b/_maps/RandomRooms/backstreets/small_west/robot_swa.dmm @@ -57,9 +57,6 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_room) -"Z" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) (1,1,1) = {" a @@ -98,11 +95,11 @@ N a "} (5,1,1) = {" -Z +a X X X U -Z +a a "} diff --git a/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm b/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm index d19a7eaabdcc..a27d99b0a0e3 100644 --- a/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm +++ b/_maps/RandomRooms/backstreets/small_west/robot_swb.dmm @@ -42,9 +42,6 @@ /obj/structure/lootcrate/money, /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) -"s" = ( -/turf/closed/indestructible/reinforced, -/area/city/backstreets_room) "v" = ( /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_room) @@ -70,11 +67,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium, /area/city/backstreets_room) -"z" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/mineral_door/iron, -/turf/open/floor/plating/asteroid/basalt, -/area/city/backstreets_room) "D" = ( /mob/living/simple_animal/hostile/price, /obj/effect/decal/cleanable/dirt/dust, @@ -171,10 +163,10 @@ a "} (5,1,1) = {" a -h -s -z -s -a +X +v +X +v +v a "} diff --git a/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm b/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm index a4e5cbe55e56..ce8118afd9bd 100644 --- a/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm +++ b/_maps/RandomRooms/backstreets/small_west/runaway_bird.dmm @@ -10,9 +10,6 @@ "x" = ( /turf/open/floor/wood, /area/city/backstreets_room) -"z" = ( -/turf/closed/indestructible/wood, -/area/city/backstreets_room) "J" = ( /mob/living/simple_animal/hostile/runawaybird, /turf/open/floor/wood, @@ -72,9 +69,9 @@ X (5,1,1) = {" X X -z +X n -z +X X X "} diff --git a/code/game/objects/structures/signs/signs_warning.dm b/code/game/objects/structures/signs/signs_warning.dm index b4b9ab4cb432..d22886da2da5 100644 --- a/code/game/objects/structures/signs/signs_warning.dm +++ b/code/game/objects/structures/signs/signs_warning.dm @@ -179,29 +179,3 @@ desc = "A warning sign which reads 'ESCAPE PODS'." icon_state = "pods" is_editable = TRUE - -////LC13 WARNING SIGNS - -/obj/structure/sign/warning/backstreets_1 - name = "\improper ROOM DANGER RATING: 1 sign" - sign_change_name = "Location - Backstreets Room, Level 1" - desc = "A warning sign which warns fixers of how dangerous the next room is." - icon_state = "backstreets_warn_1" - -/obj/structure/sign/warning/backstreets_2 - name = "\improper ROOM DANGER RATING: 2 sign" - sign_change_name = "Location - Backstreets Room, Level 2" - desc = "A warning sign which warns fixers of how dangerous the next room is." - icon_state = "backstreets_warn_2" - -/obj/structure/sign/warning/backstreets_3 - name = "\improper ROOM DANGER RATING: 3 sign" - sign_change_name = "Location - Backstreets Room, Level 3" - desc = "A warning sign which warns fixers of how dangerous the next room is." - icon_state = "backstreets_warn_3" - -/obj/structure/sign/warning/backstreets_4 - name = "\improper ROOM DANGER RATING: 4 sign" - sign_change_name = "Location - Backstreets Room, Level 4" - desc = "A warning sign which warns fixers of how dangerous the next room is." - icon_state = "backstreets_warn_4" diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index f701dd4a8820efa924fd28c93ab28ec5e80c7a64..0e55b137d526bf5036dcfa8bac45b5be23b3f4c9 100644 GIT binary patch delta 19449 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 From f3786436b48824229d0c02e69c579e7a34b8443d Mon Sep 17 00:00:00 2001 From: EnderMage99 <130017867+EnderMage99@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:38:37 -0500 Subject: [PATCH 43/47] Removing Slime Office --- _maps/RandomRooms/backstreets/bossroom/slime_office.dmm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm index 14e6e77c3135..f7ba036930f1 100644 --- a/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm +++ b/_maps/RandomRooms/backstreets/bossroom/slime_office.dmm @@ -1599,14 +1599,6 @@ /obj/structure/spider/stickyweb/genetic, /turf/open/floor/carpet/green, /area/city/backstreets_room) -<<<<<<< HEAD -"SS" = ( -/turf/closed/indestructible/reinforced{ - color = "#42f545" - }, -/area/city/backstreets_room) -======= ->>>>>>> parent of 30603e5766 (Room Updates) "Tb" = ( /obj/structure/table/wood/fancy/green, /obj/effect/turf_decal/siding/green{ From 6ca15c8ebe61bbb2a6b58de228a7063b5dab758d Mon Sep 17 00:00:00 2001 From: EnderMage99 <130017867+EnderMage99@users.noreply.github.com> Date: Mon, 27 Jan 2025 22:08:25 -0500 Subject: [PATCH 44/47] Bleed Cooldown --- code/datums/status_effects/debuffs.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 888cdb422b3d..80147e9cf226 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1197,6 +1197,8 @@ var/new_stack = FALSE var/burn_res = 0 var/safety = TRUE + var/bleed_cooldown = 20 + var/bleed_time /atom/movable/screen/alert/status_effect/lc_bleed name = "Bleeding" @@ -1212,11 +1214,14 @@ //Deals true damage /datum/status_effect/stacking/lc_bleed/proc/Moved(mob/user, atom/new_location) SIGNAL_HANDLER + if (world.time - bleed_time < bleed_cooldown) + return + bleed_time = world.time 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) + if(stacks >= 5) var/obj/effect/decal/cleanable/blood/B = locate() in get_turf(owner) if(!B) B = new /obj/effect/decal/cleanable/blood(get_turf(owner)) From f0ad4968c8c2741adc1fe9e61eed29110f21e72f Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Mon, 27 Jan 2025 22:33:11 -0500 Subject: [PATCH 45/47] Re add book sprite --- icons/obj/library.dmi | Bin 32255 -> 32524 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 31d3fc9624f18e2e4cd55f2bc9e05b4ea4aed106..a35862cf3c3f3abc38a8bc55fe218a1e971629f1 100644 GIT binary patch delta 11932 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 From 88c42c6d4e84addd0235e977e724fae74352bd05 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Mon, 27 Jan 2025 23:02:02 -0500 Subject: [PATCH 46/47] Amber Fixes --- .../tegu_items/associations/cityspawners.dm | 28 ++++++++++++++++++- .../tegu_mobs/lc13_corrosions.dm | 4 +-- .../simple_animal/hostile/ordeal/amber.dm | 9 ++++-- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/ModularTegustation/tegu_items/associations/cityspawners.dm b/ModularTegustation/tegu_items/associations/cityspawners.dm index 215c61cb5d67..22eb0c1cd6ca 100644 --- a/ModularTegustation/tegu_items/associations/cityspawners.dm +++ b/ModularTegustation/tegu_items/associations/cityspawners.dm @@ -77,6 +77,7 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) "gcorp", "sweeper", "bots", + "worms", ) /obj/effect/landmark/backstreetspawn/Initialize() @@ -99,7 +100,15 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot if(prob(30)) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big + + if("worms") + spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug + if(prob(30)) + spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk + new spawning(get_turf(src)) + if (GLOB.city_center_enemies == "worms") + new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src)) @@ -111,6 +120,7 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) "gcorp", "sweeper", "bots", + "worms", ) /obj/effect/landmark/backstreetspawnwest/Initialize() @@ -134,7 +144,15 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot if(prob(30)) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big + + if("worms") + spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug + if(prob(30)) + spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk + new spawning(get_turf(src)) + if (GLOB.city_west_enemies == "worms") + new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src)) /obj/effect/landmark/backstreetspawneast @@ -144,6 +162,7 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) "gcorp", "sweeper", "bots", + "worms", ) /obj/effect/landmark/backstreetspawneast/Initialize() @@ -166,5 +185,12 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot if(prob(30)) spawning = /mob/living/simple_animal/hostile/ordeal/green_bot_big - new spawning(get_turf(src)) + if("worms") + spawning = /mob/living/simple_animal/hostile/ordeal/amber_bug + if(prob(30)) + spawning = /mob/living/simple_animal/hostile/ordeal/amber_dusk + + new spawning(get_turf(src)) + if (GLOB.city_east_enemies == "worms") + new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src)) diff --git a/ModularTegustation/tegu_mobs/lc13_corrosions.dm b/ModularTegustation/tegu_mobs/lc13_corrosions.dm index ced1ce03677e..fadc8af42cca 100644 --- a/ModularTegustation/tegu_mobs/lc13_corrosions.dm +++ b/ModularTegustation/tegu_mobs/lc13_corrosions.dm @@ -420,7 +420,7 @@ if(!ishuman(attacked_target)) return var/mob/living/carbon/human/H = attacked_target - if(H.health < 0 || gibbing) + if(H.health < 0 && gibbing) H.gib() playsound(src, "sound/abnormalities/clouded_monk/eat.ogg", 75, 1) adjustBruteLoss(-heal_amount) @@ -495,7 +495,7 @@ if(!ishuman(L)) continue var/mob/living/carbon/human/H = L - if(H.health < 0 || gibbing) + if(H.health < 0 && gibbing) H.gib() playsound(src, "sound/abnormalities/clouded_monk/eat.ogg", 75, 1) adjustBruteLoss(-heal_amount) 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 5c2f2c036905..302132d92216 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/amber.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/amber.dm @@ -203,6 +203,8 @@ var/burrowing = FALSE /// List of currently spawned dawns, so we don't create too many var/list/spawned_mobs = list() + //If they can burrow or not. + var/can_burrow = TRUE var/datum/looping_sound/amberdusk/soundloop @@ -258,9 +260,10 @@ . = ..() if(!.) // Dead return FALSE - if(!burrowing && world.time > burrow_cooldown) - AttemptBirth() - BurrowIn() + if(can_burrow) + if(!burrowing && world.time > burrow_cooldown) + AttemptBirth() + BurrowIn() /mob/living/simple_animal/hostile/ordeal/amber_dusk/death(gibbed) if(LAZYLEN(butcher_results)) From 4008367748bbdad31b6cd4a1bd144c65a304b076 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Mon, 27 Jan 2025 23:04:12 -0500 Subject: [PATCH 47/47] Spaces removal --- ModularTegustation/tegu_items/associations/cityspawners.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/ModularTegustation/tegu_items/associations/cityspawners.dm b/ModularTegustation/tegu_items/associations/cityspawners.dm index 22eb0c1cd6ca..e797895a2613 100644 --- a/ModularTegustation/tegu_items/associations/cityspawners.dm +++ b/ModularTegustation/tegu_items/associations/cityspawners.dm @@ -110,9 +110,6 @@ GLOBAL_VAR_INIT(city_east_enemies, FALSE) if (GLOB.city_center_enemies == "worms") new /mob/living/simple_animal/hostile/ordeal/amber_bug (get_turf(src)) - - - /obj/effect/landmark/backstreetspawnwest name = "cityspawn landmark" icon_state = "x2"