Cheridan ea3d4b35c4 fixing conflict

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

..

admin

Merge pull request #3667 from MrStonedOne/adminpermfix

2014-05-14 09:57:00 +01:00

assembly

…

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

Thanks byond and your stealth declarations

2014-04-28 00:21:15 +04:00

flufftext

…

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

Replaced the isRobot() check with two new functions, one of which is overloaded for robots. Object oriented programming intensifies!

2014-05-09 18:03:49 -04:00

nano

…

paperwork

[MAP] Firing Range Instructions

2014-05-10 19:53:48 -06:00

power

Merge pull request #3480 from AstralSerpent/master

2014-05-14 10:39:10 +01:00

projectiles

Emp Icon fix Commit

2014-05-06 02:55:58 +08:00

reagents

Merge pull request #3624 from phil235/SyringeDrawFix

2014-05-14 10:20:13 +01: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 #3602 from GunHog/Advanced_HUDs

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

scripting

…

security levels

…

shuttle

…

surgery

Changed suicide messages to visible_messages and fixed relative pathing

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

telesci

…