Zuhayr
3997129390
Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple.
2014-12-25 20:26:22 +10:30
Zuhayr
930e8c6e5d
Removes an unused debug var.
2014-12-25 20:09:45 +10:30
PsiOmegaDelta
3427787359
Merge pull request #7524 from Zuhayr/mutantrace
...
Species and organ fixes.
2014-12-25 10:56:17 +13:00
Zuhayr
31ba0d12e0
Fixes #6676 and #7375
2014-12-24 23:32:10 +10:30
Zuhayr
0263bc9c84
merge
2014-12-24 22:50:13 +10:30
Zuhayr
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
Zuhayr
e74c0c38e4
Fixes #5801
2014-12-24 22:00:31 +10:30
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
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
Hubblenaut
7988b78f69
No stomping when grabbing
2014-12-23 14:46:59 +01:00
Hubblenaut
d2a31eb024
Changes on kicks and stomps
2014-12-23 14:46:58 +01: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
ccomp5950
0a63932d48
Simple Animals now no longer move while facing south all the time.
...
Fucking weirdo's
resolves #7396 for simple animals.
2014-12-22 21:44:48 -05:00
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
b446ccb2ab
Remove Borg nightvision when special views aren't selected.
...
Resolves #7452
2014-12-22 21:44:11 -05:00
Zuhayr
83c17750c7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 12:56:17 +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
Amunak
15b4c1f5fe
Fixes shield circuit board research designs
2014-12-22 15:25:34 +01:00
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
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
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
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
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
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
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
Hubblenaut
4065dcb7e2
Fixes, fixes, and more fixes
2014-12-16 14:51:46 +01:00
Zuhayr
a5e30fae72
Fixes #7472
2014-12-16 18:24:01 +10:30
Zuhayr
2214837449
Comments out combi-tool, fixes infinite range combitool.
2014-12-16 18:23:21 +10:30
Hubblenaut
8120a9b77f
Makes kicks and stomps their own unarmed_attack types
2014-12-15 18:54:07 +01:00
Chinsky
7683086619
Merge pull request #7464 from Zuhayr/dev-freeze
...
Fixes (at least some) of the recursive power-drain crash issues.
2014-12-15 16:38:40 +03:00
