Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev ...

Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm

2015-02-04 04:44:09 +06:00

..

autotraitor

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

blob

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

calamity

Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text.

2015-01-06 11:11:34 +10:30

changeling

Merge pull request #7797 from Baystation12/master

2015-01-12 21:17:04 +10:30

cult

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

epidemic

Restricts Gibbingtons, Suicide, and Monkism syndromes

2015-01-10 03:08:42 -05:00

events

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

extended

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

heist

Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

2014-12-23 17:38:05 +10:30

malfunction

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

meme

…

meteor

…

mutiny

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

ninja

Fixes #7599

2015-01-03 06:30:43 +10:30

nuclear

Merge pull request #7924 from Kelenius/ofTablesAndPass

2015-01-30 16:17:41 +03:00

revolution

Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation

2015-01-09 21:55:11 +06:00

sandbox

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

traitor

Fixes #7295.

2014-12-08 17:06:36 +01:00

wizard

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

events.dm

Moved several globals into the config controller, updated eample config appropriately.

2014-12-25 21:10:30 +10:30

factions.dm

…

game_mode.dm

Cleans up post-round summary.

2015-01-21 22:05:45 +01:00

gameticker.dm

Fixes #7295.

2014-12-08 17:06:36 +01:00

intercept_report.dm

…

newobjective.dm

Changed helmet lights over to a general system/overlays.

2014-11-16 13:40:13 +10:30

objective.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

setupgame.dm

Merge pull request #7850 from Baystation12/master

2015-01-16 14:23:03 +03:00