Bawhoppen 7f73fd2a7b Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners ...

# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm

2020-03-12 05:06:09 -05:00

..

backpack.dm

The Families Gamemode. Home. At least it was 'til I fucked everything up. (#49274)

2020-03-08 18:33:54 -07:00

bags.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners

2020-02-14 21:28:55 -06:00

belt.dm

Brooms Upgraded: Disposal Bin Edition (#49433)

2020-03-05 20:57:20 +08:00

book.dm

Adds Religious Sects and Basic Technophile Sect for Proof of Concept (#49434)

2020-03-06 11:11:52 +08:00

boxes.dm

gumbox size

2020-02-29 14:46:01 +01:00

briefcase.dm

Gets rid of the GetComponent macros (#44220)

2019-06-04 17:39:58 +02:00

fancy.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

firstaid.dm

Cobbduceus: (Baby) C2 Additions (Rhig,Troph) and Changes (Helbital) (#49356)

2020-02-22 22:24:36 +13:00

holsters.dm

Slimes with belts? And clumsy people now shoot themselves

2020-02-17 17:40:34 -06:00

lockbox.dm

update_icon() improvements (#48669)

2020-01-11 23:46:43 -05:00

secure.dm

* "You should..." and "You must..."

2019-06-26 06:13:32 +03:00

sixpack.dm

update_icon() improvements (#48669)

2020-01-11 23:46:43 -05:00

storage.dm

Gets rid of the GetComponent macros (#44220)

2019-06-04 17:39:58 +02:00

toolbox.dm

update_icon() improvements (#48669)

2020-01-11 23:46:43 -05:00

uplink_kits.dm

[READY] Two Handed Component (#49422)

2020-03-04 11:26:01 +13:00

wallets.dm

remove caching from wallet update_overlays()

2020-01-26 02:53:15 +02:00