Poojawa 789064a3a5 Clean up .rej files

2017-06-28 02:24:03 -05:00

..

admin

Merge pull request #1781 from Citadel-Station-13/upstream-merge-28782

2017-06-26 06:19:03 -05:00

assembly

Ports Goonchat

2017-06-08 16:27:56 -05:00

atmospherics

Freezers and heaters now drop the correct materials (Fixes #28560)

2017-06-19 21:27:30 -05:00

awaymissions

Fixes basic spiderlings becoming ice spiders

2017-06-10 12:22:48 -05:00

cargo

Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564

2017-06-26 09:00:54 -05:00

chatter

…

client

Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750

2017-06-26 06:26:11 -05:00

clothing

Ancient Space Station [Space Spawn Ruin]

2017-06-25 11:03:27 -05:00

crafting

Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115

2017-06-10 09:01:25 -05:00

detectivework

…

emoji

Ports Goonchat

2017-06-08 16:27:56 -05:00

error_handler

…

events

Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync

2017-06-14 06:41:01 -05:00

fields

…

flufftext

another huge sync

2017-06-21 18:00:00 -05:00

food_and_drinks

Adds container types INJECTABLE and DRAWABLE

2017-06-27 08:19:49 -05:00

games

…

goonchat

Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750

2017-06-26 06:26:11 -05:00

holiday

…

holodeck

…

html_interface

…

hydroponics

Bonfires light up in lavaland atmos

2017-06-19 08:53:41 -05:00

jobs

Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740

2017-06-26 10:51:51 -05:00

language

another huge sync

2017-06-21 18:00:00 -05:00

library

Chisel messages will be below objects

2017-06-19 22:07:23 -05:00

lighting

Fix some things assuming lighting corners existed (#1642)

2017-06-17 13:17:21 -07:00

mapping

upstream-merge-27951

2017-06-11 02:11:34 -05:00

mentor

…

mining

Merge pull request #1785 from Citadel-Station-13/upstream-merge-28760

2017-06-26 10:10:00 -05:00

mob

Merge pull request #1798 from Citadel-Station-13/upstream-merge-28856

2017-06-27 22:53:40 -05:00

modular_computers

Clean up .rej files

2017-06-28 02:24:03 -05:00

ninja

Ninja Dash

2017-06-26 08:57:46 -05:00

orbit

…

paperwork

Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584

2017-06-27 21:25:50 -05:00

power

Freezers and heaters now drop the correct materials (Fixes #28560)

2017-06-19 21:27:30 -05:00

procedural_mapping

Fixes badmin repair mapgen module for real this time (#1604)

2017-06-17 13:29:10 -07:00

projectiles

Clean up .rej files

2017-06-28 02:24:03 -05:00

reagents

Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584

2017-06-27 21:25:50 -05:00

recycling

Ports Goonchat

2017-06-08 16:27:56 -05:00

research

Adds container types INJECTABLE and DRAWABLE

2017-06-27 08:19:49 -05:00

ruins

Adds some neat tiles and walls for use on lavaland

2017-06-26 09:19:17 -05:00

security_levels

…

server_tools

another huge sync

2017-06-21 18:00:00 -05:00

shuttle

Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564

2017-06-26 09:00:54 -05:00

space_transition

…

spells

upstream-merge-27951

2017-06-11 02:11:34 -05:00

station_goals

…

stock_market

Ports Goonchat

2017-06-08 16:27:56 -05:00

surgery

another huge sync

2017-06-21 18:00:00 -05:00

telesci

…

tgui

…

tooltip

…

uplink

.rej cleanup

2017-06-26 06:14:42 -05:00

vehicles

…

vore

Removed vore sound falloff

2017-06-21 07:27:54 -05:00

VR

…

zombie

Reduces the size of the zombie revival flavor text (Fixes #28568)

2017-06-19 19:53:44 -05:00