Commit Graph

181 Commits

Author SHA1 Message Date
Datraen
ca24446d7f Merge pull request #1287 from Kelenius/unitTests
Ports unit tests
2016-04-04 10:34:12 -04:00
Kelenius
e06df420fc Adds color to unit tests 2016-04-04 11:46:39 +03:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
PsiOmegaDelta
d6797056f2 Adds progress bars to tasks that take time 2016-03-21 17:13:23 +00:00
Datraen
141962b22f Adds lizard, visitors and intrigue game modes. 2016-03-16 11:11:44 -04:00
Neerti
07eeb16a2e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-03-15 10:17:31 -04:00
Zuhayr
cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Neerti
9493290997 Merge pull request #933 from Zuhayr/tesharifixes
Small mob reagent changes.
2016-02-11 17:18:07 -05:00
Zuhayr
84a045ffe5 Moved age min and max to the species datum. 2016-02-09 18:20:23 +10:30
Zuhayr
4820420182 Added several mobsize and Teshari checks to reagent processing. 2016-02-08 20:21:04 +10:30
Neerti
be43fd1d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-02-07 22:15:36 -05:00
Zuhayr
2e83dfba51 Added blood volume and hunger variables for species. 2016-02-08 13:13:35 +10:30
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Kelenius
138850a37b Fixes for vendors 2016-01-18 17:40:20 +03:00
Neerti
403fbf05ab Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-01-14 00:54:35 -07:00
Neerti
19603db5dc More work on new wizard. 2016-01-14 00:54:07 -07:00
Datraen
e77a06e176 Merge pull request #748 from Zuhayr/prosthetics
Blindness fix.
2016-01-08 23:09:03 -05:00
Zuhayr
905cb5943d Readds blindness removal to imida
zoline and organ surgery. Stops imidazoline healing robotic eyes.
2016-01-09 13:24:46 +10:30
Zuhayr
baf1e4315e Generalized pulling restrictions to mob level. 2016-01-08 23:20:30 +10:30
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
NullSnapshot
87afd2feb2 Fixes: #11351 #11357 #11359 #11361 2015-12-24 21:10:41 +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
56d8975a19 Tweaks Filtering and Toxic Gases 2015-12-17 17:50:30 +01:00
Zuhayr
6e8368ac4c Rewrote targeting. 2015-12-16 10:26:40 +10:30
Hubblenaut
58cb56492e Tweaks Filtering and Toxic Gases 2015-12-15 13:57:52 +01:00
PsiOmegaDelta
b31a5ba836 Compilation fixes. 2015-12-13 10:21:00 +01:00
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
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
Chinsky
939c1a3146 Merge pull request #11376 from NullSnapshot/dev-freeze
Bunch of IPC fixes.
2015-12-04 11:28:25 +03:00
Zuhayr
fd59c3ad76 More tweaks to IPC fixes. 2015-12-03 22:56:19 -08:00
Zuhayr
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08:00
Neerti
2c81761494 Removes most references to NSS Exodus. 2015-12-03 13:47:37 -05:00
PsiOmegaDelta
2d39621801 Makes it possible to ignore some incapacitation checks.
This fixes  #11576. Also corrects the viewers() usage in visible_message.

Conflicts:
	code/__defines/mobs.dm
	code/modules/mob/living/carbon/resist.dm
2015-12-03 12:37:30 -05:00
Jon
331e12b304 Reduces the loadout points from 15 to 10. We can see where we go from there, but I think we all agree that 15 was just a large number chosen for testing and is probably a little ridiculous, but we want higher than 5 - hence 10. 2015-11-22 11:02:59 +00:00
mwerezak
52deec9fde Adds thermal radiation into space for human mobs
Main effect is that IPCs won't gain temperature infinitely anymore.
2015-11-10 23:52:41 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
NullSnapshot
4694a263a7 Fixes: #11351 #11357 #11359 #11361 2015-10-25 21:51:31 -07:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
Chinsky
2a88b4d0aa Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision
Overhauls humanoid vision handling.
2015-10-15 19:15:28 +03:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04: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
38c6ba3a07 Code relocation. 2015-10-11 17:31:21 +02:00
Datraen
6556e57064 [MISC] Increase number of points for gear loadout
Explanitory
2015-10-11 00:28:12 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00