Commit Graph

316 Commits

Author SHA1 Message Date
KorPhaeron
d4f3d47c0a Adds survival capsules to pods 2015-12-10 01:09:12 -06:00
duncathan salt
bea8d35ff5 Merge pull request #13437 from neersighted/clickable_stats
Refactor MC/Failsafe/add Subsystems
2015-12-07 19:58:46 -06:00
Kyle Spier-Swenson
f993a5b9d2 You may now sleep in process() 2015-12-06 05:44:40 -08:00
Bjorn Neergaard
531e4b947f Subsystem display tweaks 2015-12-05 10:13:59 -06:00
Bjorn Neergaard
34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -06:00
Bjorn Neergaard
703290e4a9 Take feedback into account 2015-12-04 15:53:42 -06:00
Bjorn Neergaard
97ca70cd34 Rework Master Controller, Failsafe, and Subsystem code 2015-12-04 15:40:58 -06:00
Razharas
d4395f6122 Merge pull request #13419 from neersighted/sstimer_fix
Fix error in SStimer arguments
2015-12-04 21:57:47 +03:00
Razharas
928c23e4d4 Merge pull request #13390 from neersighted/nano_subsys_tweak
Tweak NanoUI Subsystem code
2015-12-03 23:10:07 +03:00
Bjorn Neergaard
b8a04fb63e Gotta go fast 2015-12-03 10:28:01 -06:00
Bjorn Neergaard
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
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
Bjorn Neergaard
5a4089432c Tweak NanoUI Subsystem code 2015-12-02 09:15:21 -06:00
Jordie
8425b5c4cf Merge pull request #13346 from neersighted/nano_tweaks
Tweak some NanoUI stuff
2015-12-02 15:54:02 +11:00
Bjorn Neergaard
0dcfd67796 We use pipes. 2015-12-01 07:28:53 -05:00
Bjorn Neergaard
b4bcaa3930 Tweak some NanoUI stuff
Sanitize config_data
Log open UIs
2015-11-30 22:21:26 -05:00
Bjorn Neergaard
aadfa979e6 Blame MSO
@MrStonedOne
2015-11-30 21:23:57 -05:00
Bjorn Neergaard
47e9a7771a Fix up SStimer, make Crew Console use SStimer
Remove crappy proc queue as well...
2015-11-30 20:56:45 -05:00
Jordie
ce5d74ef07 Merge pull request #13221 from MrStonedOne/patch-69
Changes event fire rate from 5-15 minutes to 3-10 minutes
2015-11-29 21:07:03 +11:00
Bjorn Neergaard
6005d54d40 Update NanoUI to use the asset_cache system
Also move a bunch of folders around.
2015-11-28 00:56:30 -05:00
Bjorn Neergaard
5f108eef4e Merge remote-tracking branch 'tgstation/master' into nanoui_update 2015-11-27 15:31:35 -05:00
phil235
da0ba3659f Merge pull request #13239 from AnturK/animalbots
Simple Animal Bots - Beepsky strikes back.
2015-11-27 17:37:59 +01:00
duncathan salt
b415e5b3b1 Merge pull request #13202 from KorPhaeron/pod_launch
Fixes pod early launch
2015-11-26 21:19:13 -06:00
Bjorn Neergaard
6a6262d6b2 Finish refactor/retooling of NanoUI core
Also:
* Fix NanoUI on IE11+
* Add missing files (oops!)
2015-11-26 22:17:53 -05:00
KorPhaeron
047c5625ae Removes sanity check 2015-11-26 18:54:59 -06:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
KorPhaeron
e275a8745a Removes useless else 2015-11-26 07:46:22 -06:00
Bjorn Neergaard
94e114fee7 Correct several oversights 2015-11-26 07:11:32 -05:00
Bjorn Neergaard
5e9c0adc3b Add NanoUI debug verb
A quick tool that helps me reload templates.
Also refactor NanoUI resource code a bit.
2015-11-26 07:11:29 -05:00
Bjorn Neergaard
4e5edf396a Update NanoUI
* Update NanoUI to the latest version, ported from Baystation12
* Update the Air Alarm UI
* Make changes to subsystems and some machines to make the new NanoUI
work
2015-11-26 07:11:27 -05:00
Kyle Spier-Swenson
29814ec89c Changes event fire rate from 5-15 minutes to 3-10 minutes
Because of the increase in the number of events possible, it seems it would make sense to raise how often events fire
2015-11-25 13:56:45 -08:00
Razharas
e0508ad572 Merge pull request #13050 from MrStonedOne/connectlagfixthankspjb
[Ready] Fixes the 2 minutes of interface lag (such as ready button not working) when a client connects.
2015-11-25 20:43:45 +03:00
KorPhaeron
a9d04a471d Sanity checks 2015-11-25 07:57:49 -06:00
MrStonedOne
ca4f4201e7 Asset Cache improvements!
Adds crew monitor to the asset cache system
Adds paper to the asset cache system

Added a way to send files to the client slowly without clogging up the queue. (This isn't technically "safe", but the client would only have issues if they didn't have that file already (rare), and only if they used a window that needed that asset (currently only nanoui windows) within the first 15 to 90 seconds of connecting (depending on ping))

Makes NanoUI use this slow send system to blindly send it's asset files. (Once bay's nanoui is ported, i'll improve this so that nanoui fully implements asset cache checking)

Makes asset cache use this system to send all registered asset files, so that ui windows don't have to wait for them if the client's been connected a while.
2015-11-25 02:11:04 -08:00
KorPhaeron
0b628575da Fixes pod launch 2015-11-24 20:12:21 -06:00
KorPhaeron
c04d80f5be Fixes 2015-11-24 08:37:47 -06:00
KorPhaeron
defc1ca2e9 Early pod launch 2015-11-23 17:45:35 -06:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Cheridan
065807eca8 Merge pull request #12986 from Yolopanther12/master
Adding Clonepod to Supply Blacklist, Fixes #12979
2015-11-13 08:29:20 -06:00
Cheridan
74529129ed Merge pull request #12984 from tkdrg/replaceTHIS
Fixes cargo manifest access restriction display
2015-11-12 23:54:45 -06:00
Yolopanther
d2bb41d581 Missnig Comma
Hey I found that comma that makes it all work. Should compile now.
2015-11-11 21:51:58 -08:00
Yolopanther
319b57004c Adding Clonepod to Supply Blacklist
Added clonepod to the supply shuttle blacklist, fixing issue #12979
2015-11-11 21:45:07 -08:00
Tkdrg
236e5cf86b Fixes cargo manifest access restriction display
Why use replacetext with no arguments? I have no idea.
This wasn't runtiming because of the bygex stuff I guess.
Thanks octareroon91 for reporting this to me ingame.
2015-11-12 02:14:35 -03:00
phil235
7af0715f7d Fixes Escape Shuttle sound being too loud. 2015-11-11 21:55:21 +01:00
duncathan salt
15c7d1f356 Merge pull request #12743 from Xhuis/maybe_theyll_find_out_where_the_other_sound_came_from_too
Causes the emergency shuttle to play sounds upon launch and dock
2015-11-11 10:25:37 -06:00
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
Xhuis
196a697f5a c 2015-11-04 21:27:44 -05:00
Xhuis
e553447f65 More optimization 2015-11-04 21:26:47 -05:00
Xhuis
2199d7c4d1 Makes sounds more optimized (I guess...) 2015-11-04 21:25:12 -05:00
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00