coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
ab7d50c90e7c39383ccfcab07b6c8199e2a01b4b
kiwistation/code/modules
T
History
paprka ab7d50c90e Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
..
admin
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
2015-01-15 21:56:23 -08:00
assembly
Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message.
2015-01-14 18:00:17 +01:00
awaymissions
Fixes conflicts
2014-12-30 15:12:09 +03:00
client
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00
clothing
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
2015-01-14 11:25:07 +08:00
crafting
fixed compile errors
2014-12-24 21:03:22 -08:00
detectivework
Standardizes attack messages to always show the attacker first (when there is an attacker).
2014-11-24 01:49:34 +01:00
emoji
Renames game_options.txt OOC_EMOJIS to EMOJIS
2014-12-17 12:48:41 -05:00
events
Merge pull request #7042 from phil235/AudibleMessageRuntimeFix
2015-01-15 19:14:31 +01:00
flufftext
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
food&drinks
Merge pull request #6137 from Iamgoofball/byond
2015-01-14 02:31:56 -03:00
holiday
Spookoween should be mucho bettero now
2014-11-04 19:11:23 +01:00
hydroponics
Merge pull request #6818 from Ergovisavi/more_pod_cloning
2015-01-06 22:53:41 -03:00
library
Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path.
2015-01-14 14:04:21 +01:00
mining
Fixes malf AI lockdown affecting doors on z levels other than station and mining.
2015-01-11 15:39:32 +01:00
mob
Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message.
2015-01-14 18:00:17 +01:00
nano
SubSystem rewrite
2014-12-31 13:25:41 +00:00
paperwork
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-04 01:52:14 +00:00
power
And other readibility improvement
2015-01-16 04:31:02 +03:00
projectiles
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
2015-01-15 21:56:23 -08:00
reagents
Merge pull request #6966 from Steelpoint/ERTv2
2015-01-15 23:41:20 -06:00
recycling
Merge pull request #6324 from Razharas/GenShit
2014-12-31 17:24:15 -03:00
research
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
2015-01-15 21:56:23 -08:00
scripting
Updates/fixes to NTSL
2015-01-03 17:43:43 -08:00
security levels
Fixes malf AI lockdown affecting doors on z levels other than station and mining.
2015-01-11 15:39:32 +01:00
shuttle
Resolves #6953 - Shuttle transparent corners now inherit a snapshot of the turf they replace. Note: don't use them for interiors! Only external corners!.
2015-01-11 18:42:58 +00:00
surgery
Makes butcher's cleaver a child of kitchen knife
2015-01-05 17:23:03 -05:00
telesci
SubSystem rewrite
2014-12-31 13:25:41 +00:00