Commit Graph

12178 Commits

Author SHA1 Message Date
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
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
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
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
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
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
MMMiracles
9add2c776e oy vey 2015-12-03 19:44:20 -05:00
duncathan salt
2d9fae5071 Merge pull request #13428 from neersighted/ai_nano_fix
Fix AI NanoUI checks
2015-12-03 16:44:18 -06:00
duncathan salt
6953de304f Merge pull request #13429 from KorPhaeron/new_mining_turfs
Fixes the pre-mapped cave pieces to spawn the right tiles
2015-12-03 16:17:17 -06:00
KorPhaeron
b8909aa814 Fixes the pre-mapped cave pieces to spawn the right tiles 2015-12-03 16:07:00 -06:00
Remie Richards
497208ec28 Merge pull request #13386 from neersighted/chem_love
Add remove buttons directly to Chem Dispenser
2015-12-03 21:59:12 +00:00
Remie Richards
fbe6c9550d Merge pull request #13384 from neersighted/pull_release
Make Ctrl-Click unpull work by using the verb
2015-12-03 21:56:17 +00:00
Bjorn Neergaard
a004c0048e Fix AI NanoUI checks
view() is broken...
2015-12-03 15:53:27 -06:00
Remie Richards
93ebd07488 Merge pull request #13426 from KorPhaeron/new_mining_turfs
Mine turf fixes
2015-12-03 21:49:40 +00:00
Bjorn Neergaard
cca05646e8 Auto-populate dispenser buttons, fix a couple warts 2015-12-03 15:01:22 -06:00
Nerd Lord
a2b8d1eb2a Vine fixes and tweaks. 2015-12-03 15:48:47 -05:00
Bjorn Neergaard
9c997c2be0 Make remove buttons for whole beaker, not individual chems
Also re-arrange chemistry because that crap is whack...
Also, clean up chemistry code's variables...
Death to colons!
2015-12-03 14:33:28 -06:00
KorPhaeron
0e4078fb90 Mine turf fixes 2015-12-03 14:25:38 -06:00
Razharas
928c23e4d4 Merge pull request #13390 from neersighted/nano_subsys_tweak
Tweak NanoUI Subsystem code
2015-12-03 23:10:07 +03:00
Cheridan
9c7ff23609 Merge pull request #13333 from MrStonedOne/lightingtweaks
Lighting system tweaks. Fixes low lum items having full center brightness, etc.
2015-12-03 13:40:23 -06:00
Razharas
626ee1d20c Merge pull request #13356 from Thunder12345/guards!guards!
Adds summon_backup() to hostile animals
2015-12-03 21:44:36 +03:00
Thunder12345
9ea8530133 Typos plssssss 2015-12-03 18:38:56 +00:00
Tkdrg
61e0817fd9 Fixes APC emp_act
Fixes #13412
2015-12-03 15:28:07 -03:00
Thunder12345
eb2e935100 Changed faction check 2015-12-03 18:22:03 +00:00
AnturK
5dcfbeab20 Removes unused mob var 2015-12-03 18:52:30 +01:00
Cheridan
26c040b274 Merge pull request #13328 from YotaXP/space-heater-love
Upgrades the space heater
2015-12-03 11:01:10 -06:00
duncathan salt
2cbc76c731 Merge pull request #13391 from Razharas/SlipLog
Added logging to slips
2015-12-03 10:05:00 -06:00
duncathan salt
19fc2d952a Merge pull request #13392 from Razharas/GrabLogs
Added logs to when someone tries to click something with a grab
2015-12-03 10:04:42 -06:00
AnturK
b4911bc9fd Fixes remote cyborg punches 2015-12-03 14:57:39 +01:00
AnturK
d45c2a7787 Duh 2015-12-03 12:09:52 +01:00
Aranclanos
d1071aa5b7 Merge pull request #13365 from tkdrg/badminthings
Admin HUD improvements
2015-12-03 01:39:51 -03:00
Cheridan
96d9609b14 Merge pull request #13380 from Incoming5643/I_changed_my_mind
Spares those in critical from the mass mindshuffle event
2015-12-02 21:59:36 -06:00
Jordie
bfe4d41554 Merge pull request #13408 from neersighted/hotfix
Hotfix for SStimer lag
2015-12-03 14:34:45 +11:00
Jordie
428ad00bb4 Merge pull request #13395 from neersighted/nano_touchup
Fix NanoUI for admin ghosts.
2015-12-03 14:24:43 +11:00