Adds VG weaponry to the server (#243)

* Adds in clothing from the /vg/ rip

* adds clothing from the /vg/ rip

* Adds VG weaponry to the server

Adds VG weaponry to the server, most of it is intended for the bussing
admin so its not obtainable normally.

This also adds in toy megabusters to the arcade machine toy list and two
vending machines intended for adminbus/events/thunderdome.

* aa

fixing even more shit

* aaa

*external code related screaming*

* aaa

funfact: that insistence on modualization broke *EVERYTHING* for the
guns. I doubt I'll fix this.

* Fixes more shit

After I finally worked the salt out from yesterday, I modularized the
code more to the standard required. It seems that the sprites for the
guns/projectiles/vending machines need to be in the titled DMI files, at
least from my observations.

* *internal screaming*

why

* more shit fixed

no impact sounds for the plasmaguns / actual buster. Now there are
sounds.

* (Hopefully) Finaly update with this.

Salty removed, modularized it.

Hope its all good now.

* aaa

Pain.

* final fix

missing sprites fixed

code/game/machinery/computer/arcade.dm

@@ -39,7 +39,9 @@
 		/obj/item/stack/tile/fakespace/loaded					= 2,
 		/obj/item/toy/toy_xeno									= 2,
 		/obj/item/weapon/storage/box/actionfigure				= 1,
-		/obj/item/weapon/restraints/handcuffs/fake              = 2)
+		/obj/item/weapon/restraints/handcuffs/fake              = 2,
+		/obj/item/weapon/gun/energy/megabuster					= 2,
+		/obj/item/weapon/gun/energy/megabuster/proto			= 2)
 
 /obj/machinery/computer/arcade/New()
 	..()

code/game/machinery/vending.dm

@@ -1101,6 +1101,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/neck/necklace/dope=3,/obj/item/clothing/suit/jacket/letterman_nanotrasen=1)
 	refill_canister = /obj/item/weapon/vending_refill/clothing
 
+
 /obj/machinery/vending/kink
 	name = "KinkMate"
 	desc = "A vending machine for all your unmentionable desires."
@@ -1112,6 +1113,57 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	premium = list()
 	refill_canister = /obj/item/weapon/vending_refill/kink
 
+/obj/machinery/vending/nazivend
+	name = "Nazivend"
+	desc = "A vending machine containing Nazi German supplies. A label reads: \"Remember the gorrilions lost.\""
+	icon_state = "nazi"
+	vend_reply = "SIEG HEIL!"
+	product_slogans = "Das Vierte Reich wird zuruckkehren!;ENTFERNEN JUDEN!;Billiger als die Juden jemals geben!;Rader auf dem adminbus geht rund und rund.;Warten Sie, warum wir wieder hassen Juden?- *BZZT*"
+	products = list(
+		/obj/item/clothing/head/stalhelm = 20,
+		/obj/item/clothing/head/panzer = 20,
+		/obj/item/clothing/suit/soldiercoat = 20,
+		/obj/item/clothing/under/soldieruniform = 20,
+		/obj/item/clothing/shoes/jackboots = 20
+		)
+	contraband = list(
+		/obj/item/clothing/head/naziofficer = 10,
+		/obj/item/clothing/suit/officercoat = 10,
+		/obj/item/clothing/under/officeruniform = 10,
+		/obj/item/clothing/suit/space/hardsuit/nazi = 3,
+		/obj/item/weapon/gun/energy/plasma/MP40k = 4
+		)
+	premium = list()
+
+	refill_canister = /obj/item/weapon/vending_refill/nazi
+
+/obj/machinery/vending/sovietvend
+	name = "KomradeVendtink"
+	desc = "Rodina-mat' zovyot!"
+	icon_state = "soviet"
+	vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
+	product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"
+	products = list(
+		/obj/item/clothing/under/soviet = 20,
+		/obj/item/clothing/head/ushanka = 20,
+		/obj/item/clothing/shoes/jackboots = 20,
+		/obj/item/clothing/head/squatter_hat = 20,
+		/obj/item/clothing/under/squatter_outfit = 20,
+		/obj/item/clothing/under/russobluecamooutfit = 20,
+		/obj/item/clothing/head/russobluecamohat = 20
+		)
+	contraband = list(
+		/obj/item/clothing/under/syndicate/tacticool = 4,
+		/obj/item/clothing/mask/balaclava = 4,
+		/obj/item/clothing/suit/russofurcoat = 4,
+		/obj/item/clothing/head/russofurhat = 4,
+		/obj/item/clothing/suit/space/hardsuit/soviet = 3,
+		/obj/item/weapon/gun/energy/laser/LaserAK = 4
+		)
+	premium = list()
+
+	refill_canister = /obj/item/weapon/vending_refill/soviet
+
 
 #undef STANDARD_CHARGE
 #undef CONTRABAND_CHARGE

