bgobandit 8e82cf324a Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit ...

Conflicts:
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm

2015-10-02 00:41:19 -04:00

..

admin

Adds missing closing span tags to admin ban bypass notices.

2015-09-27 17:50:18 -07:00

assembly

Merge remote-tracking branch 'upstream/master' into hot_or_not

2015-09-24 03:14:04 +01:00

awaymissions

Merge pull request #11883 from phil235/DnaMonkeyStuff

2015-09-22 18:43:27 +03:00

client

MERGE CONFLICTS, MY ONLY WEAKNESS

2015-09-26 23:42:14 -07:00

clothing

Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit

2015-10-02 00:41:19 -04:00

crafting

…

detectivework

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

2015-09-19 22:34:30 +02:00

emoji

…

events

Radiation changes

2015-09-26 13:33:27 -04:00

flufftext

…

food&drinks

Merge branch 'edgy' into hot_or_not

2015-09-24 03:12:08 +01:00

games

…

holiday

…

html_interface

…

hydroponics

Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().

2015-09-24 03:08:28 +01:00

library

removes a bunch of .0

2015-09-10 20:57:30 +09:00

lighting

…

mining

Replaced /proc/is_sharp() with /obj/item/proc/is_sharp().

2015-09-24 03:08:28 +01:00

mob

Merge pull request #11985 from KorPhaeron/guardianfix

2015-09-29 23:14:50 +10:00

nano

…

ninja

- Fixed monkey starting with no dna.

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

paperwork

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

power

Radiation changes

2015-09-26 13:33:27 -04:00

procedural mapping

…

projectiles

Merge pull request #12028 from phil235/AddbloodRuntimeFix

2015-09-28 06:36:54 -03:00

reagents

Organs update 3

2015-09-25 22:26:15 +03:00

recycling

Merge pull request #11899 from kingofkosmos/altclickrotatepipe

2015-09-24 01:59:04 +03:00

research

Merge pull request #12031 from Xhuis/a_pretty_rad_pr

2015-09-28 03:24:43 +03:00

scripting

…

security levels

removes a bunch of .0

2015-09-10 20:57:30 +09:00

shuttle

…

space transition

Use defines instead of magic

2015-09-08 21:58:05 +03:00

surgery

Organs update 3

2015-09-25 22:26:15 +03:00

telesci

removes a bunch of .0

2015-09-10 20:57:30 +09:00