tkdrg 8180da65fa Merge pull request #6528 from TZK13/Socks ...

Adds socks as an underwear option and adds a few new undershirts

2015-01-03 14:17:17 -03:00

..

admin

Fixes feedback on failure due to null rank or disconnected DB. Sanitizes ckey in DB query.

2015-01-02 13:24:49 -07:00

assembly

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

2014-12-28 11:20:15 +03:00

awaymissions

Fixes conflicts

2014-12-30 15:12:09 +03:00

client

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

2015-01-03 07:07:03 -06:00

clothing

Merge pull request #6678 from paprka/nitrile

2015-01-01 00:29:04 -03:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

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

2014-12-28 11:20:15 +03:00

flufftext

Fixes hallucinated attackers not doing the attack animation.

2014-12-27 22:41:13 +01:00

food&drinks

Merge pull request #6498 from as334/MobReactions

2014-12-27 01:20:18 -06:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

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

2014-12-22 19:55:04 -08:00

library

Defines allowed books in main bookcase define

2014-12-31 23:08:23 -05:00

mining

Merge pull request #6586 from phil235/ResonatorTableFix

2014-12-27 15:06:36 -03:00

mob

Reverted removal of jerseys.

2015-01-03 10:33:45 -06:00

nano

Giacom Fixes

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

paperwork

Conflict fix

2014-12-21 06:12:33 +03:00

power

Merge pull request #6584 from phil235/HoloSwordFix

2015-01-01 16:39:16 -03:00

projectiles

Fixed a typo that can prevent gun firing message from appearing.

2015-01-02 17:51:34 +01:00

reagents

Merge pull request #6186 from Dorsisdwarf/Chemoverlaysreal

2015-01-03 02:26:10 -03:00

recycling

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

research

Fixed retractor spawning an /obj/item/weapon/retractor when fabricated in an autolathe.

2014-12-29 20:46:01 +01:00

scripting

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

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

2014-10-05 13:48:11 +02:00

shuttle

moves emag effects from attackby() into atom proc emag_act()

2014-11-20 17:49:06 -08:00

surgery

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

2014-12-16 02:52:08 +03:00

telesci

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00