RandomMarine 9a6b11e785 Merge branch 'master' of https://github.com/tgstation/-tg-station into golemship ...

# Conflicts:
#	config/admins.txt

2016-04-10 17:13:19 -07:00

..

backpack.dm

I like trustygun's idea

2016-03-26 14:13:27 -06:00

bags.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

belt.dm

removed a redundant carried in shoulder holster desc

2016-03-31 13:07:47 +01:00

book.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

boxes.dm

Golem ship tweaks and additions

2016-04-09 21:19:38 -07:00

briefcase.dm

Update briefcase.dm

2015-12-30 17:50:00 -02:00

fancy.dm

Cigarette packs will brand their cigarettes.

2016-04-03 10:42:53 +01:00

firstaid.dm

HUD item slots no longer show item placeholders when there are actual items inside

2016-03-22 08:00:38 +03:00

internal.dm

…

lockbox.dm

I refactored how a mob resisting out of a closet that is itself inside something is done.

2016-03-03 20:20:34 +01:00

secure.dm

I refactored how a mob resisting out of a closet that is itself inside something is done.

2016-03-03 20:20:34 +01:00

storage.dm

Merge pull request #16279 from Core0verload/HUDfuckery

2016-03-30 23:30:06 -06:00

toolbox.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

uplink_kits.dm

adds reinforced bolas, tweaks uplink throwing star bundle

2016-03-09 23:02:18 -08:00

wallets.dm

...

2016-04-09 12:33:32 -04:00