cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 02:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,143 Commits 61 Branches 14 Tags
9fc02e0c9a5cc98c1d39ce30ffcd3c00a2d2659f
Commit Graph

285 Commits

Author SHA1 Message Date
Jordie
dd38db21b5 Merge pull request #14756 from duncathan/fuckshuttles 
Pipes don't transport air across time and space
 2016-01-21 15:13:39 +11:00
duncathan salt
1493db977e Compile fix part 3 2016-01-20 09:17:18 -06:00
Jordie
02a6c6cdef Merge pull request #14744 from tgstation/piperuntimes 
Resolves atmos runtimes
 2016-01-20 16:46:55 +11:00
Bjorn Neergaard
6ac9997edc Remove atmos radio delay; fix setting external pressure; fix phantom atmos machines 
Fixes #11953
 2016-01-19 23:29:54 -06:00
duncathan
5413fa9288 better idea 2016-01-19 18:12:00 -06:00
duncathan
4e61b999fa resolves atmos runtimes 2016-01-19 00:52:06 -06:00
Bjorn Neergaard
41caa93330 Hotfix for display issues and UIs droping ui_act calls 2016-01-18 17:00:15 -06:00
Bjorn Neergaard
a1ff8e8783 Refactor tgui interactions 
Removes a lot of duplicated code, thanks to @nullquery's parent tweaks
 2016-01-18 14:27:56 -06:00
Bjorn Neergaard
1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
duncathan salt
eafb93bb2f fixes #14671 2016-01-16 13:52:01 -06:00
Bjorn Neergaard
5c1fd9c85b Fix JS/CSS watchers, fix listmos/tgui bugs 2016-01-16 12:13:50 -06:00
tkdrg
dd74b5869d Merge pull request #14630 from securitycopper/bugFix9906 
BugFix9906: atospherics heater / cooler power usage based on temp diff
 2016-01-16 00:11:45 -03:00
securitycopper
4ec39f5408 BugFix9906: Changed heater cooler logic to have power usage be based on change in current tempature and not change off of T20C 2016-01-14 21:44:48 -05:00
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
tkdrg
cd70da9045 Merge pull request #14085 from MrStonedOne/patch-107 
[Ready]Fixes portable connector keeping air
 2016-01-09 12:47:15 -03:00
Kyle Spier-Swenson
3a51b0e4e0 Does it right 2016-01-09 07:35:00 -08:00
Cheridan
797bfe01ef Merge pull request #14391 from neersighted/tgui_followup 
Fix tgui proc signatures and thus AI APC reboot
 2016-01-04 17:06:52 -06:00
Bjorn Neergaard
aec6bc103c Fix tgui proc signatures and thus AI APC reboot 
This allows state overloading

Make AI reboot code use ui_interact instead of attack_ai
Fixes #13762
 2016-01-04 16:25:20 -06:00
duncathan
b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
 2016-01-02 18:02:54 -06:00
Cheridan
145ed07651 Merge pull request #14268 from lordpidey/welderfix 
Welding vents/scrubbers shut now uses fuel.
 2016-01-02 16:29:12 -06:00
lordpidey
aca6a3dc83 Update vent_scrubber.dm 
Removed whitespace.
 2016-01-01 21:36:14 -05:00
Mike Long
8e09360556 Only consumes fuel at the END of the weld now. 2016-01-01 21:15:10 -05:00
Bjorn Neergaard
777ba0486d Rename the tgui pref and adjust all UI sizes for the rewrite 2016-01-01 17:47:45 -06:00
Bjorn Neergaard
a2bb279164 NanoUI is now 'tgui' 2016-01-01 17:47:44 -06:00
Bjorn Neergaard
8d344ec883 Finish even more UIs... 
* Add atmos UIs and solar interface
* Add air alarm interface
 2016-01-01 17:47:13 -06:00
Bjorn Neergaard
113fc2435a Add cryo interface 2016-01-01 17:46:55 -06:00
Mike Long
c0d88d051d Welding vents/scrubbers shut now uses fuel. 
Fixes #9947
 2016-01-01 16:20:16 -05:00
duncathan
9e77fffe2a maps and nano 2015-12-30 00:06:42 -06:00
duncathan
8392974ad0 fixes associative list; adds gas_overlay to "datum gases" 2015-12-29 22:50:09 -06:00
duncathan
17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
duncathan
b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
Kyle Spier-Swenson
a2c7b435e9 Fixes portable connector keeping air 
OH GOD I HOPE THIS DOESN'T BREAK SOMETHING.

It shouldn't they link directly into the pipenet.
 2015-12-26 22:21:56 -08:00
tkdrg
a73f3261b3 Merge pull request #13771 from AnturK/pipecrawl 
Ventcrawling fixes
 2015-12-20 14:23:55 -03:00
AnturK
46a11b0542 Ventcrawling fixes 2015-12-20 11:15:13 +01:00
Bjorn Neergaard
487942a09c Reduce NanoUI size by hosting fonts externally 
Also resize Cryo to be more compact
 2015-12-17 10:15:13 -06:00
oranges
134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
Razharas
9dac032681 Merge pull request #13507 from neersighted/nanoui_compat 
NanoUI 3.0!
 2015-12-16 07:43:29 +03:00
Bjorn Neergaard
da4842dddf Make NanoUI resistant to Topic spoofs 
Move Topic() into a NanoUI-specific ui_act proc
Update to @YotaXP's latest JSON code.
Return focus to the mapwindow if a key is pressed in a NanoUI.
 2015-12-15 22:37:52 -06:00
Bjorn Neergaard
47b727a23e Rework how NanoUI handles Topic() 
Also, add the ability to winset and the like, all from Javascript
 2015-12-15 13:12:35 -06:00
Bjorn Neergaard
5678dfcbd1 Prefix everything with 'nanoui' to avoid conflicts 2015-12-15 13:12:33 -06:00
Bjorn Neergaard
8fdfa08e58 Port NanoUI styles to LESS 2015-12-15 13:08:27 -06:00
Bjorn Neergaard
a0c54eba97 Begin rewrite of NanoUI frontend. 
* Remove jQuery in favor of polyfills.
* Make NanoUI work with IE8-IE11
* Upstream doT
* Change NanoUI template syntax
* Event driven code
 2015-12-15 13:07:11 -06:00
Supermichael777
a5df034693 noaccsesrequirements on mixers 2015-12-14 20:25:32 -05:00
Supermichael777
943e3b1335 Update mixer.dm 2015-12-14 20:23:10 -05:00
Cheridan
ef989fe1dc Merge pull request #13589 from Menshin/atmos_disconnect_runtime_fix 
Fixes runtimes on unary atmos devices rotation
 2015-12-13 15:09:30 -06:00
Menshin
9262d81ad4 Fixes freezer going into negative Kelvin temperatures (fixes #13583). 2015-12-12 20:43:26 +01:00
Menshin
92b334b027 Fixes runtimes on unary atmos devices rotation. 2015-12-12 16:13:30 +01: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
Bjorn Neergaard
34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -06:00
Bjorn Neergaard
bfdaf453b0 Fix Cryo checks 
Derp
 2015-12-04 00:31:43 -05:00