cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,395 Commits 5 Branches 0 Tags
b47d91b612a055af91aa692be99be6d7a24f90da
Commit Graph

235 Commits

Author SHA1 Message Date
PsiOmega
596b71a4ff Adds support to better handle air alarms in sensitive areas and vents with custom settings. 
Air alarms now have a new setting, breach_detection, which allows for disabling the automatic mode change when a breach occurs.

Vents now have three new settings. These are primarily for when air alarms request a mode change to ensure that custom pressure levels/checks (in terms of mapping, not set later in game)  are not lost.
external_pressure_bound_default
internal_pressure_bound_default
checks_default
 2014-06-27 11:12:09 +02:00
Loganbacca
2218164df9 Bug fix and mapping example 
- Fixed mapped omni devices being set to off at round start
- Remapped the research outpost atmos room, taking advantage of omni devices
 2014-06-26 21:10:17 +12:00
Loganbacca
9c80541936 Mapper sanity checks 
- Checks that mapped values add up to 100% so mappers can't set unusual ratios
 2014-06-26 15:40:10 +12:00
Loganbacca
5af82714b2 Omni device tweaks 
- Better mapping support (mapping icons and can now set mixer concentration)
- Trimmed overlay lists
- Utilized existing procs for icon generation
- Changed filter icon color to better contrast the output color
 2014-06-26 14:55:53 +12:00
Loganbacca
71ff9f7671 Add omni devices to dispenser 
- Added omni filters and mixers to pipe dispenser
- Added construction code
- A couple more cosmetic tweaks
 2014-06-25 23:17:45 +12:00
Loganbacca
095ab7d97c Added omni filters 
- Added omni gas filter
- Cleaned up some code in mixer.dm and omni_base.dm
 2014-06-25 23:17:44 +12:00
Loganbacca
4d4947021e Atmos Overhaul - Phase 1 
- Implements omni device core framework
- Adds omni gas mixer
 2014-06-25 23:17:44 +12:00
Loganbacca
493ecdeb9e Pipe fixes 
- Cleans up silent pipe deleting (now creates a loose pipe item where the pipe section was)
- Allows pipe painters to paint disconnected pipes
- Removes OOC message from IC feedback
 2014-06-25 23:17:44 +12:00
Chinsky
8c67326576 Merge pull request #5331 from UristMcKerman/pipeturbine 
Pipe Turbine
 2014-06-24 13:08:11 +04:00
UristMcKerman
72a55ae04c Forgot code file 
Lol
 2014-05-26 12:48:06 +04:00
Ravensdale
3ed9ac7774 Makes it so mixers and filters no longer block mob 2014-05-22 03:00:18 -07:00
UristMcKerman
a4eae6d661 Oups commit 
Toxins renamed to phoron. I have no words to describe my feelings...
 2014-05-20 07:30:27 +04:00
UristMcKerman
72cf6c329d Phoron came back 
Long story of my commiting attempts
 2014-05-20 07:02:04 +04:00
UristMcKerman
2164f03655 Added heat radiation to H/E pipes 
Added black-body heat radiation to H/E pipes placed over /turf/space
according to Stephan-Botzmann law
 2014-05-20 06:50:26 +04:00
Loganbacca
8e1ac09545 Trinary atmospheric device variants 
- Mirror filter - standard filter with the output mirrored to the opposite side
- T-Mixer - takes left and right inputs then outputs the mix perpendicular to the inputs
- Mirror mixer - standard filter with the output mirrored to the opposite side
- Added all three to pipe dispenser and construction code so they can be built in-game
 2014-05-03 22:01:33 +12:00
Ravensdale
3b67dabb17 Atmos mainline pipe code moved and enabled. 2014-04-28 09:08:38 -07:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
Mloc-Argent
9b19d7dacf atmos: remove a few force-deletes in merge code 
Removes del(giver) from pipeline/merge(), turf/assume_air() and
atom/assume_air().
Thanks to valzargaming on reddit/github for pointing it out.
fixes #4717

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-04-07 17:28:09 +01:00
Ccomp5950
753a2ef08c Code Effeciency Project: Vent scrubbers have a bit more sanity. 
No longer checking for 0.00000000000000000000000001 moles of toxins scrubers can only detect stuff worse then 0.001 moles.

Have a nice day.
 2014-04-04 13:21:47 -05:00
Ccomp5950
63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm
 2014-02-20 19:16:23 -06:00
Loganbacca
e140998f86 Pipe painter bad-fix revert 
Oops. Thanks Segrain.
 2014-02-20 16:46:43 +13:00
