Fox McCloud 03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc ...

# Conflicts:
#	code/game/objects/items.dm

2019-04-07 19:54:14 -04: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

[Goonchem] Reagent Temperature

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

weapons

Merge remote-tracking branch 'upstream/master' into fix-cqc

2019-04-07 19:54:14 -04: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

…

crayons.dm

Suicide Refactor

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

dehy_carp.dm

…

documents.dm

Refactored pickup code and fixed the bug

2019-03-18 16:42:44 +01:00

flag.dm

[Goonchem] Reagent Temperature

2019-03-18 20:06:15 -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

Fixes Russian Revolver

2019-04-07 07:37:02 -04:00

trash.dm

Updates files.

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