Merge branch 'master' into muzzled-masks

code/game/mecha/working/ripley.dm

@@ -2,14 +2,14 @@
 	desc = "Autonomous Power Loader Unit. This newer model is refitted with powerful armour against the dangers of planetary mining."
 	name = "\improper APLU \"Ripley\""
 	icon_state = "ripley"
-	step_in = 4 //Move speed, lower is faster.
-	var/fast_pressure_step_in = 2 //step_in while in normal pressure conditions
-	var/slow_pressure_step_in = 4 //step_in while in better pressure conditions
+	step_in = 3 //Move speed, lower is faster.
+	var/fast_pressure_step_in = 2
+	var/slow_pressure_step_in = 3
 	max_temperature = 20000
 	max_integrity = 200
-	lights_power = 7
+	lights_power = 8
 	deflect_chance = 15
-	armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	armor = list("melee" = 30, "bullet" = 15, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	max_equip = 6
 	wreckage = /obj/structure/mecha_wreckage/ripley
 	var/list/cargo = new
@@ -64,6 +64,9 @@
 	desc = "Autonomous Power Loader Unit. This model is refitted with additional thermal protection."
 	name = "\improper APLU \"Firefighter\""
 	icon_state = "firefighter"
+	step_in = 4
+	fast_pressure_step_in = 2
+	slow_pressure_step_in = 4
 	max_temperature = 65000
 	max_integrity = 250
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -191,4 +194,4 @@
 		cargo -= O
 	else
 		if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded.
-			to_chat(user, "<span class='warning'>You fail to push [O] out of [src]!</span>")
+			to_chat(user, "<span class='warning'>You fail to push [O] out of [src]!</span>")

code/game/objects/items/defib.dm

@@ -411,6 +411,8 @@
 			to_chat(user, "<span class='warning'>[src] are recharging!</span>")
 		return
 
+	user.stop_pulling() //User has hands full, and we don't care about anyone else pulling on it, their problem. CLEAR!!
+
 	if(user.a_intent == INTENT_DISARM)
 		do_disarm(M, user)
 		return

code/modules/client/preferences.dm

@@ -127,6 +127,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 	var/action_buttons_screen_locs = list()
 
+	//backgrounds
+	var/mutable_appearance/character_background
+	var/icon/bgstate = "steel"
+	var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced")
+
 /datum/preferences/New(client/C)
 	parent = C
 
@@ -266,6 +271,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Species:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=species;task=input'>[pref_species.id]</a><BR>"
 			dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=all;task=random'>Random Body</A><BR>"
 			dat += "<b>Always Random Body:</b><a href='?_src_=prefs;preference=all'>[be_random_body ? "Yes" : "No"]</A><BR>"
+			dat += "<br><b>Cycle background:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=cycle_bg;task=input'>[bgstate]</a><BR>"
 
 			var/use_skintones = pref_species.use_skintones
 			if(use_skintones)
@@ -1412,6 +1418,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if("previous_facehair_style")
 					facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_list)
 
+				if("cycle_bg")
+					bgstate = next_list_item(bgstate, bgstate_options)
+
 				if("underwear")
 					var/new_underwear
 					if(gender == MALE)
@@ -1455,10 +1464,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							features["mam_body_markings"] = "Plain"
 						if("tail_lizard" in pref_species.default_features)
 							features["tail_lizard"] = "Smooth"
-						if("mam_tail" in pref_species.default_features)
-							features["mam_tail"] = "None"
-						if("mam_ears" in pref_species.default_features)
-							features["mam_ears"] = "None"
 						if(pref_species.id == "felinid")
 							features["mam_tail"] = "Cat"
 							features["mam_ears"] = "Cat"

code/modules/client/preferences_savefile.dm

@@ -260,12 +260,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_lizard_body_markings"]	>> features["body_markings"]
 	S["feature_lizard_legs"]			>> features["legs"]
 	S["feature_moth_wings"]				>> features["moth_wings"]
