Removes the stamina version of .45 ammo (#42692)

* webbit reddit

* commits for each file

damn i hate web edits

* magazine

one of these is going to conflict with the guns pr why am i doing this at 2 am

* yeet

* does it compile

probably not
This commit is contained in:
subject217
2019-02-08 08:55:48 -08:00
committed by moo
parent 46e3894bb2
commit 7a2d4cd7ef
5 changed files with 3 additions and 11 deletions

View File

@@ -39,7 +39,7 @@
minimum_distance = 5 minimum_distance = 5
icon_state = "stickmanranged" icon_state = "stickmanranged"
icon_living = "stickmanranged" icon_living = "stickmanranged"
casingtype = /obj/item/ammo_casing/c45/nostamina casingtype = /obj/item/ammo_casing/c45
projectilesound = 'sound/misc/bang.ogg' projectilesound = 'sound/misc/bang.ogg'
loot = list(/obj/item/gun/ballistic/automatic/pistol/stickman) loot = list(/obj/item/gun/ballistic/automatic/pistol/stickman)

View File

@@ -211,7 +211,7 @@
rapid = 2 rapid = 2
icon_state = "syndicate_smg" icon_state = "syndicate_smg"
icon_living = "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' projectilesound = 'sound/weapons/gunshot_smg.ogg'
/mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot //caravan ambush ruin /mob/living/simple_animal/hostile/syndicate/ranged/smg/pilot //caravan ambush ruin

View File

@@ -23,6 +23,3 @@
desc = "A .45 bullet casing." desc = "A .45 bullet casing."
caliber = ".45" caliber = ".45"
projectile_type = /obj/item/projectile/bullet/c45 projectile_type = /obj/item/projectile/bullet/c45
/obj/item/ammo_casing/c45/nostamina
projectile_type = /obj/item/projectile/bullet/c45_nostamina

View File

@@ -60,7 +60,7 @@
/obj/item/ammo_box/magazine/smgm45 /obj/item/ammo_box/magazine/smgm45
name = "SMG magazine (.45)" name = "SMG magazine (.45)"
icon_state = "c20r45-24" icon_state = "c20r45-24"
ammo_type = /obj/item/ammo_casing/c45/nostamina ammo_type = /obj/item/ammo_casing/c45
caliber = ".45" caliber = ".45"
max_ammo = 24 max_ammo = 24

View File

@@ -1,11 +1,6 @@
// .45 (M1911 & C20r) // .45 (M1911 & C20r)
/obj/item/projectile/bullet/c45 /obj/item/projectile/bullet/c45
name = ".45 bullet"
damage = 20
stamina = 65
/obj/item/projectile/bullet/c45_nostamina
name = ".45 bullet" name = ".45 bullet"
damage = 30 damage = 30