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
13,399 Commits 8 Branches 0 Tags
efd3d83e78712939334a4ba99e9e6a19cb7cdf1d
Commit Graph

38 Commits

Author SHA1 Message Date
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
SkyMarshal
dffed10290 Fixed a long-lasting error with vending machine in toxins, fixed/added atmos setting editor in game. 2012-06-18 23:39:12 -07:00
SkyMarshal
692fdc724e Second part of UltraLight. Some fixed up fire stuff. 2012-06-18 17:52:40 -07:00
SkyMarshal
aeb850fef0 Working UL 2012-06-18 15:02:34 -07:00
SkyMarshal
92e2cd32de ZAS fixes. 2012-06-09 00:55:00 -07:00
SkyMarshal
0cc2d20a33 Merge branch 'master' of git://github.com/Aryn/Baystation12 into BugFixes 
Conflicts:
	code/ZAS/Airflow.dm
 2012-06-08 11:37:43 -07:00
Aryn
6730a1bf22 Modified fire algorithms, made bombs possible. 2012-06-08 10:45:47 -06:00
SkyMarshal
2892ea733e More changes for ZAS. Firelocks work properly, and rebuilding zones occurs at the proper times. 2012-06-07 13:43:55 -07:00
Aryn
37125a42f9 Fixed bugs and optimized ZAS. 2012-05-30 01:33:58 -06:00
Aryn
c9478c6a46 Made SkyMarshal's recommended changes. 2012-05-28 16:41:18 -06:00
Aryn
f0f6f14355 Fixed up the errors related to ALL_ITEM_CONTAMINATION and hotspots, made extinguishers work again. 2012-05-27 12:49:26 -06:00
Aryn
56a2c1d77a Added comments and updated the changelog. 2012-05-26 22:01:28 -06:00
Aryn
6f00258376 I accidentally ALL THE THINGS! But yeah, ZAS is updated. 2012-05-26 02:01:26 -06:00
unknown
a7bce8a609 WHOOPS 
Signed-off-by: unknown <Colm@Blue.(none)>
 2012-03-15 22:52:29 +00:00