-	if(!CONFIG_GET(flag/join_with_mutant_humans))
-		features["tail_human"] = "none"
-		features["ears"] = "none"
-	else
-		S["feature_human_tail"]				>> features["tail_human"]
-		S["feature_human_ears"]				>> features["ears"]
+	S["feature_human_tail"]				>> features["tail_human"]
+	S["feature_human_ears"]				>> features["ears"]
 
 	//Custom names
 	for(var/custom_name_id in GLOB.preferences_custom_names)
@@ -388,15 +384,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
 	features["mcolor"]	= sanitize_hexcolor(features["mcolor"], 3, 0)
 	features["tail_lizard"]	= sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard)
-	features["tail_human"] 	= sanitize_inlist(features["tail_human"], GLOB.tails_list_human, "None")
+	features["tail_human"] 	= sanitize_inlist(features["tail_human"], GLOB.tails_list_human)
 	features["snout"]	= sanitize_inlist(features["snout"], GLOB.snouts_list)
 	features["horns"] 	= sanitize_inlist(features["horns"], GLOB.horns_list)
-	features["ears"]	= sanitize_inlist(features["ears"], GLOB.ears_list, "None")
+	features["ears"]	= sanitize_inlist(features["ears"], GLOB.ears_list)
 	features["frills"] 	= sanitize_inlist(features["frills"], GLOB.frills_list)
 	features["spines"] 	= sanitize_inlist(features["spines"], GLOB.spines_list)
 	features["body_markings"] 	= sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
-	features["feature_lizard_legs"]	= sanitize_inlist(features["legs"], GLOB.legs_list, "Normal Legs")
-	features["moth_wings"] 	= sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list, "Plain")
+	features["feature_lizard_legs"]	= sanitize_inlist(features["legs"], GLOB.legs_list)
+	features["moth_wings"] 	= sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list)
 
 	joblessrole	= sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))

code/modules/clothing/suits/labcoat.dm

@@ -5,7 +5,28 @@
 	item_state = "labcoat"
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|ARMS
-	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(
+		/obj/item/analyzer,
+		/obj/item/stack/medical,
+		/obj/item/dnainjector,
+		/obj/item/reagent_containers/dropper,
+		/obj/item/reagent_containers/syringe,
+		/obj/item/reagent_containers/hypospray,
+		/obj/item/hypospray/mkii,
+		/obj/item/healthanalyzer,
+		/obj/item/flashlight/pen,
+		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/glass/beaker,
+		/obj/item/reagent_containers/pill,
+		/obj/item/storage/pill_bottle,
+		/obj/item/paper,
+		/obj/item/melee/classic_baton/telescopic,
+		/obj/item/soap,
+		/obj/item/sensor_device,
+		/obj/item/tank/internals/emergency_oxygen,
+		/obj/item/tank/internals/plasmaman
+		)
+
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
 	togglename = "buttons"
 	species_exception = list(/datum/species/golem)

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -25,7 +25,6 @@
 //	var/wide_icon = FALSE //CITDEL THINGS
 //	if(features["taur"] != "None")
 //		wide_icon = TRUE
-
 	if(job_engsec_high)
 		switch(job_engsec_high)
 			if(AI_JF)
@@ -37,6 +36,8 @@
 
 	// Set up the dummy for its photoshoot
 	var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
+	mannequin.cut_overlays()
+	mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER))
 	copy_to(mannequin)
 
 	// Determine what job is marked as 'High' priority, and dress them up as such.

code/modules/mob/living/carbon/human/dummy.dm

@@ -2,6 +2,7 @@
 /mob/living/carbon/human/dummy
 	real_name = "Test Dummy"
 	status_flags = GODMODE|CANPUSH
+	mouse_drag_pointer = MOUSE_INACTIVE_POINTER
 	var/in_use = FALSE
 
 INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)

code/modules/mob/living/carbon/human/species.dm

