Tigercat2000 0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ...

Conflicts:
	code/game/gamemodes/objective.dm

2016-08-08 06:21:02 -07:00

..

admin

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-08 06:21:02 -07:00

alarm

…

arcade

…

assembly

…

atmos_automation

…

awaymissions

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-08 06:21:02 -07:00

client

Merge pull request #5348 from LittleBigKid2000/aesthetic-sunglasses

2016-08-07 23:06:20 -04:00

clothing

Merge pull request #5348 from LittleBigKid2000/aesthetic-sunglasses

2016-08-07 23:06:20 -04:00

computer3

Removes dels and unused code that contains dels

2016-08-02 01:33:19 -04:00

crafting

tweakssss

2016-07-26 13:21:06 -04:00

customitems

…

detective_work

…

economy

Atom Say Refactor

2016-08-06 06:45:20 -04:00

error_handler

…

events

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-08 06:21:02 -07:00

examine

…

ext_scripts

…

fish

…

flufftext

…

food_and_drinks

Implements Fire System

2016-07-29 13:24:09 -04:00

garbage_collection

Makes sure early qdels still call Destroy

2016-08-02 01:56:02 -04:00

holiday

Integrates the z level manager with the space transition system

2016-07-29 19:11:36 -07:00

hydroponics

Removes dels and unused code that contains dels

2016-08-02 01:33:19 -04:00

karma

…

library

Implements Fire System

2016-07-29 13:24:09 -04:00

lighting

…

logic

…

martial_arts

Various grammar/spelling fixes

2016-08-05 18:43:33 -04:00

media

…

mining

Merge pull request #5251 from Fox-McCloud/fire-system

2016-08-01 19:39:50 -04:00

mob

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-08 06:21:02 -07:00

nano

Merge pull request #5264 from tigercat2000/seriously_fox

2016-08-01 20:44:37 -04:00

ninja

…

paperwork

better check

2016-07-31 16:13:19 -04:00

pda

Integrates the z level manager with the space transition system

2016-07-29 19:11:36 -07:00

persistence

Map writer is now legible in DM, saves 19x faster

2016-08-07 12:02:43 -07:00

pooling

…

power

Merge pull request #5309 from Fox-McCloud/field-generators

2016-08-03 23:29:09 -04:00

procedural_mapping

…

projectiles

Less stealth more sprite.

2016-08-03 22:54:00 -05:00

reagents

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-08 06:21:02 -07:00

recycling

Merge pull request #5277 from Crazylemon64/robojanitor_disposal_fix

2016-08-01 20:15:09 -04:00

research

Atom Say Refactor

2016-08-06 06:45:20 -04:00

ruins

…

scripting

…

security_levels

Removs Airlock World Calls

2016-08-02 22:44:27 -04:00

shuttle

Integrates the z level manager with the space transition system

2016-07-29 19:11:36 -07:00

space_management

Makes a certain tiger pre-emptively happy

2016-07-30 14:15:17 -07:00

spacepods

…

store

Integrates the z level manager with the space transition system

2016-07-29 19:11:36 -07:00

surgery

Oh

2016-08-05 18:58:38 -04:00

telesci

Update bscrystal.dm

2016-08-07 00:33:52 +01:00

tooltip

…

tram

…

vehicle

…