ikarrus 0891744c8e Resolved Conflicts: ...

_maps/map_files/tgstation.2.1.3.dmm

2014-08-21 19:47:30 -06:00

..

admin

Resolved Conflicts:

2014-08-21 19:47:30 -06:00

assembly

ABSOLUTELY ABSOLUTE

2014-08-06 16:21:24 +02:00

awaymissions

Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot

2014-08-18 19:27:02 +02:00

client

Removes the unused and useless warn button on the player panel.

2014-08-06 03:43:28 -03:00

clothing

Resolved Conflicts:

2014-08-21 19:47:30 -06:00

detectivework

cargonia strong!

2014-08-07 05:51:27 -07:00

events

Merge pull request #4488 from Ikarrus/remove-ninja-instagib

2014-08-21 15:17:25 -05:00

flufftext

moremoarmoaaaaarabsolutes

2014-08-06 16:54:06 +02:00

food&drinks

Merge pull request #4448 from Firecage/absolutefood

2014-08-17 13:45:23 +01:00

hydroponics

Merge pull request #4123 from Rolan7/Issue_4045

2014-07-21 08:40:38 -05:00

library

moremoarmoaaaaarabsolutes

2014-08-06 16:54:06 +02:00

mining

Merge pull request #4441 from Ikarrus/brigtimer_notice

2014-08-19 10:32:50 +01:00

mob

Merge pull request #4476 from Iamgoofball/hair

2014-08-21 09:47:42 +02:00

nano

Giacom Fixes

2014-08-06 20:22:36 +02:00

paperwork

Bug fixes to AI photography Ext. 2

2014-08-13 14:42:36 -05:00

power

Adds static power value on areas. These variables should replace machines on the process list, that are only there to consume power.

2014-08-06 06:57:52 -03:00

projectiles

Merge pull request #4393 from paprka/emptyclick

2014-08-19 10:36:06 +01:00

reagents

buff to condensed capsaicin

2014-08-12 17:24:25 -07:00

recycling

Absolute paths for recycling folder files

2014-08-17 15:51:15 +02:00

research

Merge pull request #4427 from Cheridan/blow_up

2014-08-17 15:35:08 -03:00

scripting

fixes shit

2014-03-09 18:31:43 +01:00

security levels

Emergency Access Override Update

2014-03-15 14:59:39 -06:00

shuttle

Removing duplicate href code

2014-08-18 22:29:32 -06:00

surgery

Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401

2014-07-07 13:42:31 -04:00

telesci

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00