a0b2b0a721
Couple of small fixes.
...
thou shalt not flee the will of nar-sie
2015-12-05 19:09:21 -05:00
953f175d2e
Hostile mobs don't get a target if the damage dealt is 0 or less.
2015-12-05 10:58:08 -05:00
58a3f742c6
Spawnable hostile constructs, for away missions and adminfuckery.
2015-12-05 10:48:52 -05:00
249a43bb08
Merge pull request #13399 from tgstation/duncathan-patch-1
...
removes unused gas mixture code
2015-12-04 21:05:35 -03:00
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
b888cb8333
Merge pull request #13427 from Anonus/vineathon2015
...
Vine fixes and tweaks
2015-12-04 21:40:33 +00:00
7560562269
Well okay SHORT delay then
2015-12-04 16:32:41 -05:00
0ccbe76a7a
Merge pull request #13402 from AnturK/pressme
...
Minor button upgrades
2015-12-04 22:21:48 +03:00
d4395f6122
Merge pull request #13419 from neersighted/sstimer_fix
...
Fix error in SStimer arguments
2015-12-04 21:57:47 +03:00
7037877028
Merge pull request #13420 from AnturK/outofideas
...
Removes unused virus var
2015-12-04 21:57:24 +03:00
87976c358f
Merge pull request #13411 from Anonus/ghostexamine
...
Removes delay on examining objects that also have a nanoui interface as a ghost
2015-12-04 15:58:19 +00:00
7469ed2263
Merge pull request #13403 from Anonus/mmnerf
...
Magic missile no longer does damage
2015-12-04 15:57:37 +00:00
c1ad583a30
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-12-04 11:38:56 +03:00
b4ddc0abb3
Merge branch 'madewithrealcaverock' of https://github.com/MMMiracles/-tg-station into MMMiracles-madewithrealcaverock
2015-12-04 11:17:49 +03:00
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
2d9fae5071
Merge pull request #13428 from neersighted/ai_nano_fix
...
Fix AI NanoUI checks
2015-12-03 16:44:18 -06:00
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
b8909aa814
Fixes the pre-mapped cave pieces to spawn the right tiles
2015-12-03 16:07:00 -06:00
497208ec28
Merge pull request #13386 from neersighted/chem_love
...
Add remove buttons directly to Chem Dispenser
2015-12-03 21:59:12 +00:00
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
a004c0048e
Fix AI NanoUI checks
...
view() is broken...
2015-12-03 15:53:27 -06:00
93ebd07488
Merge pull request #13426 from KorPhaeron/new_mining_turfs
...
Mine turf fixes
2015-12-03 21:49:40 +00:00
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
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
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
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
Nerd Lord