Tg 2 11 sync (#215)

* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes

code/modules/clothing/masks/gasmask.dm

@@ -99,26 +99,28 @@
 	flags_cover = MASKCOVERSEYES
 	resistance_flags = FLAMMABLE
 	actions_types = list(/datum/action/item_action/adjust)
+	
 
-/obj/item/clothing/mask/gas/mime/attack_self(mob/user)
-	cycle_mask(user)
+/obj/item/clothing/mask/gas/mime/ui_action_click(mob/user)
+	if(!istype(user) || user.incapacitated())
+		return
 
-/obj/item/clothing/mask/gas/mime/proc/cycle_mask(mob/user)
-	switch(icon_state)
-		if("mime")
-			icon_state = "sadmime"
-		if("sadmime")
-			icon_state = "scaredmime"
-		if("scaredmime")
-			icon_state = "sexymime"
-		if("sexymime")
-			icon_state = "mime"
-	user.update_inv_wear_mask()
-	for(var/X in actions)
-		var/datum/action/A = X
-		A.UpdateButtonIcon()
-	user << "<span class='notice'>You adjust your mask to portray a different emotion.</span>"
-	return 1
+	var/list/options = list()
+	options["Blanc"] = "mime"
+	options["Triste"] = "sadmime"
+	options["Effrayé"] = "scaredmime"
+	options["Excité"] ="sexymime"
+
+	var/choice = input(user,"To what form do you wish to Morph this mask?","Morph Mask") in options
+
+	if(src && choice && !user.incapacitated() && in_range(user,src))
+		icon_state = options[choice]
+		user.update_inv_wear_mask()
+		for(var/X in actions)
+			var/datum/action/A = X
+			A.UpdateButtonIcon()
+		user << "<span class='notice'>Your Mime Mask has now morphed into [choice]!</span>"
+		return 1
 
 /obj/item/clothing/mask/gas/monkeymask
 	name = "monkey mask"
@@ -170,6 +172,7 @@
 	resistance_flags = FLAMMABLE
 	obj_integrity = 100
 	max_integrity = 100
+	actions_types = list(/datum/action/item_action/adjust)
 	dog_fashion = null
 
 
@@ -186,7 +189,6 @@ obj/item/clothing/mask/gas/tiki_mask/ui_action_click(mob/user)
 
 	if(src && choice && !M.stat && in_range(M,src))
 		icon_state = options[choice]
-		item_state = options[choice]
 		user.update_inv_wear_mask()
 		for(var/X in actions)
 			var/datum/action/A = X

code/modules/clothing/suits/armor.dm

@@ -268,6 +268,11 @@
 /obj/item/clothing/suit/armor/reactive/tesla
 	name = "reactive tesla armor"
 	desc = "An experimental suit of armor with sensitive detectors hooked up to a huge capacitor grid, with emitters strutting out of it. Zap."
+	siemens_coefficient = -1
+	var/tesla_power = 25000
+	var/tesla_range = 20
+	var/tesla_boom = FALSE
+	var/tesla_stun = FALSE
 
 /obj/item/clothing/suit/armor/reactive/tesla/hit_reaction(mob/living/carbon/human/owner, attack_text)
 	if(!active)
@@ -277,15 +282,10 @@
 			var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
 			sparks.set_up(1, 1, src)
 			sparks.start()
-			owner.visible_message("<span class='danger'>The tesla capacitors on [owner]'s reactive telsa armor are still recharging! The armor merely emits some sparks.</spawn>")
+			owner.visible_message("<span class='danger'>The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.</spawn>")
 			return
 		owner.visible_message("<span class='danger'>The [src] blocks the [attack_text], sending out arcs of lightning!</span>")
-		for(var/mob/living/M in view(6, owner))
-			if(M == owner)
-				continue
-			owner.Beam(M,icon_state="lightning[rand(1, 12)]",time=5)
-			M.adjustFireLoss(25)
-			playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
+		tesla_zap(owner,tesla_range,tesla_power,tesla_boom, tesla_stun)
 		reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
 		return 1