Commit Graph

57 Commits

Author SHA1 Message Date
Atermonera
fac9b26540 Merge pull request #7150 from KillianKirilenko/kk-misc
[QOL] More Readable CMC
2020-05-15 21:14:53 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Unknown
6dc8552e8c Finishes this PR 2019-04-21 21:32:39 -04:00
Leshana
048bd62fe2 Fix markers on nanomaps to the new map size of 140. 2018-04-29 00:07:56 -04:00
Leshana
4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
Atermonera
bed08c7b7b Synthetics show up on the manifest (#4664)
* Silicons actually show up in the pda manifest now
2018-01-29 12:04:25 -08:00
Leshana
3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-01-19 17:52:25 -05:00
Atermonera
7a6b0fd750 Cleans up PDA Manifest template (#4540)
* Cleans up PDA Manifest template, adds Planetside and Silicon sections

* Cleanups up some testing code

* A rogue space-indented line

* Hides empty manifest categories
2018-01-18 11:33:09 -06:00
Leshana
28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme
2018-01-04 22:44:04 -05:00
Atermonera
7870ee529c Adds a weather app to the communicator
Splits communicator.dm into multiple files
Also a few bits from my PDA->communicator project, should be commented out
2017-12-28 21:33:23 -08:00
Leshana
93f309b358 Updated nanomaps for tether map.
* Generated the tether nanoui maps.
* Had to update the nanomap generator and nanoui CSS to account for our smaller maxx and maxy
2017-05-16 20:55:26 -04:00
Anewbe
b4ec8eb026 Oxyloss shows as cyan 2017-03-05 14:19:51 -06:00
Leshana
26b2ce1f4d Fix formatting of security and medical notes in PDA.
* Line beaks were being smooshed becuase PDA nanoui uses HTML template.  Fixed by adding white-space: pre-wrap style.
2017-02-21 19:01:25 -05:00
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
2016-08-15 12:58:00 -04:00
SinTwo
4fa126b7e7 a whole lot of nanoui upgrades 2016-06-24 00:43:16 -04:00
SinTwo
ba4fa36984 Adds UI and a few fixes 2016-05-23 17:59:41 -04:00
SinTwo
dc6d796e19 Quick UI fix for communicators 2016-05-19 23:25:33 -04:00
SinTwo
a87c8de3fd HTML5 and CSS3 (#1677)
* Updates to HTML5 and CSS3

* UI Tweaks and Fixes
2016-05-19 14:28:38 -04:00
SinTwo
47176f4912 Communicator Texting And UI Overhaul (#1670)
* Communicators ui moved to FakeNanoUI

* Removed test file.

* Back to NanoUI

* NanoUI

* Communicator Texting and UI overhaul.

* Comment Fixes
2016-05-18 09:29:07 -04:00
Jon
86850d15f4 Fixes the map for NanoUI. It's now 1200x1200px not 1024x1024px due to our dimensions.
Necessary changes to nanomapgen.dm and various image files to generate new nanoui maps have not been committed. These changes were required because our station's map is 300x300 tiles, not 255x255 tiles like the Exodus.

Changes were needed to layout_default.css to ensure the map shows properly in the UI at 300x300.
This should work fine for now, but other changes can be pushed through to bring the tools in line with our map's size if necessary.
2015-11-30 20:15:27 +00:00
PsiOmegaDelta
d36d6d42e0 Cargo now sorts under their own department in the manifests. 2015-08-24 10:03:15 +02:00
PsiOmega
99406e3077 NanoUI AI door interface.
Related:
Cleans up airlock Topic()
Power and electricity is now also handled by process instead of sleeps().
Wires, remote door controls, etc. now use airlock procs instead of manhandling variables directly.
2015-03-03 13:23:18 +01:00
PsiOmega
683ef229c1 NanoUI interfaces.
Turret Controls.
Omni-filters/mixers now disable the On/Off button during configuration.
2015-02-28 13:21:08 +01:00
PsiOmega
1c763ff2c9 Merge remote-tracking branch 'upstream/dev' into subsystems 2015-02-23 10:32:32 +01:00
PsiOmega
5578afa07c General update.
NanoUI interface sorted.
Accessible by AI, borgs, and through consoles.
Automatic alarm resets in case of lost sources.
2015-02-23 10:32:25 +01:00
PsiOmega
ead0f31426 Revises how Topic and NanoUI shares allowance-logic.
All mob-interaction logic now resides in nanointeraction.dm and is called by the base CanUseTopic().
Specifics for when objects allows mob-interaction can be specified by overriding CanUseTopic(), see machinery.dm.
2015-02-19 18:22:19 +01:00
Atlantiscze
afe991c1b4 Powernet Sensor System Overhaul
- Completely reworks the powernet sensor system that i created.
- Code mostly refactored to nice properly commented one.
- Sensors now have (currently unused) proc for returning HTML encoded string (it's there if someone needs it) and (newly added) proc that returns assoc list of data.
- Thanks to previous, the console has been fully reworked to utilize NanoUI.
- This addresses most issues with old UI which was harder to use and somewhat buggy at specific situations (such as, showing lower load than suposed)
2015-01-01 07:48:42 +01:00
PsiOmega
23bb747364 Merge remote-tracking branch 'upstream/master' into dev 2014-11-26 22:10:09 +01:00
Loganbacca
8538c7fe81 Another NanoUI fix
- Rewrote CSS fix to utilize inheritance
- Added some removed code I missed in the first commit
2014-11-25 23:14:42 +13:00
Loganbacca
2ab9c4354d NanoUI fixes
- Fixes #6013
- Reverts temporary fix that removed said problem formatting (#6343)
- Renames red and yellow classes to be more self explanatory
2014-11-25 22:38:19 +13:00
PsiOmega
77c52f48a8 Newscaster and photo cleanup
Synthetics can no longer magically print color images on a black-and-white photocopier.
No longer possible for organics to acquire a synth-image by un-attaching it from a newscaster.
News articles now come with a timestamp and photo captions, if anything was penned on an attached photo.
Reception-checks no longer unconditionally sleeps the thread. Was causing havoc with NanoUI.

Misc. code refactoring.
2014-11-06 13:28:17 +01:00
PsiOmega
9c41148a08 PDA newscaster
One can one access and view newsfeeds from the comfort of one's PDA.
Possible to change and disable the newsmessage beep.

Known issues:
Unlike browse() NanoUI does not appear to wait for browse_rsc(), the method which to transfers image to the client's cache, to finish.
This often results in newsfeeds not always displaying their images the first time they are viewed.
2014-10-28 17:10:35 +01:00
Mark Aherne
5fd0d2d16e Changed map dragging functionality to use jQuery UI. This is an attempt to fix dragging on WINE. 2014-07-23 16:46:37 +01:00
Mark Aherne
8dbf71a270 Update NanoUI Live Map.
* Simplified how items are positioned on the map (e.g. ((value.x - 1) * 8) is now just value.x, scaling is applied later).
* Added four zoom levels (x1.0 to x2.5, triggered by links in the template).
* Moved the "Generate NanoUI Map" into the Server tab, to prevent it being used by admins accidentally.
2014-07-19 11:02:46 +01:00
Mark Aherne
3323a26300 Added PDA check in wear_id slot to get any potential id rank. 2014-07-19 03:38:50 +01:00
Mark Aherne
8396b76b83 Improved Crew Monitoring Console map.
Added icons for use with map.
2014-07-19 02:44:13 +01:00
Mark Aherne
f09b24ae17 Added a station map to NanoUI, this map can be used by any NanoUI to display live/dynamic elements on a map.
The map functionality has been added to the crew monitor console to show active crew trackers, this is working but needs refinement (icons etc.).
2014-07-19 00:31:28 +01:00
Mark Aherne
34516bded4 Layout update for NanoUI.
The layout HTML (which was mainly used for the title bar) is no longer hard coded in nanoui.dm.
Layouts are now dynamic and each consists of a template and stylesheet (CSS) file.
Multiple layouts can exist, they can be switched to using the set_layout_key proc. See the proc comments for more info.
Added "default" and "basic" layouts, "basic" has no title bar.
Moved image source assets (GIMP and Flash files) into a separate source folder so that they are not sent to the client.
2014-07-15 01:08:06 +01:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
mwerezak
0319c96502 Adds docking support to shuttles, NanoUI 2014-06-09 23:41:08 -04:00
GinjaNinja32
42d8344f7d Change crew monitoring computer to use NanoUI 2014-06-02 09:29:34 +01:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Loganbacca
d35fbfd562 Airlock controller rewrite
- /datum/computer/file/embedded_program moved from embedded_controller_base.dm to code/game/machinery/embedded_controller/airlock_program.dm
- embedded_controller_base.dm cleaned up and identical parts of the controller subtypes were moved here
- embedded_controller subtypes moved to code/game/machinery/embedded_controller/airlock_controllers.dm
- Added nanoUI templates for airlock controllers
- Added a couple of classes to nano/css/shared.css for colouring buttons
- Minor map update to maintain airlock compatibility and fix a broken airlock near virology
2014-02-13 14:23:02 +13:00
Mark Aherne (Faerdan)
024a0baa49 Canister, Tank & Tank Transfer Value NanoUIs.
* Added Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 01:08:45 +00:00
Mark Aherne (Faerdan)
f25052fd4c NanoUI updates.
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).
2014-01-06 02:49:25 +00:00
Ccomp5950
ec7921909f NANOUI PDA
Creates NanoUI for the PDA and Syndicate Uplink.

New features:
	Crew manifest now sorted with department heads at the top.
	Can select individual conversations and delete individual conversations among PDA's
	Powernet Monitor much more simple now and easier to read.
	Janitorial supplies locator now includes Janicart.
	Items will actually refresh if you click "Refresh"

Some other changes:
	Captain's PDA cartridge now has all access (added janitor access and quartermaster access)
	With the conversation change I had to change how tnote (the variable that holds PDA messages works.
		Setup the message server to use the new methods.
	Removed procs that will no longer be used (UI generation procs from old UI methods)
	Commented everything the best I can.
	Created HORRIBLE, TERRIBLE lists.  But it's pretty much required because that's how nanoUI rolls.
	Created a variable on the uplink called NanoUI items, this list is created upon creation of the
		uplink.

	I included the functionality for Mimes and Clowns for our downstream servers that have those.
2013-12-22 06:18:39 -06:00
Ccomp5950
1a0e010c4e Forgot my CSS too. 2013-11-23 02:01:51 -06:00
Ccomp5950
ec79e75c0f Fixed nanoUI issues with Watermelon Juice in the Soda Dispenser
Added some if statements so that NanoUI for the booze/soda dispensers isn't /exactly/ like the chemdispenser, mentions glass instead of beaker, and "drinks" instead of chemical.

Also removed my debug messages
2013-11-23 01:43:34 -06:00
Mark Aherne (Faerdan)
f9906ef76e Styling improvements for Chem Dispenser and DNA Modifier Nano UIs.
Injector buttons are now disabled when the injector system is not ready.
2013-09-20 23:08:04 +01:00