Cael_Aislinn 9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-10-22 19:35:03 +10:00

..

diseases

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

2012-10-21 01:25:04 +10:00

helper_datums

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

organs

Fixes a runtime.

2012-10-18 15:22:54 +02:00

spells

Cult swords are force 30 now, and don't fit in bags or on belts. Use the damn robes they come with if you want to use em.

2012-09-10 01:31:54 +00:00

ai_laws.dm

More and yet more fixes from the piratepad.

2012-10-12 14:25:54 -07:00

computerfiles.dm

…

datacore.dm

Slapped a few nullchecks near reported runtimes.

2012-10-21 16:41:44 +04:00

datumvars.dm

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

2012-10-21 00:25:05 +10:00

disease.dm

mergefixes

2012-10-21 02:22:06 +10:00

mind.dm

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

2012-10-21 01:25:04 +10:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

-You can now store donuts in the donut box. The next donut you pull out will be the last one you put in.

2012-07-20 00:12:50 +00:00

spell.dm

-Adds a new wizard artifact, the gem-encrusted hardsuit. Attack protection is equal to the highest values of robes + normal rig suit, and it allows spellcasting like a normal set of robes. Maybe now wizards can stop dying after blinking into space/teleporting to Borg Deathsquad Arrived.

2012-10-02 05:34:03 +00:00

sun.dm

…

supplypacks.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-10-05 22:21:26 +10:00

vote.dm

Replaces the voting system. It should fix a pretty serious server-crashing exploit and simplify the code a fair bit.

2012-09-12 00:44:13 +00:00