ccomp5950
66ac2d6e05
Added "give them their breath back" to admin_revive.
...
Prevents perpetual oxyloss after a revive.
2014-12-22 21:44:38 -05:00
ccomp5950
3ba1b18b8f
Most PDA's now are set to silent on news updates.
...
resolves #7454
Heads and Librarian(reporter) are not set to silent. The librarian can shush herself.
old bitty.
2014-12-22 21:44:26 -05:00
ccomp5950
b446ccb2ab
Remove Borg nightvision when special views aren't selected.
...
Resolves #7452
2014-12-22 21:44:11 -05:00
Zuhayr
056d2c1584
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 12:56:42 +10:30
Zuhayr
83c17750c7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 12:56:17 +10:30
Mloc
984444d11d
Merge pull request #7498 from Zuhayr/dev-freeze
...
Should fix #6782
2014-12-22 19:04:15 +00:00
PsiOmegaDelta
5b03184e9c
Merge pull request #7491 from Mloc/bs12-sleepyedges
...
atmos changes; sleepy edges and hardy rwalls
2014-12-22 20:04:08 +01:00
Mloc-Argent
8800c33e50
fixes #7487
...
also fixes lag when building APCs in space.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-22 15:41:07 +00:00
Amunak
15b4c1f5fe
Fixes shield circuit board research designs
2014-12-22 15:25:34 +01:00
Zuhayr
e6110b61b6
Should fix #6782
2014-12-23 00:50:11 +10:30
Zuhayr
360775b96f
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 00:01:09 +10:30
Zuhayr
f55f9c7fce
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 00:00:48 +10:30
Mloc
f647906f3d
Merge pull request #7492 from mwerezak/casings
...
Fixes shotgun shell description
2014-12-22 13:29:32 +00:00
Mloc
f4e171c1b1
Merge pull request #7484 from Zuhayr/languages
...
Language scrambling/species selection window.
2014-12-22 13:21:24 +00:00
Zuhayr
d82e7e42de
Merge pull request #7477 from atlantiscze/substation-remap
...
Substation remap
2014-12-22 23:47:36 +10:30
Zuhayr
3de0562dbe
Merge resolution.
2014-12-22 23:28:27 +10:30
Zuhayr
32d799e53e
Line ending conflict resolution.
2014-12-22 23:27:06 +10:30
mwerezak
55baf1553f
Adjusts tradeband scrambling parameters
2014-12-22 00:19:56 -05:00
mwerezak
d74f49ce9b
Fixes shotgun shell description
...
Fixes shotgun shell description not indicating when a shell is spent.
2014-12-21 17:53:12 -05:00
Mloc-Argent
7c7d35eded
buff rwall health, change wall fire damage scaling.
...
Now uses a fancy log instead of whatever that thing was.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-21 20:36:59 +00:00
Mloc-Argent
cf15517f8a
fix up airless turfs to be actually airless
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-21 20:36:11 +00:00
Mloc-Argent
debba68c44
add sleeping for ZAS connection edges
...
Edges will sleep and fully balance if compare() passes.
also some small small xgm tweaks.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-21 20:35:40 +00:00
Mloc
5895615f72
Merge pull request #7377 from Amunak/ref
...
Research and circuit boards refactoring and improvements. Explosive can no longer be planted on webbing. Also some other stuff.
2014-12-18 22:29:35 +00:00
Amunak
94b8784b76
Fixed capitalization of 'engine control console'.
2014-12-18 23:15:22 +01:00
Mloc
66cb91d281
Merge pull request #7280 from Neerti/12_7_14_holopad_and_emotes
...
Adds see_emote(), other cool things.
2014-12-18 22:10:54 +00:00
Amunak
c53d14d80c
Weapon type design datums will now get proper description.
...
Also fixes two names I forgot to fix before.
2014-12-18 05:28:41 +01:00
Amunak
16c548b03f
Fixes explosives-on-webbing-prevention not working
2014-12-18 05:27:37 +01:00
Amunak
a86f77d7ad
Final research refactoring and formatting
2014-12-18 04:59:33 +01:00
Amunak
417fe41248
Mining items path formatting
2014-12-18 04:58:40 +01:00
Amunak
619143186e
Moved design disk to research.dm; fixed disks' names
2014-12-18 04:00:51 +01:00
Amunak
d28cb57f79
Merges upstream/dev to ref, resolves merge conflicts
2014-12-18 03:44:28 +01:00
Amunak
d20ccdb6b4
More name updates and refactoring for research
...
Also fixes compile errors
2014-12-18 03:26:55 +01:00
Amunak
064357495d
Decreased fire delay on the unobtainable pulse funguns.
...
They were as lame as the death squad guns.
2014-12-18 03:13:04 +01:00
Amunak
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
Amunak
edffbc680d
Fixed capitalization of most game items
2014-12-18 03:10:36 +01:00
Amunak
1fcf11cdb5
You can no longer plant explosives on webbing.
2014-12-18 01:17:50 +01:00
PsiOmegaDelta
9a4dd0b6ea
Merge pull request #7473 from Hubblenaut/dev-freeze
...
Context-base Combat Cleanup and Fixes
2014-12-17 23:18:14 +01:00
Amunak
cc327cb671
Fixes typos in powercells.dm
2014-12-17 20:03:04 +01:00
Amunak
42bdf427b8
Properly decapitalized mecha equipment.
2014-12-17 19:10:31 +01:00
Amunak
4a7fdbf595
Removed unused substation batteryrack code.
2014-12-17 14:31:57 +01:00
Amunak
1a972974bc
Moves all circuitboards to their respective files.
...
Computer boards are now in /code/game/objects/items/weapons/circuitboards/computer/.
Buildable machinery boards are in /code/game/objects/items/weapons/circuitboards/machinery/.
Everything else is just in /code/game/objects/items/weapons/circuitboards/.
The circuitboard parent definition is in /code/game/objects/items/weapons/circuitboards/circuitboard.dm.
Did some minor renaming and capitalization fixes on the boards.
2014-12-17 14:31:21 +01:00
Amunak
ae8829cabe
Moved supply computers to a separate file in machinery/computer/.
...
Renamed supply shuttle console to supply control console and properly de-capitalized both console names.
2014-12-17 12:53:18 +01:00
Zuhayr
fc203f186a
Merge pull request #7478 from GinjaNinja32/cameras
...
Converts camera console to NanoUI
2014-12-17 19:43:55 +10:30
Atlantiscze
77fa2705dd
Ion laws (including the "random" ones by admins) are now more visible for the AI/robots.
...
Because single line of text is so easy to miss in spammed chat. Now it automatically shows output of show-laws verb which is significantly harder to miss.
2014-12-17 07:43:46 +01:00
Ccomp5950
8d65f8a87a
Merge pull request #7175 from atlantiscze/pewPEWPEWboom
...
[Ready To Merge] Emitter update
or how I might learn to love the revert button.
2014-12-16 21:17:54 -05:00
Ccomp5950
20e6b4ca01
Merge pull request #7395 from atlantiscze/nanostuff
...
NanoUIs
2014-12-16 21:11:55 -05:00
Wild Bill
5bae906c47
Reserve PascalCase inits
2014-12-16 16:20:50 +02:00
Hubblenaut
4065dcb7e2
Fixes, fixes, and more fixes
2014-12-16 14:51:46 +01:00
GinjaNinja32
a7bcd6f406
NanoUI camera console
2014-12-16 12:30:25 +00:00
Atlantiscze
71cb87b423
Substation Remap 1
...
- Remaps Medical, Research and Civilian West substations completed. Medical Research substation split into two rooms.
- Minor changes at Security substation (adds 2nd door to avoid wiring under doors)
- TODO: Remap all remaining substations
2014-12-16 10:31:37 +01:00
