cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 15:03:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

QM update, along with other things:

Browse Source 
-Combat shotguns must be pumped for every shot
-Security combat shotguns have a max of four loadable shots
-Combat shotguns removed from the map
-Beanbags now autolathable without hacking it, lowered metal cost for shells as well
-Beanbags fixed to knock players down
-Made armor crate only give you two vests and two helmets (regular)
-Added experimental energy weapons crate, contains two pairs of laserproof armor and two energy guns
-Added ballistic weapons crate, contains two security shotguns and two pairs of bulletproof armor
-Shotgun crate for QM, provides one loaded shotgun and two extra beanbags
-Beanbag crate for QM
-Energy crossbow now has a w_class of four (not the mini one)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1934 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uhangi@gmail.com
2011-07-26 21:15:07 +00:00
parent 7769420e4c
commit 753eb07915
6 changed files with 8502 additions and 8472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
code/defines/obj/supplypacks.dm
View File

@@ -41,6 +41,31 @@
containertype = "/obj/crate/freezer"
containername = "Monkey crate"
/datum/supply_packs/shotgun
name = "Shotgun crate"
contains = list("/obj/item/weapon/gun/projectile/shotgun",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag")
cost = 25
containertype = "/obj/crate"
containername = "Shotgun crate"
/datum/supply_packs/beanbagammo
name = "Beanbag shells"
contains = list("/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag",
"/obj/item/ammo_casing/shotgun/beanbag")
cost = 10
containertype = "/obj/crate"
containername = "Beanbag shells"
/datum/supply_packs/party
name = "Party equipment"
contains = list("/obj/item/weapon/storage/drinkingglasses",
@@ -245,7 +270,7 @@
name = "50 Metal Sheets"
contains = list("/obj/item/stack/sheet/metal")
amount = 50
cost = 15
cost = 10
containertype = "/obj/crate"
containername = "Metal sheets crate"
@@ -253,7 +278,7 @@
name = "50 Glass Sheets"
contains = list("/obj/item/stack/sheet/glass")
amount = 50
cost = 15
cost = 10
containertype = "/obj/crate"
containername = "Glass sheets crate"
@@ -335,7 +360,7 @@
"/obj/item/weapon/cell/high",
"/obj/item/weapon/cell/high")
cost = 10
containertype = /obj/crate/secure/gear
containertype = "/obj/crate/secure/gear"
containername = "Robotics Assembly"
access = access_robotics
@@ -388,8 +413,19 @@
containername = "Experimental weapons crate"
access = access_heads
/datum/supply_packs/armor
name = "Armor crate"
contains = list("/obj/item/clothing/head/helmet",
"/obj/item/clothing/head/helmet",
"/obj/item/clothing/suit/armor/vest",
"/obj/item/clothing/suit/armor/vest")
cost = 15
containertype = "/obj/crate/secure"
containername = "Armor crate"
access = access_armory
/datum/supply_packs/riot
name = "Riot crate"
name = "Riot gear crate"
contains = list("/obj/item/weapon/melee/baton",
"/obj/item/weapon/melee/baton",
"/obj/item/weapon/shield/riot",
@@ -399,28 +435,33 @@
"/obj/item/weapon/handcuffs",
"/obj/item/weapon/handcuffs",
"/obj/item/clothing/head/helmet/riot",
"/obj/item/clothing/suit/armor/riot",)
cost = 25
containertype = "/obj/crate/secure/gear"
containername = "Riot crate"
access = access_security
"/obj/item/clothing/suit/armor/riot")
cost = 40
containertype = "/obj/crate/secure"
containername = "Riot gear crate"
access = access_armory
/datum/supply_packs/armor
name = "Armor crate"
contains = list("/obj/item/clothing/head/helmet",
"/obj/item/clothing/head/helmet",
"/obj/item/weapon/shield/riot",
"/obj/item/weapon/shield/riot",
"/obj/item/clothing/suit/armor/vest",
"/obj/item/clothing/suit/armor/vest",
"/obj/item/clothing/head/helmet/riot",
"/obj/item/clothing/suit/armor/riot",
/datum/supply_packs/ballistic
name = "Ballistic gear crate"
contains = list("/obj/item/clothing/suit/armor/bulletproof",
"/obj/item/clothing/suit/armor/bulletproof",
"/obj/item/clothing/suit/armor/laserproof",)
cost = 25
containertype = "/obj/crate/secure/gear"
containername = "Armor crate"
access = access_security
"/obj/item/weapon/gun/projectile/shotgun/combat2",
"/obj/item/weapon/gun/projectile/shotgun/combat2")
cost = 35
containertype = "/obj/crate/secure"
containername = "Ballistic gear crate"
access = access_armory
/datum/supply_packs/expenergy
name = "Experimental energy gear crate"
contains = list("/obj/item/clothing/suit/armor/laserproof",
"/obj/item/clothing/suit/armor/laserproof",
"/obj/item/weapon/gun/energy",
"/obj/item/weapon/gun/energy")
cost = 35
containertype = "/obj/crate/secure"
containername = "Experimental energy gear crate"
access = access_armory
/datum/supply_packs/securitybarriers
name = "Security Barriers"

