cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,963 Commits 8 Branches 0 Tags
e7d85f8edc7a38caccfd3e82a2fbba9c36595fa1
Commit Graph

63 Commits

Author SHA1 Message Date
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
mwerezak
c432268596 Fixes fires burning forever 
Fixes fires grinding to a near halt but never actually stopping.
 2015-03-09 01:45:31 -04:00
mwerezak
49b3db964f Implements fuel fires 
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
 2015-03-02 12:40:01 -05:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
Hubblenaut
30f590aef7 Fixes phoron reactions with oxygen not following a consistent reaction equation 2014-08-13 19:56:02 +02:00
Mloc-Argent
d5e9851b62 integrate XGM into the code 
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 19:52:12 +01:00
Mloc-Argent
1aca3fe7f2 atmos: make fires more destructive 
Fires can now burn through walls, windows, and (with a high enough
 temperature) rwalls.
New proc: adjacent_fire_act().  Called on turfs that a fire isn't able
 to spread to. (walls, floor surrounded by windows, etc.)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-23 20:58:14 +01:00
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
Mloc-Argent
191e21ead6 atmos: fix everlasting fires 
Fires were checking against a non-reduced air sample for existance, so
the reduced sample wasn't working in zburn when it failed the check.
Also fixed volatilefuel not being scaled in the phoron reagent.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-22 15:25:23 +01:00
Chinsky
ded321d5c1 Nextgen lights #3: Fire 
Fire now emites colored light, pretty rad.
 2014-06-19 00:16:19 +04:00
Mloc-Argent
6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Mloc-Argent
3fb37ade17 zas: fix zburn /0 runtime 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 17:40:35 +01: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
0d589ff569 Changes all instances of PLASMA in active code into PHORON 2014-04-10 00:19:29 -07:00
Aryn
bc971b01ea New ZAS version, stable and efficient. Git broke the everything so it's in one commit. 2014-02-19 16:47:53 -07:00
LBraindead
9e752d7c79 Update Fire.dm 
a bit of rebalancing that should fix the eternal-fire bug
 2014-01-01 23:19:27 +01:00
Chinsky
a210c1b613 derp XOR 2013-11-03 20:31:50 +04:00
Chinsky
8274114e47 VG ZAS Fire stolen 2013-11-03 20:28:26 +04:00
SkyMarshal
cffa100caa Reverted both LordBraindead and my own work on firecode back to when it was stable. Fixed some issue with phantom-fires-in-pipes. Removed some useless things left over from FEA. 2013-10-05 00:32:02 -07: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
Mloc-Argent
d2d08208a8 made zburn/firelevel more predictable. Probably won't change much ingame, but it's a start. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-29 22:06:27 +01:00
Mloc-Argent
ebc19424e0 Fix for minute traces of toxins in the air causing firestorms. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-17 00:19:28 +01:00
Mloc-Argent
2a825e6cca Made most paths in ZAS absolute, for easier searching. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-24 21:13:48 +01:00
LordBraindead
6f0ebc1bb5 changed how fire works 
-fire switched to release energy by burning fuel and generating heat from that
- reorganzied the fire process in a saner manner
 2013-07-05 19:56:53 +01:00
SkyMarshal
efd3d83e78 Reverts my firechanges, also air alarms now have a temperature regulation capacity. 2013-07-04 20:55:59 -07:00
SkyMarshal
1ccceb0e6d Fixes an issue with fire leaving the trace_gases list full of nulls and revert some more of whatever Cael had done to that poor air-movement procedure. 2013-04-18 09:58:37 -07:00
SkyMarshal
710e97bcc6 fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-18 09:56:52 -07:00
SkyMarshal
5c5b7028b0 Fire update. Should now burn out after a time, and temperature varies on a number of conditions. Fixed a runtime, and made fire work in canisters. Ingame modification of ZAS is now possible again. Firedoors now remove duplicate firedoors on the same turf. 2013-04-18 09:56:51 -07:00
SkyMarshal
f05b8e0083 Fixes issues: 
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
 2013-04-18 09:56:49 -07:00
