fe403d013b
Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
...
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
e0047c5830
Merge pull request #7545 from atlantiscze/blast-door-refactor
...
Blast Door refactor
2014-12-30 21:15:47 -05:00
a76af3c7c5
Fixes #7572
2014-12-30 16:33:34 +10:30
a9e1f920fd
Powersink Load Fix
...
- Apparently i forgot to add check for used amount of power when reworking powersink, causing it to drain 2kW from each APC, even above drain cap.
2014-12-29 20:36:50 +01:00
301af06033
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into blast-door-refactor
2014-12-28 23:50:15 +01:00
505d84049c
Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly.
2014-12-28 19:16:07 +10:30
fabee2fdf8
Stopped glass shards from proning mobs with NO_PAIN.
2014-12-28 17:32:55 +10:30
a7f47e32d7
Merge pull request #7534 from mwerezak/doors
...
Doors and stacks
2014-12-28 13:14:23 +10:30
931682f926
Fixes #7327
2014-12-27 10:01:17 +10:30
07b5b7af8b
Updates references
...
- Changed referenced to old blastdoor type to new type, removing compile errors
- Fixes small issue in blast door file which caused compile error
2014-12-27 00:03:20 +01:00
07debf9405
Adjusts door repair to use a welding tool
2014-12-25 15:31:15 -05:00
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
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
8978747e53
Moved several globals into the config controller, updated eample config appropriately.
2014-12-25 21:10:30 +10:30
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
f4ada7b869
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-25 20:05:01 +10:30
fee93bba38
Fix bloody extinguisher bug.
2014-12-24 16:24:16 -07:00
c49cb0c645
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
2014-12-24 22:43:10 +10:30
c6245681d6
Fixes #5910
2014-12-24 22:23:26 +10:30
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
d36f465647
Fixes being able to put lit welders in backpacks
2014-12-24 00:55:56 -05:00
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
a82ec718f3
Fixes #7508
2014-12-24 12:43:36 +10:30
591fc164de
Updating rack paths to match previous commit.
2014-12-24 12:26:43 +10:30
2ed0e433aa
Table/rack refactor. Fixes #7509
2014-12-24 12:14:48 +10:30
cc00fa3d52
Fixes and tweaks to the previous.
2014-12-23 22:03:02 +10:30
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
7c2407c21c
Fixes #5220
2014-12-23 13:23:35 +10:30
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
056d2c1584
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 12:56:42 +10:30
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
32d799e53e
Line ending conflict resolution.
2014-12-22 23:27:06 +10:30
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
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
16c548b03f
Fixes explosives-on-webbing-prevention not working
2014-12-18 05:27:37 +01:00
d28cb57f79
Merges upstream/dev to ref, resolves merge conflicts
2014-12-18 03:44:28 +01:00
d20ccdb6b4
More name updates and refactoring for research
...
Also fixes compile errors
2014-12-18 03:26:55 +01:00
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
edffbc680d
Fixed capitalization of most game items
2014-12-18 03:10:36 +01:00
1fcf11cdb5
You can no longer plant explosives on webbing.
2014-12-18 01:17:50 +01:00
cc327cb671
Fixes typos in powercells.dm
2014-12-17 20:03:04 +01:00
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
2214837449
Comments out combi-tool, fixes infinite range combitool.
2014-12-16 18:23:21 +10:30
8aa5ee4d9a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-15 08:58:28 +01:00
70abe4af0d
Merge pull request #7447 from mwerezak/manual-runtime
...
Alternative fix for manual runtimes
2014-12-14 13:06:16 +10:30
efb6adb452
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-14 00:27:16 +01:00
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
d2803ec4d7
Merge resolution.
2014-12-13 23:10:46 +10:30
7efae862a2
Fixes #7290
2014-12-13 23:04:13 +10:30
7770b355dd
Fixes #7404
2014-12-13 22:15:13 +10:30
Chinsky