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
80,473 Commits 8 Branches 0 Tags
af1d624a992bd1b29e7387c696a10383893df2a1
Commit Graph

510 Commits

Author SHA1 Message Date
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep 
Ports Byond 510 preperations from Bay
 2016-03-20 13:45:40 -04:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay 
Updates comment

Updates supply file
 2016-03-14 18:21:44 +00:00
Kelenius
acc78a8000 Changes types of ghosts and eyes 
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
 2016-02-20 15:36:05 +03:00
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options. 
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
 2015-12-24 21:10:33 +10:30
Hubblenaut
b994a07dc2 Fixes duplicate gas layers 2015-12-15 13:32:01 +01:00
HarpyEagle
326a6f445f Fixes #11071, #10936 
Adjusts fire_fuel_energy_release to compensate for fixed fire heat release.
Adjusts liquid fire burn parameters so that liquid fuel fire heat release and
burn duration is unaffected.

Conflicts:
	code/setup.dm
 2015-12-08 18:15:40 +01:00
HarpyEagle
ca52d2b3f2 Fixes calculate_firelevel() not counting oxidizer 
Fixes calculate_firelevel() not counting oxidizer when determining the ratio
of reactants to other gases. As well firelevel calculation is now done
separately for burning gas and burning liquid.

Adjusted FIRE_LIQUID_BURNRATE_MULT so that liquid burn rate is unaffected by
this fix, which will result in generally higher firelevels and thus faster
burn rates.

Conflicts:
	code/setup.dm
 2015-12-08 18:12:23 +01:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
 2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
HarpyEagle
1cf6ace74e Fixes #11071, #10936 
Adjusts fire_fuel_energy_release to compensate for fixed fire heat release.
Adjusts liquid fire burn parameters so that liquid fuel fire heat release and
burn duration is unaffected.
 2015-10-09 01:19:15 -04:00
HarpyEagle
9639d608a6 Fixes calculate_firelevel() not counting oxidizer 
Fixes calculate_firelevel() not counting oxidizer when determining the ratio
of reactants to other gases. As well firelevel calculation is now done
separately for burning gas and burning liquid.

Adjusted FIRE_LIQUID_BURNRATE_MULT so that liquid burn rate is unaffected by
this fix, which will result in generally higher firelevels and thus faster
burn rates.
 2015-10-08 23:40:08 -04:00
Zuhayr
e0cfd8fdbd Merge pull request #10420 from Kearel/sbike 
[Feature] Space Bikes!
 2015-09-07 13:58:25 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
PsiOmega
35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-08-29 10:06:18 +02:00
PsiOmegaDelta
bf3040cc2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-27 09:01:50 +02:00
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
mwerezak
ec7f60f9ad Allows indirectly connected turfs to merge zones if either zone is small enough. 
Fixes #9235

Conflicts:
	code/ZAS/Controller.dm
 2015-08-26 14:25:43 -04:00
GinjaNinja32
9a5da57d60 fix heatcap calculation in equalize() 2015-08-24 19:33:37 +01:00
GinjaNinja32
8521df47f3 fix equalize() not equalizing gases 2015-08-24 19:24:55 +01:00
PsiOmega
d001489d14 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-21 18:59:19 +02:00
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
PsiOmegaDelta
a0a09c04e4 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 2015-08-20 14:09:07 +02:00
mwerezak
58bc7fbb40 Cleans up dynamic member lookup 2015-08-18 17:20:37 -04:00
mwerezak
d70f064b1b Adjusts phoron exposure to use body_parts_covered 2015-08-18 17:18:25 -04:00
mwerezak
ac738f3db4 Moves flags values to item_flags var 
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
 2015-08-18 17:18:25 -04:00
mwerezak
b80c01ffbe Removes *COVERSEYES 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
 2015-08-18 17:06:49 -04:00
PsiOmega
8138815dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-18 18:05:16 +02:00
Kelenius
afc5414ed9 Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570. 2015-08-18 10:48:22 +03:00
PsiOmegaDelta
77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
 2015-08-13 08:09:28 +02:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
Kearel
10359889e7 Fixes 
Slight change to airflow/animations interaction when buckled
 2015-08-04 13:41:27 -05:00
PsiOmegaDelta
c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-07-31 10:00:16 +02:00
Mloc
b727de8398 anchored and unsimulated objects are no longer considered for airflow 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 21:00:42 +01:00
Mloc
cfac670cb6 anchored and unsimulated objects are no longer considered for airflow 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-30 19:51:11 +01:00
PsiOmegaDelta
0ab507ccec Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-07-28 09:03:49 +02:00
PsiOmegaDelta
0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
mwerezak
e8db7dc8d8 Fire now uses the full zone size when considering the minimum amount of phoron/oxygen required to sustain a fire 
Fixes an oversight that made fires able to burn with a smaller amount of phoron than they should.
 2015-07-26 22:47:18 -04:00
Zuhayr
c779482afc Merge with dev. 2015-07-15 16:20:39 +09:30
mwerezak
53eedb5498 Fixes liquid fuel fire regression 
The reaction progress needed to be clamped before used_fuel is
calculated, or else the will bleed into each other even though they are
clamped properly afterwards.
 2015-07-13 20:45:57 -04:00
mwerezak
06000a6984 Adds setMoveCooldown() 2015-06-30 22:30:12 -04:00
PsiOmega
f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
PsiOmegaDelta
8fef02501c Merge pull request #9936 from mwerezak/fire 
Balances fire to work better with very low concentration phoron gas burning
 2015-06-26 13:34:21 +02:00
mwerezak
e08dbc3080 Adjusts gas fires to burn out faster with low concentrations of gas fuel 2015-06-26 00:40:06 -04:00
mwerezak
285ce84044 Fixes disposals not transferring gas to holder, creating air_contents with the wrong volume, runtime due to terrible management of shared gas_mix 
Fixes one of the runtimes in #9310
 2015-06-23 23:32:27 -04:00
mwerezak
c5d283f544 Fixes phoron fire reaction progress 
The amount of gas burning is already limited by vsc.fire_consuption_rate
so there is no need to limit the ratio of gas burning.
 2015-06-20 21:03:48 -04:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-06-16 10:52:33 +02:00