Erthilo b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2012-05-29 15:00:11 +01:00

..

admin

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

assembly

TG: - Standardized var definition for RND and radio code (possibly some other stuff)

2012-05-28 23:37:43 +01:00

chemical

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

clothing

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01: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

TG: - Some runtime-prevention tweaks so that impatient coders don't just break

2012-05-29 00:33:25 +01:00

flufftext

TG: - Replaced some hardcoded hallucination strings for screen placement to instead

2012-05-29 00:56:13 +01:00

food

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +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

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

mob

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

paperwork

TG: - Some runtime-prevention tweaks so that impatient coders don't just break

2012-05-29 00:33:25 +01:00

power

TG: Added a new logging system that can be used for various things in the game (such

2012-05-29 01:45:03 +01:00

projectiles

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

recycling

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

research

TG: Added a new logging system that can be used for various things in the game (such

2012-05-29 01:45:03 +01:00

scripting

TG: More work done on Telecomms:

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

security levels

…