Merge branch 'master' of https://github.com/Greenjoe12345/Polaris into swordsandbow

code/game/objects/effects/spiders.dm

@@ -57,9 +57,12 @@
 	health -= Proj.get_structure_damage()
 	healthcheck()
 
+/obj/effect/spider/proc/die()
+	qdel(src)
+
 /obj/effect/spider/proc/healthcheck()
 	if(health <= 0)
-		qdel(src)
+		die()
 
 /obj/effect/spider/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300 + T0C)
@@ -141,7 +144,7 @@
 	layer = HIDING_LAYER
 	health = 3
 	var/last_itch = 0
-	var/amount_grown = -1
+	var/amount_grown = 0
 	var/obj/machinery/atmospherics/unary/vent_pump/entry_vent
 	var/travelling_in_vent = 0
 	var/list/grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/nurse, /mob/living/simple_mob/animal/giant_spider/hunter)
@@ -171,16 +174,17 @@
 	else
 		..()
 
-/obj/effect/spider/spiderling/proc/die()
+/obj/effect/spider/spiderling/die()
 	visible_message("<span class='alert'>[src] dies!</span>")
 	new /obj/effect/decal/cleanable/spiderling_remains(src.loc)
-	qdel(src)
+	..()
 
 /obj/effect/spider/spiderling/healthcheck()
 	if(health <= 0)
 		die()
 
 /obj/effect/spider/spiderling/process()
+	healthcheck()
 	if(travelling_in_vent)
 		if(istype(src.loc, /turf))
 			travelling_in_vent = 0

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

@@ -254,12 +254,12 @@
 	desc = "A chocolate-coated biscuit stick."
 	icon_state = "pocky"
 	item_state = "pocky"
+	filling = list("sugar" = 2, "chocolate" = 5)
+	type_butt = null
 
 /obj/item/clothing/mask/chewable/candy/pocky/process()
 	chew()
 	if(chewtime < 1)
-		spitout(0)
-
-/obj/item/clothing/mask/chewable/candy/pocky/Initialize()
-	. = ..()
-	reagents.add_reagent("chocolate", 10)
+		if(ismob(loc))
+			to_chat(loc, SPAN_NOTICE("There's no more of \the [name] left!"))
+		spitout(0)

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

@@ -11,6 +11,7 @@
 	var/datum/wires/explosive/c4/wires = null
 	var/timer = 10
 	var/atom/target = null
+	var/list/location = list()
 	var/open_panel = 0
 	var/image_overlay = null
 	var/blast_dev = -1
@@ -53,9 +54,9 @@
 	to_chat(user, "Planting explosives...")
 	user.do_attack_animation(target)
 
-	if(do_after(user, 50) && in_range(user, target))
+	if(do_after(user, 5 SECONDS) && in_range(user, target))
 		user.drop_item()
-		src.target = target
+		set_target(target) // Saving coordinates in case the reference becomes invalid
 		loc = null
 
 		if (ismob(target))
@@ -67,16 +68,25 @@
 
 		target.overlays += image_overlay
 		to_chat(user, "Bomb has been planted. Timer counting down from [timer].")
-		spawn(timer*10)
-			explode(get_turf(target))
+		addtimer(CALLBACK(src, .proc/detonate), timer SECONDS)
 
-/obj/item/weapon/plastique/proc/explode(var/location)
+/obj/item/weapon/plastique/proc/set_target(var/atom/T)
+	if(!isatom(T))
+		return
+	target = T
+	location = list(T.x, T.y, T.z)
+
+/obj/item/weapon/plastique/proc/detonate()
 	if(!target)
 		target = get_atom_on_turf(src)
 	if(!target)
 		target = src
-	if(location)
-		explosion(location, blast_dev, blast_heavy, blast_light, blast_flash)
+	
+	var/turf/T = get_turf(target)
+	if (!T && length(location))
+		T = locate(location[1], location[2], location[3])
+	if (T)
+		explosion(T, blast_dev, blast_heavy, blast_light, blast_flash)
 
 	if(target)
 		if (istype(target, /turf/simulated/wall))

code/game/objects/items/weapons/grenades/explosive.dm

@@ -12,6 +12,7 @@
 	//The radius of the circle used to launch projectiles. Lower values mean less projectiles are used but if set too low gaps may appear in the spread pattern
 	var/spread_range = 7
 	loadable = null
+	hud_state = "grenade_frag" // TGMC Ammo HUD Port
 
 /obj/item/weapon/grenade/explosive/detonate()
 	..()

