deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization ...

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

2017-12-08 19:58:41 -05:00

..

blob

Datumizes saymodes

2017-12-03 12:56:03 -06:00

brother

cleans up whitespace in traitor_bro.dm

2017-11-21 14:58:43 -05:00

changeling

Datumizes saymodes

2017-12-03 12:56:03 -06:00

clock_cult

Fixes Lord Singuloth hungering for more than he should

2017-11-24 13:00:42 -06:00

cult

Fixes Lord Singuloth hungering for more than he should

2017-11-24 13:00:42 -06:00

devil

Merge pull request #33112 from AnturK/devilfix

2017-11-28 06:29:25 -06:00

extended

[MIRROR] Refactors roundstart centcom threat report. (#2739)

2017-09-13 22:50:01 -05:00

gang

[MIRROR] Removes the multiverse and its sword (#2573)

2017-09-22 20:23:56 -05:00

malfunction

Adds emergency lights, built into light fixtures

2017-12-03 12:54:48 -06:00

meteor

Actually fixes meteors, again (#32162)

2017-10-29 07:13:31 -05:00

miniantags

Merge pull request #4232 from cebutris/borers

2017-12-08 18:52:58 +00:00

nuclear

Merge branch 'master' into upstream-merge-32624

2017-12-04 17:12:53 -05:00

revolution

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

sandbox

[READY]Refactors uplinks to a component!

2017-11-22 15:17:03 -06:00

traitor

Merge branch 'master' into upstream-merge-32624

2017-12-04 17:12:53 -05:00

wizard

Merge branch 'master' into donoritemmodularization

2017-12-04 20:17:02 -05:00

antag_hud.dm

Datum antag wizard.

2017-10-11 05:24:17 -05:00

antag_spawner_cit.dm

Undoes Borer HUDs

2017-10-26 21:19:34 +02:00

antag_spawner.dm

Fixes syndieborg spawner

2017-12-02 09:44:11 -06:00

cit_objectives.dm

Borer admin refactor (#2209)

2017-07-31 21:45:32 -07:00

events.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

game_mode.dm

Merge branch 'master' into upstream-merge-32188

2017-11-18 05:31:42 +00:00

intercept_report.dm

commit

2017-09-13 06:04:22 -05:00

objective_items.dm

Minor refactor of how gas IDs are handled

2017-10-12 00:30:09 -05:00

objective_team.dm

Datum rev & related upgrades to base datum antag

2017-10-18 02:26:11 -05:00

objective.dm

Ling datum antag standarization.

2017-11-05 19:32:59 -06:00