MagmaRam cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat ...

Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.

2014-11-16 02:56:32 -05:00

..

__HELPERS

Merge pull request #6983 from PsiOmegaDelta/Event

2014-11-12 23:45:02 +03:00

_onclick

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

ATMOSPHERICS

Scrubber Icons

2014-11-14 18:48:56 +01:00

controllers

Fixes and event end estimations.

2014-11-12 09:39:54 +01:00

datums

Apparently the blue lawyer jacket didn't actually button up properly. Now it should button up, and uses the same system as everything else.

2014-11-11 12:47:02 -05:00

defines

Logging of event changes.

2014-11-10 16:19:51 +01:00

FEA

…

game

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat

2014-11-16 02:56:32 -05:00

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat

2014-11-16 02:56:32 -05:00

TriDimension

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

unused

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

WorkInProgress

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

ZAS

Merge remote-tracking branch 'upstream/master' into dev-freeze

2014-10-15 22:13:44 +01:00

global.dm

Merge remote-tracking branch 'upstream/dev' into TheGreatEvents

2014-11-08 10:26:45 +01:00

hub.dm

…

names.dm

…

setup.dm

Merge remote-tracking branch 'upstream/dev' into PortaTurret

2014-10-29 19:17:35 +01:00

stylesheet.dm

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

world.dm

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

2014-10-15 10:05:50 +10:30