From 3818c227d229fa8bd50ff3dc40a875418c74efeb Mon Sep 17 00:00:00 2001 From: Akke Date: Sat, 19 Dec 2015 22:44:49 +0000 Subject: [PATCH 01/13] For a 60 crew round, this theoretically allows all operatives to own a gun and some ammo, and still have some points left over for luxuries. This mainly balances gun prices and adds new bundles --- code/datums/uplink_item.dm | 83 ++++++++++++++++--- .../objects/items/weapons/storage/backpack.dm | 81 ++++++++++++++++++ code/modules/projectiles/guns/projectile.dm | 7 ++ 3 files changed, 158 insertions(+), 13 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index ea0ac1edcf9..925ba18bc1b 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -109,6 +109,40 @@ var/list/uplink_items = list() // */ +//Operator special offers + +/datum/uplink_item/specoffer + category = "Special offer roles" + gamemodes = list(/datum/game_mode/nuclear) + +/datum/uplink_item/specoffer/c20r + name = "C20r bundle" + desc = "The classic C20r, with two magazines, at discount price. Contains free surplus suppressor." + item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle + cost = 14//normal price 16 + gamemodes = list(/datum/game_mode/nuclear) + +/datum/uplink_item/specoffer/c90gl + name = "C90gl bundle" + desc = "Premium offer. Pick up the C90gl with a magazine, some grenades, and a pack of cigarettes for a premium discount." + item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c90glbundle + cost = 15//normal price 18 + gamemodes = list(/datum/game_mode/nuclear) + +/datum/uplink_item/specoffer/bulldog + name = "Bulldog bundle" + desc = "Optimised for people that want to get up close and personal. Contains the popular Bulldog shotgun, a two drums of ammunition, and an elite hardsuit." + item = /obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle + cost = 16//normal price 20 THATS TWO FREE DRUMS + gamemodes = list(/datum/game_mode/nuclear) + +/datum/uplink_item/specoffer/medical + name = "Medical bundle" + desc = "Support your fellow operatives with this medical bundle. Contains a Donksoft machine gun, a box of ammo, and a pair of magboots to rescue your friends in no-gravity environments." + item = /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle + cost = 15//normal price 20 THATS A FREE MAGBOOT AND a box OF RIOT DART LMG + gamemodes = list(/datum/game_mode/nuclear) + // DANGEROUS WEAPONS /datum/uplink_item/dangerous @@ -127,11 +161,19 @@ var/list/uplink_items = list() cost = 13 surplus = 50 +/datum/uplink_item/dangerous/shotgun + name = "C-20r Submachine Gun" + desc = "A fully-loaded semi-automatic drum fed shotgun. Compatiable with all 12 gauge rounds. Designed for close quarter combat use." + item = /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog + cost = 8 + gamemodes = list(/datum/game_mode/nuclear) + surplus = 40 + /datum/uplink_item/dangerous/smg name = "C-20r Submachine Gun" desc = "A fully-loaded Scarborough Arms bullpup submachine gun that fires .45 rounds with a 20-round magazine and is compatible with suppressors." item = /obj/item/weapon/gun/projectile/automatic/c20r - cost = 14 + cost = 10 gamemodes = list(/datum/game_mode/nuclear) surplus = 40 @@ -143,7 +185,7 @@ var/list/uplink_items = list() name = "M-90gl Carbine" desc = "A fully-loaded three-round burst carbine that uses 30-round 5.56mm magazines with a togglable underslung 40mm grenade launcher." item = /obj/item/weapon/gun/projectile/automatic/m90 - cost = 18 + cost = 12 gamemodes = list(/datum/game_mode/nuclear) surplus = 50 @@ -199,7 +241,7 @@ var/list/uplink_items = list() name = "Toy Submachine Gun" desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade rounds with a 20-round magazine." item = /obj/item/weapon/gun/projectile/automatic/c20r/toy - cost = 8 + cost = 5 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -207,7 +249,7 @@ var/list/uplink_items = list() name = "Toy Machine Gun" desc = "A fully-loaded Donksoft belt-fed machine gun. This weapon has a massive 50-round magazine of devastating riot grade darts, that can briefly incapacitate someone in just one volley." item = /obj/item/weapon/gun/projectile/automatic/l6_saw/toy - cost = 12 + cost = 10 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -215,7 +257,7 @@ var/list/uplink_items = list() name = "Viscerator Delivery Grenade" desc = "A unique grenade that deploys a swarm of viscerators upon activation, which will chase down and shred any non-operatives in the area." item = /obj/item/weapon/grenade/spawnergrenade/manhacks - cost = 8 + cost = 5 gamemodes = list(/datum/game_mode/nuclear) surplus = 35 @@ -233,7 +275,7 @@ var/list/uplink_items = list() desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent for hit-and-run style attacks. \ This model lacks a method of space propulsion, and therefore it is advised to repair the mothership's teleporter if you wish to make use of it." item = /obj/mecha/combat/gygax/dark/loaded - cost = 90 + cost = 80 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -241,7 +283,7 @@ var/list/uplink_items = list() name = "Mauler Exosuit" desc = "A massive and incredibly deadly Syndicate exosuit. Features long-range targetting, thrust vectoring, and deployable smoke." item = /obj/mecha/combat/marauder/mauler/loaded - cost = 140 + cost = 120 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -249,7 +291,7 @@ var/list/uplink_items = list() name = "Syndicate Cyborg" desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel." item = /obj/item/weapon/antag_spawner/nuke_ops/borg_tele - cost = 50 + cost = 80 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 @@ -260,7 +302,7 @@ var/list/uplink_items = list() cost = 25 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 - + /datum/uplink_item/dangerous/reinforcement/spawn_item() var/obj/item/weapon/antag_spawner/nuke_ops/T = ..() if(istype(T)) @@ -305,14 +347,22 @@ var/list/uplink_items = list() name = "SMG Magazine - .45" desc = "An additional 20-round .45 magazine for use in the C-20r submachine gun. These bullets pack a lot of punch that can knock most targets down, but do limited overall damage." item = /obj/item/ammo_box/magazine/smgm45 - cost = 2 + cost = 3 gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) +/datum/uplink_item/ammo/smgammo + name = "Ammo Duffelbag - C20r Ammo Grab Bag" + desc = "A duffelbag filled with C20r to kit out an entire team, at a discounted price." + item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg + cost = 20 //get about 2 mags for free this shit is imba as fuck Normal price 27 + gamemodes = list(/datum/game_mode/nuclear) + + /datum/uplink_item/ammo/ammobag name = "Ammo Duffelbag - Shotgun Ammo Grab Bag" desc = "A duffelbag filled with Bulldog ammo to kit out an entire team, at a discounted price." item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/loaded - cost = 10 //bulk buyer's discount. Very useful if you're buying a mech and dont have TC left to buy people non-shotgun guns + cost = 12 //bulk buyer's discount. Very useful if you're buying a mech and dont have TC left to buy people non-shotgun guns gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/bullslug @@ -354,14 +404,21 @@ var/list/uplink_items = list() name = "Toploader Magazine - 5.56" desc = "An additional 30-round 5.56 magazine for use in the M-90gl carbine. These bullets don't have the punch to knock most targets down, but dish out higher overall damage." item = /obj/item/ammo_box/magazine/m556 - cost = 2 + cost = 4 gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) /datum/uplink_item/ammo/a40mm name = "Ammo Box - 40mm grenades" desc = "A box of 4 additional 40mm HE grenades for use the M-90gl's underbarrel grenade launcher. Your teammates will thank you to not shoot these down small hallways." item = /obj/item/ammo_box/a40mm - cost = 4 + cost = 5 + gamemodes = list(/datum/game_mode/nuclear) + +/datum/uplink_item/ammo/fireteam + name = "Ammo Duffelbag - Fireteam Ammo Grab Bag" + desc = "A duffelbag filled with ammo to kit out a fireteam, contains four C20r magazines, two C90gl magazines, a box of 40mm grenades, and sniper ammunition at a discounted price." //C90gl ammo bag is too imba. fuck that. + item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/fireteam + cost = 24//you get 4 grenades for free. Normal price 29 gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/machinegun diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 091d49a36ea..121745f6ceb 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -388,3 +388,84 @@ icon_state = "duffle-clown" item_state = "duffle-clown" +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg + desc = "A large dufflebag, packed to the brim with C20r magazines." + +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg/New() + ..() + contents = list() + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + return + + +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/fireteam + desc = "A large dufflebag, packed to the brim with C20r, C90gl, and sniper ammunition." + +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/fireteam/New() + ..() + contents = list() + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/m556(src) + new /obj/item/ammo_box/magazine/m556(src) + new /obj/item/ammo_box/magazine/a40mm(src) + new /obj/item/ammo_box/magazine/sniper_rounds(src) + return + +/obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle + desc = "A large dufflebag containing a C20r, some magazines, and a cheap looking suppressor." + +/obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle/New() + ..() + contents = list() + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/weapon/gun/projectile/automatic/c20r(src) + new /obj/item/weapon/suppressor/specialoffer(src) + return + +/obj/item/weapon/storage/backpack/dufflebag/syndie/c90glbundle + desc = "A large dufflebag containing a C90gl, a magazine, and a stimpack." + +/obj/item/weapon/storage/backpack/dufflebag/syndie/c90glbundle/New() + ..() + contents = list() + new /obj/item/ammo_box/magazine/m556(src) + new /obj/item/ammo_box/magazine/a40mm(src) + new /obj/item/weapon/gun/projectile/automatic/m90(src) + new /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate(src) + return + +/obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle + desc = "A large dufflebag containing a Bulldog, several drums, and a collapsed hardsuit." + +/obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle/New() + ..() + contents = list() + new /obj/item/ammo_box/magazine/m12g(src) + new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src) + new /obj/item/ammo_box/magazine/m12g/buckshot(src) + new /obj/item/clothing/suit/space/hardsuit/syndi/elite(src) + return + +/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle + desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." + +/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle/New() + ..() + contents = list() + new /obj/item/clothing/shoes/magboots/syndie(src) + new /obj/item/weapon/storage/firstaid/tactical(src) + new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src) + new /obj/item/ammo_box/foambox/riot(src) + return \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index dcb69e3d0eb..2f85d29e238 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -155,3 +155,10 @@ w_class = 2 var/oldsound = null var/initial_w_class = null + + +/obj/item/weapon/suppressor/specialoffer + name = "cheap suppressor" + desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons." + icon = 'icons/obj/guns/projectile.dmi' + icon_state = "suppressor" \ No newline at end of file From 8c3ef38a3b982636b18f56799db133d375e74e1c Mon Sep 17 00:00:00 2001 From: Akke Date: Sat, 19 Dec 2015 22:50:35 +0000 Subject: [PATCH 02/13] dsfdf --- tgstation.dme | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index e5a9aa6781f..97d0f1a9006 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,6 +6,73 @@ // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "code" +#define FILE_DIR "code/modules" +#define FILE_DIR "code/modules/games" +#define FILE_DIR "code/modules/html_interface" +#define FILE_DIR "code/modules/html_interface/cards" +#define FILE_DIR "code/modules/html_interface/nanotrasen" +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/ass" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/inhands" +#define FILE_DIR "icons/mob/large-worn-icons" +#define FILE_DIR "icons/mob/large-worn-icons/64x64" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/atmospherics/components" +#define FILE_DIR "icons/obj/atmospherics/pipes" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/doors/airlocks" +#define FILE_DIR "icons/obj/doors/airlocks/centcom" +#define FILE_DIR "icons/obj/doors/airlocks/external" +#define FILE_DIR "icons/obj/doors/airlocks/glass_large" +#define FILE_DIR "icons/obj/doors/airlocks/hatch" +#define FILE_DIR "icons/obj/doors/airlocks/highsec" +#define FILE_DIR "icons/obj/doors/airlocks/shuttle" +#define FILE_DIR "icons/obj/doors/airlocks/station" +#define FILE_DIR "icons/obj/doors/airlocks/station2" +#define FILE_DIR "icons/obj/doors/airlocks/vault" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/food" +#define FILE_DIR "icons/obj/guns" +#define FILE_DIR "icons/obj/hydroponics" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/power_cond" +#define FILE_DIR "icons/obj/smooth_structures" +#define FILE_DIR "icons/obj/smooth_structures/alien" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/stamp_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/turf/floors" +#define FILE_DIR "icons/turf/walls" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/arcade" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/guitar" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/magic" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/spookoween" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/vox_fem" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES From bc450c1f76ef3864341773f00f0e85ca3141e7e2 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Sat, 19 Dec 2015 22:56:02 +0000 Subject: [PATCH 03/13] Update backpack.dm --- code/game/objects/items/weapons/storage/backpack.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 121745f6ceb..6ebfc101059 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -468,4 +468,5 @@ new /obj/item/weapon/storage/firstaid/tactical(src) new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) - return \ No newline at end of file + return + From 9db11ae0b97ba893e221b5f92ed557f94250bdb3 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Sat, 19 Dec 2015 22:56:10 +0000 Subject: [PATCH 04/13] Update projectile.dm --- code/modules/projectiles/guns/projectile.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 2f85d29e238..39553fcbd53 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -161,4 +161,5 @@ name = "cheap suppressor" desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons." icon = 'icons/obj/guns/projectile.dmi' - icon_state = "suppressor" \ No newline at end of file + icon_state = "suppressor" + From 85c4f46792a8a9a8a3341f689e65e87a6bea0220 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Sat, 19 Dec 2015 23:01:12 +0000 Subject: [PATCH 05/13] Update uplink_item.dm --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 925ba18bc1b..4776b4a0997 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -162,7 +162,7 @@ var/list/uplink_items = list() surplus = 50 /datum/uplink_item/dangerous/shotgun - name = "C-20r Submachine Gun" + name = "Bulldog Shotgun" desc = "A fully-loaded semi-automatic drum fed shotgun. Compatiable with all 12 gauge rounds. Designed for close quarter combat use." item = /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog cost = 8 From d0c4089a3362d351fb0ee85cc76e8b67018a6165 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Sat, 19 Dec 2015 23:08:51 +0000 Subject: [PATCH 06/13] whoops that was a mistake --- code/game/objects/items/weapons/storage/backpack.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 6ebfc101059..6f67a033cd6 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -418,7 +418,7 @@ new /obj/item/ammo_box/magazine/smgm45(src) new /obj/item/ammo_box/magazine/m556(src) new /obj/item/ammo_box/magazine/m556(src) - new /obj/item/ammo_box/magazine/a40mm(src) + new /obj/item/ammo_box/a40mm(src) new /obj/item/ammo_box/magazine/sniper_rounds(src) return @@ -441,7 +441,7 @@ ..() contents = list() new /obj/item/ammo_box/magazine/m556(src) - new /obj/item/ammo_box/magazine/a40mm(src) + new /obj/item/ammo_box/a40mm(src) new /obj/item/weapon/gun/projectile/automatic/m90(src) new /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate(src) return From 29ffdd90aa08a526adbb839c41dbb958225e5bf8 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Sun, 20 Dec 2015 00:16:53 +0000 Subject: [PATCH 07/13] reverts mauler to previous price. --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 4776b4a0997..f3d79828c0f 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -283,7 +283,7 @@ var/list/uplink_items = list() name = "Mauler Exosuit" desc = "A massive and incredibly deadly Syndicate exosuit. Features long-range targetting, thrust vectoring, and deployable smoke." item = /obj/mecha/combat/marauder/mauler/loaded - cost = 120 + cost = 140 gamemodes = list(/datum/game_mode/nuclear) surplus = 0 From 060ed21b7c1d73b45cd57f3335c9162e6cf551a9 Mon Sep 17 00:00:00 2001 From: Akke Date: Sun, 20 Dec 2015 20:59:23 +0000 Subject: [PATCH 08/13] adds so much more shit --- code/datums/uplink_item.dm | 16 +++++++++- .../objects/items/weapons/storage/backpack.dm | 30 ++++++++++++++++++- .../items/weapons/storage/briefcase.dm | 26 ++++++++++++++++ code/modules/clothing/under/syndicate.dm | 12 +++++++- 4 files changed, 81 insertions(+), 3 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 925ba18bc1b..600cc681c8e 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -143,6 +143,20 @@ var/list/uplink_items = list() cost = 15//normal price 20 THATS A FREE MAGBOOT AND a box OF RIOT DART LMG gamemodes = list(/datum/game_mode/nuclear) +/datum/uplink_item/specoffer/sniper + name = "Sniper bundle" + desc = "Contains a collapsed sniper rifle in an expensive carrying case, a hollowpoint haemorrhage magazine, a soporific knockout magazine, a free surplus supressor, and a worn out suit and tie." + item = /obj/item/weapon/storage/briefcase/sniperbundle + cost = 20//26 normal cost. suppressor is excluded from price. + gamemodes = list(/datum/game_mode/nuclear) + +/datum/uplink_item/specoffer/chemical + name = "Tiger Cooperation Chemical Bioterror bundle" + desc = "Contains Bioterror spray, Bioterror grenade, chemicals, syringe gun, box of syringes, Donksoft assault rifle, and some darts. Warning: Seal suit and equip internals before use." + item = /obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle + cost = 30 //normal price 42 biggest saving here + gamemodes = list(/datum/game_mode/nuclear) + // DANGEROUS WEAPONS /datum/uplink_item/dangerous @@ -162,7 +176,7 @@ var/list/uplink_items = list() surplus = 50 /datum/uplink_item/dangerous/shotgun - name = "C-20r Submachine Gun" + name = "Bulldog Shotgun" desc = "A fully-loaded semi-automatic drum fed shotgun. Compatiable with all 12 gauge rounds. Designed for close quarter combat use." item = /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog cost = 8 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 121745f6ceb..2cfb5b12c18 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -468,4 +468,32 @@ new /obj/item/weapon/storage/firstaid/tactical(src) new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) - return \ No newline at end of file + return + +/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle + desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." + +/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle/New() + ..() + contents = list() + new /obj/item/clothing/shoes/magboots/syndie(src) + new /obj/item/weapon/storage/firstaid/tactical(src) + new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src) + new /obj/item/ammo_box/foambox/riot(src) + return + +/obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle + desc = "A large dufflebag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes" + +/obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle/New() + ..() + contents = list() + new /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror(src) + new /obj/item/weapon/storage/box/syndie_kit/chemical(src) + new /obj/item/weapon/gun/syringe/syndicate(src) + new /obj/item/weapon/gun/projectile/automatic/c20r/toy(src) + new /obj/item/weapon/storage/box/syringes(src) + new /obj/item/ammo_box/foambox/riot(src) + new /obj/item/weapon/grenade/chem_grenade/bioterrorfoam(src) + return + diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 063eaca98f6..728d2a99ea1 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -23,3 +23,29 @@ new /obj/item/weapon/paper(src) new /obj/item/weapon/paper(src) new /obj/item/weapon/pen(src) + +/obj/item/weapon/storage/briefcase/sniperbundle + name = "briefcase" + desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps." + icon_state = "briefcase" + flags = CONDUCT + force = 10 + hitsound = "swing_hit" + throw_speed = 2 + throw_range = 4 + w_class = 4 + max_w_class = 3 + max_combined_w_class = 21 + attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") + burn_state = FLAMMABLE + burntime = 20 + +/obj/item/weapon/storage/briefcase/sniperbundle/New() + ..() + new /obj/item/weapon/gun/projectile/sniper_rifle/syndicate(src) + new /obj/item/clothing/tie/red(src) + new /obj/item/clothing/under/syndicate/sniper(src) + new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) + new /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage(src) + new /obj/item/weapon/suppressor/specialoffer(src) + diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index efcb153dff7..f6ddd47ca7d 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -13,4 +13,14 @@ desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-." icon_state = "tactifool" item_state = "bl_suit" - item_color = "tactifool" \ No newline at end of file + item_color = "tactifool" + +/obj/item/clothing/under/syndicate/sniper + name = "Tactical turtleneck suit" + desc = "A double seamed tactical turtleneck disguised as a civillian grade silk suit. Intended for the most formal operator. The collar is really sharp" + icon_state = "really_black_suit" + item_state = "bl_suit" + item_color = "black_suit" + has_sensor = 0 + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + alt_covers_chest = 1 \ No newline at end of file From 986bfc8501437251a6e0fdaa50e76be31e4aaa03 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Sun, 20 Dec 2015 21:04:09 +0000 Subject: [PATCH 09/13] merge error --- code/game/objects/items/weapons/storage/backpack.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index ff6b8a180dd..790ce2173fe 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -469,7 +469,7 @@ new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) return -<<<<<<< HEAD +<<<<<<< HEAD /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." @@ -497,7 +497,3 @@ new /obj/item/ammo_box/foambox/riot(src) new /obj/item/weapon/grenade/chem_grenade/bioterrorfoam(src) return - -======= - ->>>>>>> 29ffdd90aa08a526adbb839c41dbb958225e5bf8 From b8bdc8fce342ef6bce81e1513d8d8cbe15222f72 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Sun, 20 Dec 2015 21:04:54 +0000 Subject: [PATCH 10/13] merge error --- code/game/objects/items/weapons/storage/backpack.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 790ce2173fe..d318bfc2d0a 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -469,7 +469,6 @@ new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) return -<<<<<<< HEAD /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." From cb5f25f23cef65f1aad23237e385bff22c747696 Mon Sep 17 00:00:00 2001 From: Akke Date: Sun, 20 Dec 2015 21:23:04 +0000 Subject: [PATCH 11/13] solves travis --- tgstation.dme | 67 --------------------------------------------------- 1 file changed, 67 deletions(-) diff --git a/tgstation.dme b/tgstation.dme index 97d0f1a9006..e5a9aa6781f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,73 +6,6 @@ // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/games" -#define FILE_DIR "code/modules/html_interface" -#define FILE_DIR "code/modules/html_interface/cards" -#define FILE_DIR "code/modules/html_interface/nanotrasen" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/ass" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/inhands" -#define FILE_DIR "icons/mob/large-worn-icons" -#define FILE_DIR "icons/mob/large-worn-icons/64x64" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/atmospherics/components" -#define FILE_DIR "icons/obj/atmospherics/pipes" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/doors/airlocks" -#define FILE_DIR "icons/obj/doors/airlocks/centcom" -#define FILE_DIR "icons/obj/doors/airlocks/external" -#define FILE_DIR "icons/obj/doors/airlocks/glass_large" -#define FILE_DIR "icons/obj/doors/airlocks/hatch" -#define FILE_DIR "icons/obj/doors/airlocks/highsec" -#define FILE_DIR "icons/obj/doors/airlocks/shuttle" -#define FILE_DIR "icons/obj/doors/airlocks/station" -#define FILE_DIR "icons/obj/doors/airlocks/station2" -#define FILE_DIR "icons/obj/doors/airlocks/vault" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/food" -#define FILE_DIR "icons/obj/guns" -#define FILE_DIR "icons/obj/hydroponics" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/power_cond" -#define FILE_DIR "icons/obj/smooth_structures" -#define FILE_DIR "icons/obj/smooth_structures/alien" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/stamp_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/turf/floors" -#define FILE_DIR "icons/turf/walls" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/arcade" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/guitar" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/magic" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/spookoween" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/complionator" -#define FILE_DIR "sound/vox_fem" -#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES From 7d5f21259d922f962ebf3f168364f81ecbc511ea Mon Sep 17 00:00:00 2001 From: Akke Date: Mon, 21 Dec 2015 00:30:55 +0000 Subject: [PATCH 12/13] Changes c90gl to m90gl --- code/datums/uplink_item.dm | 8 ++++---- code/game/objects/items/weapons/storage/backpack.dm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 9cb9a11796d..88432b26854 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -122,9 +122,9 @@ var/list/uplink_items = list() cost = 14//normal price 16 gamemodes = list(/datum/game_mode/nuclear) -/datum/uplink_item/specoffer/c90gl - name = "C90gl bundle" - desc = "Premium offer. Pick up the C90gl with a magazine, some grenades, and a pack of cigarettes for a premium discount." +/datum/uplink_item/specoffer/m90gl + name = "M90gl bundle" + desc = "Premium offer. Pick up the M90gl with a magazine, some grenades, and a pack of cigarettes for a premium discount." item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c90glbundle cost = 15//normal price 18 gamemodes = list(/datum/game_mode/nuclear) @@ -430,7 +430,7 @@ var/list/uplink_items = list() /datum/uplink_item/ammo/fireteam name = "Ammo Duffelbag - Fireteam Ammo Grab Bag" - desc = "A duffelbag filled with ammo to kit out a fireteam, contains four C20r magazines, two C90gl magazines, a box of 40mm grenades, and sniper ammunition at a discounted price." //C90gl ammo bag is too imba. fuck that. + desc = "A duffelbag filled with ammo to kit out a fireteam, contains four C20r magazines, two M90gl magazines, a box of 40mm grenades, and sniper ammunition at a discounted price." //M90gl ammo bag is too imba. fuck that. item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/fireteam cost = 24//you get 4 grenades for free. Normal price 29 gamemodes = list(/datum/game_mode/nuclear) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index d318bfc2d0a..927c64278da 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -407,7 +407,7 @@ /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/fireteam - desc = "A large dufflebag, packed to the brim with C20r, C90gl, and sniper ammunition." + desc = "A large dufflebag, packed to the brim with C20r, M90gl, and sniper ammunition." /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/fireteam/New() ..() @@ -434,10 +434,10 @@ new /obj/item/weapon/suppressor/specialoffer(src) return -/obj/item/weapon/storage/backpack/dufflebag/syndie/c90glbundle - desc = "A large dufflebag containing a C90gl, a magazine, and a stimpack." +/obj/item/weapon/storage/backpack/dufflebag/syndie/m90glbundle + desc = "A large dufflebag containing a M90gl, a magazine, and a stimpack." -/obj/item/weapon/storage/backpack/dufflebag/syndie/c90glbundle/New() +/obj/item/weapon/storage/backpack/dufflebag/syndie/m90glbundle/New() ..() contents = list() new /obj/item/ammo_box/magazine/m556(src) From ba18bebf485f6fd0b9507f8a3f394d6fbfb80765 Mon Sep 17 00:00:00 2001 From: LanCartwright Date: Mon, 21 Dec 2015 00:40:20 +0000 Subject: [PATCH 13/13] missed this one --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 88432b26854..0dd52da5ecc 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -125,7 +125,7 @@ var/list/uplink_items = list() /datum/uplink_item/specoffer/m90gl name = "M90gl bundle" desc = "Premium offer. Pick up the M90gl with a magazine, some grenades, and a pack of cigarettes for a premium discount." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c90glbundle + item = /obj/item/weapon/storage/backpack/dufflebag/syndie/m90glbundle cost = 15//normal price 18 gamemodes = list(/datum/game_mode/nuclear)