Zuhayr
1faf2ef25b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-08 09:42:47 +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
Zuhayr
b28592d707
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-06 13:42:23 +10:30
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
c8beb39944
Dirt Fixes. Pass ALL the attack_by's to the floor.
2014-01-05 19:17:26 -06:00
Zuhayr
b05f81df3d
Added NO_BLOOD checks to drips, syringes.
2014-01-05 14:13:58 +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
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
Mark Aherne (Faerdan)
c1ed93cf29
The new NanoUI PDA will now update automatically, eliminating the need for a Refresh button.
...
When a user sends or recieves a Message using a PDA, the UI (if open) will now update instantly to show the sent/received message (this uses the new nanomanager.update_user_uis proc).
2014-01-04 02:12:18 +00:00
Zuhayr
62893f80b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-04 11:35:07 +10:30
Ccomp5950
8ea79311c7
Compile fix after bad merge.
...
VERY BAD MERGE, no treats.
2014-01-03 11:03:39 -06:00
Ccomp5950
f0563911cb
Fingerprints on showers and crayon graffiti.
...
fixes #4076
as well as admin request on crayons.
2014-01-02 20:26:14 -06:00
DJSnapshot
2949c2f675
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-01-02 16:56:38 -08:00
Zuhayr
2c492d8289
Using DNA2 files from master.
2014-01-03 11:19:40 +10:30
Chinsky
5f9045eb06
Merge pull request #4169 from Kilakk/master
...
Fixed centcomm status reports listing vox raiders
2014-01-01 14:42:38 -08:00
Mloc
9e4a5b09a3
Merge pull request #4160 from Ccomp5950/albino_clone_fix
...
Albino clone fix
2014-01-01 11:02:55 -08:00
Kilakk
7a75242640
Where the hell did this even come from?
...
I should probably start checking for these things
2014-01-01 13:46:21 -05:00
Kilakk
3f4646ed58
Fixed centcomm status reports listing vox raiders
...
* It would say something like "Kikichata, the MODE"
* Which is hilarious, but still
2014-01-01 13:28:52 -05:00
Kilakk
4a10e9ce39
Merge remote-tracking branch 'upstream/dev' into dev
...
Conflicts:
code/game/gamemodes/nuclear/nuclear.dm
2014-01-01 11:51:53 -05:00
Ccomp5950
c6c09954aa
Cleanbot runtime derp.
...
Set something to null then change a variable on it? Sure that won't runtime.
2014-01-01 02:55:08 -06:00
DJSnapshot
b294174acb
Openable soda cans and beer bottles!
2013-12-31 17:52:12 -08:00
Chinsky
2cf4a9279c
Merge pull request #4157 from Ccomp5950/cleanbot_fix
...
Bugfix: Actually implement cleanbot targeting.
2013-12-31 17:33:14 -08:00
Ccomp5950
3448b24dad
Removed debug messages.
2013-12-31 18:06:39 -06:00
Ccomp5950
eb93d0a188
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into albino_clone_fix
2013-12-31 18:04:16 -06:00
Ccomp5950
36f81bd9b0
DNA2 clone fix. No longer albino with blue beards.
...
Looks like a copy paste problem where the eye blocks were being set to facial blocks
and the math needed for s_tone wasn't being done.
Todo: Fix clones not having unique_enzymes, /list being displayed in cloning pod, etc.
2013-12-31 18:02:48 -06:00
Zuhayr
56c967c250
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2013-12-31 21:24:03 +10:30
Zuhayr
da654c80d0
Binary merge conflict, agh. Manual merge incoming.
2013-12-31 21:16:20 +10:30
Ccomp5950
645710cb0b
Bugfix: Actually implement cleanbot targeting.
...
Cleanbots won't attempt to clean up the same mess.
Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds.
It was creating a blank list and then checking that list to see if anything else had
that mess targeted. Removed the blank list check and added an actual check.
2013-12-30 21:59:20 -06:00
Zuhayr
9d4d14f107
Fix for low oxy tank at ninja spawn.
2013-12-31 11:37:21 +10:30
Zuhayr
441b015186
Fix for absurd dirt levels.
2013-12-31 11:34:35 +10:30
Zuhayr
25f7db1949
Fix for unremovable dirty tiles.
2013-12-31 11:32:36 +10:30
Zuhayr
4c371a3d0b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-12-31 10:25:54 +10:30
DJSnapshot
7a7eca4393
Merge pull request #4146 from Baystation12/dev-freeze
...
Dev-freeze --> Master staging [Going live!]
2013-12-30 13:52:21 -08:00
Kilakk
c7f840de73
Fixes #4145 , nuke ops can choose their names on spawn-in
2013-12-30 15:38:02 -05:00
Zuhayr
5ca939fd39
Nuke starting condition rebalance, op number scaling rebalance.
2013-12-30 14:03:48 -05:00
Zuhayr
19c963ac73
Revised commit due to Mloc's suggestion.
2013-12-31 04:24:53 +10:30
Zuhayr
df6bd5d6c8
Gib rewrite/resprite to allow for arbitrary blood and flesh colours.
2013-12-30 21:48:34 +10:30
Zuhayr
f20a843496
Merge pull request #4142 from Ccomp5950/pda_optimizations
...
Optimizations of PDA NanoUI
2013-12-29 16:06:29 -08:00
Zuhayr
53c94f76bd
Merge pull request #4134 from comma/gunlocker
...
Adds gun cabinets - special snowflake secure closets.
2013-12-29 06:25:12 -08:00
Chinsky
4ddf6ad4a1
Merge pull request #4140 from Zuhayr/dev
...
Adds ghost writing, config options, redid blood paths/xenoblood.
2013-12-29 05:54:27 -08:00
Chinsky
e63d5c14a5
BYOND cannot into chain assignment
2013-12-29 17:52:56 +04:00
Ccomp5950
da140dd4bb
Optimizations of PDA NanoUI
...
We don't have to process every function every time, should shrink the JSON
data pushes as well as sanitize some of the data.
2013-12-28 19:38:14 -06:00
Zuhayr
154717aef6
Actually stopped gibs from being shaded without making their footprints pale.
2013-12-29 04:06:17 +10:30
Zuhayr
bf820a99b6
Fixed robot gib display issue, updated single path on map to new path.
2013-12-29 03:07:20 +10:30
Zuhayr
5313851da9
Converted robots over to current blood system/paths, updated various files to work with update.
2013-12-29 02:48:20 +10:30
Zuhayr
5d902525cf
Fixed up human and xeno blood procs, stopped gibs being shaded until we can rewrite them to work with blood colour.
2013-12-29 02:47:46 +10:30
