ikarrus 6befeed46f -Giacom's feedback ...

-Fixed secbots being able to stun silicons
-Added an attack cooldown for secbots

2014-06-27 09:25:52 -06:00

..

admin

Securitron Update

2014-06-15 16:19:32 -06:00

assembly

Merge pull request #3906 from Malkevin/sparklesparkle

2014-06-13 09:16:30 +01:00

awaymissions

Removes hacky code in favour of a process() check for the nuke disk's location

2014-05-30 22:01:20 -06:00

client

Merge pull request #3473 from Giacom/gotta_fix_em_all

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

clothing

Merge pull request #3903 from phil235/HardHatUpdateFix

2014-06-12 19:29:14 -05:00

detectivework

Merge pull request #3572 from Aranclanos/evidencebags

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

events

Merge pull request #3831 from CollenN/bogemagchance

2014-06-05 21:38:43 +01: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

Merge pull request #3718 from hornygranny/cheeseallthewaydown

2014-05-31 13:56:03 +02:00

hydroponics

fixing conflict

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

library

carved books now turn into storage items

2014-05-16 14:30:04 -07:00

mining

Merge pull request #3651 from Cheridan/areaSounds

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

mob

-Giacom's feedback

2014-06-27 09:25:52 -06: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

Resolved conflicts:

2014-06-13 09:04:30 -06:00

projectiles

Update shotgun.dm

2014-06-11 19:15:53 -05:00

reagents

Merge pull request #3803 from Cheridan/pills_here

2014-06-11 12:10:23 +01:00

recycling

The Loggening: Admin Edition

2014-06-02 23:13:33 -06:00

research

Merge pull request #3509 from Cheridan/MeteorsSuck

2014-05-17 18:42:16 -05: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

Initial pass to convert LF to CRLF

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

surgery

Moved item_heal_robotic out of obj/item and into mob_helpers.dm

2014-06-05 19:25:08 -05:00

telesci

Initial pass to convert LF to CRLF

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