coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
3f9bf15ca5f2ccc394cd1e911f08fe8983c6dbaa
kiwistation/code/modules
T
History
Miauw 3f9bf15ca5 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP 
Conflicts:
	code/modules/mob/mob.dm
2014-02-15 17:30:21 +01:00
..
admin
u_equip is now called unEquip PANIC
2014-02-13 20:58:33 +01:00
assembly
Obsoletes flags = FPRINT | TABLEPASS*
2013-12-30 15:03:17 -06:00
awaymissions
Readds slime and AI corpse to box away
2014-02-05 06:39:05 +13:00
client
Nano UI for SMES
2014-02-05 16:32:07 -08:00
clothing
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
2014-02-15 17:30:21 +01:00
detectivework
You can now properly clean your hands of blood. Fixes #2258.
2014-01-22 17:42:36 +00:00
events
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
2014-02-15 17:30:21 +01:00
flufftext
Merge pull request #2283 from YotaXP/list2text-refactor
2014-01-11 10:11:13 -08:00
food
Added spider meat recipes
2014-01-10 21:04:34 +00:00
hydroponics
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
2014-02-15 17:30:21 +01:00
library
Added book bags. The librarian now spawns holding one.
2014-02-02 04:46:34 -03:00
mining
Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
2014-01-31 05:20:59 +04:00
mob
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
2014-02-15 17:30:21 +01:00
nano
NanoUI Update
2014-01-09 01:02:13 +00:00
paperwork
u_equip is now called unEquip PANIC
2014-02-13 20:58:33 +01:00
power
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
2014-02-15 17:30:21 +01:00
projectiles
Merge pull request #2653 from Incoming5643/syndiborgchance
2014-02-08 04:15:46 -08:00
reagents
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
2014-02-15 17:30:21 +01:00
recycling
now it's finished entirely \o/
2014-02-15 16:56:12 +01:00
research
Who decided to have it like that?
2014-02-09 17:47:59 +04:00
scripting
NTSL, parrots, and ID consoles hate apostrophes less.
2013-11-30 14:33:02 -05:00
security levels
Communications Console Update
2013-10-15 22:42:20 -06:00
shuttle
* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.
2013-12-20 22:09:06 +00:00
surgery
Many changes
2014-02-04 22:49:38 -08:00
telesci
u_equip is now called unEquip PANIC
2014-02-13 20:58:33 +01:00