2aa6096fe4
Merge pull request #13447 from KorPhaeron/fountain
...
Healing fountain subtype for use by anyone
2015-12-08 07:56:33 +00:00
bea8d35ff5
Merge pull request #13437 from neersighted/clickable_stats
...
Refactor MC/Failsafe/add Subsystems
2015-12-07 19:58:46 -06:00
0472592b97
Merge pull request #13327 from KorPhaeron/reactive
...
check_shields() refactor
2015-12-07 19:58:17 -06:00
0c31ca58cc
Fixes changeling shields
2015-12-07 19:05:57 -06:00
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
9ec6e187a4
Merge pull request #13464 from Anonus/hostileconstructs
...
Spawnable hostile constructs, for away missions and adminfuckery
2015-12-06 17:25:53 -06:00
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
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
45a9e138b2
Merge pull request #13435 from SuperSayu/window_unbreaker
...
Fixes window fixing
2015-12-06 12:06:37 +11:00
5646f0eb5b
syntax error
2015-12-05 18:42:50 -06:00
9fa4288b08
Makes everything that used spawn () throw_at use throw_at_fast
2015-12-05 16:40:52 -08:00
a0b2b0a721
Couple of small fixes.
...
thou shalt not flee the will of nar-sie
2015-12-05 19:09:21 -05:00
3c75d78f84
Use a list instead of net_id
...
reduce excess calls to update_icon()
2015-12-05 16:35:41 -06:00
58a3f742c6
Spawnable hostile constructs, for away missions and adminfuckery.
2015-12-05 10:48:52 -05:00
34b717afb4
radio_controller -> SSradio, SSbp -> SSnpc
2015-12-04 22:25:24 -06: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
97ca70cd34
Rework Master Controller, Failsafe, and Subsystem code
2015-12-04 15:40:58 -06:00
4253585e1e
Use TRUE/FALSE instead of 1/0
2015-12-04 13:28:19 -06:00
9d591c1c5f
Healing fountains
2015-12-04 13:26:03 -06:00
0ccbe76a7a
Merge pull request #13402 from AnturK/pressme
...
Minor button upgrades
2015-12-04 22:21:48 +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
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
544295c563
define proc/refreshID
2015-12-04 03:42:54 -06:00
f3f61367da
Give wallets merged access of all IDs inside.
2015-12-04 03:16:43 -06: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
6f6968773b
Fixes #13418
2015-12-03 22:46:56 -05: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
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
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
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
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
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
4705037955
Merge pull request #13358 from neersighted/map_name
...
Add map_name to areas
2015-12-03 14:18:34 +11: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
dd768b9046
Merge pull request #13369 from neersighted/caps
...
Capitals for Tank logging
2015-12-02 19:09:30 -06:00
08a8115790
Merge pull request #13271 from KorPhaeron/new_mining_turfs
...
New mining turf sprites
2015-12-02 18:11:46 -06:00
056dfe51f3
Makes buttons work on away missions
...
Makes spawned buttons simplier to use
2015-12-02 23:55:42 +01:00
f634890457
Merge pull request #13335 from Incoming5643/fudge_dice
...
Fudge dice
2015-12-02 16:40:25 -06:00
4b7b8a0e94
Adds Bots to Diagnostic HUDs
...
- Adds bots to the Diagnostic HUD.
- Fixes mode tracking issues with AI's botcall interface
- Added Sentience tracking to bots in PDA and AI displays
- New HUD sprites by WJohnston
- Moved bot defines to its own file so it can be used properly.
2015-12-02 16:16:33 -06:00
Remie Richards
duncathan salt
KorPhaeron
Razharas
Jordie
octareenroon91
MrStonedOne
Nerd Lord
Bjorn Neergaard
KorPhaeron
Razharas
paprka
Vincent
Cheridan
MMMiracles
AnturK
GunHog