Albert Iordache 604f7c417d Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master ...

Conflicts:
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi

2012-05-29 08:50:58 +03:00

..

admin

Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master

2012-05-29 08:50:58 +03:00

assembly

TG: Adds the framework for randomlly loading an additional external z-level at

2012-05-10 02:12:12 +01:00

chemical

Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master

2012-05-29 08:50:58 +03:00

clothing

Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master

2012-05-29 08:50:58 +03:00

critters

TG: (Might very possibly be broken. Didn't port most of the stuff due to it having been rewritten. - Erthilo)

2012-05-06 22:53:39 +01:00

customitems

Adds whitewolf41's custom item. Also updates Deus's hat sprite.

2012-05-22 22:15:26 +01:00

DetectiveWork

Adds a sounds for implant removal, and better messages for the rag.

2012-05-21 21:02:01 +01:00

flufftext

Merge fixes.

2012-04-26 18:35:15 +01:00

food

TG: -Reverted default UI sprites to Erro's old-style. Retina-scalding Orange and new

2012-05-23 18:02:00 +01:00

maps

TG: Adds the framework for randomlly loading an additional external z-level at

2012-05-10 02:12:12 +01:00

mining

Fixes #1180

2012-05-28 19:18:07 +10:00

mob

Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master

2012-05-29 08:50:58 +03:00

paperwork

TG: Sanitized a large number of input()s.

2012-05-26 00:09:56 +01:00

power

Fixes Particle Accelerator admin logging.

2012-05-21 23:55:00 +01:00

projectiles

Merge pull request #1185 from Erthilo/master

2012-05-28 22:13:53 -07:00

recycling

TG: Sanitized a large number of input()s.

2012-05-26 00:09:56 +01:00

research

Added empty lockboxes and secure briefcases to the R&D Designs.

2012-05-22 12:32:07 -07:00

scripting

TG: More work done on Telecomms:

2012-04-24 21:13:55 +01:00

security levels

TG Updates: Bugfixes: Fix for Issue 161. Fix for Issue 239. Circuit imprinter runtime involving Atmosphereic Alert circuits.

2012-02-03 08:09:32 +00:00