cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-13 18:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 62 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

102 Commits

Author SHA1 Message Date
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
xxalpha
68dedb9ee2 Reverts #15187 2016-02-05 01:28:44 +00:00
xxalpha
3316070ac0 Merge remote-tracking branch 'upstream/master' into putin 2016-02-05 01:27:26 +00:00
xxalpha
cdef1324d3 Fixes var edited SMES starting with no charge. 2016-02-04 08:52:26 +00:00
KorPhaeron
8d4351fd04 Revert "Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue" 2016-02-03 22:03:22 -06:00
Razharas
6dd29e1211 Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue 
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
 2016-02-02 01:02:17 +03:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs 
Absolute paths and changes one liner if's/else's/else if's.
 2016-01-29 03:15:12 +03:00
Bjorn Neergaard
f93822c195 Allow tgui input() to be 0, fix SMES components 
Fixes #14965
 2016-01-28 07:10:37 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
d9162b653c Fix tgui recursion being broken 
..() is more elegant after all... You win @RemieRichards
Fixes #14925
 2016-01-27 00:52:22 -06:00
Razharas
d6ddcf6b4c For real fixes smeses charge on construction 
For real fixes smeses charge on construction
Fixes https://github.com/tgstation/-tg-station/issues/14806
 2016-01-23 18:17:01 +03:00
Bjorn Neergaard
1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Razharas
4244d67b1c Makes SMES great again 
Makes SMES great again
 2016-01-21 00:31:04 +03:00
Razharas
247505d448 Final solution to the Mean() question 
Final solution to the Mean() question
 2016-01-20 01:03:20 +03:00
Firecage
d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02: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
Razharas
afccde250c Further corrections to smeses 
Further corrections to smeses
 2016-01-18 17:10:35 +03:00
Razharas
c71c01f4e9 Roundstart smes fix 
Roundstart smes fix
 2016-01-18 17:00:30 +03:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
Razharas
36f0daa071 Makes SMES drain cells on deconstruction 
Makes SMES drain cells on deconstruction
Fixes https://github.com/tgstation/-tg-station/issues/6451
 2016-01-16 19:38:35 +03:00
duncathan salt
f9f12f6447 Merge pull request #14261 from KorPhaeron/SMES 
SMES logging fix
 2016-01-05 03:13:30 +01:00
KorPhaeron
3d74978881 Uses get_turf 2016-01-04 19:40:01 -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
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
bb152b5c47 Add more complete UIs 
* Add airlock electronics UI
* Add space heater UI
* Add SMES interface
 2016-01-01 17:46:57 -06:00
KorPhaeron
55ceabae3e SMES fix 2016-01-01 13:29:11 -06:00
oranges
134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13: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
Bjorn Neergaard
06e5df9336 Fix NanoUI missing assignment; use two-line ifs 2015-11-29 18:20:10 -05:00
Bjorn Neergaard
b897fb6d72 Fix NanoUIs flashing, update Tanks, Solars, and Canisters 2015-11-27 15:30:18 -05:00
Bjorn Neergaard
83a2d64b25 Update NanoUI Javascript libraries, SMES UI 2015-11-27 01:13:30 -05:00
Bjorn Neergaard
1a44e3d851 Refactor NanoUI API 
Also update NanoUI-using code to the new API.
 2015-11-26 07:11:31 -05:00
Tkdrg
021b99badb Logging improvements 
Fixes SMES deconstruction logging.
Radiation will no longer message admins unless a living mob is hit.
All rad pulses will still be saved to logs.
Also adds a JMP link to the rad pulse message.

Fixes #12442
Fixes #12609
 2015-11-13 18:08:23 -03:00
phil235
d3ee910211 Makes effect system code more OOP. 
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
 2015-10-21 23:28:29 +02:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Razharas
bfbe4e997e Merge pull request #11505 from duncathan/returnQDEL_HINT_LETMEDIE 
Makes all Destroy() procs return properly
 2015-09-01 15:54:18 +03:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
bgobandit
d4e058c7ea HONK HONK HONK HONK HONK 2015-08-30 15:08:54 -04:00
bgobandit
504f2b7270 Adds fingerprint transfer for machine deconstruction and logging for SMES in particular. 2015-08-30 14:58:21 -04:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
 2015-06-23 12:54:26 -07:00
phil235
3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing 
The Nanoing (Episode 2: The Fix Wars)
 2015-06-22 14:24:20 +02:00