Skip to content

Commit

Permalink
Что же у меня тогда лежало в подсумке? (#347)
Browse files Browse the repository at this point in the history
* Что же у меня тогда лежало в подсумке?

а я уже явно не помню

* Update pouch.dm

* Update pouch.dm

* Update icons.dm
  • Loading branch information
polerno authored Nov 2, 2023
1 parent 084097b commit a9ac33f
Show file tree
Hide file tree
Showing 6 changed files with 372 additions and 8 deletions.
5 changes: 3 additions & 2 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3238,7 +3238,6 @@
#include "interface\interface.dm"
#include "interface\skin.dmf"
#include "maps\_maps.dm"
#include "proxima\code\game\objects\structures\flora.dm"
#include "proxima\code\_helpers\colors.dm"
#include "proxima\code\_helpers\gauss.dm"
#include "proxima\code\_helpers\_onclick\hud\_defines_ai.dm"
Expand All @@ -3264,15 +3263,16 @@
#include "proxima\code\game\machinery\factory\blueprint.dm"
#include "proxima\code\game\machinery\factory\factory.dm"
#include "proxima\code\game\machinery\factory\blueprints\generic.dm"
#include "proxima\code\game\objects\effects\particles\snow.dm"
#include "proxima\code\game\objects\items\circuits_remote.dm"
#include "proxima\code\game\objects\items\containers.dm"
#include "proxima\code\game\objects\items\posters.dm"
#include "proxima\code\game\objects\items\remote_weapon_ammo.dm"
#include "proxima\code\game\objects\items\toys.dm"
#include "proxima\code\game\objects\items\device\remote_weapon_controller.dm"
#include "proxima\code\game\objects\structures\barrier.dm"
#include "proxima\code\game\objects\structures\flora.dm"
#include "proxima\code\game\objects\structures\holoplants.dm"
#include "proxima\code\game\objects\effects\particles\snow.dm"
#include "proxima\code\game\verbs\who.dm"
#include "proxima\code\modules\filmgrain.dm"
#include "proxima\code\modules\poraz_corgi.dm"
Expand All @@ -3286,6 +3286,7 @@
#include "proxima\code\modules\clothing\feet\feet.dm"
#include "proxima\code\modules\clothing\masks\masks.dm"
#include "proxima\code\modules\clothing\masks\smokable.dm"
#include "proxima\code\modules\clothing\pouch\pouch.dm"
#include "proxima\code\modules\clothing\spacesuits\rig\suits\interstellar.dm"
#include "proxima\code\modules\clothing\suit\suit.dm"
#include "proxima\code\modules\clothing\suits\armor.dm"
Expand Down
3 changes: 2 additions & 1 deletion code/datums/supplypacks/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@
/obj/item/device/scanner/health,
/obj/item/device/flashlight/pen,
/obj/item/reagent_containers/syringe,
/obj/item/clothing/accessory/storage/white_vest)
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/storage/pouch/tubular/vial)
cost = 22
containertype = /obj/structure/closet/crate/secure
containername = "paramedic equipment crate"
Expand Down
13 changes: 9 additions & 4 deletions code/datums/supplypacks/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
/obj/item/clothing/glasses/tacgoggles,
/obj/item/storage/belt/holster/security/tactical,
/obj/item/clothing/shoes/tactical,
/obj/item/clothing/gloves/tactical)
/obj/item/clothing/gloves/tactical,
/obj/item/storage/pouch/ammo)
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "tactical armor crate"
Expand Down Expand Up @@ -107,7 +108,8 @@
/obj/item/clothing/head/helmet/riot = 4,
/obj/item/clothing/suit/armor/riot = 4,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/teargas)
/obj/item/storage/box/teargas,
/obj/item/storage/pouch/baton_holster)
cost = 55
containertype = /obj/structure/closet/crate/secure
containername = "riot gear crate"
Expand All @@ -116,7 +118,9 @@
/decl/hierarchy/supply_pack/security/ballisticarmor
name = "Armor - Ballistic"
contains = list(/obj/item/clothing/head/helmet/ballistic = 4,
/obj/item/clothing/suit/armor/bulletproof = 4)
/obj/item/clothing/suit/armor/bulletproof = 4,
/obj/item/storage/pouch/pistol_holster = 4,
/obj/item/storage/pouch/ammo = 4)
cost = 60
containertype = /obj/structure/closet/crate/secure
containername = "ballistic suit crate"
Expand All @@ -137,7 +141,8 @@
/obj/item/reagent_containers/spray/pepper = 4,
/obj/item/melee/baton/loaded = 4,
/obj/item/gun/energy/taser = 4,
/obj/item/storage/box/handcuffs)
/obj/item/storage/box/handcuffs,
)
cost = 50
containertype = /obj/structure/closet/crate/secure/weapon
containername = "security weapons crate"
Expand Down
20 changes: 19 additions & 1 deletion code/game/machinery/biogenerator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,25 @@
/obj/item/clothing/suit/leathercoat = 500,
/obj/item/clothing/suit/storage/toggle/brown_jacket = 500,
/obj/item/clothing/suit/storage/toggle/bomber = 500,
/obj/item/clothing/suit/storage/hooded/wintercoat = 500))
/obj/item/clothing/suit/storage/hooded/wintercoat = 500,
/obj/item/storage/pouch/small_generic = 200,
/obj/item/storage/pouch/small_generic/purple = 250,
/obj/item/storage/pouch/small_generic/leather = 275,
/obj/item/storage/pouch/medium_generic = 400,
/obj/item/storage/pouch/medium_generic/leather = 475,
/obj/item/storage/pouch/large_generic = 600,
/obj/item/storage/pouch/large_generic/leather = 675,
/obj/item/storage/pouch/medical_supply = 350,
/obj/item/storage/pouch/engineering_tools = 350,
/obj/item/storage/pouch/engineering_supply = 350,
/obj/item/storage/pouch/janitor_supply = 450,
/obj/item/storage/pouch/ammo = 500,
/obj/item/storage/pouch/tubular = 400,
/obj/item/storage/pouch/tubular/vial = 450,
/obj/item/storage/pouch/pistol_holster = 250,
/obj/item/storage/pouch/pistol_holster/cowboy = 500,
/obj/item/storage/pouch/kniferig = 400,
/obj/item/storage/pouch/baton_holster = 300))

/obj/machinery/biogenerator/New()
..()
Expand Down
Loading

0 comments on commit a9ac33f

Please sign in to comment.