@@ -1164,16 +1164,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			H.update_inv_w_uniform()
 			H.update_inv_wear_suit()
 
-	/*
-	if(H.noisy && H.nutrition <= NUTRITION_LEVEL_STARVING)
-		if(prob(10))
-			playsound(get_turf(H),"hunger_sounds",35,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
-
-	else if(H.noisy && H.nutrition <= NUTRITION_LEVEL_HUNGRY)
-		if(prob(10))
-			playsound(get_turf(H),"hunger_sounds",15,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
- 	*/
-
 	// nutrition decrease and satiety
 	if (H.nutrition > 0 && H.stat != DEAD && !H.has_trait(TRAIT_NOHUNGER))
 		// THEY HUNGER

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -345,7 +345,15 @@
 
 /mob/living/simple_animal/hostile/proc/AttackingTarget()
 	in_melee = TRUE
-	return target.attack_animal(src)
+	if(isliving(target))
+		var/mob/living/L = target
+		if(L.Adjacent(src) && vore_active && L.devourable) // aggressive check to ensure vore attacks can be made
+			if(prob(voracious_chance))
+				vore_attack(src,L,src)
+			else
+				return L.attack_animal(src)
+	else
+		return target.attack_animal(src)
 
 /mob/living/simple_animal/hostile/proc/Aggro()
 	vision_range = aggro_vision_range

code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm

@@ -8,8 +8,6 @@
 	var/obj/belly/megafauna/dragon/maw/maw = new(src)
 	var/obj/belly/megafauna/dragon/gullet/gullet = new(src)
 	var/obj/belly/megafauna/dragon/gut/gut = new(src)
-//	for(var/obj/belly/X in list(maw, gullet, gut))
-//		vore_organs[X.name] = X
 	// Connect 'stomachs' together
 	maw.transferlocation = gullet
 	gullet.transferlocation = gut
@@ -49,6 +47,6 @@
 	vore_sound = "Tauric Swallow"
 	desc = "With a rush of burning ichor greeting you, you're introduced to the Drake's stomach. Wrinkled walls greedily grind against you, acidic slimes working into your body as you become fuel and nutriton for a superior predator. All that's left is your body's willingness to resist your destiny."
 	digest_mode = DM_DRAGON
-	digest_burn = 5
+	digest_burn = 2
 	swallow_time = 100  // costs extra time to eat directly to here
 	escapechance = 0

code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

@@ -85,7 +85,7 @@
 				OpenFire()
 			if(L.Adjacent(src) && (L.stat != CONSCIOUS))
 				if(vore_active && L.devourable == TRUE)
-					dragon_feeding(src,L)
+					vore_attack(src,L,src)
 					LoseTarget()
 		else
 			devour(L)

code/modules/mob/living/simple_animal/simple_animal_vr.dm

@@ -1,21 +1,29 @@
+#define VORACIOUS_CHANCE 40
+#define VORE_SWALLOW_TIME 50
+
 /mob/living/simple_animal
-	// List of targets excluded (for now) from being eaten by this mob.
-	var/list/prey_exclusions = list()
-	devourable = FALSE //insurance because who knows.
-	digestable = TRUE	//I mean, if it's devourable it should also be digestible
-	var/vore_active = FALSE				// If vore behavior is enabled for this mob
+	//Specific vore behaviors
+	var/vore_active = FALSE						// If vore behavior is enabled for this mob
+	var/isPredator = FALSE 						//Are they capable of performing and pre-defined vore actions for their species?
+	var/swallowTime = VORE_SWALLOW_TIME 		//How long it takes to eat Human and other Simple_animal prey in 1/10 of a second. The default is 5 seconds.
+	var/list/prey_excludes = list()				//For excluding people from being eaten.
+	var/voracious_chance = VORACIOUS_CHANCE		//Mob AI Engagement probability when rolling between regular melee strike and a vore attempt, default 40%
 
