ikarrus 6dbdc37e04 Resolved Conflicts: ...

code/modules/events/immovable_rod.dm

2014-05-17 18:46:53 -06:00

..

admin

Merge pull request #3694 from Rolan7/Issue2883-medal

2014-05-15 11:55:57 +01:00

assembly

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

2014-03-26 18:14:48 -07:00

awaymissions

Fixes issue #2489

2014-05-01 06:01:14 -03:00

client

Merge pull request #3473 from Giacom/gotta_fix_em_all

2014-04-24 21:08:06 -05:00

clothing

Merge pull request #3602 from GunHog/Advanced_HUDs

2014-05-14 11:06:03 +01:00

detectivework

Merge pull request #3572 from Aranclanos/evidencebags

2014-05-02 17:46:04 +01:00

events

Resolved Conflicts:

2014-05-17 18:46:53 -06:00

flufftext

Fixes the bug where players get deleted because of hallucinations. How the fuck did I screw this up so badly...

2014-03-22 21:55:52 -07:00

food

human-burgers now eject correctly

2014-04-03 22:50:02 +02:00

hydroponics

fixing conflict

2014-05-14 10:01:29 -05:00

library

Added a check for "_nodrop_" items for several machines/structures (fix #3407).

2014-04-20 20:49:32 +02:00

mining

Merge pull request #3651 from Cheridan/areaSounds

2014-05-14 11:04:02 +01:00

mob

Merge pull request #3509 from Cheridan/MeteorsSuck

2014-05-17 18:42:16 -05:00

nano

Initial pass to convert LF to CRLF

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

paperwork

Fixed indentations.

2014-05-14 09:02:53 -06:00

power

Merge pull request #3509 from Cheridan/MeteorsSuck

2014-05-17 18:42:16 -05:00

projectiles

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

2014-05-13 14:03:42 -05:00

reagents

Merge pull request #3509 from Cheridan/MeteorsSuck

2014-05-17 18:42:16 -05:00

recycling

Added a check for "_nodrop_" items for several machines/structures (fix #3407).

2014-04-20 20:49:32 +02:00

research

Merge pull request #3509 from Cheridan/MeteorsSuck

2014-05-17 18:42:16 -05:00

scripting

…

security levels

…

shuttle

Initial pass to convert LF to CRLF

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

surgery

Changed suicide messages to visible_messages and fixed relative pathing

2014-05-13 01:44:29 +10:00

telesci

Initial pass to convert LF to CRLF

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