2
code/game/machinery/autolathe.dm
View File

@@ -244,6 +244,7 @@ var/global/list/autolathe_recipes = list( \
new /obj/item/device/t_scanner(), \
new /obj/item/weapon/reagent_containers/glass/bucket(), \
new /obj/item/ammo_casing/shotgun/blank(), \
new /obj/item/ammo_casing/shotgun/beanbag(), \
new /obj/item/device/taperecorder(), \
new /obj/item/weapon/stock_parts/console_screen(), \
)
@@ -260,7 +261,6 @@ var/global/list/autolathe_recipes_hidden = list( \
new /obj/item/ammo_magazine(), \
new /obj/item/ammo_casing/shotgun(), \
new /obj/item/ammo_magazine/c38(), \
new /obj/item/ammo_casing/shotgun/beanbag(), \
new /obj/item/ammo_casing/shotgun/dart(), \
/* new /obj/item/weapon/shield/riot(), */ \
)

24
code/game/objects/items/weapons/guns_new.dm
View File

@@ -48,11 +48,11 @@
weakbullet
damage = 15
mobdamage = list(BRUTE = 15, BURN = 0, TOX = 0, OXY = 0, CLONE = 0)
mobdamage = list(BRUTE = 8, BURN = 0, TOX = 0, OXY = 0, CLONE = 0)
New()
..()
effects["weak"] = 5
effectprob["weak"] = 10
effects["weak"] = 25
effectprob["weak"] = 35
suffocationbullet
damage = 65
@@ -380,7 +380,7 @@
name = "12 gauge shell"
icon_state = "gshell"
caliber = "shotgun"
m_amt = 25000
m_amt = 12500
New()
BB = new /obj/item/projectile
@@ -390,7 +390,7 @@
desc = "A blank shell."
name = "blank shell"
icon_state = "blshell"
m_amt = 500
m_amt = 250
New()
src.pixel_x = rand(-10.0, 10)
@@ -400,7 +400,7 @@
desc = "A weak beanbag shell."
name = "beanbag shell"
icon_state = "bshell"
m_amt = 10000
m_amt = 500
New()
BB = new /obj/item/projectile/weakbullet
@@ -411,7 +411,7 @@
desc = "A stunning shell."
name = "stun shell"
icon_state = "stunshell"
m_amt = 10000
m_amt = 2500
New()
BB = new /obj/item/projectile/stunshot
@@ -698,7 +698,7 @@
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
max_shells = 8
origin_tech = "combat=3"
maxpump = 2
maxpump = 1
New()
for(var/i = 1, i <= max_shells, i++)
loaded += new /obj/item/ammo_casing/shotgun(src)
@@ -708,11 +708,11 @@
name = "security combat shotgun"
icon_state = "cshotgun"
w_class = 4.0
force = 12.0
force = 10.0
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
max_shells = 8
max_shells = 4
origin_tech = "combat=3"
maxpump = 2
maxpump = 1
New()
for(var/i = 1, i <= max_shells, i++)
loaded += new /obj/item/ammo_casing/shotgun/beanbag(src)
@@ -1397,7 +1397,7 @@
name = "Energy Crossbow"
desc = "A weapon favored by syndicate infiltration teams."
icon_state = "crossbow"
w_class = 2.0
w_class = 4.0
item_state = "crossbow"
force = 9.0
throw_speed = 4

9
code/game/objects/storage/crates.dm
View File

@@ -105,15 +105,6 @@
openicon = "plasmacrateopen"
closedicon = "plasmacrate"
/obj/crate/secure/gear
desc = "A secure gear crate."
name = "Gear crate"
icon = 'storage.dmi'
icon_state = "secgearcrate"
density = 1
openicon = "secgearcrateopen"
closedicon = "secgearcrate"
/obj/crate/secure/bin
desc = "A secure bin."
name = "Secure bin"