Lzimann 79d9178adf Fix conflicts

2017-04-25 10:51:49 -03:00

..

blob

Changed alternate appearances to /datum/atom_hud s (#26289)

2017-04-23 20:25:52 +02:00

changeling

Braining/debraining fixes (#26346)

2017-04-23 21:48:19 +02:00

clock_cult

Fix conflicts

2017-04-25 10:51:49 -03:00

cult

Merge pull request #26285 from ChangelingRain/cultinit

2017-04-19 21:39:37 +12:00

devil

Fix conflicts

2017-04-25 10:51:49 -03:00

extended

…

gang

Fix conflicts

2017-04-25 10:51:49 -03:00

malfunction

Merge pull request #26196 from Cyberboss/SpawnDeath

2017-04-14 22:04:50 -04:00

meteor

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

miniantags

Refactors ear damage into ear organs (#26044)

2017-04-22 08:51:03 -04:00

nuclear

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

revolution

fix

2017-04-10 05:43:39 -04:00

sandbox

EngiMarket Part Four - Ranged RCD and Rapid Lighting Device (RLD) (#25263)

2017-04-14 09:31:43 +12:00

traitor

Corrects incorrect shuffles

2017-04-11 09:32:13 -04:00

wizard

Moves tesla_ignore from var on /mob/living to secondary flag (#26273)

2017-04-17 10:13:02 -04:00

antag_hud.dm

Changed alternate appearances to /datum/atom_hud s (#26289)

2017-04-23 20:25:52 +02:00

antag_spawner.dm

Partial sparks boilerplate reduction (#26081)

2017-04-12 19:59:45 +02:00

events.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

factions.dm

…

game_mode.dm

Fuck u shitty coder

2017-04-13 16:37:28 -04:00

intercept_report.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

objective_items.dm

…

objective.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00