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

# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme

2019-05-30 19:35:52 +02:00

..

alien.dm

Remove unused species_fit and move chameleon file

2019-05-05 20:37:53 +02:00

armor.dm

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

2019-05-30 19:35:52 +02:00

bio.dm

Remove unused species_fit and move chameleon file

2019-05-05 20:37:53 +02:00

hood.dm

Port over Corn and affected's work on Lavaland

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

jobs.dm

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

2019-05-30 19:35:52 +02:00

labcoat.dm

Remove unused species_fit and move chameleon file

2019-05-05 20:37:53 +02:00

miscellaneous.dm

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

2019-05-13 22:08:49 +02:00

storage.dm

Multilingualism

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

utility.dm

Remove unused species_fit and move chameleon file

2019-05-05 20:37:53 +02:00

wiz_robe.dm

add magical var to clothing, remove istype checks on spellcast

2018-12-30 17:36:27 +00:00