Chinsky ea4f34d53c Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/ZAS/FEA_system.dm

2012-11-17 00:20:23 +04:00

..

area

Fix for issue #1947

2012-11-15 17:48:13 +01:00

events

Simple AI Ion Storm Laws change, in accordance with http://baystation12.net/forums/viewtopic.php?f=5&t=5889&p=115166#p115166

2012-11-11 23:40:26 -07:00

gamemodes

Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps.

2012-11-13 22:46:43 -07:00

jobs

Merge pull request #1950 from comma/master

2012-11-15 08:49:09 -08:00

machinery

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

2012-11-17 00:20:23 +04:00

magic

…

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

Can fix limbs with welders again. And attack mobs with welders at all.

2012-11-15 18:04:03 +04: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

human icon generation update, tajarnan darkseeing

2012-11-16 15:19:20 +04: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