Spamcat 11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops ...

Conflicts:
	code/game/gamemodes/objective.dm

2013-07-01 19:49:29 +04:00

..

admin

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-06-30 20:02:36 -07:00

assembly

…

awaymissions

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

client

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-06-30 20:02:36 -07:00

clothing

Fixes #3200

2013-06-29 16:57:08 -07:00

customitems

Custom item.

2013-07-01 19:21:49 -07:00

destilery

…

detectivework

Phasing out world loops, pt 1

2013-06-20 17:21:16 +04:00

DetectiveWork

Changed the vote sound as discussed by admins, and made it so that -all- votes (Not just crew transfer) automatically disable OOC.

2013-06-21 14:40:36 +01:00

events

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

flufftext

…

food

…

genetics

…

icon generation

…

library

…

liquid

…

maps

Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.

2013-06-21 20:14:11 -07:00

mining

excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster

2013-06-23 10:25:16 +10:00

mob

Fixes #3210

2013-07-01 19:09:56 -07:00

organs

Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter.

2013-06-27 08:47:15 -07:00

paperwork

…

power

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

projectiles

Cleaned up a lot of the module selection code, added Combat module.

2013-06-29 22:14:43 -07:00

reagents

Message tweaks.

2013-06-28 15:55:41 -07:00

recycling

…

research

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

2013-07-01 19:49:29 +04:00

scripting

…

security levels

World loops 2: Electric Boogaloo.

2013-07-01 19:43:56 +04:00

surgery

Fixes #3081

2013-06-21 18:00:25 -07:00