Contraband Update (#564)

code/datums/supplypacks/contraband_vr.dm

@@ -0,0 +1,7 @@
+/datum/supply_packs/stolen
+	name = "Stolen supplies"
+	contains = list(/obj/item/stolenpackage)
+	cost = 150
+	containertype = /obj/structure/closet/crate
+	containername = "Stolen crate"
+	contraband = 1

code/game/objects/items/contraband_vr.dm

@@ -0,0 +1,87 @@
+/obj/item/stolenpackage
+	name = "stolen package"
+	desc = "What's in the box?"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "deliverycrate4"
+	item_state = "table_parts"
+	w_class = 5
+
+	attack_self(mob/user as mob)
+		// Another way of doing this. Commented out because the other method is better for this application.
+		/*var/spawn_chance = rand(1,100)
+		switch(spawn_chance)
+			if(0 to 49)
+				new /obj/random/gun/guarenteed(usr.loc)
+				usr << "You got a thing!"
+			if(50 to 99)
+				new /obj/item/weapon/bikehorn/rubberducky(usr.loc)
+				new /obj/item/weapon/bikehorn(usr.loc)
+				usr << "You got two things!"
+			if(100)
+				usr << "The box contained nothing!"
+				return
+		*/
+		var/loot = pick(/obj/random/contraband,
+						/obj/random/contraband,
+						/obj/item/weapon/book/manual/engineering_hacking,
+						/obj/item/device/chameleon,
+						/obj/item/weapon/contraband/poster,
+						/obj/item/seeds/ambrosiadeusseed,
+						/obj/item/seeds/ambrosiavulgarisseed,
+						/obj/item/seeds/libertymycelium,
+						/obj/item/xenos_claw,
+						/obj/item/weapon/reagent_containers/food/snacks/xenomeat,
+						/obj/item/weapon/reagent_containers/food/snacks/clownstears,
+						/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
+						/obj/item/clothing/glasses/thermal,
+						/obj/item/clothing/gloves/combat,
+						/obj/item/clothing/head/bearpelt,
+						/obj/item/clothing/mask/balaclava,
+						/obj/item/weapon/storage/fancy/cigar/havana,
+						/obj/item/clothing/mask/horsehead,
+						/obj/item/clothing/mask/muzzle,
+						/obj/item/weapon/storage/toolbox/syndicate,
+						/obj/item/weapon/stamp/centcomm,
+						/obj/item/weapon/stamp/solgov,
+						/obj/item/weapon/storage/bible/booze,
+						/obj/item/weapon/pen/reagent/paralysis,
+						/obj/item/weapon/grenade/flashbang/clusterbang,
+						/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine,
+						/obj/item/weapon/reagent_containers/glass/beaker/neurotoxin,
+						/obj/item/weapon/grenade/flashbang/clusterbang,
+						/obj/item/weapon/grenade/spawnergrenade/spesscarp,
+						/obj/item/weapon/card/emag,
+						/obj/item/weapon/card/emag_broken,
+						/obj/item/device/pda/syndicate,
+						/obj/item/weapon/shield/energy,
+						/obj/item/weapon/melee/energy/sword,
+						/obj/item/weapon/melee/telebaton,
+						/obj/item/weapon/melee/classic_baton,
+						/obj/item/clothing/suit/armor/heavy,
+						/obj/item/clothing/suit/armor/vest,
+						/obj/item/clothing/suit/armor/laserproof,
+						/obj/random/weapon/guarenteed,
+						/obj/item/weapon/material/knuckledusters,
+						/obj/effect/landmark/costume,
+						/obj/item/mecha_parts/chassis/phazon,
+						/obj/item/mecha_parts/part/phazon_torso,
+						/obj/item/mecha_parts/part/phazon_head,
+						/obj/item/mecha_parts/part/phazon_left_arm,
+						/obj/item/mecha_parts/part/phazon_right_arm,
+						/obj/item/mecha_parts/part/phazon_left_leg,
+						/obj/item/mecha_parts/part/phazon_right_leg)
+		new loot(usr.loc)
+		usr << "You unwrap the package."
+		del(src)
+
+/obj/item/weapon/storage/fancy/cigar/havana // Putting this here 'cuz fuck it. -Spades
+	name = "\improper Havana cigar case"
+	desc = "Save these for the fancy-pantses at the next CentCom black tie reception. You can't blow the smoke from such majestic stogies in just anyone's face."
+	icon_state = "cigarcase"
+	icon = 'icons/obj/cigarettes.dmi'
+	w_class = 1
+	throwforce = 2
+	slot_flags = SLOT_BELT
+	storage_slots = 7
+	can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar/havana)
+	icon_type = "cigar"