code/game/objects/items/weapons/grenades/grenade.dm

@@ -13,6 +13,8 @@
 	var/det_time = 50
 	var/loadable = TRUE
 	var/arm_sound = 'sound/weapons/armbomb.ogg'
+	var/hud_state = "grenade_he" // TGMC Ammo HUD Port
+	var/hud_state_empty = "grenade_empty" // TGMC Ammo HUD Port
 
 /obj/item/weapon/grenade/proc/clown_check(var/mob/living/user)
 	if((CLUMSY in user.mutations) && prob(50))

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -6,6 +6,7 @@
 	det_time = 20
 	item_state = "flashbang"
 	slot_flags = SLOT_BELT
+	hud_state = "grenade_smoke"
 	var/datum/effect_system/smoke_spread/bad/smoke
 	var/smoke_color
 	var/smoke_strength = 8

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

@@ -127,6 +127,18 @@
 	desc = "It's an orange backpack which was designed to hold beakers, pill bottles and bottles."
 	icon_state = "chempack"
 
+/obj/item/weapon/storage/backpack/white
+	name = "white backpack"
+	icon_state = "backpack_white"
+
+/obj/item/weapon/storage/backpack/fancy
+	name = "fancy backpack"
+	icon_state = "backpack_fancy"
+
+/obj/item/weapon/storage/backpack/military
+	name = "military backpack"
+	icon_state = "backpack_military"
+
 /*
  * Duffle Types
  */
@@ -184,6 +196,16 @@
 	desc = "A large dufflebag for holding circuits and beakers."
 	icon_state = "duffle_sci"
 
+/obj/item/weapon/storage/backpack/dufflebag/drone
+	name = "drone dufflebag"
+	desc = "A large dufflebag for holding small robots? Or maybe it's one used by robots!"
+	icon_state = "duffle_drone"
+
+/obj/item/weapon/storage/backpack/dufflebag/cursed
+	name = "cursed dufflebag"
+	desc = "That probably shouldn't be moving..."
+	icon_state = "duffle_cursed"
+
 /*
  * Satchel Types
  */
@@ -192,7 +214,6 @@
 	name = "leather satchel"
 	desc = "It's a very fancy satchel made with fine leather."
 	icon_state = "satchel"
-	item_state_slots = list(slot_r_hand_str = "briefcase", slot_l_hand_str = "briefcase")
 
 /obj/item/weapon/storage/backpack/satchel/withwallet
 	starts_with = list(/obj/item/weapon/storage/wallet/random)
@@ -206,43 +227,36 @@
 	name = "industrial satchel"
 	desc = "A tough satchel with extra pockets."
 	icon_state = "satchel-eng"
-	item_state_slots = list(slot_r_hand_str = "engiepack", slot_l_hand_str = "engiepack")
 
 /obj/item/weapon/storage/backpack/satchel/med
 	name = "medical satchel"
 	desc = "A sterile satchel used in medical departments."
 	icon_state = "satchel-med"
-	item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
 
 /obj/item/weapon/storage/backpack/satchel/vir
 	name = "virologist satchel"
 	desc = "A sterile satchel with virologist colours."
 	icon_state = "satchel-vir"
-	item_state_slots = list(slot_r_hand_str = "viropack", slot_l_hand_str = "viropack")
 
 /obj/item/weapon/storage/backpack/satchel/chem
 	name = "chemist satchel"
 	desc = "A sterile satchel with chemist colours."
 	icon_state = "satchel-chem"
-	item_state_slots = list(slot_r_hand_str = "chempack", slot_l_hand_str = "chempack")
 
 /obj/item/weapon/storage/backpack/satchel/gen
 	name = "geneticist satchel"
 	desc = "A sterile satchel with geneticist colours."
 	icon_state = "satchel-gen"
-	item_state_slots = list(slot_r_hand_str = "genpack", slot_l_hand_str = "genpack")
 
 /obj/item/weapon/storage/backpack/satchel/tox
 	name = "scientist satchel"
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
-	item_state_slots = list(slot_r_hand_str = "toxpack", slot_l_hand_str = "toxpack")
 
 /obj/item/weapon/storage/backpack/satchel/sec
 	name = "security satchel"
 	desc = "A robust satchel for security related needs."
 	icon_state = "satchel-sec"
-	item_state_slots = list(slot_r_hand_str = "securitypack", slot_l_hand_str = "securitypack")
 
 /obj/item/weapon/storage/backpack/satchel/hyd
 	name = "hydroponics satchel"
