Zuhayr
fabee2fdf8
Stopped glass shards from proning mobs with NO_PAIN.
2014-12-28 17:32:55 +10:30
Zuhayr
a7f47e32d7
Merge pull request #7534 from mwerezak/doors
...
Doors and stacks
2014-12-28 13:14:23 +10:30
Zuhayr
931682f926
Fixes #7327
2014-12-27 10:01:17 +10:30
mwerezak
07debf9405
Adjusts door repair to use a welding tool
2014-12-25 15:31:15 -05:00
mwerezak
f297f7cd0a
Stack reorganization, use() now dels after yield
...
stack/use() now only deletes an empty stack after the current context
yields, removing the need for some awkward patterns when dealing with
stacks. Also adds procs for transferring and splitting stacks.
2014-12-25 15:09:09 -05:00
mwerezak
64e26b2dbd
Fixes robot stacks transferability
...
Cleans up transferring between stacks and makes robot stacks
transferable with regular ones.
2014-12-25 15:06:31 -05:00
Zuhayr
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
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
f4ada7b869
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-25 20:05:01 +10:30
SkyMarshal
fee93bba38
Fix bloody extinguisher bug.
2014-12-24 16:24:16 -07:00
Zuhayr
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
Zuhayr
c6245681d6
Fixes #5910
2014-12-24 22:23:26 +10:30
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
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
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
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
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
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
Zuhayr
32d799e53e
Line ending conflict resolution.
2014-12-22 23:27:06 +10:30
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
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
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
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
Zuhayr
70abe4af0d
Merge pull request #7447 from mwerezak/manual-runtime
...
Alternative fix for manual runtimes
2014-12-14 13:06:16 +10:30
PsiOmega
efb6adb452
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-14 00:27:16 +01:00
mwerezak
168cabf03a
Fixes manual runtimes without modifying the construction of every object
...
Loads configuration before map creation instead.
This reverts commit 37b14bae39
2014-12-13 09:35:36 -05:00
Zuhayr
d2803ec4d7
Merge resolution.
2014-12-13 23:10:46 +10:30
Zuhayr
7efae862a2
Fixes #7290
2014-12-13 23:04:13 +10:30
Zuhayr
7770b355dd
Fixes #7404
2014-12-13 22:15:13 +10:30
Zuhayr
75d163705a
Merge pull request #7419 from PsiOmegaDelta/Books
...
Fixes manual runtimes, ensures initialize is called even after round start
2014-12-13 21:50:35 +10:30
Zuhayr
eafaef5cfa
Merge pull request #7422 from PsiOmegaDelta/MovableCorpses
...
Makes remains movable/cleanable.
2014-12-13 19:40:44 +10:30
PsiOmega
37b14bae39
Fixes manual runtimes, ensures initialize is called even after round start.
2014-12-12 20:07:53 +01:00
PsiOmega
b9ce5404d8
Fixes lab coat without icon.
...
Simply by changing it to the new labcoat variant that can be closed/opened.
Still created a proper definition for the old lab coat, /obj/item/clothing/suit/storage/labcoat, as it's inherited by custom gear.
2014-12-12 14:30:12 +01:00
PsiOmega
1047a75da4
Makes remains movable/cleanable.
...
It's now possible to move remains around.
Non-robotic remains can be poked to turn them into ashes. The ash can then be cleaned up.
2014-12-12 11:52:30 +01:00
PsiOmega
2e34cb79a5
Morphic Clerical Kit
...
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
2014-12-12 10:07:42 +01:00
PsiOmega
cf78fe903b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-12 09:04:09 +01:00
