Hawk-v3 17f128cb02 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	baystation12.dme

2012-03-06 19:24:38 +00:00

..

admin

Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event.

2012-03-03 20:23:10 -07:00

assembly

Fixed up the verb.

2012-03-02 10:06:16 -07:00

chemical

Tweaked overdose values so sleepers don't leave any toxin damage.

2012-03-04 16:05:00 +00:00

clothing

Added custom items. Small fix for labcoat buttons and descriptions.

2012-03-05 17:52:28 +00:00

critters

Space carp and other critter balancing.

2012-02-12 11:48:15 +01:00

customitems

custom item for Tzefa

2012-03-05 18:40:54 +10:30

DetectiveWork

Fix for bloodying shoes when walking in blood.

2012-03-02 20:14:27 -07:00

flufftext

Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event.

2012-03-03 20:23:10 -07:00

food

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

2012-03-06 19:24:38 +00:00

mining

added missing file

2012-02-15 17:17:03 +10:00

mob

Made emagged cyborgs laws gender neutral and use crew. Small reset module description change.

2012-03-06 10:22:34 +00:00

power

Subject: [PATCH 086/285] TG UPDATES:

2012-03-01 20:50:19 +00:00

projectiles

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

2012-03-06 19:24:38 +00:00

recycling

Merge pull request #614 from comma/master

2012-03-03 22:26:54 -08:00

research

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

2012-03-02 22:57:14 +00:00

scripting

Merge pull request #563 from SkyMarshal/master

2012-02-29 12:51:48 -08: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