coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
e3dcebc65ee5da839652efc9ab93ada1dacbef09
kiwistation/code/modules
T
History
KorPhaeron e3dcebc65e Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2 
# Conflicts:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
2016-03-30 02:12:20 -05:00
..
admin
Revert "Adds mentorhelp"
2016-03-25 01:48:27 -03:00
assembly
Fixes
2016-03-12 15:14:50 +03:00
atmospherics
fixes a LINDA bug
2016-03-23 09:41:01 -06:00
awaymissions
Ghost nullspace
2016-03-26 13:26:34 -05:00
cargo
Merge pull request #16417 from Xhuis/fix_bundle_2
2016-03-28 10:39:24 -05:00
client
Fix Preference toggles and button name.
2016-03-28 03:29:31 +02:00
clothing
Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2
2016-03-30 02:12:20 -05:00
crafting
Adds craftable paper sacks
2016-03-27 23:37:43 -05:00
detectivework
Get the code running on 510
2016-02-04 17:19:40 -06:00
emoji
makes emoji parsing return the text if they runtime
2016-03-16 21:28:36 -07:00
events
Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues
2016-03-26 21:06:00 -05:00
flufftext
Chaotic
2016-03-14 15:24:57 -05:00
food&drinks
Merge pull request #16147 from Xhuis/bacchus_approves
2016-03-24 19:05:56 +01:00
games
Merge conflict fix
2016-01-17 19:15:30 +02:00
holiday
Fixes most (non hardsuit) helmets hiding the glasses when they shouldn't.
2016-02-14 00:03:07 +01:00
holodeck
icon smooth ss
2016-03-12 23:57:45 +00:00
html_interface
Fixed 'in' precedence errors.
2015-12-29 17:16:09 -07:00
hydroponics
Bee fixes and updates!
2016-03-27 21:07:53 +01:00
jobs
Temperature resist
2016-03-30 01:43:50 -05:00
library
Replaced last occurences of gc_destroyed by qdeleted().
2016-03-05 01:58:56 +01:00
lighting
Entirely area based
2015-12-24 03:50:27 -06:00
mining
Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2
2016-03-30 02:12:20 -05:00
mob
Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2
2016-03-30 02:12:20 -05:00
ninja
Neatens the code, by making non-visible antaghuds a subtype of antaghud.
2016-03-08 21:19:46 -05:00
paperwork
Replaced last occurences of gc_destroyed by qdeleted().
2016-03-05 01:58:56 +01:00
power
Merge pull request #16188 from Robustin/zap
2016-03-22 19:18:45 +01:00
procedural mapping
Explosions and singulo use spiral range (and other changes)
2016-03-15 03:39:41 -07:00
projectiles
Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2
2016-03-30 02:12:20 -05:00
reagents
Bee fixes and updates!
2016-03-27 21:07:53 +01:00
recycling
Merge pull request #16357 from Iamgoofball/fast
2016-03-29 20:06:55 -06:00
research
removes evil fucking comma from experimentor.dm
2016-03-19 22:24:03 -07:00
ruins
FREE GOLEM
2016-03-25 22:25:18 -05:00
security levels
Rename get_ui_data -> ui_data, remove useless shuffle from wires
2016-02-05 17:09:40 -06:00
shuttle
Merge pull request #16067 from xxalpha/silky_smooth
2016-03-15 04:59:48 -05:00
space transition
Shaves off 1568 iterations
2015-11-13 10:57:42 +03:00
spells
Merge pull request #16403 from optimumtact/wizared_mute_fix
2016-03-27 15:57:23 -05:00
stock_market
You must be 18 or older to play
2016-03-27 22:21:34 -04:00
surgery
Cleans up some text formatting
2016-03-27 14:13:16 -05:00
telesci
Fixes issues put forth by maintainers.
2016-03-19 01:09:32 -07:00
tgui
Rename get_ui_data -> ui_data, remove useless shuffle from wires
2016-02-05 17:09:40 -06:00
tooltip
update operative tooltip style(matches syndicate uplink theme)
2016-03-27 19:04:18 -04:00
uplink
Merge pull request #16260 from Bawhoppen/grenadesholyshithelp
2016-03-22 19:35:43 +01:00
vehicles
Merge pull request #16375 from ChangelingRain/fastbike
2016-03-26 20:46:35 -05:00