@@ -253,7 +267,18 @@
 	name = "site manager's satchel"
 	desc = "An exclusive satchel for officers."
 	icon_state = "satchel-cap"
-	item_state_slots = list(slot_r_hand_str = "captainpack", slot_l_hand_str = "captainpack")
+
+/obj/item/weapon/storage/backpack/satchel/white
+	name = "white satchel"
+	icon_state = "satchel_white"
+
+/obj/item/weapon/storage/backpack/satchel/fancy
+	name = "fancy satchel"
+	icon_state = "satchel_fancy"
+
+/obj/item/weapon/storage/backpack/satchel/military
+	name = "military satchel"
+	icon_state = "satchel_military"
 
 //ERT backpacks.
 /obj/item/weapon/storage/backpack/ert
@@ -293,56 +318,104 @@
 	name = "messenger bag"
 	desc = "A sturdy backpack worn over one shoulder."
 	icon_state = "courierbag"
-	item_state_slots = list(slot_r_hand_str = "backpack", slot_l_hand_str = "backpack")
+	item_state_slots = list(slot_r_hand_str = "satchel-norm", slot_l_hand_str = "satchel-norm")
 
 /obj/item/weapon/storage/backpack/messenger/chem
 	name = "chemistry messenger bag"
 	desc = "A serile backpack worn over one shoulder.  This one is in Chemsitry colors."
 	icon_state = "courierbagchem"
-	item_state_slots = list(slot_r_hand_str = "chempack", slot_l_hand_str = "chempack")
+	item_state_slots = list(slot_r_hand_str = "satchel-chem", slot_l_hand_str = "satchel-chem")
 
 /obj/item/weapon/storage/backpack/messenger/med
 	name = "medical messenger bag"
 	desc = "A sterile backpack worn over one shoulder used in medical departments."
 	icon_state = "courierbagmed"
-	item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
+	item_state_slots = list(slot_r_hand_str = "satchel-med", slot_l_hand_str = "satchel-med")
 
 /obj/item/weapon/storage/backpack/messenger/viro
 	name = "virology messenger bag"
 	desc = "A sterile backpack worn over one shoulder.  This one is in Virology colors."
 	icon_state = "courierbagviro"
-	item_state_slots = list(slot_r_hand_str = "viropack", slot_l_hand_str = "viropack")
+	item_state_slots = list(slot_r_hand_str = "satchel-vir", slot_l_hand_str = "satchel-vir")
 
 /obj/item/weapon/storage/backpack/messenger/tox
 	name = "research messenger bag"
 	desc = "A backpack worn over one shoulder.  Useful for holding science materials."
 	icon_state = "courierbagtox"
-	item_state_slots = list(slot_r_hand_str = "toxpack", slot_l_hand_str = "toxpack")
+	item_state_slots = list(slot_r_hand_str = "satchel-tox", slot_l_hand_str = "satchel-tox")
 
 /obj/item/weapon/storage/backpack/messenger/com
 	name = "command messenger bag"
 	desc = "A special backpack worn over one shoulder.  This one is made specifically for officers."
 	icon_state = "courierbagcom"
-	item_state_slots = list(slot_r_hand_str = "captainpack", slot_l_hand_str = "captainpack")
+	item_state_slots = list(slot_r_hand_str = "satchel-cap", slot_l_hand_str = "satchel-cap")
 
 /obj/item/weapon/storage/backpack/messenger/engi
 	name = "engineering messenger bag"
 	icon_state = "courierbagengi"
-	item_state_slots = list(slot_r_hand_str = "engiepack", slot_l_hand_str = "engiepack")
+	item_state_slots = list(slot_r_hand_str = "satchel-eng", slot_l_hand_str = "satchel-eng")
 
 /obj/item/weapon/storage/backpack/messenger/hyd
 	name = "hydroponics messenger bag"
 	desc = "A backpack worn over one shoulder.  This one is designed for plant-related work."
 	icon_state = "courierbaghyd"
+	item_state_slots = list(slot_r_hand_str = "satchel_hyd", slot_l_hand_str = "satchel_hyd")
 
 /obj/item/weapon/storage/backpack/messenger/sec
 	name = "security messenger bag"
 	desc = "A tactical backpack worn over one shoulder. This one is in Security colors."
 	icon_state = "courierbagsec"
