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

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme

2019-05-04 03:16:38 +02:00

..

artistic_toolbox.dm

Crit Rework Final Submission

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

backpack.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-05-04 03:16:38 +02:00

bags.dm

Kills off Object and Fast Object Processes

2019-04-23 23:53:40 -04:00

belt.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-05-03 18:31:45 +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

Nuke ops updates

2019-04-07 21:57:22 +02:00

fancy.dm

…

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

Tweaks

2019-05-01 16:04:07 +02:00

toolbox.dm

Update toolbox.dm

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

uplink_kits.dm

And fix the uplink kits

2019-05-01 21:01:16 +02:00

wallets.dm

…