Merge branch 'master' into aro_mechshoes

modular_chomp/code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -0,0 +1,17 @@
+/datum/gear/suit/pcarrier // No protection until inserted with plates, purely for cosmetic purposes.
+	display_name = "Plate Carrier selection (Security/Exploration)"
+	path = /obj/item/clothing/suit/armor/pcarrier
+	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Pathfinder", "Field Medic", "Pilot", "Explorer")
+	cost = 2
+
+/datum/gear/suit/pcarrier/New()
+	..()
+	var/list/pcarriers = list(
+	"Black Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier,
+	"Navy Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier/navy,
+	"Blue Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier/blue,
+	"Light Blue Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier/press,
+	"Green Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier/green,
+	"Tan Plate Carrier" = /obj/item/clothing/suit/armor/pcarrier/tan
+	)
+	gear_tweaks += new/datum/gear_tweak/path(pcarriers)

modular_chomp/code/modules/mining/shelter_atoms_ch.dm

@@ -105,6 +105,8 @@
 
 /area/survivalpod/superpose/PizzaParlor
 
+/area/survivalpod/superpose/GrandLibrary
+
 /obj/item/device/survivalcapsule/superpose
 	name = "superposed surfluid shelter capsule"
 	desc = "A proprietary hyperstructure of many three-dimensional spaces superposed around a supermatter nano crystal; use a pen to reach the reset button. There's a license for use printed on the bottom."

modular_chomp/code/modules/mining/shelters_ch.dm

@@ -320,3 +320,9 @@
 	mappath = "modular_chomp/maps/submaps/shelters/PizzaParlor-18x19.dmm"
 	name = "Pizza Parlor"
 	description = "A small locally owned pizza parlor, now with delivery services."
+
+/datum/map_template/shelter/superpose/GrandLibrary
+	shelter_id = "GrandLibrary"
+	mappath = "modular_chomp/maps/submaps/shelters/GrandLibrary-31x24.dmm"
+	name = "Pizza Parlor"
+	description = "A grand ornate library, more books than you can count."

modular_chomp/code/modules/mob/dead/observer/observer.dm

@@ -1,5 +1,6 @@
 /mob/observer
 	var/mob/living/body_backup = null //add reforming
+	low_priority = TRUE
 
 /mob/observer/Destroy()
 	if(body_backup)

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

@@ -38,14 +38,14 @@
 	B.belly_sprite_to_affect = "stomach"
 	B.name = "Churno-Vac"
 	B.desc = "With an abrupt loud WHUMP after a very sucky trip through the hungry bot's vacuum tube, you finally spill out into its waste container, where everything the bot slurps off the floors ends up for swift processing among the caustic sludge, efficiently melting everything down into a thin slurry to fuel its form. More loose dirt and debris occasionally raining in from above as the bot carries on with its duties to keep the station nice and clean."
-	B.digest_messages_prey = list("Under the heat and internal pressure of the greedy machine's gutworks, you can feel the tides of the hot caustic sludge claiming the last bits of space around your body, a few more squeezes of the synthetic muscles squelching and glurking as your body finally loses its form, completely blending down and merging into the tingly sludge to fuel the mean machine.")
+	B.digest_messages_prey = list("Under the heat and internal pressure of the greedy machine's gutworks, you can feel the tides of the hot caustic sludge claiming the last bits of space around your body, a few more squeezes of the synthetic muscles squelching and glurking as your body finally loses its form, completely blending down and merging into the tingly sludge to fuel the mean machine.")
 	B.digest_mode = DM_DIGEST
 	B.item_digest_mode = IM_DIGEST
 	B.digest_burn = 3
 	B.fancy_vore = 1
 	B.vore_sound = "Stomach Move"
-	B.belly_fullscreen = "anim_belly"
-	B.belly_fullscreen_color = "#3e2f27"
+	B.belly_fullscreen = "VBO_trash"
+	B.belly_fullscreen_color = "#555B34"
 	B.sound_volume = 25
 	B.count_items_for_sprite = TRUE
 