SkyMarshal
ef54f5566e Fire apparently was ignoring fire/temperature resistant things, I was informed of a possible fix (commenting out the call to the FireBurn proc when you are in a tile with fire, thanks Nernums) and should hopefully resolve the issue. 2013-04-04 17:18:35 -07:00
SkyMarshal
06da479c97 Makes liquid fuel cleanable again. Got removed in last commit since all that was done was revert Cael's changes. 2013-04-04 01:50:59 -07:00
SkyMarshal
9b0c40756b Fixed fire. 2013-04-04 01:29:23 -07:00
Cael_Aislinn
b2dc822744 tweaked fire to lower fuel/oxy requirements, increase temperature rise, made it a bit easier to get fires working 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-01 23:06:40 +10:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
Cael_Aislinn
5b5153ee37 some tweaks to fire - it consumes fuel faster, and properly goes out after a while, hopefully fix for 1 * 10e-99 burning fuel bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-27 23:39:17 +10:00
Cael_Aislinn
8d22166941 - tweaked lplasma spills and fire spawning - oxygen content is no longer counted towards % spawn chance. 
- to spawn a turf fire (at default ignition level) atmos zones now require at least 17 moles of ignitable material (note that flamethrower fuel counts 15x more than other ignitables)

the relevant code seems weird and all over the place, but this seems to work in testing so i'm committing it for now

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-25 00:33:47 +10:00
Chinsky
5f7c9d5518 Readded welder fuel. 
Fixed issue with fire not generating light.
Fixed pre-merge issue with fuel passing through closed airlocks.
 2012-10-18 21:25:24 +04:00
Mloc
3845ed96d9 Nerfed volatile fuel. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-10-17 16:55:13 +01:00
Cael_Aislinn
ad75e6b352 merge with tgstation's r4618, removed some broken bs12 merges (organs, pain) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-06 13:09:20 +10:00
Cael_Aislinn
eacd84b212 Merge tgstation13 r4570 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-28 19:57:11 +10:00
Erthilo
aff3907c04 Cleaning up files and UltraLight, added some BS12 files, and fixes sprite issues. 2012-08-24 16:20:50 +01:00
Erthilo
3510a8adf0 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/mecha/mecha.dm
	code/game/objects/devices/PDA/PDA.dm
	code/game/objects/devices/flashlight.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/radio/radio.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/mob.dm
 2012-08-23 13:56:12 +01:00
SkyMarshal
ffa80e2e94 Ultralight update, less laggy and less buggy. Might still need to be removed, time will tell. Also: Added an Ion Storm law, and reverted the radio mode change back to the new subspace radios. Also added myself to the admins.txt since I am a dev again and the main server already is updated like that. 2012-08-21 17:25:57 -07:00
Cael_Aislinn
157d4b70c9 compile fix, minor dme change 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-22 05:47:47 +10:00
SkyMarshal
d41ffc18fd Fixes for ZAS, including fire, geometry, rebuilding consideration, and atmospheric lockdowns. In addition, improved supermatter, and humans now absorb all the oxygen they inhale, due to the ludicrous volumes of air normally encountered (Does not reduce effectiveness of air tanks) 2012-08-21 01:18:01 -07:00
SkyMarshal
54ce48fb9d Connections no longer are deleted when a door closes, instead persisting until merged or a wall is built there or something. Better runtime detection, and no more searching through world for fires to process. 2012-07-26 15:33:21 -07:00
SkyMarshal
4fe2b585a7 Adds further checking and variable presets to ZAS, and made the contamination overlay actually work. 2012-07-24 22:12:25 -07:00
SkyMarshal
abe222afde Fixed botpathing. Some fixes/changes to glows. Made lights less piss yellow. 2012-06-19 20:52:01 -07:00
SkyMarshal
8f0a815eb9 Fixed some stuff. 2012-06-18 23:59:07 -07:00