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

Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm

2015-03-20 08:44:52 +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

Ports /tg/ & Paradise ghost sight.

2015-03-19 16:14:02 +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

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

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

2015-03-20 08:44:52 +01:00

meme

Replaces antag intro text and objective announcement with a proc.

2014-07-30 21:36:31 +09:30

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

Fixes ninja spawn logic.

2015-03-09 19:22:07 +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

Removes references to the Syndicate and renames nuclear emergency mode.

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

traitor

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

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

wizard

Soulstones now require victim to actually be dead or maimed, as message says, instead of just sleeping.

2015-03-13 13:16:59 +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

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

finishes work on adapting the goon process scheduler for BS12.

2015-03-04 05:14:36 -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