RKF45
16cc421e34
Tiny objects on ears
2014-01-09 23:45:08 +01:00
Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
Zuhayr
70fe0e02cd
Merge pull request #4245 from SkyMarshal/airfixes
...
Lots of bugfixes.
2014-01-09 02:47:20 -08:00
ZomgPonies
09c56a0930
BS12 compile fixes for Constructs
2014-01-09 04:49:16 -05:00
ZomgPonies
7829c13c36
Typo compile fix
2014-01-09 04:46:27 -05:00
ZomgPonies
b4f401e3b6
Constructs missing all their abilities -- Taken from /tg/
...
Desc of constructs and cult mode promises certain abilities to various
constructs that were missing. Also fixes some typos.
2014-01-09 04:40:37 -05:00
SkyMarshal
f79ffa598e
Tradeband and Gutterspeak now have a different font than Tradeband.
...
Fixes #4143
2014-01-08 22:15:47 -07:00
SkyMarshal
2308e71157
Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
2014-01-08 21:33:17 -07:00
Zuhayr
1f779a010b
Merge pull request #4241 from Faerdan/dev
...
Minor fix for NanoUI
2014-01-08 17:49:22 -08:00
Chinsky
3259ccf86f
Merge pull request #4217 from DJSnapshot/dev
...
Custom stuffs!
2014-01-08 17:22:29 -08:00
Mark Aherne (Faerdan)
8e041670e7
Minor fix for NanoUI
...
* I was passing src instead of src_object in try_update_ui, this is fixed now.
* Changed checks to use the isnul procl, just to be sure.
2014-01-09 01:06:24 +00:00
Mark Aherne (Faerdan)
b9335e8855
NanoUI fix.
...
* Moved the receiveUpdateData JavaScript into the head so that it's loaded first.
This is to prevent an error which occurs if an update is recieved from the server before the UI is fully loaded.
2014-01-08 12:42:20 +00:00
Mloc
0c48d1b102
Merge pull request #4233 from Zuhayr/dev
...
Commit testing? What's that? Single character fix for pulse checking.
2014-01-08 02:37:42 -08:00
Zuhayr
a040cb8f08
Commit testing? What's that? Single character fix for pulse checking.
2014-01-08 21:07:10 +10:30
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
e1365598e6
Merge pull request #4213 from Zuhayr/dev
...
Significant diona and species flag changes.
2014-01-06 20:25:12 -08:00
DJSnapshot
8ef5d78b04
stealthfix
2014-01-06 17:21:26 -08:00
DJSnapshot
dcef3e81e8
Papadrow's custom dress for lillian: http://baystation12.net/forums/viewtopic.php?f=33&t=9363
2014-01-06 13:15:15 -08:00
DJSnapshot
7ad5b43707
Commiting Michael Guess's pendant: http://baystation12.net/forums/viewtopic.php?f=33&t=9367
2014-01-06 13:06:16 -08:00
DJSnapshot
39c04e06f0
Fix so that custom sprited borgs don't spawn as a cardborg
2014-01-06 12:50:30 -08: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
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
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
