From 3a966670034d7dab82f64d5d145d5ea293ee5eb3 Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Thu, 16 Feb 2012 07:20:32 +0000 Subject: [PATCH] Desert Eagles now use magazines, .50AE ammo, and only have 7 shots. They're basically revolvers that use magazines. Nuke ops lost that horribly nerfed piece of shit c20r and now get Desert Eagles and Riot Shields. The detectives .38 ammo now does the same damage as regular revolver bullets. If he wants to keep acting as a glorified sec officer, he can go grab a taser. The Veil Render now summons a subtype of Nar-Sie which doesn't pull anchored objects. This should reduce the power of the item/reduce lag while I get sprites and finalize details with Urist for reworking it as the Sphere of Annihilation (as in, this is temporary) Updated the changelog git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3132 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/nuclear/nuclear.dm | 6 ++-- code/game/gamemodes/wizard/veilrender.dm | 2 +- code/game/objects/closets/nuclear.dm | 10 +++---- code/game/objects/closets/syndicate.dm | 1 + code/modules/power/singularity/singularity.dm | 27 ++++++++++++++++++ code/modules/projectiles/ammunition/boxes.dm | 17 +++++++++-- .../modules/projectiles/ammunition/bullets.dm | 6 +++- .../projectiles/guns/projectile/automatic.dm | 2 -- .../projectiles/guns/projectile/pistol.dm | 27 +++++++++++++++--- html/changelog.html | 14 +++++++++ icons/obj/ammo.dmi | Bin 8106 -> 9521 bytes tgstation.dme | 4 +++ 12 files changed, 98 insertions(+), 18 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 764d56664a3..e0957395571 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -221,10 +221,10 @@ synd_mob.equip_if_possible(new /obj/item/clothing/head/helmet/swat(synd_mob), synd_mob.slot_head) synd_mob.equip_if_possible(new /obj/item/weapon/card/id/syndicate(synd_mob), synd_mob.slot_wear_id) synd_mob.equip_if_possible(new /obj/item/weapon/storage/backpack(synd_mob), synd_mob.slot_back) - synd_mob.equip_if_possible(new /obj/item/ammo_magazine/a12mm(synd_mob), synd_mob.slot_in_backpack) - synd_mob.equip_if_possible(new /obj/item/ammo_magazine/a12mm(synd_mob), synd_mob.slot_in_backpack) + synd_mob.equip_if_possible(new /obj/item/ammo_magazine/a50(synd_mob), synd_mob.slot_in_backpack) + synd_mob.equip_if_possible(new /obj/item/ammo_magazine/a50(synd_mob), synd_mob.slot_in_backpack) synd_mob.equip_if_possible(new /obj/item/weapon/reagent_containers/pill/cyanide(synd_mob), synd_mob.slot_in_backpack) - synd_mob.equip_if_possible(new /obj/item/weapon/gun/projectile/automatic/c20r(synd_mob), synd_mob.slot_belt) + synd_mob.equip_if_possible(new /obj/item/weapon/gun/projectile/deagle(synd_mob), synd_mob.slot_belt) var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(synd_mob) E.imp_in = synd_mob E.implanted = 1 diff --git a/code/game/gamemodes/wizard/veilrender.dm b/code/game/gamemodes/wizard/veilrender.dm index 7e257178a46..c75b1b9d008 100644 --- a/code/game/gamemodes/wizard/veilrender.dm +++ b/code/game/gamemodes/wizard/veilrender.dm @@ -23,7 +23,7 @@ /obj/effect/rend/New() spawn(50) - new /obj/machinery/singularity/narsie(get_turf(src)) + new /obj/machinery/singularity/narsie/wizard(get_turf(src)) del(src) return return diff --git a/code/game/objects/closets/nuclear.dm b/code/game/objects/closets/nuclear.dm index 78472fd4578..d4c0b48a0c1 100644 --- a/code/game/objects/closets/nuclear.dm +++ b/code/game/objects/closets/nuclear.dm @@ -1,11 +1,11 @@ /obj/structure/closet/syndicate/nuclear/New() ..() sleep(2) - new /obj/item/ammo_magazine/a12mm(src) - new /obj/item/ammo_magazine/a12mm(src) - new /obj/item/ammo_magazine/a12mm(src) - new /obj/item/ammo_magazine/a12mm(src) - new /obj/item/ammo_magazine/a12mm(src) + new /obj/item/ammo_magazine/a50(src) + new /obj/item/ammo_magazine/a50(src) + new /obj/item/ammo_magazine/a50(src) + new /obj/item/ammo_magazine/a50(src) + new /obj/item/ammo_magazine/a50(src) new /obj/item/weapon/storage/handcuff_kit(src) new /obj/item/weapon/storage/flashbang_kit(src) new /obj/item/weapon/gun/energy/gun(src) diff --git a/code/game/objects/closets/syndicate.dm b/code/game/objects/closets/syndicate.dm index 241485e0d5e..b4871556872 100644 --- a/code/game/objects/closets/syndicate.dm +++ b/code/game/objects/closets/syndicate.dm @@ -10,4 +10,5 @@ new /obj/item/weapon/cell(src) new /obj/item/weapon/card/id/syndicate(src) new /obj/item/device/multitool(src) + new /obj/item/weapon/shield/riot(src) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 7093fe95e68..ef0861c9f56 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -515,3 +515,30 @@ var/global/list/uneatable = list( target << "\red NAR-SIE HUNGERS FOR YOUR SOUL" else target << "\red NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL" + + + +/obj/machinery/singularity/narsie/wizard + + eat() + set background = 1 + if(defer_powernet_rebuild != 2) + defer_powernet_rebuild = 1 + for(var/atom/movable/X in orange(consume_range,src)) + consume(X) + for(var/turf/X in orange(consume_range,src)) + consume(X) + for(var/atom/movable/X in orange(grav_pull,src)) + if(is_type_in_list(X, uneatable)) continue + if(((X) &&(!X:anchored) && (!istype(X,/mob/living/carbon/human)))) + step_towards(X,src) + else if(istype(X,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = X + if(istype(H.shoes,/obj/item/clothing/shoes/magboots)) + var/obj/item/clothing/shoes/magboots/M = H.shoes + if(M.magpulse) + continue + step_towards(H,src) + if(defer_powernet_rebuild != 2) + defer_powernet_rebuild = 0 + return \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 8012ccad7e2..7772b5b246b 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -70,9 +70,22 @@ multiple_sprites = 1 - /obj/item/ammo_magazine/a12mm/empty name = "magazine (12mm)" icon_state = "12mm" ammo_type = "/obj/item/ammo_casing/12mm" - max_ammo = 0 \ No newline at end of file + max_ammo = 0 + +/obj/item/ammo_magazine/a50 + name = "magazine (.50)" + icon_state = "50ae" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/a50" + max_ammo = 7 + multiple_sprites = 1 + +/obj/item/ammo_magazine/a50/empty + name = "magazine (.50)" + icon_state = "50ae" + ammo_type = "/obj/item/ammo_casing/a50" + max_ammo = 0 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 623221002aa..fa7d8953450 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -3,6 +3,10 @@ caliber = "357" projectile_type = "/obj/item/projectile/bullet" +/obj/item/ammo_casing/a50 + desc = "A .50AE bullet casing." + caliber = ".50" + projectile_type = "/obj/item/projectile/bullet" /obj/item/ammo_casing/a418 desc = "A .418 bullet casing." @@ -25,7 +29,7 @@ /obj/item/ammo_casing/c38 desc = "A .38 bullet casing." caliber = "38" - projectile_type = "/obj/item/projectile/bullet/weakbullet" + projectile_type = "/obj/item/projectile/bullet/bullet" /obj/item/ammo_casing/c9mm diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 43024098039..34d6cfdc3ff 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -66,5 +66,3 @@ - - diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 394649e92f1..21f7fe3ddc7 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -13,16 +13,35 @@ /obj/item/weapon/gun/projectile/deagle name = "Desert Eagle" - desc = "A robust handgun that uses 357 magnum ammo" + desc = "A robust handgun that uses .50 AE ammo" icon_state = "deagle" force = 14.0 - max_shells = 9 + max_shells = 7 + caliber = ".50" + ammo_type ="/obj/item/ammo_casing/a50" + load_method = 2 + New() + ..() + empty_mag = new /obj/item/ammo_magazine/a50/empty(src) + update_icon() + return + afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) + ..() + if(!loaded.len && empty_mag) + empty_mag.loc = get_turf(src.loc) + empty_mag = null + playsound(user, 'smg_empty_alarm.ogg', 40, 1) + update_icon() + return + update_icon() + ..() + return /obj/item/weapon/gun/projectile/deagle/gold name = "Desert Eagle" - desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses 357 ammo." + desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .50 AE ammo." icon_state = "deagleg" item_state = "deagleg" @@ -30,7 +49,7 @@ /obj/item/weapon/gun/projectile/deagle/camo name = "Desert Eagle" - desc = "A Deagle brand Deagle for operators operating operationally. Uses 357 ammo." + desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo." icon_state = "deaglecamo" item_state = "deagleg" diff --git a/html/changelog.html b/html/changelog.html index 0bba1681868..f2704f3ab30 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -92,6 +92,20 @@ should be listed in the changelog upon commit tho. Thanks. --> + +
+

15 February 2012

+

Kor updated:

+