Atlantiscze
20d33815ba
Breaker Box Fix
...
- Removes source of runtime errors. From my examination of code, it seems these errors happen when breaker box is turned off for the first time. It should work then.
- Mostly temporary fix, i intend to rework the powernet code over time. I would welcome cooperation with @mwerezak as he is currently doing lots of related things.
2014-09-02 17:09:37 +02:00
Ccomp5950
ed9850b373
Merge pull request #6258 from mwerezak/rddesigns
...
Adds gas cooler/heater circuit designs
2014-09-02 10:06:48 -05:00
Atlantiscze
3ca0d1577f
Breaker Box AI interaction fix
...
- AI can now properly interact with Breaker Box, without interacting BOTH as AI and human.
2014-09-02 17:02:36 +02:00
Zuhayr
0344b33467
Merge pull request #6255 from PsiOmegaDelta/AreasStage2
...
Re-arranges Areas - Stage 2
2014-09-03 00:32:02 +09:30
Atlantiscze
6905a90b9e
SMES Construction rework
...
- Buildable SMES is now subtype of regular SMES.
- Buildable SMES related stuff moved to separate file (smes_construction.dm)
Please note that this commit is one of two commits which have to be applied together. Otherwise, compilation error occurs. (Code + Map. This one is Code)
2014-09-02 15:33:36 +02:00
Atlantiscze
8c983b317e
SMES Board design fix
...
- Fixes SMES circuit board issue
2014-09-02 15:18:14 +02:00
Atlantiscze
68dc63e005
SMES Coil Cost
...
- Supply point cost doubled to 150 according to feedback.
2014-09-02 15:15:47 +02:00
mwerezak
0675c332a1
Adds cooler/heater circuit designs
2014-09-02 08:43:51 -04:00
mwerezak
30464da6ef
Allows refitting to change worn sprite
2014-09-02 08:31:16 -04:00
PsiOmega
dda1449404
Includes mwerezak's fore solar area changes.
2014-09-02 12:29:57 +02:00
Zuhayr
67cb6e297e
Merge pull request #6254 from Kelenius/OfStacks
...
Of Stacks
2014-09-02 17:58:28 +09:30
PsiOmega
9cd5a1b1fe
Maintenance Cleanup
2014-09-02 09:22:14 +02:00
Chinsky
367ddf6848
Merge pull request #6242 from PsiOmegaDelta/ExploitableAlternative
...
Antags - Exploitable Information - MKII
2014-09-02 11:18:50 +04:00
Kelenius
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
PsiOmega
b7d356c4ab
The Syndicate uplink now only access the locked records, meaning it will be unaware of later in-round changes concerning a given character.
2014-09-02 07:12:13 +02:00
Zuhayr
68b587b95f
Merge pull request #6116 from Hubblenaut/dev
...
Hazardly low pressure induces OxyLoss up to 55 points
2014-09-02 14:36:27 +09:30
Whitellama
71c2317264
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
...
Conflicts:
code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
Zuhayr
9f6c22d437
Reapplies LightningIron's fix for #6131
2014-09-02 10:02:37 +09:30
Zuhayr
e2120f9f27
Merge pull request #6249 from JimTheCactus/pda_monitor_upgrade
...
[DEV] PDA Power Monitor Clarity Upgrade
2014-09-02 09:42:52 +09:30
Zuhayr
643c60d0a6
Merge pull request #6237 from PsiOmegaDelta/NewAreas
...
Re-arranges areas - Stage 1
2014-09-02 09:41:15 +09:30
Zuhayr
08df83fc3d
Merge pull request #6243 from Whitellama/bugfixes
...
Fixes tank dispenser sprites not updating, fixes combat belts not holding police tape, other bugfixes
2014-09-02 09:39:17 +09:30
Zuhayr
0129ec81d0
Merge pull request #6252 from DeeUnderscore/pencode-headings
...
Add headings to pencode
2014-09-02 09:37:53 +09:30
Zuhayr
61d2c7f1d6
Fixed a comment in cryofreezer code.
2014-09-02 09:28:24 +09:30
Zuhayr
e33280090c
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev
2014-09-02 09:24:22 +09:30
Zuhayr
53bee60a27
Merge resolution.
2014-09-02 09:18:20 +09:30
Zuhayr
6faad805d8
Merge pull request #6244 from JimTheCactus/LibraryFix
...
Fixes sanitizeSQL proc
2014-09-02 00:23:52 +09:30
Zuhayr
58a750398e
Fixes 5866#
2014-09-01 23:20:46 +09:30
Zuhayr
aedb3725f2
Fixes #5874
2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce
Fixes #5879
2014-09-01 22:45:37 +09:30
Zuhayr
ad2cf64c7b
Fixes #6119
2014-09-01 22:41:15 +09:30
Zuhayr
ad15b7e2c1
Fixes #6137
2014-09-01 22:27:44 +09:30
PsiOmega
9e4b7ed265
Preliminary support for the new general information. Renames the exploit record to permanent record.
...
The new general information being:
Home system
Citizenship
Faction
Religion
Still to be made available in employment/security/medical records as applicable.
2014-09-01 14:45:47 +02:00
Zuhayr
74d9b1bf2d
Fixes #6178
2014-09-01 22:15:45 +09:30
PsiOmega
3c0f527c1c
Merge remote-tracking branch 'upstream/dev' into NewAreas
2014-09-01 14:39:48 +02:00
Zuhayr
bf462d21b1
Fixes #6198
2014-09-01 22:08:56 +09:30
Chinsky
4e281fde44
Merge pull request #6231 from mwerezak/entropy-fix
...
Fixes #6229
2014-09-01 16:35:23 +04:00
Chinsky
8a8f1ce7e1
Merge pull request #6227 from mwerezak/camera
...
Camera Fixes
2014-09-01 16:35:19 +04:00
Zuhayr
059532c155
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-09-01 22:03:29 +09:30
JimTheCactus
b54a3056c7
Improved PDA power monitor for clarity
...
The PowerON cart will now display the area that the power monitor is located to make it clear that you're looking at the power monitor, not the actual power net. This comes up when multiple power monitors have the same name.
2014-09-01 01:32:30 -06:00
JimTheCactus
aeea0b0bd6
PDAs now behave properly with unconnected power monitors
...
Resolves an issue where the PDA would throw a runtime and a client side error when attempting to communicate with a power monitor that wasn't connected to a power net.
2014-09-01 01:27:54 -06:00
JimTheCactus
eaa641adbd
Fixes sanitizeSQL proc
...
Resolved an issue where an extra character was being removed.
2014-08-31 21:28:24 -06:00
Whitellama
9cd42a3f33
Changes candle.dm procs to absolute paths
2014-08-31 19:48:34 -07:00
Zuhayr
e2a7bd897b
Merge pull request #6228 from PsiOmegaDelta/LockerCapacity
...
Limited locker capacity
2014-09-01 12:17:07 +09:30
Whitellama
bdce104b6d
Improved anomaly chat message cooldowns.
2014-08-31 17:51:13 -07:00
Whitellama
98e287bc6d
Fixed xenobiologist having no preview clothes in character setup
2014-08-31 16:22:43 -07:00
PsiOmega
dccec4483d
Syndicate agents can now view exploitable information from their syndicate uplink display.
2014-09-01 01:12:03 +02:00
Whitellama
d536f7d56a
Fixed police tape not going in tactical combat belts
2014-08-31 15:34:21 -07:00
Whitellama
dae602a2ec
Fixes tank dispenser sprite not updating icons when a tank is added
2014-08-31 15:22:13 -07:00
PsiOmega
89b29eb0f0
One can now save exploitable information about the character, potentially to be used by antags.
2014-08-31 21:31:10 +02:00
D Anzorge
9d76b55eb7
Add headings to pencode
...
Allows for h1 through h3 use in pen-written text.
2014-08-31 09:46:45 -04:00