code/game/objects/items/devices/PDA/PDA.dm

@@ -168,8 +168,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /obj/item/device/pda/syndicate
 	default_cartridge = /obj/item/weapon/cartridge/syndicate
 	icon_state = "pda-syn"
-	name = "Military PDA"
-	owner = "John Doe"
+//	name = "Military PDA" // Vorestation Edit
+//	owner = "John Doe"
 	hidden = 1
 
 /obj/item/device/pda/chaplain

code/game/objects/random/random_vr.dm

@@ -0,0 +1,126 @@
+/obj/random/weapon // For Gateway maps and Syndicate. Can possibly spawn almost any gun in the game.
+	name = "Random Illegal Weapon"
+	desc = "This is a random illegal weapon."
+	icon = 'icons/obj/gun.dmi'
+	icon_state = "p08"
+	spawn_nothing_percentage = 50
+	item_to_spawn()
+		return pick(prob(11);/obj/random/ammo_all,\
+					prob(11);/obj/item/weapon/gun/energy/laser,\
+					prob(11);/obj/item/weapon/gun/projectile/pirate,\
+					prob(10);/obj/item/weapon/material/twohanded/spear,\
+					prob(10);/obj/item/weapon/gun/energy/stunrevolver,\
+					prob(10);/obj/item/weapon/gun/energy/taser,\
+					prob(10);/obj/item/weapon/gun/launcher/crossbow,\
+					prob(10);/obj/item/weapon/gun/projectile/shotgun/doublebarrel/pellet,\
+					prob(10);/obj/item/weapon/material/knife,\
+					prob(10);/obj/item/weapon/material/hatchet/tacknife/combatknife,\
+					prob(10);/obj/item/weapon/material/butterfly/switchblade,\
+					prob(10);/obj/item/weapon/gun/projectile/luger,\
+					prob(10);/obj/item/weapon/gun/projectile/luger/brown,\
+				/*	prob(10);/obj/item/weapon/gun/projectile/pipegun,\ */
+					prob(10);/obj/item/weapon/gun/projectile/revolver,\
+					prob(10);/obj/item/weapon/gun/projectile/revolver/detective,\
+					prob(10);/obj/item/weapon/gun/projectile/revolver/mateba,\
+					prob(10);/obj/item/weapon/gun/projectile/revolver/judge,\
+					prob(10);/obj/item/weapon/gun/projectile/colt,\
+					prob(10);/obj/item/weapon/gun/projectile/shotgun/pump,\
+					prob(10);/obj/item/weapon/gun/projectile/shotgun/pump/rifle,\
+					prob(10);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin,\
+					prob(10);/obj/item/weapon/melee/baton,\
+					prob(10);/obj/item/weapon/melee/telebaton,\
+					prob(10);/obj/item/weapon/melee/classic_baton,\
+					prob(10);/obj/item/weapon/melee/energy/sword,\
+					prob(9);/obj/item/weapon/gun/projectile/automatic/wt550/lethal,\
+					prob(9);/obj/item/weapon/gun/projectile/automatic/pdw,\
+					prob(9);/obj/item/weapon/gun/projectile/derringer,\
+					prob(9);/obj/item/weapon/gun/energy/crossbow/largecrossbow,\
+					prob(9);/obj/item/weapon/gun/projectile/automatic/mini_uzi,\
+					prob(9);/obj/item/weapon/gun/projectile/pistol,\
+					prob(9);/obj/item/weapon/gun/projectile/shotgun/pump/combat,\
+					prob(9);/obj/item/weapon/twohanded/fireaxe,\
+					prob(9);/obj/item/weapon/cane/concealed,\
+					prob(9);/obj/item/weapon/gun/energy/gun,\
+					prob(8);/obj/item/weapon/gun/energy/ionrifle,\
+					prob(8);/obj/item/weapon/gun/energy/retro,\
+					prob(8);/obj/item/weapon/gun/energy/gun/eluger,\
+					prob(8);/obj/item/weapon/gun/energy/xray,\
+					prob(8);/obj/item/weapon/gun/projectile/automatic/c20r,\
+					prob(8);/obj/item/weapon/gun/projectile/automatic/stg,\
+					prob(8);/obj/item/weapon/melee/energy/sword,\
+				/*	prob(8);/obj/item/weapon/gun/projectile/automatic/m41a,\ */
+					prob(7);/obj/item/weapon/gun/energy/captain,\
+					prob(7);/obj/item/weapon/gun/energy/sniperrifle,\
+					prob(7);/obj/item/weapon/gun/projectile/automatic/p90,\
+					prob(7);/obj/item/weapon/gun/projectile/automatic/as24,\
+					prob(7);/obj/item/weapon/gun/projectile/automatic/sts35,\
+					prob(7);/obj/item/weapon/gun/projectile/automatic/z8,\
+					prob(7);/obj/item/weapon/gun/energy/gun/burst,\
+					prob(7);/obj/item/weapon/gun/projectile/shotgun/pump/unsc,\
+					prob(7);/obj/item/weapon/gun/projectile/deagle,\
+					prob(7);/obj/item/weapon/gun/launcher/grenade,\
+					prob(6);/obj/item/weapon/gun/projectile/SVD,\
+					prob(6);/obj/item/weapon/gun/projectile/automatic/l6_saw,\
+					prob(6);/obj/item/weapon/gun/energy/lasercannon,\
+					prob(5);/obj/item/weapon/gun/projectile/automatic/carbine,\
+					prob(5);/obj/item/weapon/gun/energy/pulse_rifle,\
+					prob(4);/obj/item/weapon/gun/projectile/automatic/battlerifle,\
+					prob(3);/obj/item/weapon/gun/projectile/deagle/camo,\
+					prob(3);/obj/item/weapon/gun/energy/gun/nuclear,\
+					prob(2);/obj/item/weapon/gun/projectile/deagle/gold,\
+					prob(1);/obj/item/weapon/gun/launcher/rocket,\
+					prob(1);/obj/item/weapon/gun/projectile/gyropistol,\
+					prob(1);/obj/item/weapon/gun/projectile/heavysniper,\
+					prob(1);/obj/item/weapon/plastique,\
+					prob(1);/obj/item/weapon/material/sword,\
+					prob(1);/obj/item/weapon/material/sword/katana)
+
+/obj/random/weapon/guarenteed
+	spawn_nothing_percentage = 0
+
+/obj/random/ammo_all
+	name = "Random Ammunition (All)"
+	desc = "This is random ammunition. Spawns all ammo types."
+	icon = 'icons/obj/ammo.dmi'
+	icon_state = "666"
+	item_to_spawn()
+		return pick(/*prob(5);/obj/item/weapon/storage/fancy/shotgun_ammo/beanbag,\
+					prob(5);/obj/item/weapon/storage/fancy/shotgun_ammo/pellet,\
+					prob(5);/obj/item/weapon/storage/fancy/shotgun_ammo/flash,\
+					prob(5);/obj/item/weapon/storage/fancy/shotgun_ammo/slug,\*/
+					prob(5);/obj/item/ammo_magazine/a357,\
+					prob(5);/obj/item/ammo_magazine/clip/a762,\
+					prob(5);/obj/item/ammo_magazine/c45m,\
+					prob(5);/obj/item/ammo_magazine/c45m/rubber,\
+					prob(5);/obj/item/ammo_magazine/c38,\
+					prob(5);/obj/item/ammo_magazine/c38/rubber,\
+					prob(5);/obj/item/weapon/storage/box/flashbangs,\
+					prob(5);/obj/item/ammo_magazine/s762,\
+					prob(4);/obj/item/ammo_magazine/clip/a556,\
+					prob(4);/obj/item/ammo_magazine/clip/c45,\
+					prob(4);/obj/item/ammo_magazine/clip/c9mm,\
+					prob(4);/obj/item/ammo_magazine/c45uzi,\
+					prob(4);/obj/item/ammo_magazine/c762,\
+					prob(4);/obj/item/ammo_magazine/mc9mm,\
+					prob(4);/obj/item/ammo_magazine/mc9mml,\
+					prob(4);/obj/item/ammo_magazine/mc9mmt,\
+					prob(4);/obj/item/ammo_magazine/mc9mmt/rubber,\
+					prob(4);/obj/item/ammo_magazine/a10mm,\
+					prob(4);/obj/item/ammo_magazine/p90,\
+				/*	prob(4);/obj/item/ammo_magazine/m14,\
+					prob(4);/obj/item/ammo_magazine/m14/large,\ */
+					prob(4);/obj/item/ammo_magazine/c762,\
+					prob(4);/obj/item/ammo_magazine/a556,\
+					prob(4);/obj/item/ammo_magazine/a556m,\
+					prob(3);/obj/item/ammo_magazine/clip/a10mm,\
+					prob(3);/obj/item/ammo_magazine/clip/a50,\
+					prob(3);/obj/item/ammo_magazine/s762,\
+					prob(2);/obj/item/ammo_magazine/a50,\
+					prob(2);/obj/item/ammo_magazine/a762,\
+					prob(1);/obj/item/ammo_magazine/battlerifle,\
+					prob(1);/obj/item/ammo_casing/rocket,\
+					prob(1);/obj/item/weapon/storage/box/sniperammo,\
+					prob(1);/obj/item/ammo_magazine/stg,\
+					prob(1);/obj/item/ammo_magazine/tommydrum,\
+					prob(1);/obj/item/ammo_magazine/tommymag
+					)

