Tkdrg e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts ...

Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi

2015-11-02 01:06:30 -03:00

..

shuttles

bird and discstation pass, replaces z2 airlocks with poddoors

2015-10-18 01:52:22 +11:00

air.dm

Replaces the Cut() usage in the processing lists from the different controllers for a Remove()

2015-08-18 06:52:57 -03:00

bots.dm

Replaces the Cut() usage in the processing lists from the different controllers for a Remove()

2015-08-18 06:52:57 -03:00

diseases.dm

Replaces the Cut() usage in the processing lists from the different controllers for a Remove()

2015-08-18 06:52:57 -03:00

events.dm

Event Fix

2015-09-24 12:29:25 +02:00

garbage.dm

compiles the game properly

2015-09-04 22:21:58 -06:00

jobs.dm

Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

2015-11-02 01:06:30 -03:00

lighting.dm

Adds a way to make certain area/space areas not force 100% brightness

2015-10-31 02:30:49 -07:00

machines.dm

Merges power subsystem into machine subsystem.

2015-05-09 23:48:18 -07:00

mobs.dm

Removes the warning of a null inside of the mob list, it was alerting for false positives.

2015-09-12 00:20:07 -03:00

nanoUI.dm

Replaces the Cut() usage in the processing lists from the different controllers for a Remove()

2015-08-18 06:52:57 -03:00

npcpool.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

objects.dm

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

pai.dm

About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working.

2015-10-07 22:11:19 +01:00

procqueue.dm

Modifications to crew monitoring computer, procqueue and html_interface.

2015-07-12 13:37:18 +02:00

radio.dm

Changes a lot of del() to qdel()

2015-08-16 23:33:22 +02:00

server_maintenance.dm

Changes a qdel back to del

2015-08-17 11:37:21 +02:00

shuttles.dm

pass for metastation, code improvement

2015-10-15 19:06:53 +11:00

sun.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

ticker.dm

Adds a config option for the round end restart delay.

2015-10-26 05:04:43 -07:00

timer.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

voting.dm

Merge pull request #11155 from Niknakflak/Restart_votes_Restriction

2015-08-19 19:07:38 +10:00