coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
4d63a481dd20e4e64959c373bdf2910cd8ac0e67
kiwistation/code/modules
T
History
phil235 4d63a481dd Fixes merge conflict erro (readd datum/hud/Destroy()) 
Fixes cyborg sight not updating when equiping/unequiping sight modules.
2016-02-04 20:43:28 +01:00
..
admin
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 17:04:10 +01:00
assembly
Merge conflict fix
2016-01-27 17:38:42 +02:00
atmospherics
More merge conflict fixes.
2016-02-04 15:48:33 +01:00
awaymissions
- you now only see turfs when inside gas pipes.
2016-02-04 00:33:16 +01:00
client
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
clothing
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
crafting
Some assembly requaired
2016-01-26 02:43:08 +03:00
detectivework
Changes relatives paths into absolute paths and makes some if()'s better
2016-01-17 01:36:56 +02:00
emoji
Fixes emoji issues to do with adminPM and OOC formatting
2016-01-31 12:57:43 -05:00
events
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 17:04:10 +01:00
flufftext
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
food&drinks
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
games
Merge conflict fix
2016-01-17 19:15:30 +02:00
holiday
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
holodeck
Merge remote-tracking branch 'upstream/master' into thanksfortheheadacheswj
2016-01-30 19:45:45 +00:00
html_interface
Fixed 'in' precedence errors.
2015-12-29 17:16:09 -07:00
hydroponics
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
jobs
Attempt to fix the issue with the single file
2016-02-01 20:48:10 +02:00
json
Revert "Make JSON.stringify encode numbers properly"
2015-12-27 15:45:48 -06:00
library
Sneaks in a new book sprite that's totally white colored, no blue dot.
2015-12-29 16:01:14 -05:00
lighting
Entirely area based
2015-12-24 03:50:27 -06:00
mining
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
mob
Fixes merge conflict erro (readd datum/hud/Destroy())
2016-02-04 20:43:28 +01:00
ninja
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
paperwork
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
power
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
procedural mapping
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
2016-01-13 20:07:21 -06:00
projectiles
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
reagents
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
recycling
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
research
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
ruins
Random Ruins
2015-12-19 06:55:50 -06:00
security levels
Rewrite SSUs, tweak newly added UIs
2016-01-25 12:03:07 -06:00
shuttle
Merge pull request #15034 from AnturK/shuttle_templates
2016-01-31 13:33:30 -03:00
space transition
Shaves off 1568 iterations
2015-11-13 10:57:42 +03:00
spells
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 17:04:10 +01:00
surgery
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 14:34:45 +01:00
telesci
Adds in-hand sprites for tracking beacon, pizza box and carp plushie.
2015-11-29 16:43:52 +02:00
tgui
Merge pull request #15030 from neersighted/tkui
2016-01-30 08:02:33 -03:00
tooltip
Does the rest of the if()'s/ else's
2016-01-17 19:03:12 +02:00
uplink
Merge pull request #15074 from Chiefwaffles/Slipocalypse
2016-02-01 00:01:33 -03:00
vehicles
Formalises Path Compatibility
2015-12-28 22:20:33 +00:00