Commit Graph

12211 Commits

Author SHA1 Message Date
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
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
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
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
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
MrStonedOne
9fa4288b08 Makes everything that used spawn () throw_at use throw_at_fast 2015-12-05 16:40:52 -08:00
Nerd Lord
b9bd386a3e coughing noise, comma comes out 2015-12-05 19:18:58 -05:00
Nerd Lord
a0b2b0a721 Couple of small fixes.
thou shalt not flee the will of nar-sie
2015-12-05 19:09:21 -05:00
Nerd Lord
77e037c294 Revenants can no longer move through walls while revealed, though they can move through tables, plastic flaps, mobs, and other similarly thin objects.
Defile now reveals for 4 seconds, overload lights reveals for 10 seconds, and blight reveals for 6 seconds
Blight has a higher chance of applying stamina damage to the infected.
2015-12-05 15:46:06 -05:00
Nerd Lord
953f175d2e Hostile mobs don't get a target if the damage dealt is 0 or less. 2015-12-05 10:58:08 -05:00
Nerd Lord
58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
Bjorn Neergaard
815ac7d2f9 Defcon improvements, renames, etc 2015-12-04 23:24:50 -06:00
Bjorn Neergaard
34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -06:00
KorPhaeron
3de101ff04 One revenant per round 2015-12-04 16:44:24 -06:00
Razharas
41341461b0 Merge pull request #13393 from kingofkosmos/fewinhandsprites
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
2015-12-05 01:14:20 +03:00
Bjorn Neergaard
97ca70cd34 Rework Master Controller, Failsafe, and Subsystem code 2015-12-04 15:40:58 -06:00
Remie Richards
b888cb8333 Merge pull request #13427 from Anonus/vineathon2015
Vine fixes and tweaks
2015-12-04 21:40:33 +00:00
Nerd Lord
7560562269 Well okay SHORT delay then 2015-12-04 16:32:41 -05:00
Razharas
7037877028 Merge pull request #13420 from AnturK/outofideas
Removes unused virus var
2015-12-04 21:57:24 +03:00
paprka
717b857401 Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls
Conflicts:
	code/datums/beam.dm
	icons/mob/animal.dmi
	tgstation.dme
2015-12-03 23:20:12 -08:00
Bjorn Neergaard
c66314d282 Make stats in the MC tab clickable 2015-12-04 00:21:45 -05:00
Jordie0608
8f7fb2c812 optimization 2015-12-04 15:54:29 +11:00
MMMiracles
9add2c776e oy vey 2015-12-03 19:44:20 -05:00