code/modules/clothing/suits/armor_vr.dm

@@ -0,0 +1,12 @@
+/obj/item/clothing/suit/armor/heavy
+	name = "heavy armor"
+	desc = "An old military-grade suit of armor. Incredibly robust against brute force damage! However, it offers little protection from energy-based weapons, which, combined with its bulk, makes it woefully obsolete."
+	icon_state = "heavy"
+	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
+	armor = list(melee = 90, bullet = 80, laser = 10, energy = 10, bomb = 80, bio = 0, rad = 0)
+	w_class = 5 // massively bulky item
+	gas_transfer_coefficient = 0.90
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	slowdown = 5 // If you're a tank you're gonna move like a tank.
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	siemens_coefficient = 0

code/modules/paperwork/pen_vr.dm

@@ -0,0 +1,8 @@
+/obj/item/weapon/pen/reagent/paralysis
+	origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
+
+/obj/item/weapon/pen/reagent/paralysis/New()
+	..()
+//	reagents.add_reagent("zombiepowder", 10)
+//	reagents.add_reagent("cryptobiolin", 15)
+	reagents.add_reagent("neurotoxin", 30) // A lot less griefy.

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

@@ -0,0 +1,2 @@
+/obj/item/weapon/gun/projectile/automatic/wt550/lethal
+	magazine_type = /obj/item/ammo_magazine/mc9mmt

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

