messy ports and fixes (#352)

* Lynx - Mobs (Merge Ready) (#76) * Fleshmother Initial Commit * Flesh Egg Sound and Babs * Beast Mother - Final Touches, Enraged Beasties Sans Undertale easteregg ahh beastie * Introducing: GutMuncher! * File Changes, braingusher mob, new buff + edits AND A NEW BUFF!! * Braingusher!!! * Braingusher fix * Accidentally pushed map changes, woops. * Name edits! * Should probably add .dm huh. * ugh im tired ffs this compiles now * Else... Deleted... Perish... * Minorsquishingofbugsdotestmaybetomakesurenobreaky! * namefix fuck my LIFE man * Audio Additions, Balance Changes! * quickquick! * dview so they don't runtime in darkness, woops! * Wendigo Ability Fix, DREAM bEastR tweaks * Working Claws and Ability on Wendigo * New var added to prevent movement # Conflicts: # code/modules/mob/living/simple_animal/hostile/hostile.dm # code/modules/mob/living/simple_animal/rogue/rogueanimals.dm # code/modules/spells/roguetown/acolyte/malum.dm # modular_causticcove/code/__DEFINES/status_effects.dm # roguetown.dme * fixes * some stupid shi * perfection? * remove shit im not gonna try to implement for linters * malum stuff added from ports * Update transmutation.dm * Update sewing.dm * more fixes * balans * some more shit * sheltering * bodytemp matters more (untested) * bodytemp examines untested * Update tools.dm * tries to fix head replantation bugs, * runtime fix and returning examine text disable * Update limb_replacement.dm * more untested fixes * Update ooc.dm * less gay looking water and maybe fixes vamp spawn spawns * Update ashlands.dmm * Update vampirelord.dm * Update ashlands.dmm * temp * Update vampirelord.dm --------- Co-authored-by: Lynx <[email protected]> Co-authored-by: EvenInDeathIStillServe <[email protected]>
StoneHedgeSS13 · Dec 30, 2024 · 2cd4ac2 · 2cd4ac2
1 parent 44b64ae
commit 2cd4ac2
Show file tree

Hide file tree

Showing 65 changed files with 1,276 additions and 272 deletions.
diff --git a/_maps/map_files/otherz/ashlands.dmm b/_maps/map_files/otherz/ashlands.dmm
@@ -214,7 +214,7 @@
 	icon_state = "1,2"
 	},
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "bX" = (
 /obj/item/roguecoin/gold/pile,
 /obj/item/dildo/plug/gold,
@@ -599,7 +599,7 @@
 	icon_state = "longtable"
 	},
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "gZ" = (
 /obj/machinery/light/rogue/torchholder{
 	dir = 4
@@ -728,7 +728,7 @@
 	dir = 8
 	},
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "ih" = (
 /obj/effect/decal/remains/human/grave{
 	icon_state = "remainslarva"
@@ -1151,12 +1151,18 @@
 	icon_state = "1,0"
 	},
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "nc" = (
 /obj/structure/table/wood{
 	dir = 4;
 	icon_state = "largetable"
 	},
+/obj/item/roguekey/vampire,
+/obj/item/roguekey/vampire,
+/obj/item/roguekey/vampire,
+/obj/item/roguekey/vampire,
+/obj/item/roguekey/vampire,
+/obj/item/roguekey/vampire,
 /turf/open/floor/rogue/blocks/stone,
 /area/rogue/indoors/town/manor{
 	first_time_text = "Underkeep";
@@ -1369,7 +1375,7 @@
 /obj/structure/mineral_door/wood/donjon{
 	dir = 1;
 	locked = 1;
-	lockid = "dungeon"
+	lockid = "mansionvampire"
 	},
 /turf/open/floor/rogue/cobble,
 /area/rogue/under/cavewet)
@@ -1451,7 +1457,7 @@
 /obj/item/storage/backpack/rogue/backpack/surgery,
 /obj/machinery/light/rogue/wallfire/candle/l,
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "pO" = (
 /obj/structure/closet/crate/coffin,
 /turf/open/floor/rogue/dirt,
@@ -1480,7 +1486,7 @@
 	icon_state = "saint"
 	},
 /turf/open/floor/carpet/inn,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "qb" = (
 /obj/structure/flora/roguegrass/thorn_bush,
 /turf/open/floor/rogue/grass,
@@ -1594,7 +1600,10 @@
 /turf/open/floor/rogue/naturalstone,
 /area/rogue/under/cavewet)
 "rk" = (
-/obj/structure/mineral_door/wood,
+/obj/structure/mineral_door/wood{
+	locked = 1;
+	lockid = "mansionvampire"
+	},
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue)
 "rn" = (
@@ -1948,7 +1957,7 @@
 "uH" = (
 /obj/structure/roguewindow/stained/zizo,
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "uL" = (
 /obj/structure/stairs/stone{
 	dir = 1
@@ -2015,7 +2024,7 @@
 "vG" = (
 /obj/structure/fluff/statue/gargoyle/candles,
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "vI" = (
 /obj/structure/fluff/statue/gargoyle/moss,
 /turf/open/floor/rogue/naturalstone,
@@ -2253,7 +2262,7 @@
 	dir = 1
 	},
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "xG" = (
 /obj/machinery/light/roguestreet/midlamp,
 /turf/open/floor/rogue/dirt/road,
@@ -2379,7 +2388,7 @@
 	icon_state = "longtable_mid"
 	},
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "zg" = (
 /obj/machinery/light/rogue/torchholder{
 	dir = 4
@@ -2393,7 +2402,7 @@
 	icon_state = "longtable"
 	},
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "zl" = (
 /turf/open/floor/rogue/rooftop,
 /area/rogue/under/cavewet)
@@ -2442,7 +2451,7 @@
 	})
 "zM" = (
 /turf/open/floor/carpet/inn,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "zN" = (
 /mob/living/simple_animal/hostile/retaliate/rogue/goatmale,
 /turf/open/floor/rogue/dirt/road,
@@ -2586,7 +2595,10 @@
 	name = "Underkeep"
 	})
 "Br" = (
-/obj/structure/mineral_door/wood,
+/obj/structure/mineral_door/wood{
+	lockid = "mansionvampire";
+	locked = 1
+	},
 /turf/open/floor/rogue/hexstone,
 /area/rogue/indoors/town/manor{
 	first_time_text = "Underkeep";
@@ -2955,7 +2967,7 @@
 "Fs" = (
 /obj/structure/chair/bench/coucha,
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "Fv" = (
 /obj/structure/fluff/statue/knight,
 /turf/open/floor/rogue/blocks/stone,
@@ -3149,7 +3161,7 @@
 /obj/structure/table/wood,
 /obj/item/candle/skull/lit,
 /turf/open/floor/carpet/inn,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "HP" = (
 /mob/living/simple_animal/hostile/rogue/ghost/wraith,
 /turf/open/floor/rogue/dirt/road,
@@ -3185,7 +3197,7 @@
 "Ij" = (
 /obj/structure/healingfountain,
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "Il" = (
 /obj/effect/decal/remains/human,
 /turf/open/floor/rogue/blocks/stone/stonepattern2,
@@ -3265,7 +3277,7 @@
 /obj/item/rogueweapon/sickle/scythe,
 /obj/item/rogueweapon/sickle/scythe,
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "Jj" = (
 /obj/structure/mineral_door/wood/deadbolt{
 	dir = 4;
@@ -3637,7 +3649,7 @@
 /obj/structure/chair/bench/coucha/r,
 /obj/machinery/light/rogue/wallfire/candle/r,
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "MN" = (
 /obj/structure/roguewindow/stained/zizo,
 /turf/open/floor/rogue/ruinedwood/spiral,
@@ -4137,7 +4149,7 @@
 "SP" = (
 /obj/machinery/light/rogue/wallfire/candle/l,
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "SS" = (
 /obj/structure/chair/wood/rogue/chair3{
 	dir = 1
@@ -4265,6 +4277,16 @@
 	},
 /turf/open/floor/rogue/blocks/stone/stonepattern2,
 /area/rogue/under/cavewet)
+"Up" = (
+/obj/structure/mineral_door/wood{
+	locked = 1;
+	lockid = "mansionvampire"
+	},
+/turf/open/floor/rogue/hexstone,
+/area/rogue/indoors/town/manor{
+	first_time_text = "Underkeep";
+	name = "Underkeep"
+	})
 "Us" = (
 /obj/machinery/light/rogue/torchholder{
 	dir = 4
@@ -4427,7 +4449,10 @@
 /turf/open/floor/rogue/ruinedwood/spiral,
 /area/rogue)
 "VY" = (
-/obj/structure/mineral_door/wood,
+/obj/structure/mineral_door/wood{
+	locked = 1;
+	lockid = "mansionvampire"
+	},
 /turf/open/floor/rogue/hexstone,
 /area/rogue)
 "We" = (
@@ -4594,6 +4619,16 @@
 	},
 /obj/item/rogueweapon/surgery/scalpel,
 /turf/open/floor/rogue/hexstone,
+/area/rogue/indoors/town/manor{
+	first_time_text = "Underkeep";
+	name = "Underkeep"
+	})
+"XO" = (
+/obj/structure/mineral_door/wood{
+	locked = 1;
+	lockid = "mansionvampire"
+	},
+/turf/open/floor/rogue/herringbone,
 /area/rogue/indoors/town/manor{
 	first_time_text = "Underkeep";
 	name = "Underkeep"
@@ -4675,7 +4710,7 @@
 	dir = 8
 	},
 /turf/closed/wall/mineral/rogue/stone/red_moss,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "YO" = (
 /obj/structure/chair/wood/rogue{
 	dir = 8
@@ -4772,7 +4807,7 @@
 /area/rogue/under/cavewet)
 "ZL" = (
 /turf/open/floor/rogue/hexstone,
-/area/chapel/main)
+/area/rogue/indoors/town/church/chapel)
 "ZM" = (
 /obj/structure/chair/stool/rogue,
 /turf/open/floor/rogue/blocks/stone/stonepattern3,
@@ -22965,7 +23000,7 @@ cc
 wj
 wj
 wj
-Br
+Up
 RG
 Kz
 Ht
@@ -23097,7 +23132,7 @@ Mv
 wj
 wj
 wj
-Br
+Up
 RG
 Kz
 Xp
@@ -23493,7 +23528,7 @@ Mv
 wj
 wj
 wj
-Br
+Up
 RG
 Kz
 hv
@@ -23625,7 +23660,7 @@ Mv
 wj
 wj
 wj
-Br
+Up
 RG
 Kz
 mo
@@ -27440,7 +27475,7 @@ aE
 sD
 bK
 sl
-sv
+XO
 qw
 qw
 qw