Cael_Aislinn 6d1ea0548d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress ...

Conflicts:
	code/modules/customitems/item_defines.dm

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

2012-12-03 13:08:47 +10:00

..

area

antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas

2012-12-01 17:49:34 +10:00

events

Turned off space ninja spawning as a minievent

2012-11-23 14:59:18 -08:00

gamemodes

made space ninja a toggleable client option

2012-12-01 18:07:18 +10:00

jobs

Removed armor suit from Captain's spawn gear

2012-12-02 00:03:30 +04:00

machinery

Merge pull request #1974 from CIB/master

2012-11-19 11:19:10 -08:00

magic

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

2012-08-24 21:55:58 +10:00

mecha

Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it.

2012-11-11 14:33:33 -07:00

objects

antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas

2012-12-01 17:49:34 +10:00

player

…

structure

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

turfs

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

2012-10-12 17:53:17 +10:00

vehicles

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

verbs

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

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

asteroid.dm

-Cleaned up Simple Animals by having a hostile class which will handle standard attacking, then the childs of that class can override the procs to do something different, if needed.

2012-10-21 01:31:41 +00:00

atoms_movable.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

atoms.dm

Added basic germ code.

2012-11-12 12:51:28 +01:00

communications.dm

…

dna.dm

Fix to Issue #1972. Humans now spawn with full SE length, as do monkeys.

2012-11-18 15:40:55 -07:00

hud.dm

all-intents-intent-button

2012-11-10 14:19:02 +04:00

json.dm

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

response_team.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

shuttle_engines.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

skincmd.dm

…

smoothwall.dm

- Fixes issue 985. false walls are now called 'wall' instead of 'falsewall', which made them obvious.

2012-10-02 21:40:36 +00:00

socket_talk.dm

…

sound.dm

Fixes for issue #1872

2012-11-15 18:40:24 +01:00

supplyshuttle.dm

Resolves issue 977 - randomised supply packs are randomised at the time of purchase

2012-09-30 14:40:48 +00:00