From c50250ca4890e8fdbc39e329596a752fa5737f7b Mon Sep 17 00:00:00 2001 From: "uhangi@gmail.com" Date: Wed, 27 Jul 2011 18:25:25 +0000 Subject: [PATCH] -Gave syndicate balloons a "useless" tag on the uplink -Shotgun crate removed -Upped prices of some weapons crates -Shotgun ammo can now fit in pockets -Buffed beanbags/rubber bullets because they did literally nothing git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1939 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/supplypacks.dm | 32 +++++++++++++++++---- code/game/objects/devices/PDA/uplink.dm | 2 +- code/game/objects/items/weapons/guns_new.dm | 10 +++++-- code/game/objects/items/weapons/uplinks.dm | 2 +- config/admins.txt | 2 +- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 84e11f66fc1..847c1cb24f2 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -41,6 +41,7 @@ containertype = "/obj/crate/freezer" containername = "Monkey crate" +/* /datum/supply_packs/shotgun name = "Shotgun crate" contains = list("/obj/item/weapon/gun/projectile/shotgun", @@ -49,6 +50,8 @@ cost = 25 containertype = "/obj/crate" containername = "Shotgun crate" +//APPARENTLY OP? +*/ /datum/supply_packs/beanbagammo name = "Beanbag shells" @@ -393,7 +396,7 @@ "/obj/item/weapon/gun/energy/taser", "/obj/item/weapon/storage/flashbang_kit", "/obj/item/weapon/storage/flashbang_kit") - cost = 20 + cost = 30 containertype = "/obj/crate/secure/weapon" containername = "Weapons crate" access = access_security @@ -422,21 +425,29 @@ cost = 15 containertype = "/obj/crate/secure" containername = "Armor crate" - access = access_armory + access = access_security /datum/supply_packs/riot name = "Riot gear crate" contains = list("/obj/item/weapon/melee/baton", "/obj/item/weapon/melee/baton", + "/obj/item/weapon/melee/baton", + "/obj/item/weapon/shield/riot", "/obj/item/weapon/shield/riot", "/obj/item/weapon/shield/riot", "/obj/item/weapon/storage/flashbang_kit", "/obj/item/weapon/storage/flashbang_kit", + "/obj/item/weapon/storage/flashbang_kit", + "/obj/item/weapon/handcuffs", "/obj/item/weapon/handcuffs", "/obj/item/weapon/handcuffs", "/obj/item/clothing/head/helmet/riot", + "/obj/item/clothing/suit/armor/riot", + "/obj/item/clothing/head/helmet/riot", + "/obj/item/clothing/suit/armor/riot", + "/obj/item/clothing/head/helmet/riot", "/obj/item/clothing/suit/armor/riot") - cost = 40 + cost = 60 containertype = "/obj/crate/secure" containername = "Riot gear crate" access = access_armory @@ -447,7 +458,7 @@ "/obj/item/clothing/suit/armor/bulletproof", "/obj/item/weapon/gun/projectile/shotgun/combat2", "/obj/item/weapon/gun/projectile/shotgun/combat2") - cost = 35 + cost = 50 containertype = "/obj/crate/secure" containername = "Ballistic gear crate" access = access_armory @@ -458,11 +469,22 @@ "/obj/item/clothing/suit/armor/laserproof", "/obj/item/weapon/gun/energy", "/obj/item/weapon/gun/energy") - cost = 35 + cost = 50 containertype = "/obj/crate/secure" containername = "Experimental energy gear crate" access = access_armory +/datum/supply_packs/exparmor + name = "Experimental armor crate" + contains = list("/obj/item/clothing/suit/armor/laserproof", + "/obj/item/clothing/suit/armor/bulletproof", + "/obj/item/clothing/head/helmet/riot", + "/obj/item/clothing/suit/armor/riot") + cost = 35 + containertype = "/obj/crate/secure" + containername = "Experimental armor crate" + access = access_armory + /datum/supply_packs/securitybarriers name = "Security Barriers" contains = list("/obj/machinery/deployable/barrier", diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm index 8e92385da75..e6edeca8520 100644 --- a/code/game/objects/devices/PDA/uplink.dm +++ b/code/game/objects/devices/PDA/uplink.dm @@ -62,7 +62,7 @@ menu_message += "Singularity Beacon (does not include a screwdriver) (3)
" menu_message += "
" menu_message += "Syndicate Toolbox (Includes various tools) (1)
" - menu_message += "Syndicate Balloon (10)
" + menu_message += "Syndicate Balloon (Useless) (10)
" menu_message += "
" diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index 4af9217c457..1f3fc73fa08 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -47,12 +47,17 @@ bumped = 0 weakbullet - damage = 15 + damage = 8 mobdamage = list(BRUTE = 8, BURN = 0, TOX = 0, OXY = 0, CLONE = 0) New() ..() effects["weak"] = 25 - effectprob["weak"] = 35 + effectprob["weak"] = 100 + effects["stutter"] = 5 + effectprob["stutter"] = 100 + effects["eyeblur"] = 5 + effectprob["eyeblur"] = 100 + suffocationbullet damage = 65 @@ -315,6 +320,7 @@ icon_state = "s-casing" flags = FPRINT | TABLEPASS | CONDUCT | ONBELT throwforce = 1 + w_class = 1.0 var caliber = "357" //Which kind of guns it can be loaded into obj/item/projectile/BB //The loaded bullet diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm index 185249b0025..5db34ba51b1 100644 --- a/code/game/objects/items/weapons/uplinks.dm +++ b/code/game/objects/items/weapons/uplinks.dm @@ -62,7 +62,7 @@ SYNDICATE UPLINK dat += "Hacked AI Module (7)
" dat += "
" dat += "Syndicate Toolbox (Includes various tools) (1)
" - dat += "Syndicate Balloon (10)
" + dat += "Syndicate Balloon (Useless) (10)
" dat += "
" if (src.origradio) dat += "Lock
" diff --git a/config/admins.txt b/config/admins.txt index 917c1f74099..57cf65fef00 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -23,6 +23,6 @@ fateweaver - Game Admin agouri - Game Master errorage - Game Master -uhangi - Trial Admin +uhangi - Game Master superxpdude - Game Master \ No newline at end of file