@@ -0,0 +1,37 @@
+////////////// Dragunov Sniper Rifle //////////////
+
+/obj/item/weapon/gun/projectile/SVD
+	name = "\improper Dragunov"
+	desc = "The SVD, also known as the Dragunov, was mass produced with an Optical Sniper Sight so simple that even Ivan can figure out how it works. Too bad for you that it's written in Russian. Uses 7.62mm rounds."
+	icon_state = "SVD"
+	item_state = "SVD"
+	w_class = 5 // So it can't fit in a backpack.
+	force = 10
+	slot_flags = SLOT_BACK // Needs a sprite.
+	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
+	recoil = 2 //extra kickback
+	caliber = "a762"
+	load_method = MAGAZINE
+	accuracy = -3 //shooting at the hip
+	scoped_accuracy = 0
+//	requires_two_hands = 1
+	one_handed_penalty = 4 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
+	fire_sound = 'sound/weapons/SVD_shot.ogg'
+	magazine_type = /obj/item/ammo_magazine/s762
+	allowed_magazines = list(/obj/item/ammo_magazine/s762, /obj/item/ammo_magazine/c762)
+
+/obj/item/weapon/gun/projectile/SVD/update_icon()
+	..()
+//	if(istype(ammo_magazine,/obj/item/ammo_magazine/c762)
+//		icon_state = "SVD-bigmag" //No icon for this exists yet.
+	if(ammo_magazine)
+		icon_state = "SVD"
+	else
+		icon_state = "SVD-empty"
+
+/obj/item/weapon/gun/projectile/SVD/verb/scope()
+	set category = "Object"
+	set name = "Use Scope"
+	set popup_menu = 1
+
+	toggle_scope(2.0)