-	var/vore_default_mode = DM_DIGEST	// Default bellymode (DM_DIGEST, DM_HOLD, DM_ABSORB)
-	var/vore_digest_chance = 25			// Chance to switch to digest mode if resisted
-	var/vore_escape_chance = 25			// Chance of resisting out of mob
-	var/vore_absorb_chance = 0			// chance of absorbtion by mob
+	// Vore belly interactions
+	// Most mobs are only going to have the one gut. Multi-gut set ups should refer to Ash Drake's dragon_vore.dm for set up.
 
-	var/vore_stomach_name				// The name for the first belly if not "stomach"
-	var/vore_stomach_flavor				// The flavortext for the first belly if not the default
-
-	var/vore_fullness = 0				// How "full" the belly is (controls icons)
-	var/list/living_mobs = list()
+	var/vore_default_sound = "Gulp"				// Default vore sound
+	var/vore_default_release = "Splatter" 		// Default release sound
+	var/vore_wetness = TRUE						// Default for a wet belly
+	var/vore_default_mode = DM_DIGEST			// Default bellymode (DM_DIGEST, DM_HOLD, DM_ABSORB)
+	var/vore_digest_chance = VORACIOUS_CHANCE	// Chance to switch to digest mode if resisted, default 40%
+	var/vore_escape_chance = VORACIOUS_CHANCE	// Chance of resisting out of mob, default 40%
+	var/vore_absorb_chance = 0					// chance of absorbtion by mob, default 0%
+	var/vore_stomach_name						// The name for the first belly if not "stomach"
+	var/vore_stomach_flavor						// The flavortext for the first belly if not the default
 
+	//Icon Memes
+	var/vore_fullness = 0					// How "full" the belly is (controls icons)
 
 // Release belly contents before being gc'd!
 /mob/living/simple_animal/Destroy()
@@ -34,35 +42,19 @@
 
 	vore_fullness = new_fullness
 
-/*
-/mob/living/simple_animal/proc/swallow_check()
-	for(var/I in vore_organs)
-		var/obj/belly/B = vore_organs[I]
-		if(vore_active)
-			update_fullness()
-			if(!vore_fullness)
-				// Nothing
-				return
-			else
-				addtimer(CALLBACK(src, .proc/swallow_mob), B.swallow_time)
-
-/mob/living/simple_animal/proc/swallow_mob()
-	for(var/I in vore_organs)
-		var/obj/belly/B = vore_organs[I]
-		for(var/mob/living/M in B.contents)
-			B.transfer_contents(M, transferlocation)
-*/
-
 /mob/living/simple_animal/death()
 	release_vore_contents(silent = TRUE)
 	. = ..()
 
 // Simple animals have only one belly.  This creates it (if it isn't already set up)
-/mob/living/simple_animal/proc/init_belly()
+/mob/living/simple_animal/init_vore()
+	vore_init = TRUE
 	if(vore_organs.len)
 		return
 	if(no_vore) //If it can't vore, let's not give it a stomach.
 		return
+	if(vore_active && !IsAdvancedToolUser()) //vore active, but doesn't have thumbs to grab people with.
+		verbs |= /mob/living/simple_animal/proc/animal_nom
 
 	var/obj/belly/B = new /obj/belly(src)
 	vore_selected = B
@@ -70,6 +62,9 @@
 	B.name = vore_stomach_name ? vore_stomach_name : "stomach"
 	B.desc = vore_stomach_flavor ? vore_stomach_flavor : "Your surroundings are warm, soft, and slimy. Makes sense, considering you're inside \the [name]."
 	B.digest_mode = vore_default_mode
+	B.vore_sound = vore_default_sound
+	B.release_sound = vore_default_release
+	B.is_wet = vore_wetness
 	B.escapable = vore_escape_chance > 0
 	B.escapechance = vore_escape_chance
 	B.digestchance = vore_digest_chance