code/game/objects/items/weapons/vending_items.dm

@@ -76,4 +76,16 @@
 	machine_name 	= "KinkMate"
 	icon_state 		= "refill_kink"
 	charges 		= list(6, 4, 0)// of 30 standard, 0 contraband, 15 premium
-	init_charges 	= list(6, 4, 0)
+	init_charges 	= list(6, 4, 0)
+
+/obj/item/weapon/vending_refill/nazi
+	machine_name 	= "nazivend"
+	icon_state 		= "refill_nazi"
+	charges 		= list(33, 13, 0)
+	init_charges 	= list(33, 13, 0)
+
+/obj/item/weapon/vending_refill/soviet
+	machine_name 	= "sovietvend"
+	icon_state 		= "refill_soviet"
+	charges 		= list(47, 7, 0)
+	init_charges 	= list(47, 7, 0)

code/modules/projectiles/ammunition/energy.dm

@@ -222,3 +222,31 @@
 
 /obj/item/ammo_casing/energy/plasma/adv
 	projectile_type = /obj/item/projectile/plasma/adv
+
+/obj/item/ammo_casing/energy/plasmagun
+	projectile_type = /obj/item/projectile/energy/plasmabolt
+	e_cost = 50
+	fire_sound = 'sound/weapons/elecfire.ogg'
+
+/obj/item/ammo_casing/energy/plasmagun/rifle
+	projectile_type = /obj/item/projectile/energy/plasmabolt/rifle
+	e_cost = 150
+
+/obj/item/ammo_casing/energy/plasmagun/light
+	projectile_type = /obj/item/projectile/energy/plasmabolt/light
+	e_cost = 50
+
+/obj/item/ammo_casing/energy/plasmagun/MP40k
+	projectile_type = /obj/item/projectile/energy/plasmabolt/MP40k
+	e_cost = 75
+
+/obj/item/ammo_casing/energy/megabuster
+	projectile_type = /obj/item/projectile/energy/megabuster
+	fire_sound = 'sound/weapons/megabuster.ogg'
+	e_cost = 5
+
+/obj/item/ammo_casing/energy/buster
+	e_cost = 25
+	projectile_type = /obj/item/projectile/energy/buster
+	fire_sound = 'sound/weapons/mmlbuster.ogg'
+

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

@@ -406,3 +406,5 @@
 	..()
 	icon_state = "oldrifle[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
 	return
+
+

code/modules/projectiles/guns/energy/laser.dm

@@ -134,3 +134,25 @@
 	pin = /obj/item/device/firing_pin/tag/red
 	ammo_x_offset = 2
 	selfcharge = 1
+
+
+
+/obj/item/weapon/gun/energy/laser/rifle
+	name = "laser rifle"
+	desc = "A laser rifle issued to high ranking members of a certain shadow corporation."
+	icon_state = "xcomlasergun"
+	item_state = null
+	icon = 'icons/obj/guns/VGguns.dmi'
+	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
+	ammo_x_offset = 4
+
+/obj/item/weapon/gun/energy/laser/LaserAK
+	name = "Laser AK470"
+	desc = "A laser AK. Death solves all problems -- No man, no problem."
+	icon_state = "LaserAK"
+	item_state = null
+	icon = 'icons/obj/guns/VGguns.dmi'
+	ammo_type = list(/obj/item/ammo_casing/energy/laser)
+	ammo_x_offset = 4
+
+

code/modules/projectiles/guns/energy/megabuster.dm

@@ -0,0 +1,25 @@
+/obj/item/weapon/gun/energy/megabuster
+	name = "Mega-buster"
+	desc = "An arm-mounted buster toy!"
+	icon_state = "megabuster"
+	item_state = "megabuster"
+	w_class = WEIGHT_CLASS_SMALL
+	ammo_type = list(/obj/item/ammo_casing/energy/megabuster)
+	clumsy_check = 0
+	needs_permit = 0
+	selfcharge = 1
+	icon = 'icons/obj/guns/VGguns.dmi'
+/obj/item/weapon/gun/energy/megabuster/proto
+	name = "Proto-buster"
+	icon_state = "protobuster"
+	item_state = "protobuster"
+
+/obj/item/weapon/gun/energy/mmlbuster
+	name = "Buster Cannon"
+	desc = "An antique arm-mounted buster cannon."
+	icon = 'icons/obj/guns/VGguns.dmi'
+	icon_state = "mmlbuster"
+	item_state = "mmlbuster"
+	w_class = WEIGHT_CLASS_SMALL
+	ammo_type = list(/obj/item/ammo_casing/energy/buster)
+	ammo_x_offset = 2

code/modules/projectiles/guns/energy/plasma.dm

