coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
80b4c3ca7fed12da4515e6045675319bfc0ddf0a
kiwistation/code/modules
T
History
Remie Richards 80b4c3ca7f Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui 
Conflicts:
	tgui/assets/tgui.css
	tgui/assets/tgui.js
2016-05-28 00:24:58 +01:00
..
admin
Shuttle manipulator (#17436)
2016-05-26 15:15:19 +02:00
assembly
Fix an antipattern when using canUseTopic
2016-05-22 00:23:47 +00:00
atmospherics
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
awaymissions
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
cargo
Adds stat tracking to cargo
2016-05-17 06:29:42 +01:00
chatter
improve chatter regex to prevent infinite loop
2016-05-15 20:12:17 +12:00
client
Renames files under code/ with naughty characters
2016-05-24 12:16:19 +01:00
clothing
Refactors NOREACT flag; minor cig refactor
2016-05-26 10:12:59 +01:00
crafting
Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui
2016-05-28 00:24:58 +01:00
detectivework
A player can change identity. First and Last touch should both register the real name.
2016-05-13 17:34:34 +02:00
emoji
makes emoji parsing return the text if they runtime
2016-03-16 21:28:36 -07:00
events
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
flufftext
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
food_and_drinks
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
games
Even more Cards Against Spess tweaks. (#17398)
2016-05-09 15:00:40 -05:00
holiday
Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui
2016-05-28 00:24:58 +01:00
holodeck
Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.
2016-05-24 01:28:04 +02:00
html_interface
…
hydroponics
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
jobs
Shuttle manipulator (#17436)
2016-05-26 15:15:19 +02:00
library
let's not have the paper forever stuck in case of power outage.
2016-05-26 22:23:24 +02:00
lighting
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
mining
Merge pull request #17959 from blobbernaut/capsulefix
2016-05-27 17:46:51 -05:00
mob
Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui
2016-05-28 00:24:58 +01:00
ninja
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
paperwork
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
power
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
procedural_mapping
Renames files under code/ with naughty characters
2016-05-24 12:16:19 +01:00
projectiles
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
reagents
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
recycling
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
research
Removes gatling gun from R&D (#17629)
2016-05-26 14:50:16 -05:00
ruins
Shuttle manipulator (#17436)
2016-05-26 15:15:19 +02:00
security_levels
Renames files under code/ with naughty characters
2016-05-24 12:16:19 +01:00
shuttle
Rounds no longer end instantly
2016-05-26 16:43:24 +01:00
space_transition
Renames files under code/ with naughty characters
2016-05-24 12:16:19 +01:00
spells
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
stock_market
fixes a typo
2016-04-30 07:31:26 -04:00
surgery
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00
telesci
Adds new items to the mining vendors. (#17362)
2016-05-11 22:19:47 -05:00
tgui
Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui
2016-05-28 00:24:58 +01:00
tooltip
update operative tooltip style(matches syndicate uplink theme)
2016-03-27 19:04:18 -04:00
uplink
KA rebalance; brings back holding a satchel
2016-05-17 00:38:29 +01:00
vehicles
Layers are now defines (#17949)
2016-05-27 22:16:21 +02:00