deathride58 4e727ee576 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860 ...

# Conflicts:
#	_maps/map_files/MetaStation/MetaStation.dmm

2017-11-20 23:34:46 -05:00

..

ass

…

effects

overhaul (#32316)

2017-11-03 23:40:27 -05:00

mecha

Adds installing cells as part of mech construction and fixes some mech construction bugs.

2017-09-27 04:14:22 -05:00

minimaps

Removes the Cerestation minimap (#32415)

2017-11-05 02:07:27 -06:00

misc

…

mob

donator sprites

2017-11-20 14:22:29 -06:00

obj

Merge pull request #4038 from Citadel-Station-13/upstream-merge-32894

2017-11-21 03:35:48 +00:00

pda_icons

Applying PDA overhaul Upstream (#30613)

2017-09-28 21:43:32 -05:00

program_icons

…

PSD files

…

stamp_icons

…

Testing

…

turf

hOPEFULLY FIXES THE GOD DAMN MERGE CONFLICTS

2017-11-20 23:12:58 -05:00

vending_icons

…

480x480.dmi

…

BadAss.dmi

…

blank_title.png

Fixed required images being in the config folder

2017-11-03 23:35:06 -05:00

dispensebutton_bg.png

…

emoji.dmi

Revert "goddamnit (#2491)" (#2510)

2017-08-26 16:13:23 -07:00

member_content.dmi

…

minimap.dmi

…

reagentname_bg.png

…

ss13_32.png

…

ss13_64.png

…

VendingMachineBG.png

…