@@ -94,6 +94,7 @@
 	B.desc = "SNAP! You have been sucked up into the big synthbird's beak, the powerful vacuum within the bird roaring somewhere beyond the abyssal deep gullet hungrily gaping before you, eagerly sucking you deeper inside towards a long bulgy ride down the bird's vacuum hose of a neck!"
 	B.autotransferlocation = "vacuum hose"
 	B.autotransfer_max_amount = 0
+	B.autotransferwait = 60
 
 	vore_selected = B
 
@@ -121,9 +122,6 @@
 
 /mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/Life()
 	. =..()
-	for(var/obj/belly/L in vore_organs) //Speedrun that autotransfer at 2s ticks instead of 6s
-		if(L.speedy_mob_processing)
-			L.process()
 	var/turf/T = get_turf(src)
 	if(istype(T))
 		for(var/obj/O in T)

modular_chomp/code/modules/mob/new_player/sprite_accessories_wing.dm

@@ -1,15 +1,55 @@
 /datum/sprite_accessory/wing/sect_drone //We should some day make a variable to make some wings not be able to fly
 	name = "Sect drone wings (To use with bodytype marking)"
 	desc = ""
-	icon = 'icons/mob/vore/wings_ch.dmi'
+	icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi'
 	icon_state = "sectdrone_wing"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 
+/datum/sprite_accessory/wing/snagc
+	name = "xenomorph backplate, colorable"
+	desc = ""
+	icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi'
+	icon_state = "csnag-backplate"
+	do_colouration = 1
+
+/datum/sprite_accessory/wing/teshbee
+	name = "Teshari bee wings"
+	desc = ""
+	icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi'
+	icon_state = "beewings_tesh"
+
+/datum/sprite_accessory/wing/teshdragonfly
+	name = "Teshari dragonfly wings"
+	desc = ""
+	icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi'
+	icon_state = "dragonfly_tesh"
+
+/datum/sprite_accessory/wing/snail //We should some day make a variable to make some wings not be able to fly
+	name = "Snail shell"
+	desc = ""
+	icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings.dmi'
+	icon_state = "snail_shell"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/wing/dragon2
+	name = "Dragon wings, large, colorable"
+	desc = ""
+	icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi'
+	icon_state = "dragon_2"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "dragon_2_mark"
+
+//
+// x64 Wings below this point.
+//
+
 /datum/sprite_accessory/wing/sect_drone_alt
 	name = "Sect drone wings Alt. (To use with bodytype marking)"
 	desc = ""
-	icon = 'icons/mob/vore/wings64_ch.dmi'
+	icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi'
 	icon_state = "sectdrone_wing_alt"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
@@ -18,7 +58,7 @@
 /datum/sprite_accessory/wing/sect_drone_alt_nomark
 	name = "Sect drone wings Alt."
 	desc = ""
-	icon = 'icons/mob/vore/wings64_ch.dmi'
+	icon = 'modular_chomp/icons/mob/human_races/sprite_accessories/wings64.dmi'
 	icon_state = "sectdrone_wing_alt_nomark"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY

modular_chomp/code/modules/recycling/v_garbosystem.dm

@@ -111,6 +111,7 @@
 			if(items_taken >= voracity)
 				break
 		if(items_taken) //Lazy coder sound design moment.
+			Recycled_Items = Recycled_Items + items_taken
 			playsound(src, 'sound/items/poster_being_created.ogg', 50, 1)
 			playsound(src, 'sound/items/electronic_assembly_emptying.ogg', 50, 1)
 			playsound(src, 'sound/effects/metalscrape2.ogg', 50, 1)
@@ -140,3 +141,5 @@
 /obj/machinery/button/garbosystem/attack_hand(mob/living/user as mob)
 	if(grinder)
 		return grinder.attack_hand(user)
+
+var/Recycled_Items = 0