Merge branch 'master' into sands-ruin

code/__DEFINES/food.dm

@@ -14,6 +14,11 @@
 #define BREAKFAST (1<<13)
 #define CLOTH (1<<14)
 #define GRILLED (1<<15)
+/*#define NUTS (1<<16)
+#define SEAFOOD (1<<17)
+#define ORANGES (1<<18)
+#define BUGS (1<<19)*/
+#define GORE (1<<20)
 
 /// IC meaning (more or less) for food flags
 #define FOOD_FLAGS_IC list( \

code/game/machinery/dance_machine.dm

@@ -2,7 +2,7 @@
 	name = "jukebox"
 	desc = "A classic music player."
 	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "jukebox"
+	icon_state = "jukebox-"
 	verb_say = "states"
 	density = TRUE
 	var/active = FALSE
@@ -15,14 +15,14 @@
 /obj/machinery/jukebox/boombox
 	name = "boombox"
 	desc = "A theoretically-portable music player that's much larger and heavier than it really needs to be."
-	icon_state = "boombox"
+	icon_state = "boombox-"
 	density = FALSE
 
 
 /obj/machinery/jukebox/disco
 	name = "radiant dance machine mark IV"
 	desc = "The first three prototypes were discontinued after mass casualty incidents."
-	icon_state = "disco"
+	icon_state = "disco-"
 	anchored = FALSE
 	var/list/spotlights = list()
 	var/list/sparkles = list()

code/modules/clothing/glasses/_glasses.dm

@@ -128,8 +128,31 @@
 /obj/item/clothing/glasses/eyepatch
 	name = "eyepatch"
 	desc = "Yarr."
-	icon_state = "eyepatch"
-	item_state = "eyepatch"
+	icon_state = "eyepatch-0"
+	item_state = "eyepatch-0"
+	var/flipped = FALSE
+
+/obj/item/clothing/glasses/eyepatch/AltClick(mob/user)
+	. = ..()
+	flipped = !flipped
+	to_chat(user, "<span class='notice'>You shift the eyepatch to cover the [flipped == 0 ? "right" : "left"] eye.</span>")
+	icon_state = "eyepatch-[flipped]"
+	item_state = "eyepatch-[flipped]"
+	update_appearance()
+
+/obj/item/clothing/glasses/eyepatch/examine(mob/user)
+	. = ..()
+	. += "It is currently aligned to the [flipped == 0 ? "right" : "left"] side."
+
+/obj/item/clothing/glasses/eyepatch/attackby(obj/item/I, mob/user, params)
+	. = ..()
+	if(istype(I, /obj/item/clothing/glasses/eyepatch))
+		var/obj/item/clothing/glasses/eyepatch/old_patch = I
+		var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new/obj/item/clothing/glasses/blindfold/eyepatch
+		double_patch.forceMove(user.drop_location())
+		to_chat(user, "<span class='notice'>You combine the eyepatches with a knot.</span>")
+		old_patch.Destroy()
+		Destroy()
 
 /obj/item/clothing/glasses/monocle
 	name = "monocle"
@@ -348,6 +371,21 @@
 		M.color = "#[H.eye_color]"
 		. += M
 
+/obj/item/clothing/glasses/blindfold/eyepatch
+	name = "double eyepatch"
+	desc = "For those pirates who've been at it a while. May interfere with navigating ability."
+	icon_state = "eyepatchd"
+	item_state = "eyepatchd"
+
+/obj/item/clothing/glasses/blindfold/eyepatch/attack_self(mob/user)
+	. = ..()
+	var/obj/item/clothing/glasses/eyepatch/patch_one = new/obj/item/clothing/glasses/eyepatch
+	var/obj/item/clothing/glasses/eyepatch/patch_two = new/obj/item/clothing/glasses/eyepatch
+	patch_one.forceMove(user.drop_location())
+	patch_two.forceMove(user.drop_location())
+	to_chat(user, "<span class='notice'>You undo the knot on the eyepatches.</span>")
+	Destroy()
+
 /obj/item/clothing/glasses/sunglasses/big
 	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks flashes."
 	icon_state = "bigsunglasses"
@@ -411,8 +449,21 @@
 /obj/item/clothing/glasses/thermal/eyepatch
 	name = "optical thermal eyepatch"
 	desc = "An eyepatch with built-in thermal optics."
-	icon_state = "eyepatch"
-	item_state = "eyepatch"
+	icon_state = "eyepatch-0"
+	item_state = "eyepatch-0"
+	var/flipped = FALSE
+
+/obj/item/clothing/glasses/thermal/eyepatch/AltClick(mob/user)
+	. = ..()
+	flipped = !flipped
+	to_chat(user, "<span class='notice'>You shift the eyepatch to cover the [flipped == 0 ? "right" : "left"] eye.</span>")
+	icon_state = "eyepatch-[flipped]"
+	item_state = "eyepatch-[flipped]"
+	update_appearance()
+
+/obj/item/clothing/glasses/thermal/eyepatch/examine(mob/user)
+	. = ..()
+	. += "It is currently aligned to the [flipped == 0 ? "right" : "left"] side."
 
 /obj/item/clothing/glasses/cold
 	name = "cold goggles"

