PsiOmega 7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm

2015-02-27 09:06:48 +01: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

Fixes changeling sting A* call, adds messages to let the changeling know what went wrong if it did

2015-02-06 09:52:01 +00:00

cult

Removes random Telecrystal grants, instead increases the start amount by 2.

2015-02-23 20:56:48 +01:00

epidemic

Restricts Gibbingtons, Suicide, and Monkism syndromes

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

events

Collapsed space vines, glowshrooms and biomass into one spreading-plant system.

2015-02-04 10:49:41 +10:30

extended

…

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

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

2015-02-27 09:06:48 +01:00

meme

…

meteor

Removes random Telecrystal grants, instead increases the start amount by 2.

2015-02-23 20:56:48 +01:00

mutiny

Removes FPRINT and TABLEPASS flags

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

ninja

Custom ninja spawn points.

2015-02-18 08:14:40 +01:00

nuclear

Merge pull request #7924 from Kelenius/ofTablesAndPass

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

revolution

Removes random Telecrystal grants, instead increases the start amount by 2.

2015-02-23 20:56:48 +01:00

sandbox

…

traitor

Removes random Telecrystal grants, instead increases the start amount by 2.

2015-02-23 20:56:48 +01:00

wizard

Merge with dev.

2015-02-16 20:34:07 +10:30

events.dm

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

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

factions.dm

Ammo magazine and casing update

2015-02-09 21:32:49 -05:00

game_mode.dm

Adjusts sniper rifle damage

2015-02-24 20:45:40 -05:00

gameticker.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

intercept_report.dm

…

newobjective.dm

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

objective.dm

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

setupgame.dm

Merge pull request #7850 from Baystation12/master

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