Spades 1338225afa Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

..

calamity

…

changeling

Changelings Now Succ Traits (#5376)

2018-07-03 17:10:27 -04:00

cult

Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

endgame

Fix cascade portal teleporting

2018-04-19 20:17:29 -04:00

epidemic

…

events

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

extended

…

heist

…

infiltrator

…

malfunction

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

meme

…

meteor

fixes the meteor refusing to move at all after being deflected

2018-04-09 04:08:13 -04:00

mixed

grammar never ends (#4421)

2017-12-08 15:30:34 -06:00

ninja

…

nuclear

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

revolution

…

sandbox

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

technomancer

Resolves some merge conflicts

2019-01-05 16:29:19 -05:00

traitor

…

wizard

…

events.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

game_mode_latespawn.dm

…

game_mode.dm

Replaces NT Relation with Economic Status

2018-01-07 14:12:10 -08:00

gameticker.dm

VS edit merges

2018-10-20 17:37:08 -04:00

newobjective.dm

Replaces most of the gender macros. (#4681)

2018-02-03 14:40:09 -06:00

objective.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

setupgame.dm

…