Projectiles cleaned up a bit and moved into a /modules folder.

Solars should work a bit better now.
Removed the old shield item as it has not been used in forever and was cluttering up some of the mob code.
IonRifle only has 5 shots before it needs to be reloaded down from 10.
Lowered the weakbullet's stun to match the taser.
You can no longer recall the shuttle on meteor.
Fixed a bug I caused on rev where if the revs were in space and dead it would count them as living.
Bit of blob work.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2220 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-09-18 07:27:05 +00:00
parent e4ec81fa6b
commit a72e6d6a84
42 changed files with 2178 additions and 2304 deletions
@@ -0,0 +1,60 @@
/obj/item/ammo_magazine/a75//Still needs to be gone through
name = "ammo magazine (.75)"
icon_state = "gyro"
New()
for(var/i = 1, i <= 8, i++)
stored_ammo += new /obj/item/ammo_casing/a75(src)
update_icon()
/obj/item/ammo_magazine/c38
name = "speed loader (.38)"
icon_state = "38"
New()
for(var/i = 1, i <= 7, i++)
stored_ammo += new /obj/item/ammo_casing/c38(src)
update_icon()
/obj/item/ammo_magazine/a418
name = "ammo box (.418)"
icon_state = "418"
New()
for(var/i = 1, i <= 7, i++)
stored_ammo += new /obj/item/ammo_casing/a418(src)
update_icon()
/obj/item/ammo_magazine/a666
name = "ammo box (.666)"
icon_state = "666"
New()
for(var/i = 1, i <= 2, i++)
stored_ammo += new /obj/item/ammo_casing/a666(src)
update_icon()
/obj/item/ammo_magazine/c9mm
name = "Ammunition Box (9mm)"
icon_state = "9mm"
origin_tech = "combat=3;materials=2"
New()
for(var/i = 1, i <= 30, i++)
stored_ammo += new /obj/item/ammo_casing/c9mm(src)
update_icon()
update_icon()
desc = text("There are [] round\s left!", stored_ammo.len)
/obj/item/ammo_magazine/c45
name = "Ammunition Box (.45)"
icon_state = "9mm"
origin_tech = "combat=3;materials=2"
New()
for(var/i = 1, i <= 30, i++)
stored_ammo += new /obj/item/ammo_casing/c45(src)
update_icon()
update_icon()
desc = text("There are [] round\s left!", stored_ammo.len)
@@ -0,0 +1,74 @@
/obj/item/ammo_casing/a418
desc = "A .418 bullet casing."
caliber = "357"
projectile_type = "/obj/item/projectile/suffocationbullet"
/obj/item/ammo_casing/a75
desc = "A .75 bullet casing."
caliber = "75"
projectile_type = "/obj/item/projectile/gyro"
/obj/item/ammo_casing/a666
desc = "A .666 bullet casing."
caliber = "357"
projectile_type = "/obj/item/projectile/cyanideround"
/obj/item/ammo_casing/c38
desc = "A .38 bullet casing."
caliber = "38"
projectile_type = "/obj/item/projectile/weakbullet"
/obj/item/ammo_casing/c9mm
desc = "A 9mm bullet casing."
caliber = "9mm"
projectile_type = "/obj/item/projectile/weakbullet"
/obj/item/ammo_casing/c45
desc = "A .45 bullet casing."
caliber = ".45"
projectile_type = "/obj/item/projectile/midbullet"
/obj/item/ammo_casing/shotgun
name = "shotgun shell"
desc = "A 12 gauge shell."
icon_state = "gshell"
caliber = "shotgun"
projectile_type = "/obj/item/projectile"
m_amt = 12500
/obj/item/ammo_casing/shotgun/blank
name = "shotgun shell"
desc = "A blank shell."
icon_state = "blshell"
m_amt = 250
/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag shell"
desc = "A weak beanbag shell."
icon_state = "bshell"
projectile_type = "/obj/item/projectile/weakbullet"
m_amt = 500
/obj/item/ammo_casing/shotgun/stunshell
name = "stun shell"
desc = "A stunning shell."
icon_state = "stunshell"
projectile_type = "/obj/item/projectile/stunshot"
m_amt = 2500
/obj/item/ammo_casing/shotgun/dart
name = "shotgun darts"
desc = "A dart for use in shotguns."
icon_state = "blshell" //someone, draw the icon, please.
projectile_type = "/obj/item/projectile/dart"
m_amt = 12500