ikarrus 55799b2ced Resolved Conflicts: ...

code/defines/procs/priority_announce.dm

2014-08-18 19:44:15 -06:00

..

admin

Merge pull request #4461 from Jordie0608/tbhtheentirefeatureiskindasilly

2014-08-18 08:25:05 +01: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

Merge pull request #4428 from Zelacks/medalssuck

2014-08-16 13:49:13 +01:00

detectivework

cargonia strong!

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

events

added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.

2014-08-03 22:14:56 -03: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 #4365 from paprka/fingerlessgloves

2014-08-15 08:03:37 +01:00

mob

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

2014-08-17 02:56:45 +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

Advanced Shotshells

2014-08-14 12:15:10 -05:00

reagents

Merge pull request #4346 from Firecage/FUCKINABSOLUTEPATHS

2014-08-08 12:15:22 +02:00

recycling

Fixes that "temporary black screen on deletion" issue for disposals

2014-08-02 18:47:00 -07:00

research

Merge pull request #4427 from Cheridan/blow_up

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

scripting

…

security levels

Minor Announcement format expanded to include Alert Level changes and Emergency Declarations

2014-08-14 20:44:18 -06:00

shuttle

…

surgery

…

telesci

…