code/modules/clothing/glasses/hud.dm

@@ -128,7 +128,20 @@
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	name = "eyepatch HUD"
 	desc = "A heads-up display that connects directly to the optical nerve of the user, replacing the need for that useless eyeball."
-	icon_state = "hudpatch"
+	icon_state = "hudpatch-0"
+	var/flipped = FALSE
+
+/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/AltClick(mob/user)
+	. = ..()
+	flipped = !flipped
+	to_chat(user, "<span class='notice'>You shift the hudpatch to cover the [flipped == 0 ? "right" : "left"] eye.</span>")
+	icon_state = "hudpatch-[flipped]"
+	item_state = "hudpatch-[flipped]"
+	update_appearance()
+
+/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/examine(mob/user)
+	. = ..()
+	. += "It is currently aligned to the [flipped == 0 ? "right" : "left"] side."
 
 /obj/item/clothing/glasses/hud/security/sunglasses
 	name = "security HUDSunglasses"

code/modules/food_and_drinks/food/ration.dm

@@ -168,7 +168,7 @@
 	desc = "A mix of various salted offal, providing a unique and flavorful snack for those with adventurous tastes."
 	filling_color = "#cc3300"
 	tastes = list("assorted offal" = 1)
-	foodtype = MEAT
+	foodtype = MEAT | GORE //its literally entrails
 
 /obj/item/reagent_containers/food/snacks/ration/entree/maple_pork_sausage_patty
 	name = "maple pork sausage patty"

code/modules/food_and_drinks/food/snacks/meat.dm

@@ -39,7 +39,7 @@
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/human
 	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human
 	tastes = list("tender meat" = 1)
-	foodtype = MEAT | RAW | GROSS
+	foodtype = MEAT | RAW | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/initialize_slice(obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human/slice, reagents_per_slice)
 	..()
@@ -88,7 +88,7 @@
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain/human/lizard
 	filling_color = "#6B8E23"
 	tastes = list("meat" = 4, "scales" = 1)
-	foodtype = MEAT | RAW
+	foodtype = MEAT | RAW | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
 	icon_state = "plantmeat"
@@ -102,21 +102,21 @@
 	desc = "Ow, the edge."
 	filling_color = "#202020"
 	tastes = list("darkness" = 1, "meat" = 1)
-	foodtype = MEAT | RAW
+	foodtype = MEAT | RAW | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly
 	icon_state = "flymeat"
 	desc = "Nothing says tasty like maggot filled radioactive mutant flesh."
 	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/uranium = 3)
 	tastes = list("maggots" = 1, "the inside of a reactor" = 1)
-	foodtype = MEAT | RAW | GROSS
+	foodtype = MEAT | RAW | GROSS | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth
 	icon_state = "mothmeat"
 	desc = "Unpleasantly powdery and dry. Kind of pretty, though."
 	filling_color = "#BF896B"
 	tastes = list("dust" = 1, "powder" = 1, "meat" = 2)
-	foodtype = MEAT | RAW
+	foodtype = MEAT | RAW | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/squid
 	name = "calamari"
@@ -131,16 +131,16 @@
 	desc = "There's a point where this needs to stop, and clearly we have passed it."
 	filling_color = "#F0F0F0"
 	tastes = list("bone" = 1)
-	slice_path = null  //can't slice a bone into cutlets
-	foodtype = GROSS
+	slice_path = null //can't slice a bone into cutlets
+	foodtype = GROSS | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
 	name = " meat (rotten)"
 	icon_state = "rottenmeat"
 	desc = "Halfway to becoming fertilizer for your garden."
 	filling_color = "#6B8E23"
 	tastes = list("brains" = 1, "meat" = 1)
-	foodtype = RAW | MEAT | TOXIC
+	foodtype = RAW | MEAT | TOXIC | GORE | GROSS // who the hell would eat this
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ethereal
 	name = "crystalline cellulose"
@@ -176,23 +176,23 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/mouse
 	name = "mouse meat"
 	desc = "A slab of mouse meat. Best not eat it raw."
-	foodtype = RAW | MEAT | GROSS
+	foodtype = RAW | MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/mothroach
 	name = "mothroach meat"
-	desc = "A light slab of meat."
-	foodtype = RAW | MEAT | GROSS
+	desc = "A light slab of mothroach meat."
+	foodtype = RAW | MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/corgi
 	name = "corgi meat"
 	desc = "Tastes like... well you know..."
 	tastes = list("meat" = 4, "a fondness for wearing hats" = 1)
-	foodtype = RAW | MEAT | GROSS
+	foodtype = RAW | MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/pug
 	name = "pug meat"
 	desc = "Tastes like... well you know..."
-	foodtype = RAW | MEAT | GROSS
+	foodtype = RAW | MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/slab/killertomato
 	name = "killer tomato meat"
@@ -358,7 +358,7 @@
 
 /obj/item/reagent_containers/food/snacks/meat/steak/plain/human
 	tastes = list("tender meat" = 1)
