From eab4c9eb191036b44d25479c3f921b3e2cc1313f Mon Sep 17 00:00:00 2001 From: Alterist <38592768+Alterist@users.noreply.github.com> Date: Sun, 23 Sep 2018 01:05:48 +0800 Subject: [PATCH] Req Supplypacks Overhaul (Operators Operating Operationally) (#301) Corrected a few typos in the list Moved the Pyro's flamer fuel to Ammo Added the Semiauto Shotgun to the list of buyable crates (shotgun x1 all ammo x1 for 60 points) Added c4 to the list of buyable crates (x5 for 60 points) Added auto-shotty stocks to the stock attachment crate, reduced amount to 2 stocks of each type Added Binos and Tactical Binos to the list of buyables Separated the Scout's M4RA ammo into 3 different buyable crates Changed the costume closets into crates (Since closets are all anchored, it's impossible to move them off the cargo pad) Matched the actual amount of flamers and flamer tanks in a crate to what it should be according to it's description(+1 flamethrower per crate, +3 tank per crate) Added /improper to all of the crate names and corrected a few so that it is clearer and more consistent Made the spec-ops crate into something interesting instead of being a joke, increased it's price --- code/datums/supplypacks.dm | 503 +++++++++++------- code/modules/clothing/masks/gasmask.dm | 5 +- .../updated_projectiles/ammo_datums.dm | 3 +- .../updated_projectiles/guns/pistols.dm | 30 +- .../updated_projectiles/magazines/pistols.dm | 7 + 5 files changed, 339 insertions(+), 209 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 6482e8781..0a737ff4d 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1,11 +1,10 @@ //SUPPLY PACKS //NOTE: only secure crate types use the access var (and are lockable) -//NOTE: hidden packs only show up when the computer has been hacked. -//ANOTER NOTE: Contraband is obtainable through modified supplycomp circuitboards. -//BIG NOTE: Don't add living things to crates, that's bad, it will break the shuttle. -//NEW NOTE: Do NOT set the price of any crates below 7 points. Doing so allows infinite points. -//We are now moving the price of RO orders to defines, try to respect it. +//NOTE: Contraband is obtainable through modified supplycomp circuitboards. +//NOTE: Don't add living things to crates, that's bad, it will break the shuttle. +//NOTE: Do NOT set the price of any crates below 7 points. Doing so allows infinite points. +#define RO_PRICE_NEAR_FREE 10 #define RO_PRICE_VERY_CHEAP 20 #define RO_PRICE_CHEAP 30 #define RO_PRICE_NORMAL 40 @@ -44,21 +43,17 @@ OPERATIONS /datum/supply_packs/specialops - name = "special operations crate (operator kit x2)" - contains = list(/obj/item/attachable/suppressor, - /obj/item/attachable/suppressor, - /obj/item/attachable/reddot, - /obj/item/attachable/reddot, - /obj/item/explosive/grenade/smokebomb, - /obj/item/explosive/grenade/smokebomb, - /obj/item/clothing/mask/gas/swat, + name = "special operations crate (operator kit x1)" + contains = list( + /obj/item/weapon/gun/pistol/b92fs/M9, + /obj/item/ammo_magazine/pistol/b92fstranq, + /obj/item/clothing/under/syndicate/combat, /obj/item/clothing/mask/gas/swat, - /obj/item/clothing/tie/storage/webbing, - /obj/item/clothing/tie/storage/webbing + /obj/item/clothing/tie/storage/black_vest ) - cost = RO_PRICE_PRICY + cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate - containername = "special ops crate" + containername = "\improper spec ops crate" group = "Operations" /datum/supply_packs/beacons_supply @@ -69,7 +64,7 @@ OPERATIONS ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate - containername = "supply beacons crate" + containername = "\improper supply beacons crate" group = "Operations" /datum/supply_packs/beacons_orbital @@ -80,7 +75,27 @@ OPERATIONS ) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate - containername = "orbital beacons crate" + containername = "\improper orbital beacons crate" + group = "Operations" + +/datum/supply_packs/binoculars_regular + name = "binoculars crate (x1)" + contains = list( + /obj/item/device/binoculars + ) + cost = RO_PRICE_VERY_CHEAP + containertype = /obj/structure/closet/crate + containername = "\improper binoculars crate" + group = "Operations" + +/datum/supply_packs/binoculars_tatical + name = "tactical binoculars crate (x1)" + contains = list( + /obj/item/device/binoculars/tactical + ) + cost = RO_PRICE_NORMAL + containertype = /obj/structure/closet/crate + containername = "\improper tactical binoculars crate" group = "Operations" /datum/supply_packs/flares @@ -93,7 +108,43 @@ OPERATIONS ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "flare pack crate" + containername = "\improper flare pack crate" + group = "Operations" + +/datum/supply_packs/alpha + name = "Alpha Supply Crate" + contains = list( + ) + cost = RO_PRICE_NEAR_FREE + containertype = /obj/structure/closet/crate/alpha + containername = "\improper Alpha Supply Crate" + group = "Operations" + +/datum/supply_packs/bravo + name = "Bravo Supply Crate" + contains = list( + ) + cost = RO_PRICE_NEAR_FREE + containertype = /obj/structure/closet/crate/bravo + containername = "\improper Bravo Supply Crate" + group = "Operations" + +/datum/supply_packs/charlie + name = "Charlie Supply Crate" + contains = list( + ) + cost = RO_PRICE_NEAR_FREE + containertype = /obj/structure/closet/crate/charlie + containername = "\improper Charlie Supply Crate" + group = "Operations" + +/datum/supply_packs/delta + name = "Delta Supply Crate" + contains = list( + ) + cost = RO_PRICE_NEAR_FREE + containertype = /obj/structure/closet/crate/delta + containername = "\improper Delta Supply Crate" group = "Operations" /datum/supply_packs/contraband @@ -108,11 +159,10 @@ OPERATIONS name = "contraband crate" cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/supply - containername = "unlabeled crate" + containername = "\improper unlabeled crate" contraband = 1 group = "Operations" - /******************************************************************************* WEAPONS *******************************************************************************/ @@ -121,25 +171,13 @@ WEAPONS /datum/supply_packs/flamethrower name = "M240 Flamethrower crate (M240 x3)" contains = list( + /obj/item/weapon/gun/flamer, /obj/item/weapon/gun/flamer, /obj/item/weapon/gun/flamer ) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "\improper M240 Incinerator crate" - group = "Weapons" - -/datum/supply_packs/pyro - name = "M240-T fuel crate (extended x2, type-B x1, type-X x1)" - contains = list( - /obj/item/ammo_magazine/flamer_tank/large, - /obj/item/ammo_magazine/flamer_tank/large, - /obj/item/ammo_magazine/flamer_tank/large/B, - /obj/item/ammo_magazine/flamer_tank/large/X - ) - cost = RO_PRICE_PRICY - containertype = /obj/structure/closet/crate/weapon - containername = "\improper M240-T fuel crate" + containername = "\improper M240 Flamethrower crate" group = "Weapons" /datum/supply_packs/weapons_sentry @@ -147,7 +185,7 @@ WEAPONS contains = list() cost = RO_PRICE_VERY_PRICY containertype = /obj/item/storage/box/sentry - containername = "sentry crate" + containername = "\improper sentry crate" group = "Weapons" /datum/supply_packs/gun/pistols @@ -161,8 +199,8 @@ WEAPONS /obj/item/ammo_magazine/revolver, /obj/item/ammo_magazine/revolver ) - name = "surplus idearms crate (M4A3 x2, M44 x2, ammo x2 each)" - cost = RO_PRICE_NORMAL + name = "surplus sidearms crate (M4A3 x2, M44 x2, ammo x2 each)" + cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate containername = "\improper sidearms crate" group = "Weapons" @@ -177,7 +215,7 @@ WEAPONS /obj/item/ammo_magazine/shotgun/buckshot ) name = "surplus shotguns crate (M37A2 x2, M37A2 ammo x2 each)" - cost = RO_PRICE_NORMAL + cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate containername = "\improper shotguns crate" group = "Weapons" @@ -189,8 +227,8 @@ WEAPONS /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39 ) - name = "surplus SMGd crate (M39 x2, M39 ammo x2)" - cost = RO_PRICE_NORMAL + name = "surplus SMG crate (M39 x2, M39 ammo x2)" + cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate containername = "\improper SMGs crate" group = "Weapons" @@ -203,15 +241,15 @@ WEAPONS /obj/item/ammo_magazine/rifle ) name = "surplus rifles crate (M41A x2, M41A ammo x2)" - cost = RO_PRICE_NORMAL + cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate containername = "\improper rifles crate" group = "Weapons" -/datum/supply_packs/gun/heavyweapons +/datum/supply_packs/gun/heavyrifle contains = list( /obj/item/weapon/gun/rifle/lmg, - /obj/item/ammo_magazine/rifle/lmg, + /obj/item/ammo_magazine/rifle/lmg ) name = "M41AE2 HPR crate (HPR x1, HPR ammo box x1)" cost = RO_PRICE_PRICY @@ -219,6 +257,19 @@ WEAPONS containername = "\improper M41AE2 HPR crate" group = "Weapons" +/datum/supply_packs/gun/combatshotgun + contains = list( + /obj/item/weapon/gun/shotgun/combat, + /obj/item/ammo_magazine/shotgun/, + /obj/item/ammo_magazine/shotgun/buckshot, + /obj/item/ammo_magazine/shotgun/flechette + ) + name = "MK221 tactical shotgun crate" + cost = RO_PRICE_PRICY + containertype = /obj/structure/closet/crate + containername = "\improper MK221 tactical shotgun crate" + group = "Weapons" + /datum/supply_packs/gun/merc contains = list() name = "black market firearms (x1)" @@ -236,7 +287,7 @@ WEAPONS name = "M39 holster crate (x2)" cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "holster crate" + containername = "\improper holster crate" group = "Weapons" /datum/supply_packs/gun_holster/m44 @@ -336,6 +387,19 @@ WEAPONS containername = "\improper explosive HEDP grenade crate (WARNING)" group = "Weapons" +/datum/supply_packs/plastique + name = "plastic explosives crate (x5)" + contains = list( + /obj/item/explosive/plastique, + /obj/item/explosive/plastique, + /obj/item/explosive/plastique, + /obj/item/explosive/plastique, + /obj/item/explosive/plastique + ) + cost = RO_PRICE_PRICY + containertype = /obj/structure/closet/crate/explosives + containername = "\improper plastic explosives crate (WARNING)" + group = "Weapons" /datum/supply_packs/mortar name = "M402 mortar crate (x1)" @@ -356,7 +420,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/primary/cannon) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/ltaaap_minigun @@ -364,7 +428,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/primary/minigun) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/flamer_module @@ -372,7 +436,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/secondary/flamer) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/towlauncher @@ -380,7 +444,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/secondary/towlauncher) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/m56_cupola @@ -388,7 +452,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/secondary/m56cupola) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/tank_glauncher @@ -396,7 +460,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/secondary/grenade_launcher) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/tank_slauncher @@ -404,7 +468,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/support/smoke_launcher) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/weapons_sensor @@ -412,7 +476,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/support/weapons_sensor) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/artillery_module @@ -420,7 +484,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/support/artillery_module) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/overdrive_enhancer @@ -428,7 +492,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/support/overdrive_enhancer) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/ballistic_armor @@ -436,7 +500,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/armor/ballistic) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/caustic_armor @@ -444,7 +508,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/armor/caustic) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/concussive_armor @@ -452,7 +516,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/armor/concussive) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/paladin_armor @@ -460,7 +524,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/armor/paladin) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/snowplow_armor @@ -468,7 +532,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/armor/snowplow) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/tank_treads @@ -476,7 +540,7 @@ HARDPOINT MODULES (and their ammo) contains = list(/obj/item/hardpoint/treads/standard) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/weapon - containername = "hardpoint module assembly crate" + containername = "\improper hardpoint module assembly crate" group = "Hardpoint Modules" /datum/supply_packs/ltb_cannon_ammo @@ -494,7 +558,7 @@ HARDPOINT MODULES (and their ammo) /obj/item/ammo_magazine/tank/ltb_cannon) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "tank ammo crate" + containername = "\improper tank ammo crate" group = "Hardpoint Modules" /datum/supply_packs/ltaaap_minigun_ammo @@ -505,7 +569,7 @@ HARDPOINT MODULES (and their ammo) /obj/item/ammo_magazine/tank/ltaaap_minigun) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "tank ammo crate" + containername = "\improper tank ammo crate" group = "Hardpoint Modules" /datum/supply_packs/tank_glauncher_ammo @@ -523,7 +587,7 @@ HARDPOINT MODULES (and their ammo) /obj/item/ammo_magazine/tank/tank_glauncher) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "tank ammo crate" + containername = "\improper tank ammo crate" group = "Hardpoint Modules" /datum/supply_packs/tank_slauncher_ammo @@ -541,7 +605,7 @@ HARDPOINT MODULES (and their ammo) /obj/item/ammo_magazine/tank/tank_slauncher) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "tank ammo crate" + containername = "\improper tank ammo crate" group = "Hardpoint Modules" /datum/supply_packs/tank_towlauncher_ammo @@ -553,7 +617,7 @@ HARDPOINT MODULES (and their ammo) /obj/item/ammo_magazine/tank/towlauncher) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "tank ammo crate" + containername = "\improper tank ammo crate" group = "Hardpoint Modules" /datum/supply_packs/tank_cupola_ammo @@ -563,7 +627,7 @@ HARDPOINT MODULES (and their ammo) /obj/item/ammo_magazine/tank/m56_cupola) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "tank ammo crate" + containername = "\improper tank ammo crate" group = "Hardpoint Modules" /datum/supply_packs/tank_flamer_ammo @@ -576,7 +640,7 @@ HARDPOINT MODULES (and their ammo) /obj/item/ammo_magazine/tank/flamer) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "tank ammo crate" + containername = "\improper tank ammo crate" group = "Hardpoint Modules" @@ -601,7 +665,7 @@ ATTACHMENTS ) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate - containername = "attachables crate" + containername = "\improper attachables crate" group = "Attachments" /datum/supply_packs/rail_reddot @@ -618,7 +682,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "red-dot sight attachment crate" + containername = "\improper red-dot sight attachment crate" group = "Attachments" /datum/supply_packs/rail_scope @@ -629,7 +693,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "scope attachment crate" + containername = "\improper scope attachment crate" group = "Attachments" /datum/supply_packs/rail_miniscope @@ -640,7 +704,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "mini scope attachment crate" + containername = "\improper mini scope attachment crate" group = "Attachments" /datum/supply_packs/rail_magneticharness @@ -655,7 +719,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "magnetic harness attachment crate" + containername = "\improper magnetic harness attachment crate" group = "Attachments" /datum/supply_packs/rail_quickfire @@ -666,7 +730,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "quickfire attachment crate" + containername = "\improper quickfire attachment crate" group = "Attachments" /datum/supply_packs/m_attachables @@ -685,7 +749,7 @@ ATTACHMENTS ) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate - containername = "attachables crate" + containername = "\improper attachables crate" group = "Attachments" /datum/supply_packs/muzzle_suppressor @@ -702,7 +766,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "suppressor attachment crate" + containername = "\improper suppressor attachment crate" group = "Attachments" /datum/supply_packs/muzzle_bayonet @@ -719,7 +783,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "bayonet attachment crate" + containername = "\improper bayonet attachment crate" group = "Attachments" /datum/supply_packs/muzzle_extended @@ -734,7 +798,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "extended barrel attachment crate" + containername = "\improper extended barrel attachment crate" group = "Attachments" /datum/supply_packs/muzzle_heavy @@ -745,7 +809,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "heavy barrel attachment crate" + containername = "\improper heavy barrel attachment crate" group = "Attachments" /datum/supply_packs/muzzle_compensator @@ -760,7 +824,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "compensator attachment crate" + containername = "\improper compensator attachment crate" group = "Attachments" /datum/supply_packs/underbarrel_attachables @@ -785,7 +849,7 @@ ATTACHMENTS ) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate - containername = "attachables crate" + containername = "\improper attachables crate" group = "Attachments" /datum/supply_packs/underbarrel_foregrip @@ -802,7 +866,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "foregrip attachment crate" + containername = "\improper foregrip attachment crate" group = "Attachments" /datum/supply_packs/underbarrel_gyro @@ -813,7 +877,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "gyro attachment crate" + containername = "\improper gyro attachment crate" group = "Attachments" /datum/supply_packs/underbarrel_bipod @@ -828,7 +892,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "bipod attachment crate" + containername = "\improper bipod attachment crate" group = "Attachments" /datum/supply_packs/underbarrel_shotgun @@ -841,7 +905,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "shotgun attachment crate" + containername = "\improper shotgun attachment crate" group = "Attachments" /datum/supply_packs/underbarrel_flamer @@ -854,7 +918,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "flamer attachment crate" + containername = "\improper flamer attachment crate" group = "Attachments" /datum/supply_packs/underbarrel_burstfire_assembly @@ -865,28 +929,26 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "burstfire assembly attachment crate" + containername = "\improper burstfire assembly attachment crate" group = "Attachments" /datum/supply_packs/s_attachables - name = "stock attachments crate (x3 each)" + name = "stock attachments crate (x2 each)" contains = list( - /obj/item/attachable/stock/revolver, /obj/item/attachable/stock/revolver, /obj/item/attachable/stock/revolver, /obj/item/attachable/stock/rifle, /obj/item/attachable/stock/rifle, - /obj/item/attachable/stock/rifle, - /obj/item/attachable/stock/shotgun, /obj/item/attachable/stock/shotgun, /obj/item/attachable/stock/shotgun, /obj/item/attachable/stock/smg, /obj/item/attachable/stock/smg, - /obj/item/attachable/stock/smg, + /obj/item/attachable/stock/tactical, + /obj/item/attachable/stock/tactical ) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate - containername = "stocks crate" + containername = "\improper stocks crate" group = "Attachments" /datum/supply_packs/stock_revolver @@ -899,7 +961,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "stock revolver attachment crate" + containername = "\improper stock revolver attachment crate" group = "Attachments" /datum/supply_packs/stock_rifle @@ -912,7 +974,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "stock rifle attachment crate" + containername = "\improper rifle stock attachment crate" group = "Attachments" /datum/supply_packs/stock_shotgun @@ -925,7 +987,7 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "stock shotgun attachment crate" + containername = "\improper shotgun stock attachment crate" group = "Attachments" /datum/supply_packs/stock_smg @@ -938,9 +1000,20 @@ ATTACHMENTS ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate - containername = "stock smg attachment crate" + containername = "\improper smg stock attachment crate" group = "Attachments" +/datum/supply_packs/stock_smg + name = "combat shotgun stock attachment crate (x3)" + contains = list( + /obj/item/attachable/stock/tactical, + /obj/item/attachable/stock/tactical, + /obj/item/attachable/stock/tactical + ) + cost = RO_PRICE_CHEAP + containertype = /obj/structure/closet/crate + containername = "\improper combat shotgun attachment crate" + group = "Attachments" /******************************************************************************* AMMO @@ -948,7 +1021,7 @@ AMMO /datum/supply_packs/ammo_regular - name = "regular magazines crate (M41A x5, M4A3 x2, M44 x2, M39 x2, M37A2 x1 each)" + name = "regular magazines crate (M41A x5, M4A3 x2, M44 x2, M39 x2, M37A2 x1)" contains = list( /obj/item/ammo_magazine/rifle, /obj/item/ammo_magazine/rifle, @@ -966,7 +1039,7 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "ammo crate" + containername = "\improper regular ammo crate" group = "Ammo" /datum/supply_packs/ammo_regular_m41a @@ -983,7 +1056,7 @@ AMMO ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "M41A regular ammo crate" + containername = "\improper M41A regular ammo crate" group = "Ammo" /datum/supply_packs/ammo_regular_m4a3 @@ -1002,7 +1075,7 @@ AMMO ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "M4A3 regular ammo crate" + containername = "\improper M4A3 regular ammo crate" group = "Ammo" /datum/supply_packs/ammo_regular_m44 @@ -1021,7 +1094,7 @@ AMMO ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "M44 regular ammo crate" + containername = "\improper M44 regular ammo crate" group = "Ammo" /datum/supply_packs/ammo_regular_m39 @@ -1040,11 +1113,11 @@ AMMO ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "M39 regular ammo crate" + containername = "\improper M39 regular ammo crate" group = "Ammo" -/datum/supply_packs/ammo_regular_m37a2 - name = "regular M37A2 shells crate (x5 slugs, x5 buckshot)" +/datum/supply_packs/ammo_regular_shotgun + name = "regular shotgun shells crate (x5 slugs, x5 buckshot)" contains = list( /obj/item/ammo_magazine/shotgun, /obj/item/ammo_magazine/shotgun, @@ -1059,9 +1132,11 @@ AMMO ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "M37A2 ammo crate" + containername = "\improper M37A2 ammo crate" group = "Ammo" + + /datum/supply_packs/ammo_extended name = "extended magazines crate (M41A x2, M4A3 x2, M39 x2)" contains = list( @@ -1074,7 +1149,7 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "extended ammo crate" + containername = "\improper extended ammo crate" group = "Ammo" /datum/supply_packs/ammo_extended_m41a @@ -1089,7 +1164,7 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "M41A extended ammo crate" + containername = "\improper M41A extended ammo crate" group = "Ammo" /datum/supply_packs/ammo_extended_m4a3 @@ -1106,7 +1181,7 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "M4A3 extended ammo crate" + containername = "\improper M4A3 extended ammo crate" group = "Ammo" /datum/supply_packs/ammo_extended_m39 @@ -1121,7 +1196,7 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "M39 extended ammo crate" + containername = "\improper M39 extended ammo crate" group = "Ammo" /datum/supply_packs/ammo_ap @@ -1136,7 +1211,7 @@ AMMO ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "armor piercing ammo crate" + containername = "\improper armor piercing ammo crate" group = "Ammo" /datum/supply_packs/ammo_ap_m41a @@ -1151,7 +1226,7 @@ AMMO ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "M41A armor piercing ammo crate" + containername = "\improper M41A armor piercing ammo crate" group = "Ammo" /datum/supply_packs/ammo_ap_m4a3 @@ -1168,7 +1243,7 @@ AMMO ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "M4A3 armor piercing ammo crate" + containername = "\improper M4A3 armor piercing ammo crate" group = "Ammo" /datum/supply_packs/ammo_ap_m39 @@ -1183,21 +1258,60 @@ AMMO ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "M39 armor piercing ammo crate" + containername = "\improper M39 armor piercing ammo crate" group = "Ammo" +/datum/supply_packs/ammo_flechette_shotgun + name = "flechette shotgun shells crate (x5)" + contains = list( + /obj/item/ammo_magazine/shotgun/flechette, + /obj/item/ammo_magazine/shotgun/flechette, + /obj/item/ammo_magazine/shotgun/flechette, + /obj/item/ammo_magazine/shotgun/flechette, + /obj/item/ammo_magazine/shotgun/flechette + ) + cost = RO_PRICE_VERY_CHEAP + containertype = /obj/structure/closet/crate/ammo + containername = "\improper M37A2 ammo crate" + group = "Ammo" + + /datum/supply_packs/ammo_scout_regular - name = "M4RA scout magazines crate (regular x3, incendiary x1, impact x1)" + name = "M4RA scout magazines crate (x5)" contains = list( /obj/item/ammo_magazine/rifle/m4ra, /obj/item/ammo_magazine/rifle/m4ra, /obj/item/ammo_magazine/rifle/m4ra, - /obj/item/ammo_magazine/rifle/m4ra/incendiary, - /obj/item/ammo_magazine/rifle/m4ra/impact, + /obj/item/ammo_magazine/rifle/m4ra, + /obj/item/ammo_magazine/rifle/m4ra ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "scout ammo crate" + containername = "\improper regular scout ammo crate" + group = "Ammo" + +/datum/supply_packs/ammo_scout_impact + name = "M4RA scout impact magazines crate (x3)" + contains = list( + /obj/item/ammo_magazine/rifle/m4ra/impact, + /obj/item/ammo_magazine/rifle/m4ra/impact, + /obj/item/ammo_magazine/rifle/m4ra/impact + ) + cost = RO_PRICE_NORMAL + containertype = /obj/structure/closet/crate/ammo + containername = "\improper impact scout ammo crate" + group = "Ammo" + +/datum/supply_packs/ammo_scout_incendiary + name = "M4RA scout incendiary magazines crate (x3)" + contains = list( + /obj/item/ammo_magazine/rifle/m4ra/incendiary, + /obj/item/ammo_magazine/rifle/m4ra/incendiary, + /obj/item/ammo_magazine/rifle/m4ra/incendiary + ) + cost = RO_PRICE_NORMAL + containertype = /obj/structure/closet/crate/ammo + containername = "\improper incendiary scout ammo crate" group = "Ammo" /datum/supply_packs/ammo_sniper_regular @@ -1212,7 +1326,7 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "regular sniper ammo crate" + containername = "\improper regular sniper ammo crate" group = "Ammo" /datum/supply_packs/ammo_sniper_flak @@ -1227,7 +1341,7 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "flak sniper ammo crate" + containername = "\improper flak sniper ammo crate" group = "Ammo" /datum/supply_packs/ammo_sniper_incendiary @@ -1242,7 +1356,7 @@ AMMO ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "incendiary sniper ammo crate" + containername = "\improper incendiary sniper ammo crate" group = "Ammo" /datum/supply_packs/ammo_rpg_regular @@ -1257,7 +1371,7 @@ AMMO ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/explosives - containername = "regular M5 RPG ammo crate" + containername = "\improper regular M5 RPG ammo crate" group = "Ammo" /datum/supply_packs/ammo_rpg_ap @@ -1272,7 +1386,7 @@ AMMO ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/explosives - containername = "armor piercing M5 RPG ammo crate" + containername = "\improper armor piercing M5 RPG ammo crate" group = "Ammo" /datum/supply_packs/ammo_rpg_wp @@ -1287,31 +1401,37 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/explosives - containername = "white phosphorus M5 RPG ammo crate" + containername = "\improper white phosphorus M5 RPG ammo crate" group = "Ammo" /datum/supply_packs/ammo_box_rifle name = "large M41A ammo box crate (x400 rounds)" - contains = list(/obj/item/big_ammo_box) + contains = list( + /obj/item/big_ammo_box + ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "ammo crate" + containername = "\improper M41A ammo box crate" group = "Ammo" /datum/supply_packs/ammo_box_rifle_ap name = "large armor piercing M41A ammo box crate (x400 AP rounds)" - contains = list(/obj/item/big_ammo_box/ap) + contains = list( + /obj/item/big_ammo_box/ap + ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "ammo crate" + containername = "\improper M41A ammo box crate" group = "Ammo" /datum/supply_packs/ammo_box_smg name = "large M39 ammo box crate (x400 rounds)" - contains = list(/obj/item/big_ammo_box/smg) + contains = list( + /obj/item/big_ammo_box/smg + ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "ammo crate" + containername = "\improper M39 ammo crate" group = "Ammo" /datum/supply_packs/ammo_black_market @@ -1343,7 +1463,7 @@ AMMO cost = RO_PRICE_NORMAL contraband = 1 containertype = /obj/structure/closet/crate/ammo - containername = "black market ammo crate" + containername = "\improper black market ammo crate" group = "Ammo" //This crate has a little bit of everything, mostly okay stuff, but it does have some really unique picks. @@ -1351,42 +1471,31 @@ AMMO name = "surplus ammo crate (x10)" randomised_num_contained = 10 contains = list( - /obj/item/ammo_magazine/rifle, - /obj/item/ammo_magazine/rifle, /obj/item/ammo_magazine/rifle, /obj/item/ammo_magazine/rifle/extended, /obj/item/ammo_magazine/rifle/ap, /obj/item/ammo_magazine/rifle/incendiary, /obj/item/ammo_magazine/rifle/m41aMK1, - /obj/item/ammo_magazine/rifle/m4ra, /obj/item/ammo_magazine/rifle/lmg, /obj/item/ammo_magazine/pistol, - /obj/item/ammo_magazine/pistol, - /obj/item/ammo_magazine/pistol, /obj/item/ammo_magazine/pistol/extended, /obj/item/ammo_magazine/pistol/ap, /obj/item/ammo_magazine/pistol/hp, /obj/item/ammo_magazine/pistol/incendiary, /obj/item/ammo_magazine/pistol/m1911, /obj/item/ammo_magazine/smg/m39, - /obj/item/ammo_magazine/smg/m39, - /obj/item/ammo_magazine/smg/m39, /obj/item/ammo_magazine/smg/m39/extended, /obj/item/ammo_magazine/smg/m39/ap, /obj/item/ammo_magazine/revolver, - /obj/item/ammo_magazine/revolver, - /obj/item/ammo_magazine/revolver, /obj/item/ammo_magazine/revolver/marksman, /obj/item/ammo_magazine/revolver/heavy, /obj/item/ammo_magazine/shotgun, - /obj/item/ammo_magazine/shotgun, - /obj/item/ammo_magazine/shotgun/buckshot, /obj/item/ammo_magazine/shotgun/buckshot, /obj/item/ammo_magazine/shotgun/incendiary ) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/ammo - containername = "surplus ammo crate" + containername = "\improper surplus ammo crate" group = "Ammo" /datum/supply_packs/ammo_smartgun @@ -1397,7 +1506,7 @@ AMMO ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/ammo - containername = "smartgun powerpack crate" + containername = "\improper smartgun powerpack crate" group = "Ammo" /datum/supply_packs/ammo_sentry @@ -1408,20 +1517,35 @@ AMMO ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "ammo crate" + containername = "\improper sentry ammo crate" group = "Ammo" /datum/supply_packs/napalm - name = "UT-Napthal Fuel (x6)" + name = "M240 fuel crate (x6)" contains = list( /obj/item/ammo_magazine/flamer_tank, /obj/item/ammo_magazine/flamer_tank, /obj/item/ammo_magazine/flamer_tank, /obj/item/ammo_magazine/flamer_tank, + /obj/item/ammo_magazine/flamer_tank, + /obj/item/ammo_magazine/flamer_tank ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/ammo - containername = "napthal fuel crate" + containername = "\improper M240 fuel crate" + group = "Ammo" + +/datum/supply_packs/pyro + name = "M240-T fuel crate (extended x2, type-B x1, type-X x1)" + contains = list( + /obj/item/ammo_magazine/flamer_tank/large, + /obj/item/ammo_magazine/flamer_tank/large, + /obj/item/ammo_magazine/flamer_tank/large/B, + /obj/item/ammo_magazine/flamer_tank/large/X + ) + cost = RO_PRICE_PRICY + containertype = /obj/structure/closet/crate/weapon + containername = "\improper M240-T fuel crate" group = "Ammo" /datum/supply_packs/mortar_ammo_he @@ -1536,7 +1660,7 @@ ARMOR ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate - containername = "armor crate" + containername = "\improper armor crate" group = "Armor" /datum/supply_packs/armor_leader @@ -1547,7 +1671,7 @@ ARMOR ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate - containername = "squad leader armor crate" + containername = "\improper squad leader armor crate" group = "Armor" @@ -1564,10 +1688,10 @@ CLOTHING /obj/item/clothing/under/marine/officer/exec, /obj/item/clothing/under/marine/officer/ce ) - name = "officer outfit closet" + name = "officer outfit crate" cost = RO_PRICE_CHEAP - containertype = /obj/structure/closet - containername = "officer dress closet" + containertype = /obj/structure/closet/crate + containername = "\improper officer dress crate" group = "Clothing" /datum/supply_packs/marine_outfits @@ -1585,10 +1709,10 @@ CLOTHING /obj/item/clothing/shoes/marine, /obj/item/clothing/shoes/marine ) - name = "marine outfit closet" + name = "marine outfit crate" cost = RO_PRICE_VERY_CHEAP - containertype = /obj/structure/closet - containername = "marine outfit closet" + containertype = /obj/structure/closet/crate + containername = "\improper marine outfit crate" group = "Clothing" /datum/supply_packs/webbing @@ -1606,7 +1730,7 @@ CLOTHING ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate - containername = "extra storage crate" + containername = "\improper extra storage crate" group = "Clothing" /datum/supply_packs/pouches_general @@ -1619,7 +1743,7 @@ CLOTHING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate - containername = "general pouches crate" + containername = "\improper general pouches crate" group = "Clothing" /datum/supply_packs/pouches_weapons @@ -1631,11 +1755,11 @@ CLOTHING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate - containername = "weapons pouches crate" + containername = "\improper weapons pouches crate" group = "Clothing" /datum/supply_packs/pouches_ammo - name = "ammo pouches crate (1x normal, large, pistol, pistol large)" + name = "ammo pouches crate (1x normal, large, pistol, large pistol)" contains = list( /obj/item/storage/pouch/magazine, /obj/item/storage/pouch/magazine/large, @@ -1644,7 +1768,7 @@ CLOTHING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate - containername = "ammo pouches crate" + containername = "\improper ammo pouches crate" group = "Clothing" /datum/supply_packs/pouches_medical @@ -1658,7 +1782,7 @@ CLOTHING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate - containername = "medical pouches crate" + containername = "\improper medical pouches crate" group = "Clothing" /datum/supply_packs/pouches_survival @@ -1670,7 +1794,7 @@ CLOTHING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate - containername = "survival pouches crate" + containername = "\improper survival pouches crate" group = "Clothing" /datum/supply_packs/pouches_construction @@ -1683,7 +1807,7 @@ CLOTHING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate - containername = "construction pouches crate" + containername = "\improper construction pouches crate" group = "Clothing" @@ -1717,7 +1841,7 @@ MEDICAL ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/medical - containername = "medical crate" + containername = "\improper medical crate" group = "Medical" /datum/supply_packs/firstaid @@ -1735,7 +1859,7 @@ MEDICAL ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/medical - containername = "medical crate" + containername = "\improper medical crate" group = "Medical" /datum/supply_packs/bodybag @@ -1748,7 +1872,7 @@ MEDICAL ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/medical - containername = "body bag crate" + containername = "\improper body bag crate" group = "Medical" /datum/supply_packs/cryobag @@ -1760,18 +1884,17 @@ MEDICAL ) cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/medical - containername = "stasis bag crate" + containername = "\improper stasis bag crate" group = "Medical" /datum/supply_packs/surgery - name = "surgery crate (x2 surgical trays)" + name = "surgery crate (x1 surgical tray)" contains = list( - /obj/item/storage/surgical_tray, /obj/item/storage/surgical_tray ) - cost = RO_PRICE_CHEAP + cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/secure/surgery - containername = "surgery crate" + containername = "\improper surgery crate" access = ACCESS_MARINE_MEDBAY group = "Medical" @@ -1789,7 +1912,7 @@ MEDICAL ) cost = RO_PRICE_CHEAP containertype = /obj/structure/closet/crate/secure/surgery - containername = "surgery crate" + containername = "\improper surgery crate" access = ACCESS_MARINE_MEDBAY group = "Medical" @@ -1803,7 +1926,7 @@ MEDICAL ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/medical - containername = "sterile equipment crate" + containername = "\improper sterile equipment crate" group = "Medical" @@ -1818,7 +1941,7 @@ ENGINEERING amount = 50 cost = RO_PRICE_VERY_CHEAP containertype = "/obj/structure/closet/crate/supply" - containername = "empty sandbags crate" + containername = "\improper empty sandbags crate" group = "Engineering" /datum/supply_packs/metal50 @@ -1827,7 +1950,7 @@ ENGINEERING amount = 50 cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/supply - containername = "metal sheets crate" + containername = "\improper metal sheets crate" group = "Engineering" /datum/supply_packs/plas50 @@ -1836,7 +1959,7 @@ ENGINEERING amount = 30 cost = RO_PRICE_NORMAL containertype = /obj/structure/closet/crate/supply - containername = "plasteel sheets crate" + containername = "\improper plasteel sheets crate" group = "Engineering" /datum/supply_packs/glass50 @@ -1845,7 +1968,7 @@ ENGINEERING amount = 50 cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/supply - containername = "glass sheets crate" + containername = "\improper glass sheets crate" group = "Engineering" /datum/supply_packs/wood50 @@ -1854,7 +1977,7 @@ ENGINEERING amount = 50 cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/supply - containername = "wooden planks crate" + containername = "\improper wooden planks crate" group = "Engineering" /datum/supply_packs/smescoil @@ -1862,7 +1985,7 @@ ENGINEERING contains = list(/obj/item/stock_parts/smes_coil) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/construction - containername = "superconducting magnetic coil crate" + containername = "\improper superconducting magnetic coil crate" group = "Engineering" /datum/supply_packs/electrical @@ -1879,7 +2002,7 @@ ENGINEERING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/construction - containername = "electrical maintenance crate" + containername = "\improper electrical maintenance crate" group = "Engineering" /datum/supply_packs/mechanical @@ -1897,7 +2020,7 @@ ENGINEERING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/construction - containername = "mechanical maintenance crate" + containername = "\improper mechanical maintenance crate" group = "Engineering" /datum/supply_packs/fueltank @@ -1905,7 +2028,7 @@ ENGINEERING contains = list(/obj/structure/reagent_dispensers/fueltank) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/largecrate - containername = "fuel tank crate" + containername = "\improper fuel tank crate" group = "Engineering" /datum/supply_packs/inflatable @@ -1917,7 +2040,7 @@ ENGINEERING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/construction - containername = "inflatable barriers crate" + containername = "\improper inflatable barriers crate" group = "Engineering" /datum/supply_packs/lightbulbs @@ -1929,7 +2052,7 @@ ENGINEERING ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/supply - containername = "replacement lights crate" + containername = "\improper replacement lights crate" group = "Engineering" /datum/supply_packs/pacman_parts @@ -1983,7 +2106,7 @@ SCIENCE ) cost = RO_PRICE_PRICY containertype = /obj/structure/closet/crate/secure/phoron - containername = "phoron assembly crate" + containername = "\improper phoron assembly crate" access = ACCESS_MARINE_ENGINEERING group = "Science" @@ -2019,7 +2142,7 @@ SUPPLIES ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/internals - containername = "internals crate" + containername = "\improper internals crate" group = "Supplies" /datum/supply_packs/evacuation @@ -2042,7 +2165,7 @@ SUPPLIES ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/internals - containername = "emergency crate" + containername = "\improper emergency crate" group = "Supplies" /datum/supply_packs/boxes @@ -2061,7 +2184,7 @@ SUPPLIES ) cost = RO_PRICE_VERY_CHEAP containertype = "/obj/structure/closet/crate/supply" - containername = "empty box crate" + containername = "\improper empty box crate" group = "Supplies" /datum/supply_packs/janitor @@ -2085,5 +2208,5 @@ SUPPLIES ) cost = RO_PRICE_VERY_CHEAP containertype = /obj/structure/closet/crate/supply - containername = "\improper Janitorial supplies crate" + containername = "\improper janitorial supplies crate" group = "Supplies" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index c7e41d8f8..3d386fa6e 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -43,9 +43,6 @@ icon_state = "bear_mask" anti_hug = 2 - - - //Plague Dr suit can be found in clothing/suits/bio.dm /obj/item/clothing/mask/gas/plaguedoctor name = "plague doctor mask" @@ -59,6 +56,8 @@ name = "\improper SWAT mask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "swat" + anti_hug = 1 + vision_impair = FALSE siemens_coefficient = 0.7 flags_armor_protection = FACE|EYES diff --git a/code/modules/projectiles/updated_projectiles/ammo_datums.dm b/code/modules/projectiles/updated_projectiles/ammo_datums.dm index b0746e9f6..fa7315994 100644 --- a/code/modules/projectiles/updated_projectiles/ammo_datums.dm +++ b/code/modules/projectiles/updated_projectiles/ammo_datums.dm @@ -231,11 +231,12 @@ /datum/ammo/bullet/pistol/tranq name = "tranq bullet" - debilitate = list(0,2,0,0,5,3,20,0) + debilitate = list(0,0,0,0,5,3,30,0) /datum/ammo/bullet/pistol/hollow name = "hollowpoint pistol bullet" + /datum/ammo/bullet/pistol/hollow/New() ..() accuracy = -config.med_hit_accuracy diff --git a/code/modules/projectiles/updated_projectiles/guns/pistols.dm b/code/modules/projectiles/updated_projectiles/guns/pistols.dm index 0f3bd9f35..b99b9aab3 100644 --- a/code/modules/projectiles/updated_projectiles/guns/pistols.dm +++ b/code/modules/projectiles/updated_projectiles/guns/pistols.dm @@ -58,7 +58,6 @@ scatter_unwielded = config.med_scatter_value damage_mult = config.base_hit_damage_mult - /obj/item/weapon/gun/pistol/m4a3/custom name = "\improper M4A3 custom pistol" desc = "An M4A3 Service Pistol, the standard issue sidearm of the Colonial Marines. Uses 9mm pistol rounds. This one has an ivory-colored grip and has a slide carefully polished yearly by a team of orphan children. Looks like it belongs to a low-ranking officer." @@ -77,7 +76,6 @@ scatter_unwielded = config.med_scatter_value damage_mult = config.base_hit_damage_mult + config.low_hit_damage_mult - //------------------------------------------------------- //M4A3 45 //Inspired by the 1911 @@ -105,7 +103,6 @@ item_state = "b92fs" current_mag = /obj/item/ammo_magazine/pistol/b92fs - New() ..() attachable_offset = list("muzzle_x" = 28, "muzzle_y" = 20,"rail_x" = 10, "rail_y" = 22, "under_x" = 21, "under_y" = 17, "stock_x" = 21, "stock_y" = 17) @@ -118,6 +115,21 @@ scatter_unwielded = config.med_scatter_value damage_mult = config.base_hit_damage_mult +/obj/item/weapon/gun/pistol/b92fs/M9 + name = "\improper M9 Custom pistol" + desc = "A 20th century military firearm customized for special forces use, fires tranq darts to take down enemies nonlethally" + icon_state = "b92fs" + item_state = "b92fs" + current_mag =/obj/item/ammo_magazine/pistol/b92fstranq + starting_attachment_types = list( + /obj/item/attachable/lasersight, + /obj/item/attachable/suppressor + ) +/obj/item/weapon/gun/pistol/b92fs/set_gun_config_values() + fire_delay = config.mhigh_fire_delay //to simulate manually cocking the pistol + accuracy_mult = config.base_hit_accuracy_mult + config.med_hit_accuracy_mult + accuracy_mult_unwielded = config.base_hit_accuracy_mult + config.low_hit_accuracy_mult //for CQC + damage_mult = config.base_hit_damage_mult - config.max_hit_damage_mult //We don't use guns to take people down, Raiden //------------------------------------------------------- //DEAGLE //This one is obvious. @@ -150,7 +162,6 @@ item_state = skin + item_state attachable_offset = list("muzzle_x" = 31, "muzzle_y" = 21,"rail_x" = 9, "rail_y" = 23, "under_x" = 20, "under_y" = 17, "stock_x" = 20, "stock_y" = 17) - /obj/item/weapon/gun/pistol/heavy/set_gun_config_values() fire_delay = config.max_fire_delay accuracy_mult = config.base_hit_accuracy_mult @@ -161,9 +172,6 @@ recoil = config.low_recoil_value recoil_unwielded = config.high_recoil_value - - - //------------------------------------------------------- //MAUSER MERC PISTOL //Inspired by the Makarov. @@ -203,8 +211,6 @@ scatter_unwielded = config.med_scatter_value damage_mult = config.base_hit_damage_mult - - /obj/item/weapon/gun/pistol/c99/russian icon_state = "pk9r" item_state = "pk9r" @@ -248,7 +254,6 @@ recoil = config.min_recoil_value recoil_unwielded = config.med_recoil_value - //------------------------------------------------------- //PIZZACHIMP PROTECTION @@ -312,8 +317,6 @@ recoil = config.min_recoil_value recoil_unwielded = config.med_recoil_value - - //------------------------------------------------------- //VP70 //Not actually the VP70, but it's more or less the same thing. VP70 was the standard sidearm in Aliens though. @@ -370,7 +373,6 @@ recoil = config.min_recoil_value recoil_unwielded = config.med_recoil_value - //------------------------------------------------------- /* Auto 9 The gun RoboCop uses. A better version of the VP78, with more rounds per magazine. Probably the best pistol around, but takes no attachments. @@ -400,8 +402,6 @@ It is a modified Beretta 93R, and can fire three round burst or single fire. Whe recoil = config.min_recoil_value recoil_unwielded = config.med_recoil_value - - //------------------------------------------------------- //The first rule of monkey pistol is we don't talk about monkey pistol. diff --git a/code/modules/projectiles/updated_projectiles/magazines/pistols.dm b/code/modules/projectiles/updated_projectiles/magazines/pistols.dm index 70b78af22..d86723133 100644 --- a/code/modules/projectiles/updated_projectiles/magazines/pistols.dm +++ b/code/modules/projectiles/updated_projectiles/magazines/pistols.dm @@ -56,6 +56,13 @@ default_ammo = /datum/ammo/bullet/pistol gun_type = /obj/item/weapon/gun/pistol/b92fs +/obj/item/ammo_magazine/pistol/b92fstranq + name = "\improper M9 tranq magazine (9mm)" + caliber = "9mm" + icon_state = "m4a3" + max_rounds = 12 + default_ammo = /datum/ammo/bullet/pistol/tranq + gun_type = /obj/item/weapon/gun/pistol/b92fs/M9 //------------------------------------------------------- //DEAGLE //This one is obvious.