KorPhaeron
|
8f01581fc0
|
Updates to use variables
|
2015-12-07 18:28:36 -06:00 |
|
KorPhaeron
|
c9330c5ef0
|
Chasm
|
2015-12-05 02:35:33 -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 |
|
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 |
|
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 |
|
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 |
|
Jordie
|
075e9e0fcb
|
Merge pull request #13381 from Anonus/spritefix
Gives artificers feedback when healing other constructs plus a few sprite fixes
|
2015-12-03 14:20:58 +11:00 |
|
Bjorn Neergaard
|
6ec257c360
|
Hotfix for SStimer lag
SStimer can now check dupes
Also fix ghosts not being inquisitive with objects...
|
2015-12-02 21:23:45 -05:00 |
|
Cheridan
|
726e568c26
|
Merge pull request #13407 from neersighted/hotfix
Hotfix for Cryo and NanoUI
|
2015-12-02 19:56:35 -06:00 |
|
Nerd Lord
|
6bd6b7ccf5
|
Conflixed
|
2015-12-02 20:30:38 -05:00 |
|
Bjorn Neergaard
|
864caa9d62
|
Hotfix for Cryo (JSON problems) and render issues (Internet Explorer)
Blame MSO
|
2015-12-02 19:48:16 -05:00 |
|
Cheridan
|
08a8115790
|
Merge pull request #13271 from KorPhaeron/new_mining_turfs
New mining turf sprites
|
2015-12-02 18:11:46 -06:00 |
|
Nerd Lord
|
b16ed6d5b8
|
oldcode deserves to die
juggernaut reflection uses the apply damage proc correctly instead of checking if the damage type is brute or burn
|
2015-12-02 17:50:21 -05:00 |
|
Nerd Lord
|
a54356f460
|
Removes terrible, unnecessary bullet_act() from constructs, replacing it with the proper damage_coeff list.
I'd bet money it was there just so ebows couldn't damage constructs.
|
2015-12-02 17:43:59 -05:00 |
|
Cheridan
|
f634890457
|
Merge pull request #13335 from Incoming5643/fudge_dice
Fudge dice
|
2015-12-02 16:40:25 -06:00 |
|
Bjorn Neergaard
|
1d60873949
|
Fix NanoUI for admin ghosts.
Also, rename the base state file.
|
2015-12-02 12:53:36 -06:00 |
|
kingofkosmos
|
03b751aafa
|
Makes the bluescape rapid part exchange device share the same in-hand sprite with the normal RPED.
|
2015-12-02 18:19:10 +02:00 |
|
Razharas
|
52fd90b9e4
|
Added logs to when someone tries to click something with a grab, like table/cryo
|
2015-12-02 19:04:44 +03:00 |
|
duncathan salt
|
38c2d8087e
|
Merge pull request #13378 from swankcookie/cakehat_fix
Redo of #13304 (Cakehat fix)
|
2015-12-02 09:37:27 -06:00 |
|
Razharas
|
c9069cc358
|
Added logging to slips
|
2015-12-02 18:27:11 +03:00 |
|
Bjorn Neergaard
|
5a4089432c
|
Tweak NanoUI Subsystem code
|
2015-12-02 09:15:21 -06:00 |
|
MrStonedOne
|
a1bfb37f0c
|
Tweaks lighting some more.
This should be ready to go.
|
2015-12-02 07:12:37 -08:00 |
|
Remie Richards
|
d909c1e82d
|
Merge pull request #13348 from neersighted/spooky_nanoui
Allow ghosts to use any NanoUI interface.
|
2015-12-02 14:15:33 +00:00 |
|
Remie Richards
|
16e414d86c
|
Merge pull request #13344 from MrStonedOne/patch-77
Fixes library computer's next page not working.
|
2015-12-02 14:10:22 +00:00 |
|
Remie Richards
|
70b01dd7a0
|
Merge pull request #13352 from MrStonedOne/patch-78
Optimizes JSON writer
|
2015-12-02 14:09:56 +00:00 |
|