Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence ...

Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi

2015-10-07 22:24:53 +01:00

..

shuttles

I'm an idiot. Remember to compile for every change kids!

2015-09-28 02:19:57 -07: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

Hand of god gamemode!

2015-09-27 16:49:56 +01:00

lighting.dm

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

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

machines.dm

…

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

Update shuttles.dm

2015-09-09 08:33:40 -07:00

sun.dm

…

ticker.dm

Merge pull request #12164 from Aranclanos/crewmonitor

2015-10-07 22:17:11 +03: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