Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme

2019-04-10 21:54:54 +02:00

..

artistic_toolbox.dm

Crit Rework Final Submission

2019-03-28 17:28:00 -04:00

backpack.dm

updates

2019-04-02 20:26:23 +01:00

bags.dm

Suicide Refactor

2019-03-27 22:54:26 -04:00

belt.dm

Minor Lavaland item fixes

2019-04-01 23:51:41 +02:00

bible.dm

whoops

2019-03-27 23:09:21 -04:00

boxes.dm

updates

2019-04-02 20:26:23 +01:00

briefcase.dm

…

fancy.dm

Fixes invisible egg and donut boxes

2018-07-22 15:33:21 -04:00

firstaid.dm

Fixess Being Unable to Open Pill Bottles

2019-04-07 09:25:45 -04:00

internal.dm

…

lockbox.dm

3 is now 2 and 4 is now 3

2019-03-17 17:01:54 -04:00

secure.dm

Multilingualism

2018-11-24 00:22:05 -08:00

storage.dm

His Grace Binds His Will

2019-02-28 19:12:48 -05:00

toolbox.dm

Update toolbox.dm

2018-12-26 00:18:37 +01:00

uplink_kits.dm

Merge pull request #11225 from TDSSS/box-revolver

2019-04-07 21:14:51 +08:00

wallets.dm

Wallet icon defaults to green if it is filled with an id of any type

2018-08-16 22:22:51 +08:00