MinorFixes (#7528)

maps/southern_cross/submaps/gateway/maddnesslab.dmm

@@ -596,11 +596,9 @@
 	},
 /area/awaymission/mol/mines)
 "dY" = (
-/mob/living/simple_mob/mechanical/mecha/imperion/phase1{
+/obj/structure/inflatable,
-	size_multiplier = 3
+/turf/simulated/floor,
-	},
+/area/awaymission/mol/crumblingmaze)
-/turf/simulated/wall/solidrock,
-/area/awaymission/mol/mines)
 "dZ" = (
 /obj/effect/floor_decal/corner/yellow/border{
 	dir = 1
@@ -3945,6 +3943,10 @@
 /mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced,
 /turf/simulated/floor/tiled/neutral,
 /area/awaymission/mol/audiotorium)
+"zf" = (
+/obj/structure/inflatable,
+/turf/simulated/floor,
+/area/awaymission/mol/mines)
 "zg" = (
 /obj/effect/floor_decal/corner/yellow/border,
 /obj/machinery/sleeper{
@@ -4370,6 +4372,10 @@
 "BG" = (
 /turf/simulated/floor/carpet/green,
 /area/awaymission/mol/vistortunnel/green)
+"BH" = (
+/obj/structure/closet/crate/secure/loot,
+/turf/simulated/floor/bmarble,
+/area/awaymission/mol/entrancetunnel)
 "BI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -6015,6 +6021,11 @@
 /obj/effect/floor_decal/corner/orange/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/awaymission/mol/security)
+"Mb" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/inflatable,
+/turf/simulated/floor,
+/area/awaymission/mol/themaze)
 "Mc" = (
 /turf/simulated/floor/tiled/kafel_full/beige,
 /area/awaymission/mol/kitchen/chamberA)
@@ -6265,6 +6276,10 @@
 	},
 /turf/simulated/wall/solidrock,
 /area/awaymission/mol/mines)