code/modules/reagents/reagent_containers/glass_vr.dm

@@ -0,0 +1,5 @@
+/obj/item/weapon/reagent_containers/glass/beaker/neurotoxin
+	New()
+		..()
+		reagents.add_reagent("neurotoxin",50)
+		update_icon()

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -133,15 +133,12 @@
 	desc = "You notice the serial number on the revolver is 667. The word 'Redemption' is engraved on dark rosewood grip. Uses .357 rounds."
 
 // sasoperative : Joseph Skinner
-/obj/item/weapon/gun/projectile/revolver/shotgun/fluff/sasoperative
+/obj/item/weapon/gun/projectile/revolver/judge/fluff/sasoperative
 	name = "\"The Jury\""
 	desc = "A customized variant of the \"The Judge\" revolver sold by Cybersun Industries, built specifically for Joseph Skinner. Uses 12g shells."
-
 	icon = 'icons/vore/custom_guns_vr.dmi'
 	icon_state = "jury"
-
 	item_state = "gun"
-
 	accuracy = 0 // Because I know you're not an idiot who needs to be nerfed. -Ace
 	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
 
@@ -166,10 +163,12 @@
 	item_state = (ammo_magazine)? "arifle" : "arifle-empty"
 	if(!ignore_inhands) update_held_icon()
 
+/*
 // For general use
 /obj/item/weapon/gun/projectile/automatic/m14/fluff/gallian
 	name = "\improper Gallian 4 Rifle"
 	desc = "The ever reliable Gallian 4 Rifle. Produced by the National Armory on the Planet of Gaia located in Gallia, the Gallian 4 Rifle offers high accuracy and is widely used in the United Federation's Military. Uses 7.62mm rounds."
+*/
 
 // For general use
 /obj/item/weapon/gun/projectile/shotgun/pump/rifle/zmkar
@@ -203,7 +202,7 @@
 // For general use
 /obj/item/weapon/gun/projectile/automatic/pdw // Vorestation SMG because the WT550 is ugly and bad.
 	name = "personal defense weapon"
-	desc = "The X-9MM is a select-fire personal defense weapon designed in-house by Xing Private Security. It was made to compete with the WT550 Saber, but hasn't yet caught on in popularity outside of the Virgo-Erigone system. Uses 9mm rounds."
+	desc = "The X-9MM is a select-fire personal defense weapon designed in-house by Xing Private Security. It was made to compete with the WT550 Saber, but hasn't yet caught on with NanoTrasen. Uses 9mm rounds."
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "pdw"
 	item_state = "c20r" // Placeholder

