diff --git a/maps/southern_cross/submaps/gateway/maddnesslab.dmm b/maps/southern_cross/submaps/gateway/maddnesslab.dmm index 71cdee9d34..e154789dcd 100644 --- a/maps/southern_cross/submaps/gateway/maddnesslab.dmm +++ b/maps/southern_cross/submaps/gateway/maddnesslab.dmm @@ -166,11 +166,11 @@ /turf/simulated/floor/wood/sif, /area/awaymission/mol/dorms) "bg" = ( -/mob/living/simple_mob/vore/candy/worm, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/floor_decal/corner/lightgrey/diagonal, +/mob/living/simple_mob/vore/candy/peppermint, /turf/simulated/floor/tiled/kafel_full/white, /area/awaymission/mol/kitchen) "bh" = ( @@ -311,6 +311,9 @@ }, /area/awaymission/mol/mines) "cj" = ( +/obj/machinery/door/blast/puzzle{ + id = "FinaleGate2" + }, /turf/simulated/floor/carpet/blue, /area/awaymission/mol/kitchen) "ck" = ( @@ -1369,12 +1372,6 @@ /obj/item/weapon/storage/firstaid/clotting, /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) -"jV" = ( -/mob/living/simple_mob/vore/candy/worm, -/obj/effect/floor_decal/corner/lightgrey/diagonal, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/kafel_full/white, -/area/awaymission/mol/kitchen) "jW" = ( /obj/structure/table/marble, /obj/random/meat, @@ -2929,14 +2926,6 @@ }, /turf/simulated/floor/tiled/kafel_full/purple, /area/awaymission/mol/kitchen/chamberC) -"uF" = ( -/mob/living/simple_mob/vore/candy/worm, -/obj/effect/floor_decal/corner/lightgrey/diagonal, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/kafel_full/white, -/area/awaymission/mol/kitchen) "uH" = ( /mob/living/simple_mob/vore/candy/peppermint, /turf/simulated/floor/tiled/kafel_full/purple, @@ -3015,13 +3004,6 @@ /mob/living/simple_mob/vore/candy/marshmellowserpent, /turf/simulated/floor/tiled/kafel_full/blue, /area/awaymission/mol/kitchen/chamberB) -"vk" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "Candy Zone" - }, -/turf/simulated/floor/bmarble, -/area/awaymission/mol/entrancetunnel) "vr" = ( /obj/machinery/light{ dir = 4 @@ -3399,10 +3381,6 @@ }, /turf/simulated/floor, /area/awaymission/mol/headdorms) -"xU" = ( -/mob/living/simple_mob/vore/candy/worm, -/turf/simulated/floor/tiled/kafel_full/yellow, -/area/awaymission/mol/kitchen/chamberC) "xX" = ( /obj/structure/table/hardwoodtable, /obj/random/maintenance/foodstuff, @@ -4567,13 +4545,6 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/mines) -"FK" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "Candy Zone" - }, -/turf/simulated/floor/bmarble, -/area/awaymission/mol/entrancetunnel) "FQ" = ( /obj/machinery/light, /obj/item/weapon/beartrap/hunting{ @@ -4932,10 +4903,6 @@ "If" = ( /turf/simulated/floor/bmarble, /area/awaymission/mol/hardlightentrance) -"Ih" = ( -/mob/living/simple_mob/vore/candy/worm, -/turf/simulated/floor/tiled/kafel_full/purple, -/area/awaymission/mol/kitchen/chamberC) "Ii" = ( /obj/machinery/light{ dir = 4 @@ -5443,11 +5410,6 @@ /obj/effect/floor_decal/corner/orange/diagonal, /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) -"LZ" = ( -/mob/living/simple_mob/vore/candy/worm, -/obj/structure/loot_pile/surface/bones, -/turf/simulated/floor/tiled/kafel_full/yellow, -/area/awaymission/mol/kitchen/chamberC) "Mc" = ( /turf/simulated/floor/tiled/kafel_full/beige, /area/awaymission/mol/kitchen/chamberA) @@ -5460,10 +5422,10 @@ /turf/simulated/floor/tiled/kafel_full/white, /area/awaymission/mol/kitchen) "Me" = ( -/mob/living/simple_mob/vore/candy/worm, -/obj/effect/floor_decal/corner/white/diagonal, +/obj/effect/floor_decal/corner/lightgrey/diagonal, +/mob/living/simple_mob/vore/candy/peppermint, /turf/simulated/floor/tiled/kafel_full/white, -/area/awaymission/mol/kitchen/ChamberD) +/area/awaymission/mol/kitchen) "Mf" = ( /obj/structure/disposalpipe/segment, /obj/structure/loot_pile/surface/bones, @@ -6381,13 +6343,6 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) -"SX" = ( -/obj/machinery/conveyor{ - id = "Candy Zone"; - dir = 8 - }, -/turf/simulated/floor/bmarble, -/area/awaymission/mol/entrancetunnel) "Ta" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7127,12 +7082,6 @@ }, /turf/simulated/floor/wmarble, /area/awaymission/mol/vistortunnel) -"Xz" = ( -/obj/machinery/conveyor{ - id = "Candy Zone" - }, -/turf/simulated/floor/bmarble, -/area/awaymission/mol/entrancetunnel) "XC" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -43181,8 +43130,8 @@ rt rt rt rt -SX -vk +rt +rt rt rt rt @@ -43439,8 +43388,8 @@ ZY rt rt rt -FK -Xz +rt +rt rt rt rt @@ -48096,7 +48045,7 @@ CF CF CF CF -bg +CL jI QS is @@ -57126,7 +57075,7 @@ zC Cx RH lf -CL +bg jI QS is @@ -58415,9 +58364,9 @@ gn gn IZ RH -uF +lf CL -jV +jI QS is BA @@ -59686,9 +59635,9 @@ TE TE is qO -uF +lf CL -jV +jI ni is is @@ -59953,7 +59902,7 @@ zC zC Qd uD -Ih +zC zC zC Ij @@ -61510,7 +61459,7 @@ zC zC zC Qd -Ih +zC hY zC zC @@ -62017,7 +61966,7 @@ KY Nb nx Nb -xU +Nb Wx WR Nb @@ -62525,7 +62474,7 @@ TE is RH lf -CF +Me jI QS is @@ -63571,7 +63520,7 @@ ob gA Nb Nb -LZ +WR Nb Nb Qs @@ -64335,11 +64284,11 @@ Eo yj Eo Eo -Me Eo Eo Eo -Me +Eo +Eo Eo Eo EL @@ -65629,7 +65578,7 @@ Eo Eo Eo Eo -Me +Eo Vj Eo Eo @@ -66913,7 +66862,7 @@ Eo Eo Eo aF -Me +Eo Vj yI yj @@ -67184,7 +67133,7 @@ Eo Eo Vj VF -Me +Eo Eo Eo pI diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm index f6f73a09cc..03186d72c2 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm @@ -431,8 +431,8 @@ icon_living = "ouroboros" icon_dead = "slainouroboros" - maxHealth = 300 - health = 300 + maxHealth = 200 + health = 200 armor = list(melee = 30, bullet = 30, laser = 30, energy = 30, bomb = 20, bio = 100, rad = 100) //armor cause boss movement_cooldown = 0 melee_attack_delay = 1 SECOND @@ -651,7 +651,7 @@ to_chat(user, "This weapon is ineffective, it does no damage.") visible_message("\The [user] gently taps [src] with \the [O].") - +/* /mob/living/simple_mob/vore/candy/worm name = "hardcandy worm" desc = "A creature made of candy." @@ -665,11 +665,13 @@ maxHealth = 60 health = 60 + /mob/living/simple_mob/vore/candy/worm/death() new /obj/random/mob/candycritter (src.loc) new /obj/random/mob/candycritter (src.loc) new /obj/random/mob/candycritter (src.loc) + /mob/living/simple_mob/vore/candy/worm/Login() . = ..() if(!riding_datum) @@ -694,6 +696,7 @@ B.emote_lists[DM_DIGEST] = list( "Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!") +*/ /mob/living/simple_mob/vore/candy/peppermint/Login() . = ..()