coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
a029f2852a53f862bb31451ec78188a4f3a33730
kiwistation/code/modules
T
History
phil235 a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00
..
admin
Merge pull request #10083 from MrStonedOne/ISTHISVALID
2015-06-23 14:26:11 -05:00
assembly
Merge pull request #9956 from Jordie0608/whocodesthecodemen
2015-06-20 00:53:30 -05:00
awaymissions
Updates more paths, for example obj/stuff to /obj/stuff
2015-05-31 17:48:33 +02:00
client
Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier
2015-06-22 23:36:06 -05:00
clothing
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
crafting
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07:00
detectivework
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07:00
emoji
Renames game_options.txt OOC_EMOJIS to EMOJIS
2014-12-17 12:48:41 -05:00
events
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
flufftext
Pray pray pray
2015-06-18 18:07:57 +01:00
food&drinks
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
holiday
Fixes #9257
2015-05-05 18:50:30 +02:00
hydroponics
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-23 12:54:26 -07:00
library
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-23 12:54:26 -07:00
lighting
Changes how destroying turfs works
2015-05-29 18:43:34 -05:00
mining
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-23 12:54:26 -07:00
mob
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
nano
Merge pull request #9466 from Fayrik/TheNanoing
2015-06-22 14:24:20 +02:00
ninja
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
paperwork
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-23 12:54:26 -07:00
power
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
procedural mapping
Updates paths
2015-06-03 22:52:39 +02:00
projectiles
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
reagents
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
recycling
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-23 12:54:26 -07:00
research
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
2015-06-24 21:15:09 +02:00
scripting
remove duplicate empty message checks and replace with !message
2015-06-09 19:29:37 +02:00
security levels
more spans
2015-04-24 20:52:00 +03:00
shuttle
Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
2015-06-16 17:24:20 +10:00
surgery
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-23 12:54:26 -07:00
telesci
Pray pray pray
2015-06-18 18:07:57 +01:00