vorestation.dme

@@ -215,6 +215,7 @@
 #include "code\datums\repositories\repository.dm"
 #include "code\datums\supplypacks\atmospherics.dm"
 #include "code\datums\supplypacks\contraband.dm"
+#include "code\datums\supplypacks\contraband_vr.dm"
 #include "code\datums\supplypacks\costumes.dm"
 #include "code\datums\supplypacks\engineering.dm"
 #include "code\datums\supplypacks\hospitality.dm"
@@ -760,6 +761,7 @@
 #include "code\game\objects\items\blueprints.dm"
 #include "code\game\objects\items\bodybag.dm"
 #include "code\game\objects\items\contraband.dm"
+#include "code\game\objects\items\contraband_vr.dm"
 #include "code\game\objects\items\crayons.dm"
 #include "code\game\objects\items\glassjar.dm"
 #include "code\game\objects\items\latexballoon.dm"
@@ -936,6 +938,7 @@
 #include "code\game\objects\items\weapons\tanks\tank_types.dm"
 #include "code\game\objects\items\weapons\tanks\tanks.dm"
 #include "code\game\objects\random\random.dm"
+#include "code\game\objects\random\random_vr.dm"
 #include "code\game\objects\structures\barsign.dm"
 #include "code\game\objects\structures\bedsheet_bin.dm"
 #include "code\game\objects\structures\coathanger.dm"
@@ -1269,6 +1272,7 @@
 #include "code\modules\clothing\spacesuits\void\wizard.dm"
 #include "code\modules\clothing\suits\alien.dm"
 #include "code\modules\clothing\suits\armor.dm"
+#include "code\modules\clothing\suits\armor_vr.dm"
 #include "code\modules\clothing\suits\bio.dm"
 #include "code\modules\clothing\suits\jobs.dm"
 #include "code\modules\clothing\suits\labcoat.dm"
@@ -1802,6 +1806,7 @@
 #include "code\modules\paperwork\paperbin.dm"
 #include "code\modules\paperwork\papershredder.dm"
 #include "code\modules\paperwork\pen.dm"
+#include "code\modules\paperwork\pen_vr.dm"
 #include "code\modules\paperwork\photocopier.dm"
 #include "code\modules\paperwork\photography.dm"
 #include "code\modules\paperwork\silicon_photography.dm"
@@ -1868,12 +1873,14 @@
 #include "code\modules\projectiles\guns\launcher\rocket.dm"
 #include "code\modules\projectiles\guns\launcher\syringe_gun.dm"
 #include "code\modules\projectiles\guns\projectile\automatic.dm"
+#include "code\modules\projectiles\guns\projectile\automatic_vr.dm"
 #include "code\modules\projectiles\guns\projectile\boltaction.dm"
 #include "code\modules\projectiles\guns\projectile\dartgun.dm"
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"
 #include "code\modules\projectiles\guns\projectile\shotgun.dm"
 #include "code\modules\projectiles\guns\projectile\sniper.dm"
+#include "code\modules\projectiles\guns\projectile\sniper_vr.dm"
 #include "code\modules\projectiles\projectile\animate.dm"
 #include "code\modules\projectiles\projectile\beams.dm"
 #include "code\modules\projectiles\projectile\bullets.dm"
@@ -1934,6 +1941,7 @@
 #include "code\modules\reagents\reagent_containers\dropper.dm"
 #include "code\modules\reagents\reagent_containers\food.dm"
 #include "code\modules\reagents\reagent_containers\glass.dm"
+#include "code\modules\reagents\reagent_containers\glass_vr.dm"
 #include "code\modules\reagents\reagent_containers\hypospray.dm"
 #include "code\modules\reagents\reagent_containers\pill.dm"
 #include "code\modules\reagents\reagent_containers\spray.dm"