LetterJay e8f581bb56 Merge branch 'master' into upstream-merge-31077

2017-09-29 12:46:25 -04:00

..

ass

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

effects

Shooting walls can create bullet holes/dents (#30714)

2017-09-28 21:48: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

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

misc

Adds the Beach Bum Language

2017-05-24 05:54:42 -05:00

mob

Back and inhands for air tanks.

2017-09-28 10:44:20 -05:00

obj

Merge pull request #2958 from Michiyamenotehifunana/wave3guns

2017-09-29 12:45:52 -04:00

pda_icons

Applying PDA overhaul Upstream (#30613)

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

program_icons

Ports bay's supermatter monitor modular program

2017-06-28 10:05:53 -05:00

PSD files

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

stamp_icons

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

Testing

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

turf

[MIRROR] Removes vine floors and their sprite (#2807)

2017-09-17 12:00:19 -05:00

vending_icons

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

480x480.dmi

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

BadAss.dmi

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

dispensebutton_bg.png

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

emoji.dmi

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

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

member_content.dmi

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

minimap.dmi

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

reagentname_bg.png

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

ss13_32.png

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

ss13_64.png

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00

VendingMachineBG.png

initial commit - cross reference with 5th port - obviously has compile errors

2016-07-03 02:17:19 -05:00