I LOVE YOU KITCHEN GUN!

2020-03-17 03:20:53 +11:00
parent fabcbd306c
commit 6f0fc2bdea
5 changed files with 4 additions and 13 deletions
@@ -204,7 +204,7 @@
 	rapid = 2
 	icon_state = "syndicate_smg"
 	icon_living = "syndicate_smg"
-	casingtype = /obj/item/ammo_casing/c45/nostamina
+	casingtype = /obj/item/ammo_casing/c45
 	projectilesound = 'sound/weapons/gunshot_smg.ogg'

 /mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot //caravan ambush ruin
@@ -24,9 +24,6 @@
 	caliber = ".45"
 	projectile_type = /obj/item/projectile/bullet/c45

-/obj/item/ammo_casing/c45/nostamina
-	projectile_type = /obj/item/projectile/bullet/c45_nostamina
-
 /obj/item/ammo_casing/c45/kitchengun
 	desc = "A .45 bullet casing. It has a small sponge attached to it."
 	projectile_type = /obj/item/projectile/bullet/c45_cleaning
@@ -60,7 +60,7 @@
 /obj/item/ammo_box/magazine/smgm45
 	name = "SMG magazine (.45)"
 	icon_state = "c20r45-24"
-	ammo_type = /obj/item/ammo_casing/c45/nostamina
+	ammo_type = /obj/item/ammo_casing/c45
 	caliber = ".45"
 	max_ammo = 24

@@ -1,18 +1,12 @@
 // .45 (M1911 & C20r)

 /obj/item/projectile/bullet/c45
-	name = ".45 bullet"
-	damage = 20
-	stamina = 65
-
-/obj/item/projectile/bullet/c45_nostamina
 	name = ".45 bullet"
 	damage = 30

 /obj/item/projectile/bullet/c45_cleaning
 	name = ".45 bullet"
-	damage = 24
-	stamina = 10
+	damage = 40 //BANG BANG BANG

 /obj/item/projectile/bullet/c45_cleaning/on_hit(atom/target, blocked = FALSE)
 	. = ..()
@@ -159,7 +159,7 @@
 /datum/uplink_item/role_restricted/kitchen_gun
 	name = "Kitchen Gun (TM)"
 	desc = "A revolutionary .45 caliber cleaning solution! Say goodbye to daily stains and dirty surfaces with Kitchen Gun (TM)! \
-	Just five shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
+	Just three shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
 	cost = 10
 	surplus = 40
 	restricted_roles = list("Cook", "Janitor")