Commit Graph

1379 Commits

Author SHA1 Message Date
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
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
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
Bjorn Neergaard
a2bb279164 NanoUI is now 'tgui' 2016-01-01 17:47:44 -06:00
Bjorn Neergaard
81155b74d0 More progress on the Ractive rewrite
* Get APCs working under the new system; clean up code
* Auto-update fancy settings; remove README (outdated now); clean Titlebar
* Convert to Stylus; seperate components and such
2016-01-01 17:44:20 -06:00
KazeEspada
92584bea29 Fixes the shuttle pre-launch sound playing twice. 2016-01-01 11:38:38 -07:00
duncathan salt
397025b292 Merge pull request #14074 from MrStonedOne/HOLYFUCKINGGHOSTPOPUPS
[ready]Ghost popup re-work
2015-12-31 23:58:03 +01:00
MrStonedOne
69a70daebd Ghost popup part 2: The didn't do much-a-ning
Fixes button3, does the remie
2015-12-31 01:54:15 -08:00
duncathan
8392974ad0 fixes associative list; adds gas_overlay to "datum gases" 2015-12-29 22:50:09 -06:00
duncathan
12eeef552b small fixes 2015-12-27 20:13:44 -06:00
duncathan
bf6a7b6741 updates gas_mixture.dm
the list is now used everywhere
updates logic of certain procs to reduce copypaste
no compile errors remain in this file
2015-12-27 17:58:50 -06:00
Bjorn Neergaard
245b4a6ee9 Subsystem too 2015-12-26 09:59:55 -06:00
Bjorn Neergaard
7132c5bd8d Cache NanoUI HTML 2015-12-26 01:21:57 -06:00
Tkdrg
75981cb729 Adds qdel() debug logging for testing
It's locked behind a #ifdef TESTING so it won't slow down qdel().
2015-12-22 21:33:49 -03:00
tkdrg
fbad689e7d Merge pull request #13875 from KorPhaeron/away_missions
Stops minimaps generating for away missions
2015-12-22 15:01:27 -03:00
KorPhaeron
202230072d Away Missions 2015-12-21 07:12:30 -06:00
Kyle Spier-Swenson
27ec045c86 atmos dynamic wait tweaks 2015-12-20 11:35:20 -08:00