MrPerson 9dc713ba9c Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2 ...

Conflicts:
	code/_onclick/hud/alert.dm
	code/game/objects/items.dm
	code/modules/mob/living/carbon/human/human.dm
	icons/mob/screen_alert.dmi

2015-06-09 03:23:18 -07:00

..

admin

forgot the new admin debug verb

2015-06-06 18:50:14 -07:00

assembly

Merge pull request #9715 from Firecage/datumspaths

2015-06-02 23:04:51 -05:00

awaymissions

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

client

merge conflict fix

2015-05-31 02:45:46 +02:00

clothing

Merge pull request #9741 from palpatine213/SecHudEmag

2015-06-04 20:19:39 -05:00

crafting

more spans

2015-04-24 20:52:00 +03:00

detectivework

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge pull request #9699 from KorPhaeron/turf

2015-06-02 23:15:42 -05:00

flufftext

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

food&drinks

adds panel open icons for the new buildables

2015-06-07 03:55:28 -07:00

holiday

Fixes #9257

2015-05-05 18:50:30 +02:00

hydroponics

adds beam sprites @cheridan merge when???

2015-06-08 19:56:06 -07:00

library

Changes alot of datum/ to /datum/

2015-05-31 02:40:54 +02:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

Merge pull request #9813 from Iamgoofball/constructionjunctionwhatsyourfunction

2015-06-09 08:48:51 +03:00

mob

Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2

2015-06-09 03:23:18 -07:00

nano

Air alarm template still needs a tweak, but it's functional now.

2015-04-25 05:22:00 +01:00

ninja

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

paperwork

Merge pull request #9779 from Cheridan/touching_linda

2015-06-07 04:57:52 +03:00

power

adds panel open icons for the new buildables

2015-06-07 03:55:28 -07:00

procedural mapping

Removes unsimulated turfs.

2015-06-01 23:24:18 -03:00

projectiles

Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome

2015-06-03 09:49:51 -05:00

reagents

Merge pull request #9767 from Iamgoofball/patch-71

2015-06-07 12:38:33 +01:00

recycling

Fixed hacking from inside machines and more.

2015-06-06 11:34:12 +01:00

research

Merge pull request #9813 from Iamgoofball/constructionjunctionwhatsyourfunction

2015-06-09 08:48:51 +03:00

scripting

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

security levels

more spans

2015-04-24 20:52:00 +03:00

shuttle

Fixes shuttles taking turfs that aren't part of the shuttle itself.

2015-06-08 05:07:02 -03:00

surgery

Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2

2015-06-09 03:23:18 -07:00

telesci

span fixes

2015-04-24 20:52:01 +03:00