cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 62 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

821 Commits

Author SHA1 Message Date
AnturK
8999db80b4 Fixes shuttles loading improperly in templates 
Adds template datum and preloader
 2016-01-29 20:51:12 +01:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs 
Absolute paths and changes one liner if's/else's/else if's.
 2016-01-29 03:15:12 +03:00
tkdrg
f56d09a859 Merge pull request #14968 from MrStonedOne/patch-136 
Fixes minimap caching
 2016-01-28 18:50:20 -03:00
KorPhaeron
4edf2a3d08 Typeless Loops 2016-01-28 04:27:10 -06:00
KorPhaeron
cfa3ff2a24 Makes objectives function properly 2016-01-27 23:59:14 -06:00
KorPhaeron
77330ccd1f Shuttle Launch 2016-01-27 23:17:55 -06:00
Kyle Spier-Swenson
04c5d9216a shouldn't be needed, but just in case 2016-01-27 15:54:10 -08:00
Kyle Spier-Swenson
fe90b9aa8b Fixes minimaps crashing the server. (for real this time) 2016-01-27 14:10:00 -08:00
Kyle Spier-Swenson
c5cf2b3dca Fixes minimap caching 2016-01-27 06:58:54 -08:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Kyle Spier-Swenson
9e33ca7cb9 Fixes minimaps crashing the server. 
The list wasn't getting gc'ed until the proc ended, causing a fuck ton of lists to use up memory until it went over the memory limit
 2016-01-26 16:08:21 -08:00
Bjorn Neergaard
2f46b224ae Fix air alarm hacking, raise SStimer display 2016-01-25 12:03:00 -06:00
Bjorn Neergaard
dbc64b7d28 tgui fire alarms 2016-01-25 12:02:59 -06:00
Bjorn Neergaard
47f08f3714 Use defines for Z-levels 2016-01-24 20:07:28 -06:00
Bjorn Neergaard
2fe70f6d7e Remie is loopy 2016-01-24 20:07:27 -06:00
Bjorn Neergaard
faf5ff59d3 Fix minimap generation for most objects 2016-01-24 20:07:27 -06:00
Bjorn Neergaard
081b6b0a04 Rework minimaps 2016-01-24 20:07:26 -06:00
tkdrg
15845c4b5e Merge pull request #14776 from MrStonedOne/patch-129 
Makes the MC avoid triggering the byond bug that causes lag.
 2016-01-23 01:44:24 -03:00
Bjorn Neergaard
4224c800f0 Rewrite cryo 
Similar balance but now healing is all in the reagent; and code is much simplified
Remove cryo leaking air, it just consumes O2 now. Gasses with a higher
specific_heat can be used to improve efficiency.
Greatly buffs cryo upgrades, in return for slight decrease in un-upgraded
performance due to atmos simulation.

Fix canister relabeling icons (Fixes #14742)

Add wrench sound to portable_atmospherics (consistency with ATMOSPHERICS/components)

Fix blood directly setting oxyloss (now uses adjustOxyLoss, balanced to be ~same as before)
 2016-01-22 19:25:34 -06:00
Bjorn Neergaard
b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
tkdrg
14f90d8f1e Merge pull request #14748 from xxalpha/airlocktiming 
Changed APC wire pulsing and airlock autoclose() to use timers.
 2016-01-22 21:36:56 -03:00
MrStonedOne
fcae050052 Make up missed SS ticks less aggressively. 
Don't attempt to make up missed subsystem ticks on dynamic wait subsystem

Only make them up 25% at a time.

(Also tweaks high cpu delaying a bit)
 2016-01-22 15:25:03 -08:00
MrStonedOne
cbdc6a4ac1 Makes the MC avoid triggering the byond bug that causes lag. 
See http://www.byond.com/forum/?post=2021963#comment18164837

Higher fps when cpu goes over 120 causes issues. I have it scaling around 100 to give us a buffer, and not going back down until it drops below 75 to avoid it jumping too much.

This is a bit of a mess, but all of it can removed once the bug is fixed on byond's end.
 2016-01-22 00:13:24 -08:00
xxalpha
9377ec8423 Changed /datum/timedevent Destroy() to return QDEL_HINT_IWILLGC 2016-01-21 19:25:23 +00:00
Firecage
d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
xxalpha
577488e0d8 safepick 
more safepick
 2016-01-18 05:46:44 +00:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Buggy123
f90d3d0144 Escape pod safes now contain red oxygen tanks instead of air mix tanks. 2016-01-15 23:31:46 -05:00
Razharas
4aea0db29b Merge pull request #14120 from duncathan/listmos 
[READY] Listmos & "Datum Gases"
 2016-01-15 11:58:05 +03:00
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
Kyle Spier-Swenson
32d9dd7b93 Minor revert of Refactor MC/Failsafe/add Subsystems #13437 
Readds check that #13437 removed
 2016-01-13 03:35:51 -08:00
Kyle Spier-Swenson
17c2c37891 Fixes cult teleport centcom exploit. 
This was an edge case anyhow, they would have to do it while the shuttle was in transit to centcom as it would delete everything once it go to centcom.
 2016-01-06 11:41:07 -08:00
duncathan salt
50ebfa0f17 Merge pull request #14395 from MrStonedOne/nomoreminus1 
Removes a bunch of sleep(-1) and spawn(-1) from the code
 2016-01-05 22:16:17 -06:00
KorPhaeron
68b2c6d505 Uses define instead of ! 2016-01-05 10:01:05 -06:00
KorPhaeron
ec2648b81a Merge remote-tracking branch 'refs/remotes/tgstation/master' into pod_launch_fix 
# Conflicts:
#	code/controllers/subsystem/shuttles/emergency.dm
 2016-01-04 19:44:28 -06:00
KorPhaeron
935ba88c48 Pod launch uses vars 2016-01-04 17:38:03 -06:00
MrStonedOne
fd80575f38 Removes a bunch of sleep(-1) and spawn(-1) from the code 
This seems to be causing issues where if the queue was too long, byond would attempt to process through all of it while hanging everything else.
 2016-01-04 15:17:12 -08:00
tkdrg
c13a2f97e5 Merge pull request #14342 from neersighted/tgui_followup 
More tgui fixes and tweaks
 2016-01-04 18:39:52 -03:00
Bjorn Neergaard
8994f95308 Clean some old comments 2016-01-04 12:22:22 -06:00
Bjorn Neergaard
dc69cbaefb Allow UIs to be attached to datums; various fixes 2016-01-04 10:46:31 -06:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
duncathan salt
01ad623602 Merge pull request #14296 from AnturK/refix 
Fixes gas overlays using turf color
 2016-01-03 18:13:51 +01:00
duncathan salt
9ee0f50cd9 Merge pull request #14285 from neersighted/tgui_followup 
tgui followup
 2016-01-03 18:00:43 +01:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns 
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
 2016-01-02 18:23:02 -08:00
duncathan
b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
 2016-01-02 18:02:54 -06:00
Cheridan
7e8f0956ea Merge pull request #14256 from KazeEspada/Shuttlesound 
Fixes the shuttle pre-launch sound playing twice.
 2016-01-02 16:19:40 -06:00
AnturK
90a10d5e51 Fixes gas overlays using turf color 2016-01-02 16:16:42 +01:00
KorPhaeron
ba90a82c36 Fixes 2016-01-01 20:53:50 -06:00
Bjorn Neergaard
85b1576ba0 Sanitize HTML in VV to prevent HTML injection 
Also rename SStgui html variable to be more informative
 2016-01-01 18:41:39 -06:00