Merge branch 'quotefox:master' into master

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -662,8 +662,8 @@ This is here to make the tiles around the station mininuke change when it's arme
 			var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 			if(istype(loneop))
 				loneop.weight += 1
-				if(loneop.weight % 5 == 0)
-					message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].")
+//				if(loneop.weight % 5 == 0)
+//					message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].")
 				log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
 	else
 		lastlocation = newturf
@@ -671,8 +671,8 @@ This is here to make the tiles around the station mininuke change when it's arme
 		var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 		if(istype(loneop) && prob(loneop.weight))
 			loneop.weight = max(loneop.weight - 1, 0)
-			if(loneop.weight % 5 == 0)
-				message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].")
+//			if(loneop.weight % 5 == 0)
+//				message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].")
 			log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].")
 
 /obj/item/disk/nuclear/examine(mob/user)

code/modules/events/holiday/vday.dm

@@ -6,10 +6,10 @@
 
 /datum/round_event_control/valentines
 	name = "Valentines!"
-	holidayID = VALENTINES
+	//holidayID = VALENTINES this is just asking for noncon and bad shit
 	typepath = /datum/round_event/valentines
-	weight = -1							//forces it to be called, regardless of weight
-	max_occurrences = 1
+	weight = 0
+	max_occurrences = 0
 	earliest_start = 0 MINUTES
 
 /datum/round_event/valentines/start()

code/modules/food_and_drinks/food/snacks_other.dm

@@ -256,6 +256,45 @@
 	tastes = list("fudge" = 1)
 	foodtype = JUNKFOOD | SUGAR
 
+/obj/item/reagent_containers/food/snacks/choccogun
+	name = "golden gun"
+	desc = "It's a golden gun! Probably will instantly kill who ever is hit."
+	icon_state = "pyritegun"
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("pistol whipped")
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5, /datum/reagent/iron = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/coco = 5)
+	filling_color = "#A0522D"
+	tastes = list("fudge" = 1, "metal" = 1)
+	bitesize = 0.1
+	foodtype = JUNKFOOD | SUGAR
+	
+	var is_wrapped = 1
+
+/obj/item/reagent_containers/food/snacks/choccogun/afterattack(user)
+	if (is_wrapped == 1)
+		to_chat(user, "<span class='danger'>*click*</span>")
+		playsound(src, "gun_dry_fire", 30, 1)
+	else //no more clicking chocolate for you. <3
+		return
+
+/obj/item/reagent_containers/food/snacks/choccogun/attack_self(mob/user)
+	if (is_wrapped == 1)
+		to_chat(user, "You look at the gun and find it's made of chocolate, unwrapping it.")
+		
+		name = "chocolate gun"
+		desc = "This explains why it wasn't firing at all.."
+		icon_state = "choccogun"
+		bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5, /datum/reagent/gold = 1)
+		list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/coco = 5)
+		filling_color = "#A0522D"
+		tastes = list("fudge" = 1)
+		foodtype = JUNKFOOD | SUGAR
+	
+		is_wrapped = 0
+	else
+		return
+
 /obj/item/reagent_containers/food/snacks/chocoorange
 	name = "chocolate orange"
 	desc = "A festive chocolate orange."

code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

@@ -49,6 +49,15 @@
 	result = /obj/item/reagent_containers/food/snacks/chocoorange
 	subcategory = CAT_MISCFOOD
 
+/datum/crafting_recipe/food/choccogun
+	name = "Choco gun"
+	reqs = list(
+		/datum/reagent/iron = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/choccogun
+	subcategory = CAT_MISCFOOD
+
 /datum/crafting_recipe/food/loadedbakedpotato
 	name = "Loaded baked potato"
 	time = 40

code/modules/mob/living/carbon/human/species_types/podpeople.dm

@@ -3,7 +3,10 @@
 	name = "Podperson"
 	id = "pod"
 	default_color = "59CE00"
-	species_traits = list(MUTCOLORS,EYECOLOR)
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR,WINGCOLOR)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
+	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "legs", "deco_wings")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "None", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "None", "legs" = "Normal Legs" , "deco_wings" = "None" )
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slice.ogg'
 	miss_sound = 'sound/weapons/slashmiss.ogg'
@@ -68,6 +71,37 @@
 		if(/obj/item/projectile/energy/florayield)
 			H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL)
 
+/datum/species/pod/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		stop_wagging_tail(H)
+
+/datum/species/pod/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		stop_wagging_tail(H)
+	. = ..()
+
+/datum/species/pod/can_wag_tail(mob/living/carbon/human/H)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/pod/is_wagging_tail(mob/living/carbon/human/H)
+	return ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/pod/start_wagging_tail(mob/living/carbon/human/H)
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
+	H.update_body()
+
+/datum/species/pod/stop_wagging_tail(mob/living/carbon/human/H)
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
+	H.update_body()
+
+
+/datum/species/pod/qualifies_for_rank(rank, list/features)
+	return TRUE
+
 /datum/species/pod/pseudo_weak
 	id = "podweak"
 	limbs_id = "pod"

code/modules/reagents/reagent_containers/Chemical_tongue.dm

@@ -57,7 +57,7 @@
 	if(user.a_intent == INTENT_DISARM && user.zone_selected == BODY_ZONE_PRECISE_MOUTH)
 		if(M != user)
 			M.visible_message("<span class='warning'>[user] attempts nuzzles into [M]'s.</span>", \
-						"<span class='userwarning'>[user] attempts to bump his snout against yours.</span>")
+						"<span class='userwarning'>[user] attempts to bump their snout against yours.</span>")
 			if(!do_mob(user, M, 10))
 				return
 			playsound(M.loc,'sound/effects/attackblob.ogg', rand(10,50), 1)

code/modules/vending/wardrobes.dm

@@ -233,12 +233,9 @@
 					/obj/item/clothing/head/soft/black = 4,
 					/obj/item/clothing/shoes/sneakers/black = 4,
 					/obj/item/reagent_containers/rag = 4,
-					/obj/item/storage/box/beanbag = 1,
-					/obj/item/clothing/suit/armor/vest/alt = 1,
 					/obj/item/circuitboard/machine/dish_drive = 1,
 					/obj/item/clothing/glasses/sunglasses/reagent = 1,
-					/obj/item/clothing/neck/petcollar = 3,
-					/obj/item/storage/belt/bandolier = 1)
+					/obj/item/clothing/neck/petcollar = 3)
 	refill_canister = /obj/item/vending_refill/wardrobe/bar_wardrobe
 
 /obj/item/vending_refill/wardrobe/bar_wardrobe