Zuhayr
aa5013fa08
Merge pull request #7885 from Baystation12/master
...
Updating dev-freeze from master.
2015-01-20 18:49:03 +10:30
Chinsky
d42482c7cc
Fixes #7259
...
Removes forks used for ribcage opening/closing since it overlapped with internal organ surgery and for some reason even priorities didn't help with that.
2015-01-16 14:18:51 +03:00
Loganbacca
985d410657
Air tank interface fix
...
- Allows tanks to be toggled on and off as internals from their UI.
- If internals are off, all tanks capable of being used for internals
will display "tank is connected to a mask".
- If internals are on, only the tank that is actively supplying air is
listed as "connected" and "open". All others will display as "not
connected".
- Tanks inside rigs will correctly display their status in their UI (if
you open it before putting it in the rig, but cannot be toggled on
through the interface. Toggling them on with the internals button works.
2015-01-13 23:19:58 +13:00
Zuhayr
61d35bd474
Merge resolution.
2015-01-12 07:17:02 +10:30
ccomp5950
2816d3c02b
Fixes PDA locking up after receiving a " in conversation.
...
Long story short, the json encoding doesn't know how to handle "
Adding a check specifically for it breaks other stuff, after banging my head against it for an hour
this is the best means of fixing the problem without breaking and fixing a lot of other things.
2015-01-09 22:27:15 -05:00
Tramziller
11ff174636
Old link was replaced by new one
2015-01-08 22:26:31 +01:00
Zuhayr
b36b41a2f5
Fixes #7656
2015-01-09 03:58:43 +10:30
Zuhayr
0d071e7f9d
Fixes #7683
2015-01-09 03:48:46 +10:30
Zuhayr
9fa73784a5
Fixes #7660
2015-01-05 01:05:13 +10:30
Zuhayr
a255fe48ca
Fixes #7619
2015-01-02 19:28:30 +10:30
Atlantiscze
2580db82b5
Removes debug statement
...
- Forgot to add this into my previous commit.
2015-01-01 07:54:04 +01:00
Atlantiscze
a17656086c
Fixes #7349
...
- This fixes missing powernet sensor entries in engineer PDAs.
- This is done by reimplementing old system, that instead connected to consoles. Bleh.
- New system connects directly to sensors, but offers only very limited amount of information (ie. console is 5x better and nicer, this is intentional before someone begins yelling it's a bug!)
2015-01-01 07:52:44 +01:00
Zuhayr
cdfa2a5205
Merge pull request #7586 from Zuhayr/dev-freeze
...
Fixes the remainder of #7567 , plus other fixes.
2014-12-31 22:48:39 +10:30
Chinsky
fe403d013b
Merge pull request #7583 from atlantiscze/cellrate-hardsuit-stuff
...
Hardsuit Powersink Adjustments
2014-12-31 08:17:20 +03:00
Zuhayr
a5b937c1e8
Readded null check.
2014-12-31 14:12:10 +10:30
Ccomp5950
e0047c5830
Merge pull request #7545 from atlantiscze/blast-door-refactor
...
Blast Door refactor
2014-12-30 21:15:47 -05:00
Zuhayr
a76af3c7c5
Fixes #7572
2014-12-30 16:33:34 +10:30
Atlantiscze
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
Atlantiscze
301af06033
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into blast-door-refactor
2014-12-28 23:50:15 +01:00
Zuhayr
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
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
Atlantiscze
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
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
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
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
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
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
