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

38 Commits

Author SHA1 Message Date
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
tkdrg
449c20ec74 Merge pull request #15497 from AnturK/scrub 
Fixes scrubbers/vents showing pipes over flooring
 2016-02-14 17:13:05 -03:00
Kyle Spier-Swenson
50d276711a Update components_base.dm 2016-02-13 22:23:31 -08:00
Kyle Spier-Swenson
202e6e1fe7 Partial revert of 14756 (Pipes don't transport air across time and space) 2016-02-13 22:22:19 -08:00
AnturK
6eb37f2d07 Fixes scrubbers/vents showing pipes over flooring 2016-02-13 17:57:26 +01:00
tkdrg
a9cb902368 Merge pull request #15413 from phil235/CryoResistFix 
Fixes resisting out of cryo not working
 2016-02-12 14:35:43 -03:00
phil235
c507036408 no need to stand still. 2016-02-12 02:20:22 +01:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc 
Fix a number of runtimes
 2016-02-10 23:50:38 -06:00
Bjorn Neergaard
4089d850cc Address feedback 
Canisters mixtures can no longer be null thanks to accepting
one in New()

Just forget assert_gas in objectives
 2016-02-10 23:42:15 -06:00
phil235
5fcf29fd24 Fixes resisting out of cryo not working when you use moving instead of the resist button. 
Also changes addtimer into a do_after().
 2016-02-11 01:25:48 +01:00
Bjorn Neergaard
e41a092f16 Properly don't process embeded atmos machinery 
Fixes weird atmos bugs of all sorts
 2016-02-10 18:04:20 -06:00
tkdrg
58c91656a2 Merge pull request #15361 from neersighted/always_null_yourself 
Null portable atmos airs
 2016-02-10 16:49:30 -03:00
Bjorn Neergaard
265b8d2d20 Fix an air alarm runtime 
Don't store hard refs to an area which can cause race condtions
Instead, get our area only when we need it

The following runtime has occured 4426 time(s).
runtime error: Cannot read null.atmosalm
proc name: update icon (/obj/machinery/airalarm/update_icon)
  source file: airalarm.dm,535
  usr: null
  src: the alarm (/obj/machinery/airalarm)
 2016-02-10 07:01:24 -06:00
Bjorn Neergaard
66dac6d164 Use more reliable method of relabeling canister 2016-02-09 23:00:39 -06:00
Bjorn Neergaard
1c0df5d40e Fix canister runtime 
The following runtime has occured 10198 time(s).
runtime error: Cannot execute null.return pressure().
proc name: update icon (/obj/machinery/portable_atmospherics/canister/update_icon)
  source file: canister.dm,112
  usr: Slurpy Slurpy (/mob/living/carbon/human)
  src: the o2 canister (/obj/machinery/portable_atmospherics/canister/oxygen)
 2016-02-09 22:40:04 -06:00
Joan Lung
e77bac15af Merge pull request #15323 from neersighted/canister_fix 
Make canisters use passive_gates
 2016-02-09 16:53:37 -05:00
Bjorn Neergaard
73e27536ff Null portable atmos airs 
Fixes #15356
 2016-02-09 15:12:27 -06:00
AnturK
203b965078 Merge pull request #15292 from neersighted/flood 
Fix flood mode on air alarms incorrectly setting pressure bounds
 2016-02-09 00:21:00 +01:00
phil235
4562f423ce Fixes small errors 2016-02-08 19:55:10 +01:00
phil235
16a5441379 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionFixes2 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2016-02-08 19:35:01 +01:00
phil235
b9bba3a501 Fixes unconscious mob standing still when removed from cryo cell, closet, containers. 
Fixes mobs inside cryo cells getting pipes overlay(ventcrawl). Ventcrawler can no longer move in or out of
the cryo cell, which fixes ventcrawler going into cryo cell and getting stuck in it.
Being inside a cryo cell now give you a nearsight overlay (same as closet).
Brains no longer get the red circles overlay when damaged.
MMI now properly updates its icon when the brain mob dies.
Fixes getting stuck with a grab inside you when grabbing someone buckled.
Silicon stunned, weakened and paralysis is now properly updated.
 2016-02-08 19:22:45 +01:00
Bjorn Neergaard
b54f8918a7 Make canisters use passive_gates 
Not a huge change but means that canisters have a pressure resistance on the valve
 2016-02-08 11:25:55 -06:00
duncathan salt
f1f3bcd1d6 Merge pull request #15245 from neersighted/portamos 
Fix missing parent calls in portable atmos
 2016-02-07 17:50:10 -06:00
Bjorn Neergaard
edd89aeef3 Fix flood mode on air alarms incorrectly setting pressure bounds 2016-02-07 17:21:52 -06:00
Bjorn Neergaard
6c4d749599 Fix missing parent calls in portable atmos 2016-02-06 15:26:16 -06:00
phil235
fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
 2016-02-06 15:42:13 +01:00
Bjorn Neergaard
f1a8fe786a Put the vars back; some other speed improvements 
Apparently . = is not the one true way
;~; @RemieRichards
 2016-02-05 18:57:09 -06:00
Bjorn Neergaard
bb10a81310 Optimize more listmos procs, rename a few vars 2016-02-05 18:56:41 -06:00
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard
fc513f9a47 Add generic "screen" capability to tgui 
Also fix typo found in uplinks, random uses of 'src'
 2016-02-05 17:06:05 -06:00
Bjorn Neergaard
29fdf73cc6 tgui power monitor; linegraph component 2016-02-05 17:06:04 -06:00
Bjorn Neergaard
c5e6a922ca Cache canister updates and make huge scrubbers use power; add movable version 2016-02-05 17:06:03 -06:00
Bjorn Neergaard
796cca2753 tgui scrubbers 
removes area atmos computer
 2016-02-05 17:06:02 -06:00
Bjorn Neergaard
c9f61fd7da Rework portable atmos; tgui portable pump 2016-02-05 17:06:00 -06:00
Bjorn Neergaard
af19bff008 tgui sleepers and uplink search 
Fix some state logic
Fix SVGs
display: based filtering
input component

Update syndicate colors

@ChangelingRain
 2016-02-05 17:05:59 -06:00
phil235
0daa87f9be More merge conflict fixes. 2016-02-04 15:48:33 +01:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
 2016-02-04 14:34:45 +01:00
Firecage
6e27893e38 Take to of grouping the atmos files in modules. 2016-01-30 21:09:38 +02:00