Zuhayr
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
Zuhayr
aeb93d8c4a
Fixes #7108
2014-12-24 22:43:00 +10:30
Zuhayr
c6245681d6
Fixes #5910
2014-12-24 22:23:26 +10:30
PsiOmegaDelta
aa3aa472fe
Merge pull request #7516 from mwerezak/pipecleaner
...
Replaces connect type system
2014-12-24 19:50:36 +13:00
PsiOmegaDelta
f580eb230e
Merge pull request #7521 from mwerezak/master
...
Fixes being able to put lit welders in backpacks
2014-12-24 19:49:53 +13:00
mwerezak
d36f465647
Fixes being able to put lit welders in backpacks
2014-12-24 00:55:56 -05:00
Zuhayr
4b030f30cd
Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.
2014-12-24 16:06:00 +10:30
PsiOmegaDelta
d1758a7162
Merge pull request #7510 from Zuhayr/mutantrace
...
Gibber fixes/refactor, mutantrace refactor, couple of small fixes.
2014-12-24 17:29:39 +13:00
Zuhayr
01f2d28187
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into mutantrace
2014-12-24 12:47:56 +10:30
Zuhayr
a82ec718f3
Fixes #7508
2014-12-24 12:43:36 +10:30
Zuhayr
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
Zuhayr
2ed0e433aa
Table/rack refactor. Fixes #7509
2014-12-24 12:14:48 +10:30
mwerezak
d4a193808b
Replaces awful connect type system with bitflags
2014-12-23 18:59:54 -05:00
Zuhayr
cc00fa3d52
Fixes and tweaks to the previous.
2014-12-23 22:03:02 +10:30
Zuhayr
bbfc6db0a3
Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)
2014-12-23 17:38:05 +10:30
Zuhayr
b9f9337584
Fixes atmos alert consoles for #5460
2014-12-23 14:00:02 +10:30
Zuhayr
7c2407c21c
Fixes #5220
2014-12-23 13:23:35 +10:30
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
Zuhayr
056d2c1584
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 12:56:42 +10:30
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
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
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
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
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
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
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
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
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
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
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
Zuhayr
2214837449
Comments out combi-tool, fixes infinite range combitool.
2014-12-16 18:23:21 +10:30
PsiOmega
8aa5ee4d9a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-15 08:58:28 +01:00
GinjaNinja32
16a7e2a4b9
Removes ninja mask, fixes ninja internals
2014-12-14 07:02:28 +00:00
Amunak
67c719d9d6
Updated medical records console description.
2014-12-14 05:03:15 +01:00
