Merge branch 'master' into hypo

code/game/objects/items/devices/communicator/communicator.dm

@@ -326,3 +326,28 @@ var/global/list/obj/item/device/communicator/all_communicators = list()
 	..()
 	client_huds |= global_hud.whitense
 	client_huds |= global_hud.darkMask
+
+//It's the 26th century. We should have smart watches by now.
+/obj/item/device/communicator/watch
+	name = "communicator watch"
+	desc = "A personal device used to enable long range dialog between two people, utilizing existing telecommunications infrastructure to allow \
+	communications across different stations, planets, or even star systems. You can wear this one on your wrist!"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "commwatch"
+	slot_flags = SLOT_GLOVES
+
+/obj/item/device/communicator/watch/update_icon()
+	if(video_source)
+		icon_state = "commwatch-video"
+		return
+
+	if(voice_mobs.len || communicating.len)
+		icon_state = "commwatch-active"
+		return
+
+	if(alert_called)
+		icon_state = "commwatch-called"
+		return
+
+	icon_state = initial(icon_state)
+

code/game/objects/items/gunbox_vr.dm

@@ -1,3 +1,18 @@
 /obj/item/gunbox
 	name = "security sidearm box"
-	desc = "A secure box containing a security sidearm."
+	desc = "A secure box containing a security sidearm."
+
+/obj/item/gunbox/attack_self(mob/living/user)
+	var/list/options = list()
+	options["M1911 (.45)"] = list(/obj/item/weapon/gun/projectile/colt/detective, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber)
+	options["NT Mk58 (.45)"] = list(/obj/item/weapon/gun/projectile/sec, /obj/item/ammo_magazine/m45/rubber, /obj/item/ammo_magazine/m45/rubber)
+	options["SW 625 Revolver (.45)"] = list(/obj/item/weapon/gun/projectile/revolver/detective45, /obj/item/ammo_magazine/s45/rubber, /obj/item/ammo_magazine/s45/rubber)
+	options["P92X (9mm)"] = list(/obj/item/weapon/gun/projectile/p92x/sec, /obj/item/ammo_magazine/m9mm/rubber, /obj/item/ammo_magazine/m9mm/rubber)
+	var/choice = input(user,"Would you prefer a pistol or a revolver?") as null|anything in options
+	if(src && choice)
+		var/list/things_to_spawn = options[choice]
+		for(var/new_type in things_to_spawn) // Spawn all the things, the gun and the ammo.
+			var/atom/movable/AM = new new_type(get_turf(src))
+			if(istype(AM, /obj/item/weapon/gun))
+				to_chat(user, "You have chosen \the [AM]. Say hello to your new friend.")
+		qdel(src)

code/game/objects/items/weapons/material/knives.dm

@@ -96,7 +96,7 @@
 	name = "machete"
 	desc = "A sharp machete often found in survival kits."
 	icon_state = "machete"
-	force_divisor = 0.3 // 20 when hardness 60 (steel)
+	force_divisor = 0.3 // 18 when hardness 60 (steel)
 	attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut")
 	var/should_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned.
 

code/game/objects/items/weapons/material/misc.dm

@@ -57,13 +57,14 @@
 	hits = initial(hits)
 	..()
 
-// These probably shouldn't inherit from hatchets.
+// These no longer inherit from hatchets.
 /obj/item/weapon/material/knife/tacknife
 	name = "tactical knife"
 	desc = "You'd be killing loads of people if this was Medal of Valor: Heroes of Space."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "tacknife"
 	item_state = "knife"
+	force_divisor = 0.25 //15 when hardness 60 (steel)
 	attack_verb = list("stabbed", "chopped", "cut")
 	applies_material_colour = 1
 

code/game/objects/items/weapons/material/twohanded.dm

@@ -149,7 +149,7 @@
 	force = 10
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
-	force_divisor = 0.75 			// 22 when wielded with hardness 15 (glass)
+	force_divisor = 0.5 			// 15 when wielded with hardness 15 (glass)
 	unwielded_force_divisor = 0.375
 	thrown_force_divisor = 1.5 		// 20 when thrown with weight 15 (glass)
 	throw_speed = 3

code/game/objects/random/random_vr.dm

