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

# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
#	code/datums/weather/weather_types/radiation_storm.dm
#	code/game/area/Space_Station_13_areas.dm

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

..

backpack.dm

Adjusts Dark Gygax Equipment and stats, gives nukies a mech support bag. (#49131)

2020-02-13 09:58:35 +01: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

Adjusts Dark Gygax Equipment and stats, gives nukies a mech support bag. (#49131)

2020-02-13 09:58:35 +01:00

book.dm

Makes raw HTML and browser datum popups UTF-8 aware (#49066)

2020-02-01 22:14:31 +01:00

boxes.dm

Adds missing box sprites and reworks some ammo boxes (#49057)

2020-02-08 20:48:14 -05: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

Normalizes payouts and vendor prices to an approximate of cargo's credit value (#48174)

2019-12-16 17:43:27 +01: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

Adds chameleon belt to cham kit (#49175)

2020-02-08 20:52:53 -05:00

wallets.dm

remove caching from wallet update_overlays()

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