@@ -97,21 +92,42 @@
 		"The juices pooling beneath you sizzle against your sore skin.",
 		"The churning walls slowly pulverize you into meaty nutrients.",
 		"The stomach glorps and gurgles as it tries to work you into slop.")
-/*	B.emote_lists[DM_ITEMWEAK] = list(
-		"The burning acids eat away at your form.",
-		"The muscular stomach flesh grinds harshly against you.",
-		"The caustic air stings your chest when you try to breathe.",
-		"The slimy guts squeeze inward to help the digestive juices soften you up.",
-		"The onslaught against your body doesn't seem to be letting up; you're food now.",
-		"The predator's body ripples and crushes against you as digestive enzymes pull you apart.",
-		"The juices pooling beneath you sizzle against your sore skin.",
-		"The churning walls slowly pulverize you into meaty nutrients.",
-		"The stomach glorps and gurgles as it tries to work you into slop.")*/
 
-//Grab = Nomf
-/*
-/mob/living/simple_animal/UnarmedAttack(var/atom/A, var/proximity)
-	. = ..()
+//
+// Simple proc for animals to have their digestion toggled on/off externally
+//
+/mob/living/simple_animal/verb/toggle_digestion()
+	set name = "Toggle Animal's Digestion"
+	set desc = "Enables digestion on this mob for 20 minutes."
+	set category = "Object"
+	set src in oview(1)
 
-	if(a_intent == I_GRAB && isliving(A) && !has_hands)
-		animal_nom(A)*/
+	var/datum/belly/B = vore_organs[vore_selected]
+	if(faction != usr.faction)
+		to_chat(usr,"<span class='warning'>This predator isn't friendly, and doesn't give a shit about your opinions of it digesting you.</span>")
+		return
+	if(B.digest_mode == "Hold")
+		var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel")
+		if(confirm == "Enable")
+			B.digest_mode = "Digest"
+			sleep(20 MINUTES) //12000=20 minutes
+			B.digest_mode = "Hold"
+	else
+		var/confirm = alert(usr, "This mob is currently set to digest all stomach contents. Do you want to disable this?", "Disabling [name]'s Digestion", "Disable", "Cancel")
+		if(confirm == "Disable")
+			B.digest_mode = "Hold"
+
+//
+// Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs.
+//
+/mob/living/simple_animal/proc/animal_nom(var/mob/living/T in oview(1))
+	set name = "Animal Nom"
+	set category = "Vore"
+	set desc = "Since you can't grab, you get a verb!"
+
+	if (stat != CONSCIOUS)
+		return
+	if (T.devourable == FALSE)
+		to_chat(usr, "<span class='warning'>You can't eat this!</span>")
+		return
+	return vore_attack(usr,T,usr)

code/modules/paperwork/paper.dm

@@ -134,7 +134,7 @@
 	var/locid = 0
 	var/laststart = 1
 	var/textindex = 1
-	while(1)	//I know this can cause infinite loops and fuck up the whole server, but the if(istart==0) should be safe as fuck
+	while(locid < 15)	//hey whoever decided a while(1) was a good idea here, i hate you
 		var/istart = 0
 		if(links)
 			istart = findtext(info_links, "<span class=\"paper_field\">", laststart)
@@ -198,7 +198,7 @@
 
 	// Count the fields
 	var/laststart = 1
-	while(1)
+	while(fields < 15)
 		var/i = findtext(t, "<span class=\"paper_field\">", laststart)
 		if(i == 0)
 			break
@@ -210,7 +210,7 @@
 /obj/item/paper/proc/reload_fields() // Useful if you made the paper programicly and want to include fields. Also runs updateinfolinks() for you.
 	fields = 0
 	var/laststart = 1
-	while(1)
+	while(fields < 15)
 		var/i = findtext(info, "<span class=\"paper_field\">", laststart)
 		if(i == 0)
 			break

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -62,7 +62,6 @@
 	)
 
 	var/list/upgrade_reagents3 = list(
-		"glycerol",
 		"mine_salve",
 		"toxin"
 	)