Ikarrus 25b134581b Resolved Conflicts: ...

code/game/gamemodes/gang/gang_pen.dm

2015-07-02 15:15:41 -06:00

..

admin

Datum-Based Gangs

2015-07-02 15:12:55 -06:00

assembly

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

awaymissions

code improvement and overlays for fancy storage, dropper, syringe and lighter

2015-06-10 18:58:19 +10:00

client

Minimap support for the crew monitoring computer.

2015-06-28 23:00:39 +02:00

clothing

MATERIAL DATUM

2015-07-01 18:32:30 +01:00

crafting

Merge from upstream.

2015-06-25 20:30:19 +02:00

detectivework

Merge from upstream.

2015-06-25 20:30:19 +02:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge pull request #10238 from Incoming5643/catgirls2015

2015-06-29 21:44:39 -05:00

flufftext

Merge from upstream.

2015-06-25 20:30:19 +02:00

food&drinks

Merge pull request #10163 from RemieRichards/TableCraftingUnFucking

2015-07-01 14:29:55 -04:00

games

- Crew monitoring computer using the html_interface module

2015-06-27 10:26:46 +02:00

holiday

Adds a category for food items, adds some missing weapons and a Misc category

2015-06-25 11:58:42 +01:00

html_interface

Minimap support for the crew monitoring computer.

2015-06-28 23:00:39 +02:00

hydroponics

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

library

Squashed Commits

2015-06-27 00:09:16 -06:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

mob

Datum-Based Gangs

2015-07-02 15:12:55 -06:00

nano

Merge from upstream.

2015-06-25 20:30:19 +02:00

ninja

Merge from upstream.

2015-06-25 20:30:19 +02:00

paperwork

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

power

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

2015-07-02 18:49:41 +01:00

procedural mapping

Merge from upstream.

2015-06-25 20:30:19 +02:00

projectiles

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

reagents

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

recycling

Squashed Commits

2015-06-27 00:09:16 -06:00

research

Material container, all items can have materials, wake me up

2015-07-01 03:34:47 +01:00

scripting

Merge from upstream.

2015-06-25 20:30:19 +02:00

security levels

more spans

2015-04-24 20:52:00 +03:00

shuttle

Merge from upstream.

2015-06-25 20:30:19 +02:00

surgery

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

2015-07-02 18:49:41 +01:00

telesci

Fixes telesci console icon

2015-06-26 17:03:29 +03:00