3cf6dc50be
Merge pull request #13414 from AnturK/shadowlingfix
...
Fixes shadowling hatch
2015-12-03 15:35:46 -06:00
7eab9a3f76
so smooth it burns
2015-12-03 16:12:56 -05:00
fdcfbb9b9d
Merge branch 'master' of https://github.com/tgstation/-tg-station into madewithrealcaverock
2015-12-03 16:07:07 -05:00
cca05646e8
Auto-populate dispenser buttons, fix a couple warts
2015-12-03 15:01:22 -06:00
a2b8d1eb2a
Vine fixes and tweaks.
2015-12-03 15:48:47 -05:00
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
0e4078fb90
Mine turf fixes
2015-12-03 14:25:38 -06:00
31989e9197
Merge pull request #13350 from Incoming5643/colon_cancer
...
IC OOC detection fixes
2015-12-03 23:12:25 +03:00
3ea054e84c
Merge pull request #13394 from octareenroon91/patch-31
...
Correct crayon comment
2015-12-03 23:10:55 +03:00
928c23e4d4
Merge pull request #13390 from neersighted/nano_subsys_tweak
...
Tweak NanoUI Subsystem code
2015-12-03 23:10:07 +03:00
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
626ee1d20c
Merge pull request #13356 from Thunder12345/guards!guards!
...
Adds summon_backup() to hostile animals
2015-12-03 21:44:36 +03:00
9ea8530133
Typos plssssss
2015-12-03 18:38:56 +00:00
61e0817fd9
Fixes APC emp_act
...
Fixes #13412
2015-12-03 15:28:07 -03:00
eb2e935100
Changed faction check
2015-12-03 18:22:03 +00:00
5dcfbeab20
Removes unused mob var
2015-12-03 18:52:30 +01:00
a3c6f5ad59
Merge pull request #13385 from spudboy555/librarian_pda
...
Moved Librarian PDA a few pixels to the left.
2015-12-03 11:48:18 -06:00
26c040b274
Merge pull request #13328 from YotaXP/space-heater-love
...
Upgrades the space heater
2015-12-03 11:01:10 -06:00
b8a04fb63e
Gotta go fast
2015-12-03 10:28:01 -06:00
2cbc76c731
Merge pull request #13391 from Razharas/SlipLog
...
Added logging to slips
2015-12-03 10:05:00 -06:00
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
71d96ba35f
Fix error in SStimer arguments
...
It still works because... luck? The only thing that uses this is the
Crew Monitor which sends a Z-level as the argument... Which happens to
work because the Z-level is usually 1.
2015-12-03 09:35:23 -06:00
8b1ef6a768
I was right; there was no way
2015-12-03 09:08:55 -06:00
b4911bc9fd
Fixes remote cyborg punches
2015-12-03 14:57:39 +01:00
d45c2a7787
Duh
2015-12-03 12:09:52 +01:00
7a34287a7d
Fixes shadowling hatch
2015-12-03 12:00:55 +01:00
6b0976afcb
updates caves.dm to use the actual basalt asteroid flooring, removes plating variant.
2015-12-03 01:00:43 -05:00
11c26fb328
updates to use real basalt tiles, removes the shitty plating ones
2015-12-03 00:57:21 -05:00
d53598b5ce
Merge pull request #13373 from KorPhaeron/attack_coordinate
...
Attack log coordinates
2015-12-03 01:46:17 -03:00
d1071aa5b7
Merge pull request #13365 from tkdrg/badminthings
...
Admin HUD improvements
2015-12-03 01:39:51 -03:00
aad604588c
Merge branch 'master' of https://github.com/tgstation/-tg-station into doyouthinkthesyndicatehaveadedicatedfashiondesigner
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
2015-12-03 15:12:52 +11:00
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
3a96d9bd8c
No delay on examining objects with a nanoui interface as a ghost
2015-12-02 22:53:33 -05:00
bfe4d41554
Merge pull request #13408 from neersighted/hotfix
...
Hotfix for SStimer lag
2015-12-03 14:34:45 +11:00
428ad00bb4
Merge pull request #13395 from neersighted/nano_touchup
...
Fix NanoUI for admin ghosts.
2015-12-03 14:24:43 +11:00
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
4705037955
Merge pull request #13358 from neersighted/map_name
...
Add map_name to areas
2015-12-03 14:18:34 +11:00
0853e66f7a
Merge pull request #13361 from neersighted/wrench_dat
...
Make unsafe Wrenching of Pipes less... bonkers...
2015-12-02 20:55:01 -06:00
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
726e568c26
Merge pull request #13407 from neersighted/hotfix
...
Hotfix for Cryo and NanoUI
2015-12-02 19:56:35 -06:00
4e1f25e69b
Make unsafe Wrenching of Pipes less... bonkers...
...
Fixes #12575
2015-12-02 20:50:08 -05:00
6bd6b7ccf5
Conflixed
2015-12-02 20:30:38 -05:00
dd768b9046
Merge pull request #13369 from neersighted/caps
...
Capitals for Tank logging
2015-12-02 19:09:30 -06:00
864caa9d62
Hotfix for Cryo (JSON problems) and render issues (Internet Explorer)
...
Blame MSO
2015-12-02 19:48:16 -05:00
08a8115790
Merge pull request #13271 from KorPhaeron/new_mining_turfs
...
New mining turf sprites
2015-12-02 18:11:46 -06:00
8b74e975b5
there's no way that share() isn't called, is there?
2015-12-02 17:39:09 -06:00
70d801639d
Actually removes some of the procs
2015-12-02 17:33:32 -06:00
1c0c1ddf60
Magic missile no longer does damage.
2015-12-02 18:08:24 -05:00
056dfe51f3
Makes buttons work on away missions
...
Makes spawned buttons simplier to use
2015-12-02 23:55:42 +01:00
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
Cheridan
MMMiracles
Bjorn Neergaard
Nerd Lord
KorPhaeron
Razharas
Thunder12345
Tkdrg
Thunder12345
AnturK
duncathan salt
Aranclanos
Jordie0608