Merge pull request #1343 from VOREStation/aro-sync

Polaris Sync

code/game/objects/items/weapons/AI_modules.dm

@@ -10,7 +10,6 @@ AI MODULES
 	name = "\improper AI module"
 	icon = 'icons/obj/module.dmi'
 	icon_state = "std_mod"
-	item_state = "electronic"
 	desc = "An AI Module for transmitting encrypted instructions to the AI."
 	flags = CONDUCT
 	force = 5.0

code/game/objects/items/weapons/permits.dm

@@ -0,0 +1,34 @@
+//This'll be used for gun permits, such as for heads of staff, antags, and bartenders
+
+/obj/item/weapon/permit
+	name = "permit"
+	desc = "A permit for something."
+	icon = 'icons/obj/card.dmi'
+	icon_state = "permit"
+	w_class = ITEMSIZE_TINY
+	var/owner = 0	//To prevent people from just renaming the thing if they steal it
+
+/obj/item/weapon/permit/attack_self(mob/user as mob)
+	if(isliving(user))
+		if(!owner)
+			set_name(user.name)
+		else
+			to_chat(user, "[src] already has an owner!")
+
+/obj/item/weapon/permit/proc/set_name(var/new_name)
+	owner = 1
+	if(new_name)
+		src.name += " ([new_name])"
+		desc += " It belongs to [new_name]."
+
+/obj/item/weapon/permit/emag_act(var/remaining_charges, var/mob/user)
+	to_chat(user, "You reset the naming locks on [src]!")
+	owner = 0
+
+/obj/item/weapon/permit/gun
+	name = "weapon permit"
+	desc = "A card indicating that the owner is allowed to carry a firearm."
+
+/obj/item/weapon/permit/gun/bar
+	name = "bar shotgun permit"
+	desc = "A card indicating that the owner is allowed to carry a shotgun in the bar."

code/game/objects/items/weapons/towels.dm

@@ -12,6 +12,10 @@
 /obj/item/weapon/towel/attack_self(mob/living/user as mob)
 	user.visible_message(text("<span class='notice'>[] uses [] to towel themselves off.</span>", user, src))
 	playsound(user, 'sound/weapons/towelwipe.ogg', 25, 1)
+	if(user.fire_stacks > 0)
+		user.fire_stacks = (max(0, user.fire_stacks - 1.5))
+	else if(user.fire_stacks < 0)
+		user.fire_stacks = (min(0, user.fire_stacks + 1.5))
 
 /obj/item/weapon/towel/random/New()
 	..()