@@ -49,14 +49,14 @@
 					prob(6);/obj/item/weapon/gun/energy/sniperrifle,\
 					prob(6);/obj/item/weapon/gun/projectile/automatic/z8,\
 					prob(6);/obj/item/weapon/gun/energy/captain,\
-					prob(6);/obj/item/weapon/material/hatchet/tacknife,\
+					prob(6);/obj/item/weapon/material/knife/tacknife,\
 					prob(5);/obj/item/weapon/gun/projectile/shotgun/pump/USDF,\
 					prob(5);/obj/item/weapon/gun/projectile/giskard/olivaw,\
 					prob(5);/obj/item/weapon/gun/projectile/revolver/consul,\
 					prob(5);/obj/item/weapon/gun/projectile/revolver/mateba,\
 					prob(5);/obj/item/weapon/gun/projectile/revolver,\
 					prob(4);/obj/item/weapon/gun/projectile/deagle,\
-					prob(4);/obj/item/weapon/material/hatchet/tacknife/combatknife,\
+					prob(4);/obj/item/weapon/material/knife/tacknife/combatknife,\
 					prob(4);/obj/item/weapon/melee/energy/sword,\
 					prob(4);/obj/item/weapon/gun/projectile/automatic/mini_uzi,\
 					prob(4);/obj/item/weapon/gun/projectile/contender,\
@@ -154,7 +154,7 @@
 				prob(2);/obj/item/weapon/material/butterfly/switchblade,\
 				prob(2);/obj/item/weapon/material/knuckledusters,\
 				prob(2);/obj/item/weapon/reagent_containers/syringe/drugs,\
-				prob(1);/obj/item/weapon/material/hatchet/tacknife,\
+				prob(1);/obj/item/weapon/material/knife/tacknife,\
 				prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc,\
 				prob(1);/obj/item/weapon/beartrap,\
 				prob(1);/obj/item/weapon/handcuffs,\

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -29,6 +29,8 @@
 	new /obj/item/clothing/under/rank/security2(src)
 	new /obj/item/clothing/under/rank/security2(src)
 	new /obj/item/clothing/under/rank/security2(src)
+	new /obj/item/clothing/under/rank/security/skirt(src)
+	new /obj/item/clothing/under/rank/security/skirt(src)
 	new /obj/item/clothing/shoes/boots/jackboots(src)
 	new /obj/item/clothing/shoes/boots/jackboots(src)
 	new /obj/item/clothing/shoes/boots/jackboots(src)

code/game/objects/structures/janicart.dm

@@ -17,7 +17,7 @@
 
 
 /obj/structure/janitorialcart/New()
-	create_reagents(100)
+	create_reagents(300)
 
 
 /obj/structure/janitorialcart/examine(mob/user)
@@ -178,7 +178,7 @@
 
 
 /obj/structure/bed/chair/janicart/New()
-	create_reagents(100)
+	create_reagents(300)
 	update_layer()
 
 

code/game/objects/structures/mop_bucket.dm

@@ -12,18 +12,18 @@
 
 
 /obj/structure/mopbucket/New()
-	create_reagents(100)
+	create_reagents(300)
 	..()
 
 /obj/structure/mopbucket/examine(mob/user)
 	if(..(user, 1))
-		user << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!"
+		to_chat(user, "[src] \icon[src] contains [reagents.total_volume] unit\s of water!")
 
 /obj/structure/mopbucket/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets"
 		if(reagents.total_volume < 1)
-			user << "<span class='warning'>\The [src] is out of water!</span>"
+			to_chat(user, "<span class='warning'>\The [src] is out of water!</span>")
 		else
 			reagents.trans_to_obj(I, 5)
-			user << "<span class='notice'>You wet \the [I] in \the [src].</span>"
+			to_chat(user, "<span class='notice'>You wet \the [I] in \the [src].</span>")
 			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)

code/game/objects/structures/trash_pile.dm

@@ -237,7 +237,7 @@
 					prob(1);/obj/item/weapon/beartrap,
 					prob(1);/obj/item/weapon/cell/hyper/empty,
 					prob(1);/obj/item/weapon/disk/nifsoft/compliance,
-					prob(1);/obj/item/weapon/material/hatchet/tacknife,
+					prob(1);/obj/item/weapon/material/knife/tacknife,
 					prob(1);/obj/item/weapon/reagent_containers/syringe/steroid)
 
 	var/obj/item/I = new path()