Merge branch 'master' into spike-loot-differentces

2020-06-17 02:36:52 -04:00
parent 51189d7a04 5e2d5c2b09
commit 51da7dfa71
374 changed files with 44895 additions and 39751 deletions
@@ -44,7 +44,6 @@
 	desc = "A 9mm incendiary bullet casing."
 	projectile_type = /obj/item/projectile/bullet/incendiary/c9mm

-
 // .50AE (Desert Eagle)

 /obj/item/ammo_casing/a50AE
@@ -53,3 +52,16 @@
 	caliber = ".50"
 	projectile_type = /obj/item/projectile/bullet/a50AE

+// .32 ACP (Improvised Pistol)
+
+/obj/item/ammo_casing/c32acp
+	name = ".32 bullet casing"
+	desc = "A .32 bullet casing."
+	caliber = "c32acp"
+	projectile_type = /obj/item/projectile/bullet/c32acp
+
+/obj/item/ammo_casing/r32acp
+	name = ".32 rubber bullet casing"
+	desc = "A .32 rubber bullet casing."
+	caliber = "c32acp"
+	projectile_type = /obj/item/projectile/bullet/r32acp
@@ -12,6 +12,15 @@
 	e_cost = 200
 	select_name = "kill"

+/obj/item/ammo_casing/energy/lasergun/improvised
+	projectile_type = /obj/item/projectile/beam/weak/improvised
+	e_cost = 200
+	select_name = "kill"
+
+/obj/item/ammo_casing/energy/lasergun/improvised/upgraded
+	projectile_type = /obj/item/projectile/beam/weak
+	e_cost = 100
+
 /obj/item/ammo_casing/energy/laser/hos
 	e_cost = 100