cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-23 08:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 6 Branches 0 Tags
69a080e2d611c6d45cb157861cade41f05d23721
Commit Graph

17479 Commits

Author SHA1 Message Date
Atlantiscze
cbeff523ac Attempt to resolve merge conflict. I hope i won't break something. 2014-09-12 20:07:21 +02:00
Atlantiscze
a7edc3f39d Explode Verb Fix 
- Explode verb is now available from round start. This ensures it works properly and won't disappear during 60 second time limit.
- Checks are moved into explode verb itself, so it works exactly as it used to work (read: It won't let you blow up station unless done within that 60s limit after takeover)
- Changed self destruct notifications a little. They now use radio messages instead of "world <<" which was ugly.
- If AI is killed within 10 second self-destruct countdown it is aborted. (Good luck)
 2014-09-12 17:30:51 +02:00
Atlantiscze
9ff1f94152 Round end spam fix 
- This ensures that "The round has ended" message is shown only once, instead of being spammed under certain circumstances.
 2014-09-12 17:24:57 +02:00
PsiOmega
d123df4b98 Fixes #6311 2014-09-12 13:59:54 +02:00
mwerezak
e7c2cf033e Adds config option for air compression heating 2014-09-12 01:18:12 -04:00
mwerezak
f3575a6162 Adjusts disposal bin pressure and power 2014-09-12 01:17:53 -04:00
mwerezak
11bdf6f568 Fixes map-set power setting not taking effect 2014-09-12 01:17:34 -04:00
mwerezak
f1bc9367c7 Increased SMES starting charge 2014-09-12 01:16:31 -04:00
Mloc-Argent
8a92fffdc2 updating turf gas overlays is now delta-based 
Fixes issues with mine turfs and other turfs that use overlays.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-11 20:13:10 +01:00
PsiOmega
3853782914 Ninjas can now phase jaunt. 
Adds phase jaunt for a cost of 250 energy, compared to phase shift which costs 400E.
Randomly jumps the ninja 5-9 tiles straight ahead.
Cell use is now redacted directly in the ninjacost() proc.
Some cleanup of ninja verb-add/removal.
 2014-09-11 15:02:42 +02:00
Zuhayr
3ef2347c0d Merge pull request #6317 from PsiOmegaDelta/Emergency 
E-blades can now force emergency shutters open
 2014-09-11 21:59:52 +09:30
Zuhayr
c75ec17f5b Merge pull request #6316 from PsiOmegaDelta/Emag 
Can no longer e-mag unpowered doors
 2014-09-11 21:59:46 +09:30
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
PsiOmega
6d2bb21a72 Ninja e-blade can now force emergency shutters open. 
Unlike doors it will not permanently break them, at least until emergency shutters can be reconstructed.
 2014-09-11 08:14:38 +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
PsiOmega
5c6068f212 Emergency shutters down have pressure/temperature difference overlays. 
Based on the emergency shutter from Paradise.
 2014-09-10 22:15:46 -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
033dce5ad1 Attempts to fix #6226 
Kind of a hack. A proper fix would look at how humans produce heat.
 2014-09-10 22:15:04 -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
89dab97ea2 Fixes #6305 
Now autolathe spews all materials like protolathe does.
 2014-09-11 05:19:25 +04:00
Chinsky
33cf071b57 Fixes #6285 
Applied phil235's fix for deconstruction.
5a6e9804b9
 2014-09-11 05:17:38 +04:00
mwerezak
b4751e8161 Adds variable power setting to heaters and freezers 2014-09-10 21:14:39 -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
PsiOmega
6d9672eae3 Cannot e-mag unpowered doors. 2014-09-10 17:12:18 +02:00
Zuhayr
6d21c3193f Trying to add to previous. 2014-09-10 21:16:06 +09:30
Zuhayr
210930b2bb Fixes most of #6300 2014-09-10 20:53:57 +09:30
Zuhayr
b819b7297a Fixes several outstanding bugs with new hydroponics. 2014-09-10 20:02:34 +09:30
Ccomp5950
7b41cd4b68 Merge pull request #6303 from PsiOmegaDelta/EmergencyShutters 
Emergency shutters now have pressure/temperature difference overlays
 2014-09-09 18:16:32 -05:00
PsiOmega
ff39ceff9c Emergency shutters down have pressure/temperature difference overlays. 
Based on the emergency shutter from Paradise.
 2014-09-09 15:57:33 +02:00
Chinsky
0167be6920 Merge pull request #6275 from RavingManiac/dev 
NewPipe
 2014-09-09 17:54:53 +04:00
mwerezak
a8f7093641 Fixes atmos control computers not being able to turn their devices on or off 2014-09-08 23:52:32 -04:00
mwerezak
e513041768 Renames syndicate mothership area, fixes temp_factor calc 2014-09-08 22:38:52 -04:00
mwerezak
dec3447e20 Adjusts airlock reserve air pressures 
Adjusts airlock reserve air pressures for faster cycling.
 2014-09-07 23:52:21 -04:00
Zuhayr
29e59ff456 Merge pull request #6289 from comma/overmap 
Overmap
 2014-09-08 11:21:37 +09:30
Zuhayr
b4a254fe36 Merge pull request #6296 from GinjaNinja32/multiz-fixes3 
Multiz fixes and mapping features
 2014-09-08 11:20:34 +09:30
Zuhayr
cfd5801172 Merge pull request #6295 from DeeUnderscore/grape-grinder 
Add grape juicing to reagent grinder
 2014-09-08 11:20:16 +09:30
mwerezak
f109e1d3ba Fixes #6269 2014-09-07 18:00:31 -04:00
mwerezak
ee56453ca3 Allows heater/freezer construction dir to be set 2014-09-07 17:07:53 -04:00
mwerezak
248a8057ac Adds engine waste intercooler 
Also fixes pipes in space having the wrong layer set.
 2014-09-07 16:51:59 -04:00
Chinsky
9e5525ba43 Merge pull request #6284 from Kelenius/OfTilesAndTiming 
Fixes floor tiles
 2014-09-07 21:23:40 +04:00
D Anzorge
697d8d5b35 Add grape juicing to reagent grinder 2014-09-07 10:36:43 -04:00
GinjaNinja32
b9f596a126 Multiz fixes and mapping features take 3 2014-09-07 15:32:36 +01: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
SparklySheep
fda0070273 Update candle.dm 2014-09-06 15:06:55 -05:00