coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
26,981 Commits 9 Branches 11 Tags
e4b4800aabb147f787fa9252bfb36167883d44ee
Commit Graph

26981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
WJohn e4b4800aab Fixes science lockers, adds real eggs to queen chamber in alien hive. 2015-12-08 06:50:00 -05:00
Remie Richards 2aa6096fe4 Merge pull request #13447 from KorPhaeron/fountain 
Healing fountain subtype for use by anyone
 2015-12-08 07:56:33 +00:00
Jordie dee6b6a4c3 Merge pull request #13482 from MrStonedOne/patch-80 
Fixes runtime in lighting system
 2015-12-08 15:41:07 +11:00
sybil-tgstation13 dc761db850 Automatic changelog compile 2015-12-08 02:03:58 +00:00
tgstation-server 4dcc7cca8d Automatic changelog generation for PR #13437 2015-12-08 01:58:47 +00:00
duncathan salt bea8d35ff5 Merge pull request #13437 from neersighted/clickable_stats 
Refactor MC/Failsafe/add Subsystems
 2015-12-07 19:58:46 -06:00
tgstation-server d9aaaf4893 Automatic changelog generation for PR #13327 2015-12-08 01:58:18 +00:00
duncathan salt 0472592b97 Merge pull request #13327 from KorPhaeron/reactive 
check_shields() refactor
 2015-12-07 19:58:17 -06:00
KorPhaeron 7f43fffd6e Can't block with armour in your hand 2015-12-07 19:23:05 -06:00
KorPhaeron 0c31ca58cc Fixes changeling shields 2015-12-07 19:05:57 -06:00
sybil-tgstation13 95aa7fe898 Automatic changelog compile 2015-12-08 01:04:19 +00:00
tgstation-server a56d82e706 Automatic changelog generation for PR #13467 2015-12-08 00:53:02 +00:00
duncathan salt fa40409851 Merge pull request #13467 from Anonus/slowdowntherebucko 
Revenants are less of a pain in the ass to kill
 2015-12-07 18:53:01 -06:00
KorPhaeron 8856d5981c Moves continue/return to new lines 2015-12-07 18:51:31 -06:00
duncathan salt d5b137c2f4 Merge pull request #13479 from MrStonedOne/patch-79 
You may now sleep in process() and life(). This is now allowed, and will not fuck up the mc
 2015-12-07 18:37:31 -06:00
duncathan salt cb5a7afa70 Merge pull request #13480 from Razharas/VineBoomFix 
Vine boom change
 2015-12-07 18:28:04 -06:00
KorPhaeron 3454c19153 Fixes armour pen mods carrying between shield attempts 2015-12-07 17:58:21 -06:00
KorPhaeron 88846b86fb Removes duplicate check from attackbye 2015-12-07 16:11:28 -06:00
sybil-tgstation13 53ffce76c4 Automatic changelog compile 2015-12-07 17:45:00 +00:00
Remie Richards 81e242f2a5 Merge pull request #13483 from MrStonedOne/patch-81 
Fixes library computers pager...... 3rd time's the charm
 2015-12-07 17:42:40 +00:00
tgstation-server e640b4263a Automatic changelog generation for PR #13440 2015-12-07 17:37:46 +00:00
Remie Richards 91c4d1bef8 Merge pull request #13440 from octareenroon91/patch-32 
Give wallets merged access of all IDs inside.
 2015-12-07 17:37:44 +00:00
Bjorn Neergaard dd353ff125 Remove unused list 2015-12-06 21:06:00 -06:00
duncathan salt 9ec6e187a4 Merge pull request #13464 from Anonus/hostileconstructs 
Spawnable hostile constructs, for away missions and adminfuckery
 2015-12-06 17:25:53 -06:00
KorPhaeron ebede4be34 Visible messages for reactive armour are actually visible 2015-12-06 17:23:44 -06:00
KorPhaeron a0105a66f1 Hugs no longer trigger an armour check 2015-12-06 17:16:42 -06:00
Nerd Lord 01b12caec8 obey the dunc 2015-12-06 17:41:27 -05:00
Remie Richards fcc977fa2f Merge pull request #13487 from MrStonedOne/patch-84 
[s]fixes typo in is banned()
 2015-12-06 21:03:35 +00:00
Kyle Spier-Swenson 88a795a0c6 fixes typo in is banned() 2015-12-06 12:54:36 -08:00
Remie Richards 8daec1c8a5 Merge pull request #13485 from MrStonedOne/patch-83 
Cleans up some unused code
 2015-12-06 20:22:05 +00:00
Kyle Spier-Swenson 0d55edc2b0 Hot fix for stickybans going hey wire 2015-12-06 12:20:12 -08:00
Razharas 02fe4ec5a8 Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP 
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
 2015-12-06 19:52:06 +03:00
Razharas 13b3f3b923 Some tweaks to vines 2015-12-06 19:47:42 +03:00
Kyle Spier-Swenson 0e4c9b79f3 Update lib_machines.dm 2015-12-06 08:40:47 -08:00
Kyle Spier-Swenson d97bd880b9 Fixes library computers pager...... 3rd time's the charm 2015-12-06 07:48:52 -08:00
Kyle Spier-Swenson dc337a6344 Fixes runtime in lighting system 
fixes #13478
 2015-12-06 07:32:28 -08:00
Kyle Spier-Swenson ab27b2bd0e Life will no long hang the MC if something sleeps. 2015-12-06 07:17:03 -08:00
Razharas ab48fa4928 Merge branch 'master' of https://github.com/tgstation/-tg-station into VineBoomFix 2015-12-06 18:12:37 +03:00
Razharas e5e76ad2a2 Makes explosive vines a bit saner 2015-12-06 18:11:27 +03:00
Razharas 5ed60c2052 Merge pull request #13452 from KorPhaeron/too_many_ghosts 
Revenant event can only occur once per round
 2015-12-06 17:21:05 +03:00
Kyle Spier-Swenson f993a5b9d2 You may now sleep in process() 2015-12-06 05:44:40 -08:00
sybil-tgstation13 5a5a48f19a Automatic changelog compile 2015-12-06 06:24:20 +00:00
tgstation-server a32f9134bb Automatic changelog generation for PR #13401 2015-12-06 06:19:58 +00:00
Jordie c018b514d2 Merge pull request #13401 from GunHog/Of_Bots_And_Diagnostic_HUDs 
Adds Bots to Diagnostic HUDs
 2015-12-06 17:19:56 +11:00
Jordie 33d749fa62 Merge pull request #13398 from AnturK/morebotfix 
More Bot Fixes
 2015-12-06 17:13:10 +11:00
tgstation-server 45771e8a48 Automatic changelog generation for PR #13438 2015-12-06 06:11:21 +00:00
Jordie d49bd5b487 Merge pull request #13438 from neersighted/cryo_alarm 
Fix Cryo checks
 2015-12-06 17:11:20 +11:00
Jordie 43cf0d52a7 Merge pull request #13432 from MMMiracles/SHIFTCLICKNOTMIDDLECLICKYOUFUCK 
Morphs SHIFT-CLICK not MIDDLE-CLICK
 2015-12-06 17:07:39 +11:00
Jordie c7dfcddc15 Merge pull request #13422 from tkdrg/a 
Fixes APC emp_act
 2015-12-06 17:06:34 +11:00
Jordie 45a9e138b2 Merge pull request #13435 from SuperSayu/window_unbreaker 
Fixes window fixing
 2015-12-06 12:06:37 +11:00