Loganbacca
f451fd42c1 Pipe tweaks 
- updated update_icon() for pipes and manifolds to change the color instead of the sprite
- updated subtypes to use global defines for colors instead of hard coded html refs
- added an alpha tweak to hidden pipes for the sake of mapping (DM doesn't render semi-transparent icons correctly, but it does handle var/alpha tweaks) - this is overridden when the pipe is spawned in the game world with New()
(Thinking about it, we could potentially do away with the transparent pipe sprites by just using the alpha variable. May do this later.)
- fixed pipe painter
- unwrenched pipes now inherit their source pipe color, and also inherit it when reattached to a pipe network again
 2014-02-20 15:50:12 +13:00
Loganbacca
42946bd2ad Vent pump efficiency 
- Tweaked the pressure delta check to "> 0.5", so pumps will stop transferring minor volumes of air every tick (because a delta of 3.05176e-005 is still greater than 0). This also reduces the calls to gas_mixture/merge() and gas_mixture/remove() significantly once the air in the environment has equalized.

The results after running the game for 10 minutes:
```
Proc Name												Self CPU	Total CPU	Real Time	Calls
/obj/machinery/atmospherics/unary/vent_pump/process		0.035		0.141		0.141		3808	<- before
/obj/machinery/atmospherics/unary/vent_pump/process		0.014		0.042		0.043		3808	<- after
```
 2014-02-18 16:16:10 +13:00
Segrain
47cca1dde8 Fix for #4446. 2014-02-16 18:08:12 +03:00
Loganbacca
8fc4e4e7db Minor tweaks and fixes for airlock equipment 
- Fixed DP vent pumps not changing direction
- Made airlock_sensor more versatile (and backwards compatible with old airlock code)
- Added airlock_sensor and access_button airlock subtypes for easier mapping
 2014-02-13 14:21:18 +13:00
Loganbacca
3978492ca4 Removed ID requirement for gas filters 
So they can be used in other areas of the station (like toxins and the engine room) without needing atmos access to change settings.
 2014-02-08 18:35:01 +13:00
Zuhayr
8a58652c41 Merge pull request #4385 from Loganbacca/pipes-cleanup 
Pipe standardization
 2014-02-06 13:43:05 +10:30
Zuhayr
f1b77d0ed6 Master merge. 2014-02-05 18:34:23 +10:30
Loganbacca
92cc536133 Pipe standardization 
Cleaned up pipes.dm
Changed pipe subtypes to the following layout:
	pipe
		simple/manifold/manifold4w
			hidden
				colour
			visible
				colour

Did a complete pass of the station to standardize all pipes (yes, nearly 2500 changes)
(Haven't done the research base air and scrubber pipes yet, and atmos will be done with my engineering redesign)
 2014-02-05 15:16:07 +13:00
Segrain
83246df6d5 Fix for #4297. 2014-02-03 07:32:53 +03:00
Mark Aherne (Faerdan)
c0d5ffd022 Added no-network check to heat_source to fix a runtime if not connected to a network. 2014-01-24 09:56:02 +00:00
Mloc
75348f6dca Fix for #4293 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-13 14:10:56 +00:00
SkyMarshal
8ecfd56540 Some turf cleanup and the like. Trace gases are now properly handled by ZAS on world load. 
Fixes #2485
 2014-01-08 21:36:03 -07:00
Chinsky
fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Segrain
fa76668500 Colouring tempfix. 2013-08-15 10:29:29 +03:00
Segrain
c8381b6e90 Pipe painter addition. 2013-07-31 14:23:30 +03:00
Cael_Aislinn
1d9fe082d7 made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 18:50:15 +10:00
SkyMarshal
3b41db4a18 Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery. 
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
 2013-04-24 15:58:39 -07:00
SkyMarshal
e8d7cc1e61 Fixes the bug with Filters allowing insane overpressurization. 2013-04-16 12:43:19 -07:00
Cael_Aislinn
c5f461e90d circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:28:57 +10:00
Cael_Aislinn
bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-11 22:12:31 +10:00
Ravensdale
4dcf0f0c76 alright, 4-way manifolds, manual t-valves, pipe caps. 2013-01-05 21:39:39 -08:00
Ravensdale
3c9d5b161c Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-01-05 20:50:47 -08:00
SkyMarshal
93476a2c16 Finishing touches on Air Alarms, Firedoors, and Central Atmos Control 2013-01-04 22:00:56 -07:00