cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 13:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,314 Commits 8 Branches 0 Tags
01ddc9af6da194299cd8fe93075e6b66247df56b
Commit Graph

8824 Commits

Author SHA1 Message Date
mwerezak
90af78ac44 Increases SM power output 
Should safely run to 700 kW. Returned starting SMES charge back to
original value to compensate. Engine omnifilters now start off on round
start.
 2014-09-12 23:01:15 -04:00
Chinsky
2cf5af181f Merge pull request #6318 from PsiOmegaDelta/EyeOfTheNinja 
Ninja-night vision now works.
 2014-09-13 03:53:07 +04:00
Atlantiscze
c5e5856e82 Merge branch 'dev' into substation-multifix 2014-09-12 20:11:42 +02:00
Atlantiscze
cbeff523ac Attempt to resolve merge conflict. I hope i won't break something. 2014-09-12 20:07:21 +02:00
PsiOmega
d123df4b98 Fixes #6311 2014-09-12 13:59:54 +02:00
mwerezak
f3575a6162 Adjusts disposal bin pressure and power 2014-09-12 01:17:53 -04:00
mwerezak
f1bc9367c7 Increased SMES starting charge 2014-09-12 01:16:31 -04:00
PsiOmega
34346cf308 Ninja-night vision now works. 
A ninja now uses proper glasses instead of using its own hack.
Fixed a bug that would override the old ninja-night vision unless one also wore additional glasses in the glasses-inventory slot.
Adds overlays to thermals and mesons as well. Slightly reduces the intensity of the night vision overlay.
 2014-09-11 13:43:13 +02:00
Zuhayr
e26b3e57fd Trying to add to previous. 2014-09-10 22:16:45 -04:00
Zuhayr
1b40e8adaa Fixes most of #6300 2014-09-10 22:16:26 -04:00
Zuhayr
ec12611171 Fixes several outstanding bugs with new hydroponics. 2014-09-10 22:16:05 -04:00
mwerezak
1133088b73 Increases max SMES output to 250 kW 
Was recently updated to that on dev so it shouldn't hurt on dev-freeze.
 2014-09-10 22:15:26 -04:00
mwerezak
8f98b35c9a Reduces supermatter DAMAGE_RATE_LIMIT 2014-09-10 22:13:31 -04:00
mwerezak
716c6ab3ef APC cell_type is now an actual power cell type 2014-09-10 22:12:43 -04:00
Chinsky
a553f412da Fixes #6307 
Now organ not having an object organ won't prevent it from falling off, just no item would appear.
 2014-09-11 05:41:31 +04:00
Chinsky
33cf071b57 Fixes #6285 
Applied phil235's fix for deconstruction.
5a6e9804b9
 2014-09-11 05:17:38 +04:00
mwerezak
709d87d933 Fixes APCs switching between autoflag 1 and 0 when cell.charge > 10 but not enough charge for one tick 
Old APC bug.
 2014-09-10 18:51:36 -04:00
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
 2014-09-10 22:14:37 +01:00
mwerezak
e513041768 Renames syndicate mothership area, fixes temp_factor calc 2014-09-08 22:38:52 -04:00
mwerezak
ee56453ca3 Allows heater/freezer construction dir to be set 2014-09-07 17:07:53 -04:00
D Anzorge
697d8d5b35 Add grape juicing to reagent grinder 2014-09-07 10:36:43 -04:00
mwerezak
0b11295c8e Supermatter balance 
Attempts to rebalance SM to work with new atmos machinery. Testing with
a 2-freezer 2-canister default setup, the engine can run to 500 kW at
700 K.
 2014-09-07 01:19:16 -04:00
mwerezak
d12a09addb Powernets 
Moved powernet datum definition to powernet.dm
Improved APC load balancing.
Updated SMES charging to work better with new APC/powernet code.
 2014-09-07 01:10:22 -04:00
mwerezak
ce970eacd2 Adds atmos/supermatter debug messages 2014-09-06 15:36:35 -04:00
mwerezak
e045c84f97 Fixes APC load totals periodically doubling 
Also fixes areas updating excessively when update_use_power() was
called.
 2014-09-06 11:35:58 -04:00
PsiOmega
98bc0d5f60 Fixes a bug where people who were in the lobby but not observers were considered non-survivors in shift-end feedback. 2014-09-05 11:00:47 +02:00
Atlantiscze
03f2be3091 PARTIAL IMPLEMENTATION - Charged SMES deconstruction & SMES code cleanup 
- Cleanup of SMES attackby() code
- Buildable SMESs now have option to override safety circuit by using multitool while the hatch is open.
- Disabling safeties lets you disassemble SMES even if it's charged above 1%.
- If charge is above 5% stored energy may discharge violently. This is percentage based (more energy = higher chance of this occuring + more severe consequences)
- Larger discharges affect whole powernet, burning out some lights and even completely destroying APCs!
- Substation PSUs act as surge protection. Thus, if set up properly damage is limited to few areas which are directly on the main grid (= maintenance mostly)
- STILL NEEDS TESTING. Pushing so other people can review the code and give further suggestions. And because i need to access it on second computer.
 2014-09-05 01:52:15 +02:00
Ccomp5950
a63f358049 Merge pull request #6272 from faerindel/dfreeze_pipe_dupe_fix 
Fixes #6268 #6122 #6121
 2014-09-04 04:18:10 -05:00
igalan
0aa6c4f38c Fixes #6121 
Moves HE pipes and junction dmi's to where the rest of the icon_manager dmi's are.
 2014-09-04 05:02:03 +01:00
Mloc-Argent
11ba197b30 fix for contaminants not processing if air is OK otherwise 
also a small fix for VV

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-03 19:00:00 +01:00
PsiOmega
65bb6f8be1 Entities wearing sec/medical HUDs or corresponding now receive broadcast messages from relevant bots. 2014-09-03 18:50:46 +02:00
Zuhayr
0b6b3d8e0e Merge pull request #6253 from mwerezak/skrell 
Hardsuit refitting sprite sheet
 2014-09-03 12:06:18 +09:30
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
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
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
Zuhayr
67cb6e297e Merge pull request #6254 from Kelenius/OfStacks 
Of Stacks
 2014-09-02 17:58:28 +09:30
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
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
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
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
58a750398e Fixes 5866# 2014-09-01 23:20:46 +09:30
Zuhayr
aedb3725f2 Fixes #5874 2014-09-01 23:20:27 +09:30