Fox-McCloud 38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle

2016-01-03 22:35:28 -05:00

..

admin

Makes IsBanned use text2num for CIDs

2016-01-03 11:56:39 -05:00

alarm

…

arcade

…

assembly

…

atmos_automation

…

awaymissions

Clean old shit, delete old files, move files, mrowl

2015-12-27 15:58:41 -08:00

client

Merge pull request #3037 from KasparoVy/master

2016-01-03 22:33:40 -05:00

clothing

Merge pull request #3043 from Fox-McCloud/elite-syndi-hardsuit

2015-12-30 13:49:39 -05:00

computer3

…

crafting

…

customitems

Ports TG's Tesla Engine

2015-12-24 00:40:20 -05:00

detective_work

…

economy

Clean old shit, delete old files, move files, mrowl

2015-12-27 15:58:41 -08:00

events

Added a bunch of new antag tags because whee these are cheap

2015-12-27 07:58:21 -08:00

examine

…

ext_scripts

Clean old shit, delete old files, move files, mrowl

2015-12-27 15:58:41 -08:00

fish

Clean incorrect styling for the ++ operator

2016-01-02 10:46:01 -08:00

flufftext

…

food

…

garbage_collection

…

holiday

…

hydroponics

Lastproduce Fix and Aging Consistency

2016-01-01 21:38:23 -05:00

karma

…

library

…

lighting

…

media

EMP Fixes

2015-12-23 04:09:47 -05:00

mining

…

mob

Merge pull request #3037 from KasparoVy/master

2016-01-03 22:33:40 -05:00

nano

NanoUI Improvements Part 2: SEE ESS ESS

2016-01-01 12:51:08 -08:00

ninja

Replaces Sleep with Paralysis

2015-12-28 00:21:38 -05:00

organs

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'

2015-12-27 18:42:59 -05:00

paperwork

…

pooling

Pooling Update from TG

2015-12-23 16:34:34 -05:00

power

Merge pull request #3092 from tigercat2000/tgsmooth

2016-01-03 22:28:50 -05:00

procedural_mapping

…

projectiles

tweak

2016-01-03 20:34:40 -05:00

reagents

Merge pull request #3037 from KasparoVy/master

2016-01-03 22:33:40 -05:00

recycling

…

research

Merge remote-tracking branch 'upstream/master' into sec-rifle

2016-01-03 22:35:28 -05:00

scripting

Clean old shit, delete old files, move files, mrowl

2015-12-27 15:58:41 -08:00

security_levels

…

shieldgen

Fixes Shield Generator Circuits

2016-01-03 21:36:27 -05:00

shuttle

-tg- smoothing/floor refactor

2016-01-03 19:24:13 -08:00

space_transition

…

store

…

surgery

Can actually do robot face surgery now

2015-12-31 10:47:37 -08:00

telesci

…

tram

…

vehicle

…

virus2

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'

2015-12-30 17:41:26 -05:00