From c2c5e6668fd5bc3dc623c243c1fe92037ba578d6 Mon Sep 17 00:00:00 2001 From: Duck- Date: Sun, 31 Aug 2014 02:52:33 -0400 Subject: [PATCH] Fixes shotgun boxes, energy shields, nerfs pressure Adds energy shields under illegal research. Because why not. Fixes those shotgun boxes I tried to steal earlier. Latheable for your convenience. Pressure nerfs in previous commit, forgot to mention. --- code/game/machinery/autolathe.dm | 5 +++++ code/modules/projectiles/ammunition/boxes.dm | 18 +++++++++++++----- code/modules/projectiles/ammunition/bullets.dm | 14 +++++++++++++- code/modules/projectiles/guns/energy/laser.dm | 1 + code/modules/research/designs.dm | 18 ++++++++++++++++++ data/investigate/gravity.html | 4 ++-- 6 files changed, 52 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index e9fbe390..240d631e 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -61,6 +61,11 @@ var/global/list/autolathe_recipes_hidden = list( \ new /obj/item/ammo_magazine/c45m(), \ new /obj/item/ammo_casing/shotgun(), \ new /obj/item/ammo_casing/shotgun/dart(), \ + new /obj/item/ammo_casing/shotgun/incendiary(), \ + new /obj/item/ammo_magazine/shotgun(), \ + new /obj/item/ammo_magazine/shotgun/beanbag(), \ + new /obj/item/ammo_magazine/a12mm(), \ + new /obj/item/ammo_magazine/shotgun/incendiary, \ /* new /obj/item/weapon/shield/riot(), */ \ ) diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 4eea2e42..f93c3c77 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -150,7 +150,7 @@ ammo_type = "/obj/item/ammo_casing/chameleon" max_ammo = 0 multiple_sprites = 1 -/* + // Tried to steal these from Para. They're kind of funky. /obj/item/ammo_magazine/a12mm @@ -167,19 +167,27 @@ ammo_type = "/obj/item/ammo_casing/shotgun" max_ammo = 8 m_amt = 100000 - +/* no buckshots. never again. too hard to steal forever. /obj/item/ammo_magazine/shotgun/buck name = "Ammunition Box (buckshot)" ammo_type = "/obj/item/ammo_casing/buck" +*/ /obj/item/ammo_magazine/shotgun/stun name = "Ammunition Box (stun shells)" - ammo_type = "/obj/item/ammo_casing/stunshell" + ammo_type = "/obj/item/ammo_casing/shotgun/stunshell" + max_ammo = 8 m_amt = 20000 /obj/item/ammo_magazine/shotgun/beanbag name = "Ammunition Box (beanbag shells)" - ammo_type = "/obj/item/ammo_casing/beanbag" + ammo_type = "/obj/item/ammo_casing/shotgun/beanbag" + max_ammo = 8 m_amt = 4000 - */ \ No newline at end of file +/obj/item/ammo_magazine/shotgun/incendiary + name = "Ammunition Box (incendiary shells)" + ammo_type = "/obj/item/ammo_casing/shotgun/incendiary" + max_ammo = 8 + m_amt = 100000 + diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index f3e479b6..3dcb0b9f 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -36,7 +36,12 @@ desc = "A 9mm bullet casing." caliber = "9mm" projectile_type = "/obj/item/projectile/bullet/midbullet2" - +/* do this later +/obj/item/ammo_casing/c9mmsilver + desc = "A silver 9mm bullet casing." + caliber = "9mm" + projectile_type = "/obj/item/projectile/bullet/midbullet2" +*/ /obj/item/ammo_casing/c45 desc = "A .45 bullet casing." @@ -62,6 +67,13 @@ projectile_type = "/obj/item/projectile/bullet" m_amt = 12500 +/obj/item/ammo_casing/shotgun/incendiary + name = "shotgun shell" + desc = "A 12 gauge shell." + icon_state = "ishell" + projectile_type = "/obj/item/projectile/bullet/incendiary/shell" + m_amt = 12500 + /obj/item/ammo_casing/shotgun/blank name = "shotgun shell" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 2535afc7..b07e64dd 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -32,6 +32,7 @@ /obj/item/weapon/gun/energy/laser/captain icon_state = "caplaser" + name ="antique laser gun" desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding." force = 10 origin_tech = null diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 74a93fc4..54372d68 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1413,6 +1413,15 @@ datum/design/implant_free materials = list("$metal" = 50, "$glass" = 50) build_path = "/obj/item/weapon/implantcase/freedom" +datum/design/energy_shield + name = "energy shield" + desc = "An energy shield." + id = "energy_shield" + req_tech = list("syndicate" = 4, "materials" = 4, "magnets" = 3) + build_type = PROTOLATHE + materials = list("$metal" = 1000, "$glass" = 3000, "$plasma" = 1000) + build_path = "/obj/item/weapon/shield/energy" + datum/design/implant_death_alarm name = "death alarm implant" desc = "Alerts others to your death." @@ -1629,6 +1638,15 @@ datum/design/stunshell materials = list("$metal" = 4000) build_path = "/obj/item/ammo_casing/shotgun/stunshell" +datum/design/stunshellbox + name = "Stun Shell box" + desc = "A box full of stun shells." + id = "stunshellbox" + req_tech = list("combat" = 3, "materials" = 3) + build_type = PROTOLATHE + materials = list("$metal" = 20000) + build_path = "/obj/item/ammo_magazine/shotgun/stun" + datum/design/plasmapistol name = "plasma pistol" desc = "A specialized firearm designed to fire lethal bolts of toxins." diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html index cbf8cd75..00a9afb7 100644 --- a/data/investigate/gravity.html +++ b/data/investigate/gravity.html @@ -1,2 +1,2 @@ -22:48 [0x200779e] (92,152,1) || the gravitational generator has regained power.
-22:48 [0x200779e] (92,152,1) || the gravitational generator is now charging.
+02:39 [0x200783d] (92,152,1) || the gravitational generator has regained power.
+02:39 [0x200783d] (92,152,1) || the gravitational generator is now charging.