-	foodtype = MEAT | GROSS
+	foodtype = MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
 	name = "killer tomato steak"
@@ -396,7 +396,7 @@
 	tastes = list("beef" = 1, "cod fish" = 1)
 
 /obj/item/reagent_containers/food/snacks/meat/steak/chicken
-	name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites.
+	name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites. //I concur
 	icon_state = "birdsteak"
 	tastes = list("chicken" = 1)
 
@@ -444,7 +444,7 @@
 /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/plain/human
 	tastes = list("tender meat" = 1)
-	foodtype = MEAT | RAW | GROSS
+	foodtype = MEAT | RAW | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain/human/initialize_cooked_food(obj/item/reagent_containers/food/snacks/S, cooking_efficiency)
 	..()
@@ -506,7 +506,7 @@
 
 /obj/item/reagent_containers/food/snacks/meat/cutlet/plain/human
 	tastes = list("tender meat" = 1)
-	foodtype = MEAT | GROSS
+	foodtype = MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/meat/cutlet/killertomato
 	name = "killer tomato cutlet"

code/modules/food_and_drinks/food/snacks_burgers.dm

@@ -33,7 +33,7 @@
 	desc = "A bloody burger."
 	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("bun" = 2, "long pig" = 4)
-	foodtype = MEAT | GRAIN | GROSS
+	foodtype = MEAT | GRAIN | GORE
 
 /obj/item/reagent_containers/food/snacks/burger/human/CheckParts(list/parts_list)
 	..()
@@ -52,15 +52,15 @@
 	name = "corgi burger"
 	desc = "You monster."
 	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 5)
-	foodtype = GRAIN | MEAT | GROSS
+	foodtype = GRAIN | MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/burger/appendix
 	name = "appendix burger"
 	desc = "Tastes like appendicitis."
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
 	icon_state = "appendixburger"
 	tastes = list("bun" = 4, "grass" = 2)
-	foodtype = GRAIN | MEAT | GROSS
+	foodtype = GRAIN | MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/burger/fish
 	name = "fillet -o- carp sandwich"
@@ -133,7 +133,7 @@
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("bun" = 4, "brains" = 2)
-	foodtype = GRAIN | MEAT | GROSS
+	foodtype = GRAIN | MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/burger/ghost
 	name = "ghost burger"
@@ -305,7 +305,7 @@
 	desc = "Pretty much what you'd expect..."
 	icon_state = "ratburger"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
-	foodtype = GRAIN | MEAT | GROSS
+	foodtype = GRAIN | MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/burger/baseball
 	name = "home run baseball burger"

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -321,7 +321,7 @@
 
 /obj/item/reagent_containers/food/snacks/boiledspiderleg
 	name = "boiled spider leg"
-	desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
+	desc = "A giant spider's leg that's still twitching after being cooked. Yum!" //Its cooked and not GORE, so it shouldnt imply that its gross to eat
 	icon_state = "spiderlegcooked"
 	trash = /obj/item/trash/plate
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
@@ -414,7 +414,7 @@
 	desc = "A human meat, on a stick."
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 6)
 	tastes = list("tender meat" = 3, "metal" = 1)
-	foodtype = MEAT | GROSS
+	foodtype = MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/kebab/monkey
 	name = "meat-kebab"
@@ -436,7 +436,7 @@
 	desc = "Severed lizard tail on a stick."
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
-	foodtype = MEAT
+	foodtype = MEAT // NOT GORE, tastes delicious!
 
 /obj/item/reagent_containers/food/snacks/kebab/rat
 	name = "rat-kebab"
@@ -445,7 +445,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("rat meat" = 1, "metal" = 1)
-	foodtype = MEAT | GROSS
+	foodtype = MEAT | GORE
 
 /obj/item/reagent_containers/food/snacks/kebab/rat/double
 	name = "double rat-kebab"

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -76,7 +76,7 @@
 	bonus_reagents = list(/datum/reagent/consumable/ketchup = 1)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/ketchup = 2)
 	tastes = list("meat" = 1)
-	foodtype = JUNKFOOD | MEAT | GROSS | FRIED | BREAKFAST
+	foodtype = JUNKFOOD | MEAT | GORE | FRIED | BREAKFAST
 	is_decorated = TRUE
 
 /obj/item/reagent_containers/food/snacks/donut/berry
@@ -377,13 +377,14 @@
 
 /obj/item/reagent_containers/food/snacks/soylentgreen
 	name = "\improper Soylent Green"
-	desc = "Not made of people. Honest." //Totally people.
+	desc = "Not made of people. Honest*." //Totally people.
 	icon_state = "soylent_green"
 	trash = /obj/item/trash/waffles
 	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 1)
 	filling_color = "#9ACD32"
 	tastes = list("waffles" = 7, "people" = 1)
+	// The wafers are supposed to be flavorful and nutritious in the movie. They shouldn't be gross in a dystopian future where the chef regularly feeds people from the morgue to you.
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/soylenviridians