+"NG" = (
+/obj/structure/inflatable,
+/turf/simulated/floor,
+/area/awaymission/mol/themaze)
 "NL" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/disposalpipe/segment{
@@ -13652,7 +13667,7 @@ YX
 Ja
 tG
 nY
-YG
+zf
 nY
 tG
 NB
@@ -13889,19 +13904,19 @@ cQ
 PC
 Jg
 tI
-tI
+dY
 SA
 Bi
 iG
 Um
 XH
-tI
+dY
 hp
 mX
 XN
 Jg
 tI
-tI
+dY
 tI
 mX
 ZW
@@ -15437,7 +15452,7 @@ cQ
 PC
 Jg
 tI
-tI
+dY
 tI
 mX
 vc
@@ -15449,7 +15464,7 @@ VP
 Cr
 Jg
 hp
-tI
+dY
 hp
 mX
 nd
@@ -16985,19 +17000,19 @@ BL
 nd
 Jg
 hp
-tI
+dY
 hp
 mX
 lr
 qC
 tI
-tI
+dY
 hp
 VP
 uE
 Jg
 tI
-tI
+dY
 tI
 mX
 nd
@@ -26007,7 +26022,7 @@ Fg
 Nf
 HH
 HH
-HH
+NG
 hG
 HH
 Xx
@@ -26017,7 +26032,7 @@ dK
 Nf
 HH
 hG
-HH
+NG
 HH
 hG
 Xx
@@ -26027,7 +26042,7 @@ Fg
 Nf
 hG
 hG
-HH
+NG
 HH
 HH
 Xx
@@ -28587,7 +28602,7 @@ dK
 Nf
 HH
 HH
-HH
+NG
 HH
 hG
 Xx
@@ -28597,7 +28612,7 @@ Fg
 Nf
 yx
 sM
-Td
+Mb
 Dm
 HH
 Xx
@@ -28607,7 +28622,7 @@ Rh
 Nf
 HH
 yx
-Td
+Mb
 Dm
 HH
 Xx
@@ -31167,7 +31182,7 @@ Fg
 Nf
 hG
 hG
-HH
+NG
 HH
 HH
 Xx
@@ -31177,7 +31192,7 @@ aj
 Nf
 HH
 HH
-HH
+NG
 hG
 hG
 Xx
@@ -31187,7 +31202,7 @@ Fg
 Nf
 HH
 hG
-HH
+NG
 HH
 hG
 Xx
@@ -33747,7 +33762,7 @@ Fx
 Nf
 HH
 HH
-HH
+NG
 HH
 HH
 Xx
@@ -33757,7 +33772,7 @@ Fg
 Nf
 HH
 HH
-HH
+NG
 hG
 HH
 Xx
@@ -33767,7 +33782,7 @@ Fg
 Nf
 hG
 HH
-HH
+NG
 HH
 HH
 Xx
@@ -38802,15 +38817,15 @@ Nh
 Nh
 Nh
 Nh
-Nh
+Ae
-Nh
+Ae
 Ae
 rt
 rt
 rt
 Ae
-Nh
+Ae
-Nh
+Ae
 Nh
 Nh
 Nh
@@ -39060,12 +39075,14 @@ Nh
 Nh
 Nh
 Nh
-Nh
-Nh
 Ae
+BH
+LM
 rt
 rt
 rt
+NN
+BH
 Ae
 Nh
 Nh
@@ -39075,8 +39092,6 @@ Nh
 Nh
 Nh
 Nh
-Nh
-Nh
 iA
 iA
 LS
@@ -39318,15 +39333,15 @@ Nh
 Nh
 Nh
 Nh
-Nh
+Ae
-Nh
+Ae
 Ae
 oH
 rt
 rt
 Ae
-Nh
+Ae
-Nh
+Ae
 Nh
 Nh
 Nh
@@ -41382,15 +41397,15 @@ Nh
 Nh
 Nh
 Nh
-Nh
+Ae
-Nh
+Ae
 Ae
 oH
 rt
 rt
 Ae
-Nh
+Ae
-Nh
+Ae
 Nh
 Nh
 Nh
@@ -41640,12 +41655,14 @@ Nh
 Nh
 Nh
 Nh
-Nh
-Nh
 Ae
+BH
+kk
 rt
 rt
 rt
+FS
+BH
 Ae
 Nh
 Nh
@@ -41655,8 +41672,6 @@ Nh
 Nh
 Nh
 Nh
-Nh
-Nh
 iA
 iA
 dP
@@ -41898,15 +41913,15 @@ Nh
 Nh
 Nh
 Nh
-Nh
+Ae
-Nh
+Ae
 Ae
 rt
 rt
 rt
 Ae
-Nh
+Ae
-Nh
+Ae
 Nh
 Nh
 Nh
@@ -51653,7 +51668,7 @@ Nh
 Nh
 Nh
 Nh
-dY
+Nh
 Nh
 Nh
 Nh

modular_chomp/code/modules/event/event_container_ch.dm

@@ -102,6 +102,7 @@
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Xenobiology Breach",		/datum/event/prison_break/xenobiology,	0,		list(ASSIGNMENT_SCIENCE = 100), 1, min_jobs = list(ASSIGNMENT_SCIENTIST = 1), min_jobs = list(ASSIGNMENT_SCIENTIST = 1, ASSIGNMENT_SECURITY =1)),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Jellyfish School",			/datum/event/jellyfish_migration,		5,		list(ASSIGNMENT_ANY = 1, ASSIGNMENT_SECURITY = 5, ASSIGNMENT_MEDICAL = 3), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meaty Ore Shower",			/datum/event/meteor_wave/meatyores,		-50,	list(ASSIGNMENT_ENGINEER = 45), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 2)),
+		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Exotic Infestation",	/datum/event/dangerinfestation, 	-30,	list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_SCIENCE = 5, ASSIGNMENT_ANY = 2)),
 	)
 	add_disabled_events(list(
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meteor Shower",			/datum/event/meteor_wave,				30,		list(ASSIGNMENT_ENGINEER = 20), min_jobs = list(ASSIGNMENT_ENGINEER = 3)),
@@ -111,7 +112,6 @@
 		//Spacedust doesn't work, commenting this out.
 		//new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust",				/datum/event/dust,	 					0,		list(ASSIGNMENT_ENGINEER = 20), 1, 0, 50),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Supply Demand",			/datum/event/supply_demand,				0,		list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1),
-		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Exotic Infestation",	/datum/event/dangerinfestation, 	-30,	list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_SCIENCE = 5, ASSIGNMENT_ANY = 2)),
 		//Check if wormhole code is good and then move to enabled.
 //		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Wormholes",				/datum/event/wormholes,	 				20,		list(ASSIGNMENT_ANY = 5)),
 //		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Lost Spiders",				/datum/event/spider_migration,			0, 		list(ASSIGNMENT_SECURITY = 30), 1), //YW EDIT //CHOMPStation Edit: Moved to disabled. This is a YW feature that spawns spiders on carp spawns.

modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm

@@ -325,7 +325,7 @@
 	vore_default_mode = DM_DIGEST
 
 
-/mob/living/simple_mob/vore/solarray
+/mob/living/simple_mob/vore/spacecritter/solarray
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/raymeat
 	meat_amount = 8
 
@@ -347,7 +347,7 @@
 		/obj/item/stack/material/wisp = 1
 		)
 
-/mob/living/simple_mob/vore/livingice
+/mob/living/simple_mob/vore/spacecritter/livingice
 	meat_type = /obj/item/stack/material/snow
 	meat_amount = 18
 
@@ -369,7 +369,7 @@
 		/obj/item/stack/material/frostscale = 1
 		)
 
-/mob/living/simple_mob/vore/radcrab
+/mob/living/simple_mob/vore/spacecritter/radcrab
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/crabmeat
 	meat_amount = 8
 
@@ -391,7 +391,7 @@
 		/obj/item/stack/material/crystalscale = 1
 		)
 
-/mob/living/simple_mob/vore/dreameel
+/mob/living/simple_mob/vore/spacecritter/dreameel
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/eelmeat
 	meat_amount = 2
 
@@ -413,7 +413,7 @@
 		/obj/item/stack/material/dreamscale = 1
 		)
 
-/mob/living/simple_mob/vore/gravityshell
+/mob/living/simple_mob/vore/spacecritter/gravityshell
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/gravityshell
 	meat_amount = 8
 

modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm

@@ -155,7 +155,7 @@
 /turf/simulated/mineral/floor/ignore_mapgen,
 /area/submap/solarmoff)
 "U" = (
-/mob/living/simple_mob/vore/solarmoth,
+/mob/living/simple_mob/vore/spacecritter/solarray/galaxyray,
 /obj/item/rig_module/device/stamp,
 /turf/simulated/mineral/floor/ignore_mapgen,
 /area/submap/solarmoff)