5a8eb3c455
Merge pull request #4318 from Loganbacca/engineroom
...
Engine Room Redesign
2014-01-19 21:22:45 -08:00
24c6063a07
Updated Supermatter user manual sprite
2014-01-20 01:57:58 +13:00
5649bb7fe2
Various tiny improvements
2014-01-18 22:15:46 +01:00
8a179a8ff1
Merge pull request #4299 from Faerdan/dev
...
Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 15:21:47 -08:00
dd7fef9dc2
Merge pull request #4277 from RKF45/paint
...
BS12 posters
2014-01-15 14:02:47 -08:00
30f2d49f01
Quotes inside strings confuse and scare me.
2014-01-15 22:45:10 +01:00
024a0baa49
Canister, Tank & Tank Transfer Value NanoUIs.
...
* Added Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 01:08:45 +00:00
5083e1cd47
Requested adjustments
2014-01-13 22:54:47 +01:00
0a4a7c7c08
Merge remote-tracking branch 'upstream/dev' into paintmixing
2014-01-13 22:15:33 +01:00
c46d872e6c
Merge remote-tracking branch 'upstream/master' into dev
2014-01-12 19:46:31 +00:00
b9c747aeaf
Makes mixing paints actually make sense
2014-01-12 12:04:18 +01:00
56e4b11ec5
Dynamic loading of posters
...
* Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
* Fixes wirecutters duping posters
* Fixes dropped posters not being placeable.
2014-01-11 18:10:31 -08:00
167671d583
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
...
Should be noticably better on large population servers.
2014-01-11 20:09:11 -06:00
2e903710b0
Merge branch 'paint' of https://github.com/RKF45/Baystation12 into paint
2014-01-11 17:58:28 -08:00
9e0391af04
Adds Baystation 12-specific posters
2014-01-12 01:42:41 +01:00
fabfceaa5a
Fixed forever!
2014-01-11 22:50:22 +01:00
8758ece582
Alright already.
2014-01-11 22:42:42 +01:00
140fb27889
Fixes
2014-01-11 22:36:35 +01:00
ab8763378b
Paint mixing
2014-01-11 22:19:02 +01:00
909928f3f9
Plasma glass stacking fix
2014-01-11 18:14:51 +13:00
efa5a600e3
Merge pull request #4252 from RKF45/ears
...
Tiny objects on ears
2014-01-10 13:47:10 -08:00
76dc0c4c49
Merge pull request #4234 from Mloc/bs12-quicklist
...
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
1e4abf785e
Merge pull request #4237 from Mloc/bs12-tgstuff
...
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
16cc421e34
Tiny objects on ears
2014-01-09 23:45:08 +01:00
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
70fe0e02cd
Merge pull request #4245 from SkyMarshal/airfixes
...
Lots of bugfixes.
2014-01-09 02:47:20 -08:00
d43b2fa492
RCDs no longer create plating with air on it.
...
Fixes #3545
2014-01-08 17:50:59 -07:00
c337e5e5f3
More elegant solution to dirt getting in the way.
...
Who needs to click dirt anyway?
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-08 21:34:15 +00:00
be153d14a3
Fixes for the tg cherrypicks.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-08 20:32:35 +00:00
f91b44b47f
correct paint can names and plural status, corrected pill box names, corrected lockbox names.
2014-01-08 19:56:03 +00:00
98f02be5a6
code/game/object/items/weapons/* lowercase pass
...
code/game/object/structure/* lowercase pass (start)
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
code/game/objects/items/weapons/paint.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/vending_items.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/structures/bedsheet_bin.dm
code/game/objects/structures/door_assembly.dm
2014-01-08 19:56:00 +00:00
7315b75cca
FIXED: inconsistencies with stack item names.
...
CHANGE: stacks are gender = PLURAL by default because it fits.
Conflicts:
code/game/objects/items/stacks/stack.dm
2014-01-08 19:48:43 +00:00
2f0a0243e9
code/game/objects/items/robot/* lowercase pass
...
NOTE: vision modes have to be proper.
Conflicts:
code/game/objects/items/robot/robot_parts.dm
code/game/objects/items/robot/robot_upgrades.dm
2014-01-08 19:47:48 +00:00
691e15bb2f
Fixes chameleon projector
...
Conflicts:
code/game/objects/items/devices/chameleonproj.dm
2014-01-08 19:43:27 +00:00
3b66f33d14
Fixes morgue trays used by ghosts and what not
2014-01-08 19:39:20 +00:00
2069a9e83c
Personnelly, I feel this pull request was successfull.
...
Spelling fixes.
Conflicts:
code/game/machinery/newscaster.dm
2014-01-08 19:26:10 +00:00
533600eaa5
Explosion Optimizations
...
Implements a trange that internally checks only turfs and thus less
intensive.
Conflicts:
code/game/objects/explosion.dm
2014-01-08 19:21:47 +00:00
794be2b31e
Fix previous commit for BS12.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-08 11:49:15 +00:00
68ae21fac3
Optimized and refactored list2text, text2list, and replacetext.
...
Also fixed some grammar in the station blueprint code.
Conflicts:
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/modules/admin/verbs/debug.dm
code/modules/clothing/masks/gasmask.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/TextFilters.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/silicon/ai/say.dm
2014-01-08 11:41:51 +00:00
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
1faf2ef25b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-08 09:42:47 +10:30
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
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
c8beb39944
Dirt Fixes. Pass ALL the attack_by's to the floor.
2014-01-05 19:17:26 -06:00
909c873b2e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-01-05 02:48:44 +00:00
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
ad740b9397
Merge pull request #4198 from Zuhayr/dev
...
Diona nymphs are now wearable.
2014-01-03 19:33:54 -08:00
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
62893f80b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-04 11:35:07 +10:30
f0563911cb
Fingerprints on showers and crayon graffiti.
...
fixes #4076
as well as admin request on crayons.
2014-01-02 20:26:14 -06:00
Chinsky