Merge branch 'master' into DRAGONMECH

modular_citadel/code/modules/client/loadout/head.dm

@@ -101,4 +101,9 @@
 /datum/gear/santahatg
 	name = "Green Santa Hat"
 	category = SLOT_HEAD
-	path = /obj/item/clothing/head/christmashatg
+	path = /obj/item/clothing/head/christmashatg
+
+/datum/gear/pharaohmhat
+	name = "Pharaoh Hat"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/pharaoh

modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm

@@ -34,7 +34,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	user.do_attack_animation(A, ATTACK_EFFECT_BITE)
 
 /obj/item/dogborg/jaws/small/attack_self(mob/user)
-	var/mob/living/silicon/robot.R = user
+	var/mob/living/silicon/robot/R = user
 	if(R.cell && R.cell.charge > 100)
 		if(R.emagged && status == 0)
 			name = "combat jaws"
@@ -166,7 +166,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	item_flags |= NOBLUDGEON //No more attack messages
 
 /obj/item/soap/tongue/attack_self(mob/user)
-	var/mob/living/silicon/robot.R = user
+	var/mob/living/silicon/robot/R = user
 	if(R.cell && R.cell.charge > 100)
 		if(R.emagged && status == 0)
 			status = !status
@@ -186,7 +186,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 	update_icon()
 
 /obj/item/soap/tongue/afterattack(atom/target, mob/user, proximity)
-	var/mob/living/silicon/robot.R = user
+	var/mob/living/silicon/robot/R = user
 	if(!proximity || !check_allowed_items(target))
 		return
 	if(R.client && (target in R.client.screen))
@@ -213,7 +213,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 			if(!do_after(R, 50, target = target))
 				return //If they moved away, you can't eat them.
 			to_chat(R, "<span class='notice'>You finish off \the [target.name].</span>")
-			var/obj/item/stock_parts/cell.C = target
+			var/obj/item/stock_parts/cell/C = target
 			R.cell.charge = R.cell.charge + (C.charge / 3) //Instant full cell upgrades op idgaf
 			qdel(target)
 			return

modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -75,8 +75,7 @@
 
 /obj/item/robot_module/k9/be_transformed_to(obj/item/robot_module/old_module)
 	var/mob/living/silicon/robot/R = loc
-	var/static/list/k9_models
-	
+	var/static/list/k9_models	
 	if(!k9_models)
 		k9_models = list(
 			"k9" = image(icon = 'modular_citadel/icons/mob/widerobot.dmi', icon_state = "k9"),

modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm

@@ -30,7 +30,7 @@
 	category = list("Ammo")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
  
- /datum/design/m10mm/ap
+/datum/design/m10mm/ap
  	name = "pistol magazine (10mm AP)"
  	desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
  	id = "10mmap"

modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm

@@ -163,9 +163,9 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	creator = get_mob_by_key(creatorID)
 
 /datum/reagent/fermi/enthrall/on_new(list/data)
-	creatorID = data.["creatorID"]
-	creatorGender = data.["creatorGender"]
-	creatorName = data.["creatorName"]
+	creatorID = data["creatorID"]
+	creatorGender = data["creatorGender"]
+	creatorName = data["creatorName"]
 	creator = get_mob_by_key(creatorID)
 
 /datum/reagent/fermi/enthrall/on_mob_add(mob/living/carbon/M)

modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm

@@ -32,7 +32,7 @@
 	can_synth = TRUE
 
 /datum/reagent/fermi/eigenstate/on_new(list/data)
-	location_created = data.["location_created"]
+	location_created = data["location_created"]
 
 //Main functions
 /datum/reagent/fermi/eigenstate/on_mob_life(mob/living/M) //Teleports to chemistry!
@@ -54,7 +54,7 @@
 		to_chat(M, "<span class='userdanger'>You feel your wavefunction split!</span>")
 		if(purity > 0.9) //Teleports you home if it's pure enough
 			if(!location_created && data) //Just in case
-				location_created = data.["location_created"]
+				location_created = data["location_created"]
 			log_game("FERMICHEM: [M] ckey: [M.key] returned to [location_created] using eigenstasium")
 			do_sparks(5,FALSE,M)
 			do_teleport(M, location_created, 0, asoundin = 'sound/effects/phasein.ogg')

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -125,7 +125,7 @@
 	var/datum/reagent/fermi/eigenstate/E = locate(/datum/reagent/fermi/eigenstate) in my_atom.reagents.reagent_list
 	if(location)
 		E.location_created = location
-		E.data.["location_created"] = location
+		E.data["location_created"] = location
 
 
 //serum
@@ -304,16 +304,16 @@
 		for(var/mob/M in seen)
 			to_chat(M, "<span class='warning'>The reaction splutters and fails to react properly.</span>") //Just in case
 			E.purity = 0
-	if (B.data.["gender"] == "female")
-		E.data.["creatorGender"] = "Mistress"
+	if (B.data["gender"] == "female")
+		E.data["creatorGender"] = "Mistress"
 		E.creatorGender = "Mistress"
 	else
-		E.data.["creatorGender"] = "Master"
+		E.data["creatorGender"] = "Master"
 		E.creatorGender = "Master"
-	E.data["creatorName"] = B.data.["real_name"]
-	E.creatorName = B.data.["real_name"]
-	E.data.["creatorID"] = B.data.["ckey"]
-	E.creatorID = B.data.["ckey"]
+	E.data["creatorName"] = B.data["real_name"]
+	E.creatorName = B.data["real_name"]
+	E.data["creatorID"] = B.data["ckey"]
+	E.creatorID = B.data["ckey"]
 
 //So slimes can play too.
 /datum/chemical_reaction/fermi/enthrall/slime
@@ -327,16 +327,16 @@
 		for(var/mob/M in seen)
 			to_chat(M, "<span class='warning'>The reaction splutters and fails to react.</span>") //Just in case
 			E.purity = 0
-	if (B.data.["gender"] == "female")
-		E.data.["creatorGender"] = "Mistress"
+	if (B.data["gender"] == "female")
+		E.data["creatorGender"] = "Mistress"
 		E.creatorGender = "Mistress"
 	else
-		E.data.["creatorGender"] = "Master"
+		E.data["creatorGender"] = "Master"
 		E.creatorGender = "Master"
-	E.data["creatorName"] = B.data.["real_name"]
-	E.creatorName = B.data.["real_name"]
-	E.data.["creatorID"] = B.data.["ckey"]
-	E.creatorID = B.data.["ckey"]
+	E.data["creatorName"] = B.data["real_name"]
+	E.creatorName = B.data["real_name"]
+	E.data["creatorID"] = B.data["ckey"]
+	E.creatorID = B.data["ckey"]
 
 /datum/chemical_reaction/fermi/enthrall/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)
 	var/turf/T = get_turf(my_atom)

modular_citadel/code/modules/reagents/objects/items.dm

@@ -29,7 +29,7 @@
 			to_chat(user, "<span class='warning'>[src] is empty!</span>")
 			add_fingerprint(user)
 			return
-    . = ..()
+	. = ..()
 	if(. & COMPONENT_NO_INTERACT)
 		return
 	var/I = user.get_active_held_item()