Commit Graph

8 Commits

Author SHA1 Message Date
Tlaltecuhtli ba1f6a77cf cargo crate fix (#43493)
* 1

* alphabet

* probably a typo
2019-04-08 16:05:18 -04:00
Tlaltecuhtli ec1ad61558 new cargo crates & tweaks (#43454)
* 1

* 2

* finall pre pr

* oof

* oof

* testing merge conflict fix

* test mk2

* test mk3

* plant & chem

* bvcgr

* fixed stuff

* grammar stuff

* fixes clothing + cobby bribe

* new sprites by wjohn

* Update code/modules/clothing/suits/armor.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* tweaks .38 stuff

* Update code/modules/cargo/packs.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* nuclear option
2019-04-03 14:23:38 -04:00
duckay 5c79d91f0b About that beer I owed ya. Adds blueshirt items to sectech and defines them better. (#42203)
* beer

* beer

* beer

* beer

* beer

* better descriptionhelmet

* better descriptionarmorname

* blue-shirt

* Update security.dm

* beer

* hey catch me later i'll buy you a

* thanks cobble

Co-Authored-By: duckay <41324849+duckay@users.noreply.github.com>

* helpies

* helpies

* discount for meme helmet

only 450 whoppers!
2019-01-04 15:12:34 -05:00
Steelpoint b9391bf203 Security Webbing (#41394)
This PR sees the addition of an expensive item to the Security vendor, the security webbing. A unique chest rig.

The concept of this item is to give Officers something to spend their money on when they save up.

webbing

The chest rig is intended as an expensive minor upgrade over the standard security belt that security personal can purchase. Functionally it is identical to the security belt except it can hold one extra item, up to 6 from 5.

The belt costs $800, meaning round start Officers will be unable to afford it. The sec vendor holds five of these webbings.

cl Steelpoint
add: Nanotrasen Security has unveiled a newly designed Security Webbing, a minor upgrade over the standard issue security belt that is comfortable, tactical and able to hold an extra security item.
add: However, the webbing is not considered standard issue, so any interested officers will need to buy the item from a SecVendor out of their own pay.
/cl
2018-11-12 20:36:01 +13:00
Iamgoofball f735a7d34d [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 02:50:51 -04:00
81Denton 02a076d2ee Uses defines for vending machine access (#38336)
* Uses defines for vending machine access

* delet
2018-06-08 15:46:03 +03:00
Fox McCloud 057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
John Ginnane 3e1db725c1 Modularises vending machines (#36508)
* Modularises vending machines

Each machine now has its own file, which includes it's refill cannister for easy maintenance

* Moved and renamed vending file
2018-03-21 16:33:39 -04:00