Commit Graph

11647 Commits

Author SHA1 Message Date
Ccomp5950
02d8093daa PDA NanoUI Optimizations.
Since we no longer have to send data on first UI view we can remove those
checks and only look at the data we need to send when we need to send it.

Also fixed a couple of the links on the status display function.
2014-01-08 02:20:14 -06:00
Ccomp5950
3df123db38 Merge pull request #4225 from Zuhayr/dev
Mixed up some whitelist flags, also added alien reagent reactions.
2014-01-07 20:12:03 -08:00
Mark Aherne (Faerdan)
e9be0ed44e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-08 02:31:03 +00:00
Mark Aherne (Faerdan)
eef5013d79 NanoUI Updates.
* Restructured HTML in an attempt to fix the "blank UI" issue.
* Added a crap ton of debugging messages.
* Added a loading message to the UI.
2014-01-08 02:30:33 +00:00
Zuhayr
901dbd634d Indentation fix. 2014-01-08 11:13:36 +10:30
Zuhayr
787da649c1 Safer way to do the alien thang. 2014-01-08 11:05:58 +10:30
Zuhayr
e8a5b37ea7 Fixed some cocked up checks for alien var. 2014-01-08 10:56:39 +10:30
Zuhayr
c8b595be95 Added an alien var to metabolize procs for humans and monkeys to tie into alien reagent reactions. 2014-01-08 10:27:21 +10:30
Zuhayr
049501a898 Added some limited support for alien reagent reactions. 2014-01-08 10:26:39 +10:30
Zuhayr
1faf2ef25b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-08 09:42:47 +10:30
Zuhayr
073dd32c37 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-08 09:42:36 +10:30
Zuhayr
a039f05372 Merge pull request #4224 from Ccomp5950/bug_fixes
Bug fixes
2014-01-07 02:36:51 -08:00
Zuhayr
a96c17fd75 Mixed up some whitelist flags. 2014-01-07 20:53:42 +10:30
Ccomp5950
1575db6320 Fixed placing ID's into PDA's that are on the ground.
Removed useless can_use check, no reason that is needed there.
2014-01-06 23:33:48 -06:00
Ccomp5950
0798c7f4c3 Cleanbots are now created unlocked.
Allows roboticist to set up cleanbots and if they patrol or not.  Requires janitor access to lock them (Captain, HoP, Janitor)

Should probably have a proc that checks you have either of the access listed but for now this fixes this minor problem.
2014-01-06 23:11:09 -06:00
Ccomp5950
e1365598e6 Merge pull request #4213 from Zuhayr/dev
Significant diona and species flag changes.
2014-01-06 20:25:12 -08:00
DJSnapshot
c6f442cb0c Merge pull request #4212 from Faerdan/dev
NanoUI updates.
2014-01-06 13:21:35 -08:00
DJSnapshot
7b2104ffef Merge pull request #4215 from SueTheCake/master
Adds missing rifle crate to cargo.
2014-01-06 13:18:31 -08:00
suethecake
a121c306ef Fixes~ 2014-01-06 00:23:02 -06:00
Zuhayr
3b072b32b0 More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically. 2014-01-06 14:54:35 +10:30
Zuhayr
b28592d707 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-06 13:42:23 +10:30
Mark Aherne (Faerdan)
cdc8b8a40d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-06 02:49:50 +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
cd4ef7a1b7 Ghost chat unicode support...removed unneeded sanitize() 2014-01-05 19:30:52 -06:00
Ccomp5950
c8beb39944 Dirt Fixes. Pass ALL the attack_by's to the floor. 2014-01-05 19:17:26 -06:00
Zuhayr
d0ac6e6fff Forgot a var. 2014-01-06 00:15:55 +10:30
Zuhayr
22e325d6ec Implemented IS_SLOW. 2014-01-06 00:13:49 +10:30
Zuhayr
b70a79f853 Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags. 2014-01-05 23:59:39 +10:30
Zuhayr
2a2fffc616 Fixed a duplicate definition bug with WHITELISTED. 2014-01-05 23:36:16 +10:30
Zuhayr
825f542011 Merge pull request #4206 from RKF45/fixes
Small fixes maybe?
2014-01-05 02:44:27 -08:00
Zuhayr
5940993694 Removed a return. 2014-01-05 14:20:53 +10:30
Zuhayr
19979562c9 Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel. 2014-01-05 14:20:23 +10:30
Zuhayr
b05f81df3d Added NO_BLOOD checks to drips, syringes. 2014-01-05 14:13:58 +10:30
Zuhayr
6fed0c70da Applying NO_BLOOD flag to bleeding code. 2014-01-05 14:06:51 +10:30
Zuhayr
28d8109136 Added NO_BLOOD and IS_SLOW to dionaea. 2014-01-05 13:48:49 +10:30
Zuhayr
b0aeb89bd1 Reusing some unused flags in species. 2014-01-05 13:44:17 +10:30
Mark Aherne (Faerdan)
909c873b2e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-05 02:48:44 +00:00
Mark Aherne (Faerdan)
6d9368d949 Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs
as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

I have removed the carets (^) from all templates as they are not used any more.

For safety I moved the src_object and user checks from the master controller to the nanoui process proc.
2014-01-05 02:48:15 +00:00
Zuhayr
db164356d8 Merge pull request #4202 from fira/dev-ghostanalyzers
Added Air Analyser verb for ghosts to spy on supermatter and atmos
2014-01-04 18:12:06 -08:00
RKF45
9b62f7b23d Small fixes, again 2014-01-04 21:26:28 +01:00
RKF45
9b2ff51486 Merge remote-tracking branch 'upstream/dev' 2014-01-04 19:41:19 +01:00
Fira
354b1978ea Partial fix for pAI emotes (they still can't hear beyond one container
level, will require a say/emote code hack)
2014-01-04 15:22:17 +01:00
Fira
ed5307abd0 Added Air Analyser verb for ghosts to spy on supermatter and atmos 2014-01-04 12:27:07 +01:00
Fira
de7c480439 Added GhostRadio -- Allowing ghosts to spy on radio from anywhere 2014-01-04 12:25:09 +01:00
Ccomp5950
ad740b9397 Merge pull request #4198 from Zuhayr/dev
Diona nymphs are now wearable.
2014-01-03 19:33:54 -08:00
Zuhayr
7005a66d5b Fix for containers getting left behind when nymphs grow. 2014-01-04 13:28:32 +10:30
Zuhayr
fa2b6fa6b4 Couple of oversights with diona. 2014-01-04 13:23:59 +10:30
Zuhayr
47dda54a72 Forgot SLOT_HEAD. 2014-01-04 12:53:51 +10:30
Zuhayr
f2300725f7 Made it possible to pick up and wear diona nymphs. 2014-01-04 12:49:55 +10:30
Zuhayr
122f5854d6 Fix for oversight of dionaea needing to breathe. 2014-01-04 12:49:15 +10:30