Tg 1 28 sync testing/confirmation (#5178)

* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -68,12 +68,7 @@
 
 		//If they have a hat/helmet and the user is targeting their head.
 		if(istype(H.head, /obj/item/clothing/head) && affecting == "head")
-
-			// If their head has an armor value, assign headarmor to it, else give it 0.
-			if(H.head.armor["melee"])
-				headarmor = H.head.armor["melee"]
-			else
-				headarmor = 0
+			headarmor = H.head.armor.melee
 		else
 			headarmor = 0
 

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -10,7 +10,7 @@
 	max_integrity = 20
 	spillable = TRUE
 	resistance_flags = ACID_PROOF
-	unique_rename = 1
+	obj_flags = UNIQUE_RENAME
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
 	cut_overlays()

code/modules/food_and_drinks/food/customizables.dm

@@ -15,7 +15,6 @@
 	bitesize = 4
 	w_class = WEIGHT_CLASS_SMALL
 	volume = 80
-	unique_rename = 1
 
 	var/ingMax = 12
 	var/list/ingredients = list()

code/modules/food_and_drinks/food/snacks.dm

@@ -5,7 +5,7 @@
 	icon_state = null
 	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
-	unique_rename = 1
+	obj_flags = UNIQUE_RENAME
 	grind_results = list() //To let them be ground up to transfer their reagents
 	var/bitesize = 2
 	var/bitecount = 0

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

@@ -108,6 +108,13 @@
 	tastes = list("maggots" = 1, "the inside of a reactor" = 1)
 	foodtype = MEAT | RAW | GROSS
 
+/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
+
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
 	name = "bone"
 	icon_state = "skeletonmeat"
@@ -119,14 +126,13 @@
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
 	name = " meat (rotten)"
-	icon_state = "lizardmeat" //Close enough.
+	icon_state = "rottenmeat"
 	desc = "Halfway to becoming fertilizer for your garden."
 	filling_color = "#6B8E23"
 	tastes = list("brains" = 1, "meat" = 1)
 	foodtype = RAW | MEAT | TOXIC
 
 
-
 ////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////
 
 

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -222,7 +222,7 @@
 	component_parts = null
 
 /obj/machinery/smartfridge/drying_rack/on_deconstruction()
-	new /obj/item/stack/sheet/mineral/wood(loc, 10)
+	new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
 	..()
 
 /obj/machinery/smartfridge/drying_rack/RefreshParts()
@@ -297,7 +297,7 @@
 	update_icon()
 
 /obj/machinery/smartfridge/drying_rack/proc/rack_dry()
-	for(var/obj/item/reagent_containers/food/snacks/S in contents)
+	for(var/obj/item/reagent_containers/food/snacks/S in src)
 		if(S.dried_type == S.type)//if the dried type is the same as the object's type, don't bother creating a whole new item...
 			S.add_atom_colour("#ad7257", FIXED_COLOUR_PRIORITY)
 			S.dry = TRUE
@@ -307,8 +307,8 @@
 			new dried(drop_location())
 			qdel(S)
 		return TRUE
-	for(var/obj/item/stack/sheet/wetleather/WL in contents)
-		var/obj/item/stack/sheet/leather/L = new(loc)
+	for(var/obj/item/stack/sheet/wetleather/WL in src)
+		var/obj/item/stack/sheet/leather/L = new(drop_location())
 		L.amount = WL.amount
 		qdel(WL)
 		return TRUE

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -547,4 +547,12 @@
 	name = "eggnog"
 	id = "eggnog"
 	results = list("eggnog" = 15)
-	required_reagents = list("rum" = 5, "cream" = 5, "eggyolk" = 5)
+	required_reagents = list("rum" = 5, "cream" = 5, "eggyolk" = 5)
+
+/datum/chemical_reaction/narsour
+	name = "Nar'sour"
+	id = "narsour"
+	results = list("narsour" = 1) 
+	required_reagents = list("blood" = 1, "lemonjuice" = 1, "demonsblood" = 1)
+	mix_message = "The mixture develops a sinister glow."
+	mix_sound = 'sound/effects/singlebeat.ogg'