Remie Richards
91c4d1bef8
Merge pull request #13440 from octareenroon91/patch-32
...
Give wallets merged access of all IDs inside.
2015-12-07 17:37:44 +00:00
Shadowlight213
3c35ac809e
Hopefully finally fixes the nanoui issue.
2015-12-06 23:24:01 -08:00
Tkdrg
7b1f04738d
Fixes AI camera reactivation
...
Fixes #13455
Fixes #12156
2015-12-07 01:53:15 -03:00
Shadowlight213
74c27189b9
Renames IsAGhost to IsAdminGhost.
...
Reworks checks to not need stat to be 0
Fixes the majority of the Nanoui bugs.
2015-12-06 20:21:43 -08: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
ktccd
c4c6fde30d
Fixes the blob win condition
...
This is a bug that seems to have been around since... a long time ago.
It also explains why blobs keep winning easily, seeing as their win
condition used to be SET to 2*350 instead of increasing by the the
amount used per blob.
This should hopefully make blob mode work as intended.
2015-12-07 00:03:48 +01:00
Kyle Spier-Swenson
6f32eb473d
Makes noslip floors speed movement up.
...
Because you can run faster in high traction... right....
2015-12-06 09:51:08 -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
Shadowlight213
0cc98d3d09
WIP 2
...
Most content is done. Just need Comms console and Fixing the Nanoui error.
2015-12-06 00:24:09 -08:00
MMMiracles
6c685d6d67
wew
2015-12-06 02:14:26 -05: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
Shadowlight213
1fa842c315
WIP commit one.
...
Allows admin ghosts to interact with the game world like an AI.
2015-12-05 21:31:37 -08:00
Jordie
45a9e138b2
Merge pull request #13435 from SuperSayu/window_unbreaker
...
Fixes window fixing
2015-12-06 12:06:37 +11:00
octareenroon91
5646f0eb5b
syntax error
2015-12-05 18:42:50 -06:00
MrStonedOne
9fa4288b08
Makes everything that used spawn () throw_at use throw_at_fast
2015-12-05 16:40:52 -08: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
octareenroon91
3c75d78f84
Use a list instead of net_id
...
reduce excess calls to update_icon()
2015-12-05 16:35:41 -06:00
Nerd Lord
58a3f742c6
Spawnable hostile constructs, for away missions and adminfuckery.
2015-12-05 10:48:52 -05:00
Incoming
7f3a1158d2
Adds glowcaps
...
Glowcaps are red mutant glowshrooms. They can be used in all the same ways normal glowshrooms can, but they also boast a special feature.
When you finish eating a glowcap, the batteries of any electronics you have on/in you are recharged up to potency%.
2015-12-05 03:35:23 -05:00
Bjorn Neergaard
34b717afb4
radio_controller -> SSradio, SSbp -> SSnpc
2015-12-04 22:25:24 -06:00
duncathan
c0d06a3f20
next commit, goof, I swear
2015-12-04 21:48:14 -06:00
MMMiracles
8ab579cb21
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
...
Conflicts:
icons/mob/animal.dmi
2015-12-04 18:55:10 -05:00
MMMiracles
6ac96194ba
snow stuff.
2015-12-04 18:52:17 -05: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
MMMiracles
de4c8b8674
snow walls+material
2015-12-04 15:07:05 -05:00
KorPhaeron
4253585e1e
Use TRUE/FALSE instead of 1/0
2015-12-04 13:28:19 -06:00
KorPhaeron
9d591c1c5f
Healing fountains
2015-12-04 13:26:03 -06:00
Razharas
0ccbe76a7a
Merge pull request #13402 from AnturK/pressme
...
Minor button upgrades
2015-12-04 22:21:48 +03:00
Remie Richards
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
MrStonedOne
a5f0f3f594
changes spawn() throw_at to throw_at_fast set waitfor = 0
...
Set waitfor = 0 has massively less overhead then spawn() but still does basically the same thing.
It causes the first sleep in the stack from that point on to make the set waitfor = 0 proc return . then continue on as if it was spawn()'ed, but it doesn't have to copy over the local vars of the proc so a lot less overhead
http://pastebin.com/kx538RqS
2015-12-04 04:37:16 -08:00
octareenroon91
544295c563
define proc/refreshID
2015-12-04 03:42:54 -06:00
octareenroon91
f3f61367da
Give wallets merged access of all IDs inside.
2015-12-04 03:16:43 -06:00
Razharas
c1ad583a30
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-12-04 11:38:56 +03:00
Razharas
b4ddc0abb3
Merge branch 'madewithrealcaverock' of https://github.com/MMMiracles/-tg-station into MMMiracles-madewithrealcaverock
2015-12-04 11:17:49 +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
Vincent
6f6968773b
Fixes #13418
2015-12-03 22:46:56 -05:00
Remie Richards
93ebd07488
Merge pull request #13426 from KorPhaeron/new_mining_turfs
...
Mine turf fixes
2015-12-03 21:49:40 +00:00
Cheridan
3cf6dc50be
Merge pull request #13414 from AnturK/shadowlingfix
...
Fixes shadowling hatch
2015-12-03 15:35:46 -06:00
MMMiracles
7eab9a3f76
so smooth it burns
2015-12-03 16:12:56 -05:00
MMMiracles
fdcfbb9b9d
Merge branch 'master' of https://github.com/tgstation/-tg-station into madewithrealcaverock
2015-12-03 16:07:07 -05:00
KorPhaeron
0e4078fb90
Mine turf fixes
2015-12-03 14:25:38 -06:00
Razharas
31989e9197
Merge pull request #13350 from Incoming5643/colon_cancer
...
IC OOC detection fixes
2015-12-03 23:12:25 +03:00
Razharas
3ea054e84c
Merge pull request #13394 from octareenroon91/patch-31
...
Correct crayon comment
2015-12-03 23:10:55 +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
Cheridan
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
Cheridan
26c040b274
Merge pull request #13328 from YotaXP/space-heater-love
...
Upgrades the space heater
2015-12-03 11:01:10 -06:00
AnturK
7a34287a7d
Fixes shadowling hatch
2015-12-03 12:00:55 +01:00
MMMiracles
6b0976afcb
updates caves.dm to use the actual basalt asteroid flooring, removes plating variant.
2015-12-03 01:00:43 -05:00
MMMiracles
11c26fb328
updates to use real basalt tiles, removes the shitty plating ones
2015-12-03 00:57:21 -05:00