Fox McCloud 85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework ...

# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme

2019-08-25 16:51:21 -04:00

..

devices

Merge pull request #11957 from FreeStylaLT/enginepicker

2019-08-24 10:49:58 -04:00

mountable_frames

…

robot

Merge pull request #11552 from Markolie/gammaborg

2019-05-27 18:14:54 +08:00

stacks

Merge remote-tracking branch 'upstream/master' into plasmamen-rework

2019-08-25 16:51:21 -04:00

weapons

Merge remote-tracking branch 'upstream/master' into plasmamen-rework

2019-08-25 16:51:21 -04:00

ashtray.dm

fixes

2019-04-24 00:49:23 -04:00

blueprints.dm

removed unnecessary == TRUE

2019-07-06 14:26:42 -04:00

bodybag.dm

…

candle.dm

Kills off Object and Fast Object Processes

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

cardboard_cutouts.dm

…

changestone.dm

…

contraband.dm

Standardized colors, finished change wrapper choosing and modified templates and their sizes

2019-06-30 19:46:13 +02:00

control_wand.dm

door remote logs

2019-07-28 17:49:04 -04:00

crayons.dm

Suicide Refactor

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

dehy_carp.dm

Even better water handling

2019-06-03 00:31:03 +02:00

documents.dm

Added Syndicate base and ported over turf decals

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

flag.dm

It's Time

2019-04-14 18:24:48 -04:00

latexballoon.dm

[Goonchem] Reagent Temperature

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

misc.dm

…

mixing_bowl.dm

…

random_items.dm

Standardized colors, finished change wrapper choosing and modified templates and their sizes

2019-06-30 19:46:13 +02:00

shooting_range.dm

…

toys.dm

Merge pull request #11864 from Markolie/portalfix

2019-08-10 23:24:58 -04:00

trash.dm

…