coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
98e04ca52ec4db0b7a75d75887db1d41447c0bec
kiwistation/code/modules
T
History
Lo6a4evskiy 98e04ca52e Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay 
Conflicts:
	code/modules/clothing/spacesuits/miscellaneous.dm
2014-10-08 16:45:22 +04:00
..
admin
Merge pull request #5097 from phil235/Msg1Fix
2014-10-07 12:09:01 -05:00
assembly
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
awaymissions
Removing many instances of the no longer used second argument of message_admins() proc.
2014-10-05 01:29:30 +02:00
client
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
clothing
Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay
2014-10-08 16:45:22 +04:00
detectivework
The rest of the junk
2014-09-05 18:14:02 +04:00
events
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
flufftext
Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3
2014-10-06 19:27:14 -05:00
food&drinks
Merge pull request #5097 from phil235/Msg1Fix
2014-10-07 12:09:01 -05:00
hydroponics
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
library
bookcases no longer opaque
2014-10-04 18:28:30 -07:00
mining
Merge pull request #4516 from MrPerson/examinate_the_doctor
2014-10-05 23:37:34 -05:00
mob
Merge remote-tracking branch 'upstream/master' into Armor_stripping_delay
2014-10-08 16:45:22 +04:00
nano
Giacom Fixes
2014-08-06 20:22:36 +02:00
paperwork
Merge pull request #4516 from MrPerson/examinate_the_doctor
2014-10-05 23:37:34 -05:00
power
Merge pull request #5097 from phil235/Msg1Fix
2014-10-07 12:09:01 -05:00
projectiles
Merge pull request #5103 from paprka/largebow
2014-10-08 10:18:51 +01:00
reagents
Merge pull request #5097 from phil235/Msg1Fix
2014-10-07 12:09:01 -05:00
recycling
Merge pull request #5097 from phil235/Msg1Fix
2014-10-07 12:09:01 -05:00
research
Merge pull request #5103 from paprka/largebow
2014-10-08 10:18:51 +01:00
scripting
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
security levels
Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix
2014-10-05 13:48:11 +02:00
shuttle
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
surgery
removing comment.
2014-09-21 22:26:18 +02:00
telesci
Change examine() from an atom verb to a mob verb
2014-05-01 09:56:39 -07:00