tigercat2000 b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC ...

# Conflicts:
#	code/__DEFINES/flags.dm

2018-03-22 15:35:12 -07:00

..

autotraitor

…

blob

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

2018-03-04 13:52:55 +05:00

changeling

removes table parts, adds table frames

2018-01-12 23:22:55 +05:00

cult

re does the chcek.

2018-03-05 23:13:32 -05:00

extended

…

heist

Fixes IPC and Diona Knockdown Immunity

2017-07-20 21:01:55 -04:00

malfunction

…

meteor

performance

2017-07-31 14:01:15 -04:00

miniantags

Merge pull request #8674 from uraniummeltdown/attacks

2018-03-22 11:55:53 -07:00

nations

…

nuclear

moves var/list/armor to /obj level

2018-03-04 13:52:54 +05:00

revolution

…

sandbox

…

shadowling

rename __DEFINES/mob.dm to __DEFINES/mobs.dm

2018-03-04 13:52:55 +05:00

traitor

…

vampire

Merge pull request #8331 from uraniummeltdown/effectfiles

2017-11-26 12:35:01 -08:00

wizard

new cult construct shell sprites

2017-12-01 19:37:07 +04:00

antag_hud.dm

…

antag_spawner.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

factions.dm

…

game_mode.dm

Add crotch holsters

2017-12-23 23:04:25 -05:00

gameticker.dm

StonedMC

2018-03-02 21:12:49 -08:00

intercept_report.dm

…

objective.dm

moves material defines to construction.dm

2018-02-06 01:24:36 +05:00

scoreboard.dm

…

setupgame.dm

Breathing is Now Handled on Lungs

2017-07-19 03:28:21 -04:00

steal_items.dm

Cryopods eject objective items upon emag

2017-09-02 19:44:30 -07:00