Merge pull request #980 from lyricalpaws/clustaur

Clustaur grenades

code/__DEFINES/misc.dm

@@ -260,16 +260,6 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_SKIN_ALT = 'icons/obj/pda_alt.dmi',
 								PDA_SKIN_RUGGED = 'icons/obj/pda_rugged.dmi', PDA_SKIN_MODERN = 'icons/obj/pda_modern.dmi'))
 
-
-//zippo icon reskins
-#define ZIPPO_SKIN_PLAIN "Plain"
-#define ZIPPO_SKIN_DAME "Dame"
-#define ZIPPO_SKIN_THIRTEEN "Thirteen"
-#define ZIPPO_SKIN_SNAKE "Snake"
-
-GLOBAL_LIST_INIT(lighter_reskins, list(ZIPPO_SKIN_PLAIN = "plain", ZIPPO_SKIN_DAME = "dame",
-								ZIPPO_SKIN_THIRTEEN = "thirteen", ZIPPO_SKIN_SNAKE = "snake"))
-
 /////////////////////////////////////
 // atom.appearence_flags shortcuts //
 /////////////////////////////////////

code/_globalvars/lists/maintenance_loot.dm

@@ -118,7 +118,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/autosurgeon/vagina = 1,
 	/obj/item/autosurgeon/breasts = 1,
 	/obj/item/autosurgeon/womb = 1,
-	/obj/item/toy/plush/random = 1
+	/obj/item/toy/plush/random = 1,
+	/obj/item/grenade/spawnergrenade/clustaur = 1
 	))
 
 GLOBAL_LIST_INIT(ratking_trash, list(//Garbage: used by the regal rat mob when spawning garbage.

code/game/objects/items/cigs_lighters.dm

@@ -522,25 +522,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		overlay_state = pick(overlay_list)
 	update_icon()
 
-/obj/item/lighter/AltClick(mob/living/user)
-	. = ..()
-	if(GLOB.lighter_reskins && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
-		reskin_obj(user)
-
-/obj/item/lighter/reskin_obj(mob/M)
-	if(lit)
-		return to_chat(M, "You need to close the lighter before changing the engraving!")
-	if(!LAZYLEN(GLOB.lighter_reskins))
-		return
-
-	var/choice = input(M, "Choose the a reskin for [src]","Reskin Object") as null|anything in GLOB.lighter_reskins
-	var/new_icon = GLOB.lighter_reskins[choice]
-	if(QDELETED(src) || isnull(new_icon) || new_icon == icon || !M.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
-		return
-	overlay_state = new_icon
-	update_icon()
-	to_chat(M, "[src] is now skinned as '[choice]'.")
-
 /obj/item/lighter/suicide_act(mob/living/carbon/user)
 	if (lit)
 		user.visible_message("<span class='suicide'>[user] begins holding \the [src]'s flame up to [user.p_their()] face! It looks like [user.p_theyre()] trying to commit suicide!</span>")

code/game/objects/items/grenades/spawnergrenade.dm

@@ -41,3 +41,11 @@
 	icon_state = "holy_grenade"
 	spawner_type = /mob/living/simple_animal/hostile/poison/bees/toxin
 	deliveryamt = 10
+
+/obj/item/grenade/spawnergrenade/clustaur
+	desc = "A very strange grenade often found in maintanance. Use of this may constitute a war crime in your area, consult your local captain."
+	name = "clustaur grenade"
+	icon_state = "clustaur"
+	item_state = "clustaur"
+	deliveryamt = 10
+	spawner_type = /obj/item/reagent_containers/glass/beaker/waterbottle/wataur