cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pass I

Browse Source
This commit is contained in:
Fox-McCloud
2015-09-04 05:18:48 -04:00
parent 7c29e59784
commit a019934e9e
80 changed files with 254 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_casings.dm
+6 -6
View File
@@ -38,7 +38,7 @@
icon_state = "blshell"
caliber = "shotgun"
projectile_type = "/obj/item/projectile/bullet"
m_amt = 4000
materials = list(MAT_METAL=4000)
/obj/item/ammo_casing/shotgun/buckshot
@@ -55,7 +55,7 @@
desc = "A weak beanbag slug for riot control."
icon_state = "bshell"
projectile_type = "/obj/item/projectile/bullet/weakbullet/rubber"
m_amt = 250
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/shotgun/improvised
@@ -63,7 +63,7 @@
desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
icon_state = "gshell"
projectile_type = "/obj/item/projectile/bullet/pellet/weak"
m_amt = 250
materials = list(MAT_METAL=250)
pellets = 5
deviation = 30
@@ -73,7 +73,7 @@
propellant. It's like playing russian roulette, with a shotgun."
icon_state = "improvshell"
projectile_type = /obj/item/projectile/bullet/pellet/random
m_amt = 250
materials = list(MAT_METAL=250)
pellets = 5
deviation = 30
@@ -86,7 +86,7 @@
desc = "A stunning taser slug."
icon_state = "stunshell"
projectile_type = "/obj/item/projectile/bullet/stunshot"
m_amt = 200
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/shotgun/meteorshot
@@ -164,7 +164,7 @@
desc = "A tranquilizer round used to subdue individuals utilizing stimulants."
icon_state = "cshell"
projectile_type = "/obj/item/projectile/bullet/dart/syringe/tranquilizer"
m_amt = 250
materials = list(MAT_METAL=250)
/obj/item/ammo_casing/syringegun
name = "syringe gun spring"
code/modules/projectiles/ammunition/boxes.dm
+4 -4
View File
@@ -54,7 +54,7 @@
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 8
m_amt = 100000
materials = list(MAT_METAL=32000)
/obj/item/ammo_box/shotgun/buck
name = "Ammunition Box (buckshot)"
@@ -63,15 +63,15 @@
/obj/item/ammo_box/shotgun/stun
name = "Ammunition Box (stun shells)"
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
m_amt = 20000
materials = list(MAT_METAL=2000)
/obj/item/ammo_box/shotgun/beanbag
name = "Ammunition Box (beanbag shells)"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
m_amt = 4000
materials = list(MAT_METAL=2000)
/obj/item/ammo_box/shotgun/tranquilizer
name = "Ammunition Box (tranquilizer darts)"
icon_state = "45box"
ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer
m_amt = 2000
materials = list(MAT_METAL=2000)