Alex 90c97375e3 Merge pull request #4193 from A-t48/PrisonButton ...

Fix #4164: Non-functional admin prison button

2014-07-25 09:25:05 +01:00

..

admin

Merge pull request #4193 from A-t48/PrisonButton

2014-07-25 09:25:05 +01:00

assembly

Merge pull request #3906 from Malkevin/sparklesparkle

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

awaymissions

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

2014-07-07 13:42:31 -04:00

client

MONKEY MODE: "IT ACTUALLY WORKS" EDITION

2014-07-08 22:55:47 -05:00

clothing

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

2014-07-18 12:52:40 +02:00

detectivework

Merge pull request #3572 from Aranclanos/evidencebags

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

events

Merge pull request #4194 from A-t48/AdminMeteorConfirm

2014-07-25 09:24:46 +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&drinks

Moar restructuring

2014-07-23 06:10:21 +02:00

hydroponics

Merge pull request #4123 from Rolan7/Issue_4045

2014-07-21 08:40:38 -05:00

library

carved books now turn into storage items

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

mining

Merge pull request #4145 from Ergovisavi/faction_check

2014-07-22 19:10:53 -05:00

mob

Merge pull request #4203 from MrPerson/track_bugs

2014-07-25 09:23:54 +01:00

nano

Initial pass to convert LF to CRLF

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

paperwork

fixes laziness

2014-07-18 18:30:23 -07:00

power

Ghost Alerts p II

2014-07-07 15:21:32 -05:00

projectiles

Fix for issue #4173, both soulstone mobs (and construct derivatives) and staff of animation mobs (statues included) are now properly tagged with a faction that is unique to the person that created them, stopping a Wizard's animated mimics from attacking his created constructs.

2014-07-17 00:40:24 -07:00

reagents

Merge pull request #4216 from Firecage/Foodstuffssss

2014-07-25 09:24:11 +01:00

recycling

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

2014-07-07 13:42:31 -04:00

research

Mining Machines: Implementing ex_act()

2014-07-20 01:11:06 -04:00

scripting

…

security levels

…

shuttle

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

2014-07-07 13:42:31 -04:00

surgery

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

2014-07-07 13:42:31 -04:00

telesci

Initial pass to convert LF to CRLF

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