Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff

code/game/objects/items/flag.dm

@@ -1,5 +1,8 @@
 /obj/item/flag
 	icon = 'icons/obj/flag.dmi'
+	icon_state = "ntflag"
+	lefthand_file = 'icons/mob/inhands/flags_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/flags_righthand.dmi'
 	w_class = WEIGHT_CLASS_BULKY
 	burntime = 20
 	burn_state = FLAMMABLE
@@ -10,10 +13,25 @@
 		user.visible_message("<span class='notice'>[user] lights the [name] with [W].</span>")
 		fire_act()
 
-/obj/item/flag/proc/update_icons()
-	overlays = null
-	overlays += image('icons/obj/flag.dmi', src , "fire")
-	item_state = "[icon_state]_fire"
+/obj/item/flag/fire_act(global_overlay = FALSE)
+	..()
+	update_icon()
+
+/obj/item/flag/extinguish()
+	..()
+	update_icon()
+
+/obj/item/flag/update_icon()
+	overlays.Cut()
+	if(burn_state == ON_FIRE)
+		overlays += image('icons/obj/flag.dmi', src , "fire")
+		item_state = "[icon_state]_fire"
+	else
+		item_state = initial(icon_state)
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_r_hand()
+		M.update_inv_l_hand()
 
 /obj/item/flag/nt
 	name = "Nanotrasen flag"
@@ -103,6 +121,11 @@
 	desc = "A flag proudly proclaiming the superior heritage of Drask."
 	icon_state = "draskflag"
 
+/obj/item/flag/species/plasma
+	name = "Plasmaman flag"
+	desc = "A flag proudly proclaiming the superior heritage of Plasmamen."
+	icon_state = "plasmaflag"
+
 //Department Flags
 
 /obj/item/flag/cargo

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

@@ -4,11 +4,11 @@
 	name = "glass shard"
 	icon = 'icons/obj/shards.dmi'
 	icon_state = "large"
-	sharp = 1
+	sharp = TRUE
 	desc = "Could probably be used as ... a throwing weapon?"
 	w_class = WEIGHT_CLASS_TINY
-	force = 5.0
-	throwforce = 10.0
+	force = 5
+	throwforce = 10
 	item_state = "shard-glass"
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
@@ -20,19 +20,18 @@
 		return (BRUTELOSS)
 
 /obj/item/weapon/shard/New()
-	src.icon_state = pick("large", "medium", "small")
-	switch(src.icon_state)
-		if("small")
-			src.pixel_x = rand(-12, 12)
-			src.pixel_y = rand(-12, 12)
-		if("medium")
-			src.pixel_x = rand(-8, 8)
-			src.pixel_y = rand(-8, 8)
-		if("large")
-			src.pixel_x = rand(-5, 5)
-			src.pixel_y = rand(-5, 5)
-		else
 	..()
+	icon_state = pick("large", "medium", "small")
+	switch(icon_state)
+		if("small")
+			pixel_x = rand(-12, 12)
+			pixel_y = rand(-12, 12)
+		if("medium")
+			pixel_x = rand(-8, 8)
+			pixel_y = rand(-8, 8)
+		if("large")
+			pixel_x = rand(-5, 5)
+			pixel_y = rand(-5, 5)
 
 /obj/item/weapon/shard/afterattack(atom/movable/AM, mob/user, proximity)
 	if(!proximity || !(src in user))
@@ -53,7 +52,7 @@
 				H.updatehealth()
 
 /obj/item/weapon/shard/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/weapon/weldingtool))
+	if(iswelder(I))
 		var/obj/item/weapon/weldingtool/WT = I
 		if(WT.remove_fuel(0, user))
 			var/obj/item/stack/sheet/glass/NG = new (user.loc)
@@ -65,7 +64,8 @@
 				G.attackby(NG, user)
 			to_chat(user, "<span class='notice'>You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.</span>")
 			qdel(src)
-	..()
+	else
+		return ..()
 
 /obj/item/weapon/shard/Crossed(AM as mob|obj)
 	if(isliving(AM))
@@ -73,7 +73,7 @@
 		if(M.incorporeal_move || M.flying || M.throwing)//you are incorporal or flying or being thrown ..no shard stepping!
 			return
 		to_chat(M, "<span class='danger'>You step on \the [src]!</span>")
-		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
+		playsound(loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
 
@@ -87,4 +87,42 @@
 				if(affecting.take_damage(5, 0))
 					H.UpdateDamageIcon()
 				H.updatehealth()
-	..()
+	..()
+
+/obj/item/weapon/shard/plasma
+	name = "plasma shard"
+	desc = "A shard of plasma glass. Considerably tougher then normal glass shards. Apparently not tough enough to be a window."
+	force = 8
+	throwforce = 15
+	icon_state = "plasmalarge"
+	sharp = TRUE
+
+/obj/item/weapon/shard/plasma/New()
+	..()
+	icon_state = pick("plasmalarge", "plasmamedium", "plasmasmall")
+	switch(icon_state)
+		if("plasmasmall")
+			pixel_x = rand(-12, 12)
+			pixel_y = rand(-12, 12)
+		if("plasmamedium")
+			pixel_x = rand(-8, 8)
+			pixel_y = rand(-8, 8)
+		if("plasmalarge")
+			pixel_x = rand(-5, 5)
+			pixel_y = rand(-5, 5)
+
+/obj/item/weapon/shard/plasma/attackby(obj/item/weapon/W, mob/user, params)
+	if(iswelder(W))
+		var/obj/item/weapon/weldingtool/WT = W
+		if(WT.remove_fuel(0, user))
+			var/obj/item/stack/sheet/plasmaglass/NG = new (user.loc)
+			for(var/obj/item/stack/sheet/plasmaglass/G in user.loc)
+				if(G == NG)
+					continue
+				if(G.amount >= G.max_amount)
+					continue
+				G.attackby(NG, user, params)
+				to_chat(usr, "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets.")
+			qdel(src)
+	else
+		return ..()

code/game/objects/items/weapons/storage/backpack.dm

@@ -385,6 +385,13 @@
 	item_state = "duffel-eng"
 	burn_state = FIRE_PROOF
 
+/obj/item/weapon/storage/backpack/duffel/atmos
+	name = "atmospherics duffelbag"
+	desc = "A duffelbag designed to hold tools. This one is specially designed for atmospherics."
+	icon_state = "duffel-atmos"
+	item_state = "duffel-atmos"
+	burn_state = FIRE_PROOF
+
 /obj/item/weapon/storage/backpack/duffel/hydro
 	name = "hydroponics duffelbag"
 	desc = "A duffelbag designed to hold seeds and fauna."