coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
194398cbbd4b4840ea8b4545dbbf41713d591b94
kiwistation/code/modules
T
History
phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor 
# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm
2016-09-29 01:44:27 +02:00
..
admin
Renames station goal modifier (#20671)
2016-09-28 09:52:15 +13:00
assembly
Arm Combat Cybernetic Implants (because toolset arm shanks weren't enough) (#20544)
2016-09-20 21:36:11 +12:00
atmospherics
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
awaymissions
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
cargo
Adds gas canister crates to cargo (#20555)
2016-09-18 19:07:55 -05:00
chatter
improve chatter regex to prevent infinite loop
2016-05-15 20:12:17 +12:00
client
Prevent the user selecting jobs before the job list has been intialised
2016-09-26 06:02:51 +00:00
clothing
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
countdown
Makes cult structures destructible and readds them
2016-09-08 09:54:01 -04:00
crafting
Carbon Dismemberment , second attempt. (#20461)
2016-09-12 19:33:50 +02:00
detectivework
Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work
2016-09-02 18:04:18 +01:00
emoji
…
events
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
flufftext
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
food_and_drinks
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
games
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
holiday
Fixes food crafting lag. (#19325)
2016-07-16 00:31:59 -04:00
holodeck
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
html_interface
…
hydroponics
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
jobs
Lawyers have special speech bubbles (#20693)
2016-09-28 09:54:53 +13:00
library
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
lighting
Make lighting object management robust. (#19365)
2016-07-19 14:53:42 +12:00
mining
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
mob
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
modular_computers
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
ninja
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
orbit
Orbits are now a subsystem (#20632)
2016-09-24 19:52:49 +12:00
paperwork
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
power
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
procedural_mapping
Adds cult,clockworck and massdelete generators to buildmode
2016-08-04 21:02:40 +02:00
projectiles
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
reagents
Merge pull request #20714 from phil235/EffectToStructure
2016-09-28 18:12:52 -04:00
recycling
Tiles are now (mostly) pooled objects (#19112)
2016-07-08 13:32:40 -04:00
research
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
ruins
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
security_levels
Adds dextrous guardian (#19254)
2016-07-13 11:25:00 +12:00
shuttle
Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor
2016-09-29 01:44:27 +02:00
space_transition
Debugging statement commented out
2016-06-20 13:57:39 +01:00
spells
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
station_goals
Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
2016-09-12 17:14:39 -04:00
stock_market
Fix multiple href exploits from incorrectly scoped locates
2016-09-28 06:55:45 +00:00
surgery
Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.
2016-09-27 22:33:08 +02:00
telesci
More than 2 hands!? WHAAAAAAT
2016-09-02 16:10:16 +01:00
tgui
Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work
2016-09-10 20:28:23 +01:00
tooltip
Clockcult fixes and tweaks (#19795)
2016-08-12 09:06:21 +12:00
uplink
Intensifies the secret satchel system so people will actually use it.
2016-09-25 21:28:56 -04:00
vehicles
Merge pull request #20441 from MrStonedOne/ssSpaceDrift
2016-09-13 09:23:16 +12:00
VR
allows vr sleepers to specify an outfit datum for the virtual human, defaulting to a coloured jumpsuit+shoes.
2016-07-17 14:58:05 +01:00
zombie
Fix an incorrect call to addtimer (#20691)
2016-09-27 15:59:35 -05:00