cib d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature ...

Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm

2012-12-16 15:10:04 +01: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

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

2012-12-16 15:10:04 +01:00

jobs

Removed loyalty implants from all security except the HoS.

2012-12-16 04:11:55 +01:00

machinery

Portable generator Fix

2012-12-12 02:49:29 -08:00

magic

…

mecha

Ty Foster's custom necklace, Butcher Royce's custom Ripley skin and some minor changes to support it.

2012-12-15 02:08:03 -08:00

objects

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

2012-12-16 14:57:54 +01:00

player

…

structure

…

turfs

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

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

vehicles

…

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

…

shuttle_engines.dm

…

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