@@ -0,0 +1,40 @@
+/obj/item/weapon/gun/energy/plasma //Not intended to be used, use its children instead.
+	name = "plasma gun"
+	desc = "A high-power plasma gun. You shouldn't ever see this."
+	icon_state = "xray"
+	w_class = WEIGHT_CLASS_NORMAL
+	ammo_type = list(/obj/item/ammo_casing/energy/plasmagun)
+	ammo_x_offset = 2
+	shaded_charge = 1
+
+
+/obj/item/weapon/gun/energy/plasma/rifle
+	name = "plasma cannon"
+	desc = "A state of the art cannon utilizing plasma in a uranium-235 lined core to output hi-power, radiating bolts of energy."
+	icon_state = "alienrifle"
+	item_state = null
+	icon = 'icons/obj/guns/VGguns.dmi'
+	w_class = WEIGHT_CLASS_BULKY
+	ammo_type = list(/obj/item/ammo_casing/energy/plasmagun/rifle)
+	ammo_x_offset = 4
+
+
+
+/obj/item/weapon/gun/energy/plasma/light
+	name = "plasma rifle"
+	desc = "A state of the art rifle utilizing plasma in a uranium-235 lined core to output radiating bolts of energy."
+	icon_state = "lightalienrifle"
+	item_state = null
+	icon = 'icons/obj/guns/VGguns.dmi'
+	ammo_type = list(/obj/item/ammo_casing/energy/plasmagun/light)
+	ammo_x_offset = 2
+
+
+/obj/item/weapon/gun/energy/plasma/MP40k
+	name = "Plasma MP40k"
+	desc = "A plasma MP40k. Ich liebe den geruch von plasma am morgen."
+	icon_state = "PlasMP"
+	item_state = null
+	icon = 'icons/obj/guns/VGguns.dmi'
+	ammo_type = list(/obj/item/ammo_casing/energy/plasmagun/MP40k)
+	ammo_x_offset = 3

code/modules/projectiles/projectile/energy.dm

@@ -188,3 +188,5 @@
 /obj/item/projectile/energy/tesla_revolver/Destroy()
 	qdel(chain)
 	return ..()
+
+

code/modules/projectiles/projectile/megabuster.dm

@@ -0,0 +1,15 @@
+/obj/item/projectile/energy/buster
+	name = "buster shot"
+	icon_state = "buster"
+	nodamage = 0
+	damage = 20
+	damage_type = BURN
+	hitsound = 'sound/weapons/sear.ogg'
+	hitsound_wall = 'sound/weapons/effects/searwall.ogg'
+	icon = 'icons/obj/VGprojectile.dmi'
+
+/obj/item/projectile/energy/megabuster
+	name = "buster pellet"
+	icon_state = "megabuster"
+	nodamage = 1
+	icon = 'icons/obj/VGprojectile.dmi'

code/modules/projectiles/projectile/plasma.dm

@@ -0,0 +1,28 @@
+obj/item/projectile/energy/plasmabolt
+	icon = 'icons/obj/VGProjectile.dmi'
+	name = "plasma bolt"
+	icon_state = "plasma"
+	weaken = 0
+	flag = "energy"
+	damage_type = BURN
+	hitsound = 'sound/weapons/sear.ogg'
+	hitsound_wall = 'sound/weapons/effects/searwall.ogg'
+
+/obj/item/projectile/energy/plasmabolt/light
+	damage = 35
+	icon_state = "plasma2"
+	irradiate = 20
+	weaken = 3
+
+/obj/item/projectile/energy/plasmabolt/rifle
+	damage = 50
+	icon_state = "plasma3"
+	irradiate = 35
+	weaken = 5
+
+/obj/item/projectile/energy/plasmabolt/MP40k
+	damage = 35
+	eyeblur = 4
+	irradiate = 25
+	weaken = 4
+	icon_state = "plasma3"

tgstation.dme

@@ -1848,6 +1848,8 @@
 #include "code\modules\projectiles\guns\energy\energy_gun.dm"
 #include "code\modules\projectiles\guns\energy\kinetic_accelerator.dm"
 #include "code\modules\projectiles\guns\energy\laser.dm"
+#include "code\modules\projectiles\guns\energy\megabuster.dm"
+#include "code\modules\projectiles\guns\energy\plasma.dm"
 #include "code\modules\projectiles\guns\energy\pulse.dm"
 #include "code\modules\projectiles\guns\energy\special.dm"
 #include "code\modules\projectiles\guns\energy\stun.dm"
@@ -1857,6 +1859,8 @@
 #include "code\modules\projectiles\projectile\bullets.dm"
 #include "code\modules\projectiles\projectile\energy.dm"
 #include "code\modules\projectiles\projectile\magic.dm"
+#include "code\modules\projectiles\projectile\megabuster.dm"
+#include "code\modules\projectiles\projectile\plasma.dm"
 #include "code\modules\projectiles\projectile\reusable.dm"
 #include "code\modules\projectiles\projectile\special.dm"
 #include "code\modules\reagents\chem_splash.dm"