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

@@ -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

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

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)

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)
 

code/modules/power/singularity/singularity.dm

@@ -515,3 +515,30 @@ var/global/list/uneatable = list(
 				target << "\red <b>NAR-SIE HUNGERS FOR YOUR SOUL</b>"
 			else
 				target << "\red <b>NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL</b>"
+
+
+
+/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

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
+
+/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

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

code/modules/projectiles/guns/projectile/automatic.dm

@@ -66,5 +66,3 @@
 
 
 
-
-

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"
 

html/changelog.html

@@ -92,6 +92,20 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+
+<div class="commit sansserif">
+	<h2 class="date">15 February 2012</h2>
+	<h3 class="author">Kor updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Terrorists Win! Desert Eagles and Riot Shields now spawn on the syndicate shuttle, replacing the c20r</li>
+		<li class="tweak">The Detectives gun still uses .38, but they're now fully lethal bullets. Go ahead, make his day.</li>
+		<li class="tweak>The Veil Render has been nerfed, the Nar-Sie it spawns will not pull anchored objects. This is a temporary measure, more nerfs/reworking to come</li>
+	</ul>
+</div>
+
+
+
+
 <div class="commit sansserif">
 	<h2 class="date">14 February 2012</h2>
 	<h3 class="author">Carn updated:</h3>

tgstation.dme

@@ -490,6 +490,9 @@
 #define FILE_DIR "data/logs"
 #define FILE_DIR "data/logs/2012"
 #define FILE_DIR "data/logs/2012/02-February"
+#define FILE_DIR "data/player_saves"
+#define FILE_DIR "data/player_saves/k"
+#define FILE_DIR "data/player_saves/k/korphaeron"
 #define FILE_DIR "html"
 #define FILE_DIR "html/.svn"
 #define FILE_DIR "html/.svn/prop-base"
@@ -576,6 +579,7 @@
 #define FILE_DIR "maps"
 #define FILE_DIR "maps/.svn"
 #define FILE_DIR "maps/.svn/text-base"
+#define FILE_DIR "maps/.svn/tmp"
 #define FILE_DIR "music"
 #define FILE_DIR "music/.svn"
 #define FILE_DIR "music/.svn/text-base"