-	item_state_slots = list(slot_r_hand_str = "securitypack", slot_l_hand_str = "securitypack")
+	item_state_slots = list(slot_r_hand_str = "satchel-sec", slot_l_hand_str = "satchel-sec")
 
 /obj/item/weapon/storage/backpack/messenger/black
 	icon_state = "courierbagblk"
+	item_state_slots = list(slot_r_hand_str = "satchel-sec", slot_l_hand_str = "satchel-sec")
+
+/*
+ * Sport Bags
+ */
+
+/obj/item/weapon/storage/backpack/sport
+	name = "sports backpack"
+	icon_state = "backsport"
+
+/obj/item/weapon/storage/backpack/sport/white
+	name = "white sports backpack"
+	icon_state = "backsport_white"
+
+/obj/item/weapon/storage/backpack/sport/fancy
+	name = "fancy sports backpack"
+	icon_state = "backsport_fancy"
+
+/obj/item/weapon/storage/backpack/sport/vir
+	name = "virologist sports backpack"
+	desc = "A sterile sports backpack with virologist colours."
+	icon_state = "backsport_green"
+
+/obj/item/weapon/storage/backpack/sport/chem
+	name = "chemist sports backpack"
+	desc = "A sterile sports backpack with chemist colours."
+	icon_state = "backsport_orange"
+
+/obj/item/weapon/storage/backpack/sport/gen
+	name = "geneticist sports backpack"
+	desc = "A sterile sports backpack with geneticist colours."
+	icon_state = "backsport_blue"
+
+/obj/item/weapon/storage/backpack/sport/tox
+	name = "scientist sports backpack"
+	desc = "Useful for holding research materials."
+	icon_state = "backsport_purple"
+
+/obj/item/weapon/storage/backpack/sport/sec
+	name = "security sports backpack"
+	desc = "A robust sports backpack for security related needs."
+	icon_state = "backsport_security"
+
+/obj/item/weapon/storage/backpack/sport/hyd
+	name = "hydroponics sports backpack"
+	desc = "A green sports backpack for plant related work."
+	icon_state = "backsport_hydro"
 
 
 //Purses

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

@@ -20,4 +20,13 @@
 	force = 0
 	w_class = ITEMSIZE_NORMAL
 	max_w_class = ITEMSIZE_SMALL
-	max_storage_space = ITEMSIZE_COST_SMALL * 4
+	max_storage_space = ITEMSIZE_COST_SMALL * 4
+
+/obj/item/weapon/storage/briefcase/bookbag
+	name = "bookbag"
+	desc = "A small bookbag for holding... things other than books?"
+	icon_state = "bookbag"
+	force = 4.0
+	w_class = ITEMSIZE_LARGE
+	max_w_class = ITEMSIZE_NORMAL
+	max_storage_space = ITEMSIZE_COST_NORMAL * 4

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -114,6 +114,7 @@
 		if(!istype(src.loc, /turf))
 			user.drop_from_inventory(src)
 			src.loc = get_turf(src)
+		playsound(src.loc, 'sound/effects/rustle5.ogg', 50, 1)
 		to_chat(user, "You add padding to \the [src].")
 		add_padding(padding_type)
 		return

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -132,6 +132,42 @@
 /obj/structure/bed/chair/comfy/orange/Initialize(var/ml,var/newmaterial)
 	. = ..(ml, MAT_STEEL, "orange")
 
+/obj/structure/bed/chair/rounded
+	name = "rounded chair"
+	desc = "It's a rounded chair. It looks comfy."
+	icon_state = "roundedchair"
+	base_icon = "roundedchair"
+
+/obj/structure/bed/chair/rounded/brown/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, MAT_LEATHER)
+
+/obj/structure/bed/chair/rounded/red/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "carpet")
+
+/obj/structure/bed/chair/rounded/teal/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "teal")
+
+/obj/structure/bed/chair/rounded/black/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "black")
+
+/obj/structure/bed/chair/rounded/green/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "green")
+
+/obj/structure/bed/chair/rounded/purple/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "purple")
+
+/obj/structure/bed/chair/rounded/blue/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "blue")
+
+/obj/structure/bed/chair/rounded/beige/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "beige")
+
+/obj/structure/bed/chair/rounded/lime/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "lime")
+
+/obj/structure/bed/chair/rounded/yellow/Initialize(var/ml,var/newmaterial)
+	. = ..(ml, MAT_STEEL, "yellow")
+
 /obj/structure/bed/chair/office
 	anchored = 0
 	buckle_movable = 1