Commit Graph

12234 Commits

Author SHA1 Message Date
KorPhaeron
8f9791d3c4 Fixes 2015-12-09 10:33:48 -06:00
KorPhaeron
53e29bcb87 Slowdown from inhand items 2015-12-09 10:25:51 -06:00
Cheridan
f29336a4f8 Merge pull request #13470 from AnturK/academytwo
Academy Fixes & Upgrades.
2015-12-08 22:25:05 -06:00
Cheridan
da3eba756d Merge pull request #13463 from Incoming5643/a_placebo_effect
Adds glowcaps
2015-12-08 22:08:25 -06:00
Incoming5643
40cac0aec3 Racism against division must end 2015-12-08 13:53:18 -05:00
duncathan salt
3ac8a3fc9a Merge pull request #13491 from GunHog/Gimme_ALL_The_HUDS!
Adds Diagnostic HUD to ghosts
2015-12-08 11:52:53 -06:00
duncathan salt
160d5428b8 Merge pull request #13474 from Shadowlight213/Aghost_control
Allows admins to interact with most machines like an AI [Review Ready]
2015-12-08 11:51:27 -06:00
duncathan salt
9cd7bdb0a0 Merge pull request #13462 from KorPhaeron/holes
Chasm/hole turfs
2015-12-08 11:47:05 -06:00
duncathan salt
b3992868d5 Merge pull request #13326 from Jordie0608/doyouthinkthesyndicatehaveadedicatedfashiondesigner
Adds nt's sprite for syndielite suit
2015-12-08 11:44:24 -06:00
duncathan salt
3ea5409f4b Merge pull request #13320 from GunHog/Removes_Royal_Alien_Penetration
Xenomorph Royals are now immune to injection.
2015-12-08 11:43:43 -06:00
duncathan salt
15ae23b74f Merge pull request #13257 from Jordie0608/allthevarsthatdontgeteditedbecomeverylonely
Adds on_varedit proc
2015-12-08 11:43:14 -06:00
Jordie
dee6b6a4c3 Merge pull request #13482 from MrStonedOne/patch-80
Fixes runtime in lighting system
2015-12-08 15:41:07 +11: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
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
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
KorPhaeron
8f01581fc0 Updates to use variables 2015-12-07 18:28:36 -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
Shadowlight213
71e76f6eec Merge branch 'master' of https://github.com/tgstation/-tg-station into Aghost_control 2015-12-07 13:10:53 -08:00
Shadowlight213
bc32764587 Changes json_writer to not use flat_array 2015-12-07 13:10:28 -08: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
Shadowlight213
3c35ac809e Hopefully finally fixes the nanoui issue. 2015-12-06 23:24:01 -08:00
Shadowlight213
74c27189b9 Renames IsAGhost to IsAdminGhost.
Reworks checks to not need stat to be 0
Fixes the majority of the Nanoui bugs.
2015-12-06 20:21:43 -08:00
GunHog
2ea50e063b Adds Diagnostic HUD to ghosts
- Ghosts may now use Diagnostic HUD.
- Feedback added for which HUD is active.
2015-12-06 19:15:26 -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
Kyle Spier-Swenson
88a795a0c6 fixes typo in is banned() 2015-12-06 12:54:36 -08: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
AnturK
1b09b3503d Adds internals box to Academy Defender outfit 2015-12-06 14:16:09 +01:00
Shadowlight213
828f880432 Lets Admins interact with AI hacked bots. 2015-12-06 00:51:32 -08:00
Shadowlight213
0cc98d3d09 WIP 2
Most content is done. Just need Comms console and Fixing the Nanoui error.
2015-12-06 00:24:09 -08: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
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