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

# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi

2019-04-11 07:27:51 +02:00

..

devices

Merge pull request #11081 from Kyep/hijack_limits

2019-04-04 09:30:56 +08:00

mountable_frames

Casing correction 1

2018-12-17 00:07:37 -05:00

robot

Gonna have to clean some files after this.

2019-01-19 22:38:47 -05:00

stacks

MORE UPDATES!

2019-04-03 20:29:16 +01:00

weapons

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

2019-04-11 07:27:51 +02:00

ashtray.dm

…

blueprints.dm

asteroid claim improvements, golem ship security

2019-02-03 15:59:04 +00:00

bodybag.dm

Forgot ERT, moved the boxes to boxes.dm

2018-11-10 12:08:06 +01:00

candle.dm

[Goonchem] Reagent Temperature

2019-03-18 20:06:15 -04:00

cardboard_cutouts.dm

Gonna have to clean some files after this.

2019-01-19 22:38:47 -05:00

changestone.dm

…

contraband.dm

…

control_wand.dm

Merge pull request #9986 from Dave-TH/access_tuner

2018-11-04 12:27:16 +08:00

crayons.dm

Suicide Refactor

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

dehy_carp.dm

…

documents.dm

Added Syndicate base and ported over turf decals

2019-03-31 20:26:02 +02:00

flag.dm

The Nations Update Everyone Deserves!

2019-04-06 20:30:04 -04:00

latexballoon.dm

[Goonchem] Reagent Temperature

2019-03-18 20:06:15 -04:00

misc.dm

…

mixing_bowl.dm

…

random_items.dm

fix merge conflict, wipe map changes

2019-01-03 14:39:41 -08:00

shooting_range.dm

Path normalization requires outdenting

2019-01-24 16:40:11 -06:00

toys.dm

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

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

trash.dm

Updates files.

2019-01-27 00:56:01 -07:00