20917 Commits

Author	SHA1	Message	Date
PsiOmegaDelta	3fd28dd361	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: html/changelogs/.all_changelog.yml	2015-10-14 08:41:38 +02:00
PsiOmegaDelta	3fd172ee63	Merge pull request #11294 from Baystation12/master ... Dev-freeze	2015-10-14 08:40:03 +02:00
mwerezak	f245e41db2	Merge pull request #11287 from PsiOmegaDelta/151013-TopicFingerprints ... Changes how Topic() calls apply fingerprints.	2015-10-13 22:11:26 -04:00
Chinsky	8c8b5a34d3	Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob ... Blob spawn locations are now more random	2015-10-14 03:24:28 +03:00
PsiOmegaDelta	a19829e968	Merge pull request #11289 from Kearel/secRemoveMaster ... Pointed secret changes to master	2015-10-13 20:27:56 +02:00
Kearel	78956843a8	Pointed secret changes to master ... New gamemodes on dev will still need to be changed.	2015-10-13 12:30:52 -05:00
PsiOmegaDelta	3b5990121f	Blobs locations are now more random. ... Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations. Blobs also now log their spawn location, which admins can use to jump to it. Space vines and nuclear discs have been updated to use the same mechanics.	2015-10-13 18:49:55 +02:00
GinjaNinja32	c6f328159c	Merge pull request #11286 from PsiOmegaDelta/151013-SillyMistake ... Antag spawner now uses the starting location list...	2015-10-13 08:04:21 +01:00
PsiOmegaDelta	cfc01d053b	Changes how Topic() calls apply fingerprints. ... Now applies fingerprints if the user is adjacent to a physical object, otherwise applies a hidden fingerprint. CouldUseTopic() is only called when a user has successfully interacted with an object interface/UI.	2015-10-13 08:56:20 +02:00
PsiOmegaDelta	f0244bc9e5	Antag spawner now uses the starting location list... ... ..instead of the mob. Someone (might just maybe potentially be me, who knows) cleaned up the code a bit too quickly. Fixes #11284.	2015-10-13 08:09:12 +02:00
Zuhayr	608c766db2	Merge pull request #11279 from PsiOmegaDelta/151012-Ghostize ... ghostize() now attempts to set the most relevant time of death.	2015-10-13 08:36:28 +10:30
Zuhayr	5dc6ff5da1	Merge pull request #11230 from PsiOmegaDelta/xenomorphs ... Xenomorph update	2015-10-13 08:31:27 +10:30
mwerezak	46f5bbc1d4	Merge pull request #11277 from Hubblenaut/stacks ... Fixes stack creation logic and return value	2015-10-12 11:25:51 -04:00
Kelenius	741cb2d423	It was bork, I made it not bork	2015-10-12 13:57:47 +03:00
PsiOmegaDelta	7247906f41	ghostize() now attempts to set the most relevant time of death. ... ghostize() now only uses the mob's time of death if the mob is actually dead, otherwise uses the current time. Fixes #11229.	2015-10-12 12:55:34 +02:00
GinjaNinja32	de68e366f5	Merge pull request #11270 from Hubblenaut/master ... Flavor Text Bugfix	2015-10-11 23:55:10 +01:00
Hubblenaut	1c8ec1a700	Fixes stack creation logic and return value	2015-10-11 22:02:05 +02: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
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
Chinsky	debe69aa80	Merge pull request #11268 from PsiOmegaDelta/151010-LessHolographicHoloComputer ... Fixes #11263.	2015-10-10 17:51:15 +03:00
Hubblenaut	d3572bf4cb	Fixes empty flavor text drawing two spaces	2015-10-10 15:55:25 +02:00
PsiOmegaDelta	13b175c529	Merge remote-tracking branch 'upstream/dev' into xenomorphs ... Conflicts: code/game/objects/effects/aliens.dm code/game/objects/structures/lamarr_cage.dm	2015-10-10 12:05:36 +02:00
PsiOmegaDelta	fd3370c01f	Fixes #11263. ... Now possible to use items other than emags on holodeck computers Blobs no longer make computers lose their density state. Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless). Fixes #11263.	2015-10-10 10:11:48 +02:00
GinjaNinja32	d5928d9927	Merge pull request #11260 from mwerezak/ttv ... Fixes TTV Yield	2015-10-10 09:05:00 +01:00
HarpyEagle	fa86509daf	Readds organ damage from failing to mend ribs	2015-10-09 18:57:17 -04:00
HarpyEagle	5684befee2	Fixes #11262	2015-10-09 18:57:17 -04:00
Hubblenaut	80cc83dbf8	Fixes backup power test light	2015-10-09 17:44:30 +02:00
HarpyEagle	6c3bbb9ee8	Updates changelog, fixes comment	2015-10-09 11:39:22 -04:00
HarpyEagle	63838b01d4	Updates preset TTV bombs, adds debug verb	2015-10-09 11:18:12 -04:00
PsiOmegaDelta	e237e33030	Merge pull request #11259 from mwerezak/rubber-bullets ... Rubber bullets and beanbags now check melee armour instead of bullet armour	2015-10-09 12:42:44 +02:00
PsiOmegaDelta	4ca487e291	Merge pull request #10113 from mwerezak/wheredoesthepowercomefrom ... Makes newly fabricated power cells start uncharged	2015-10-09 12:42:22 +02:00
GinjaNinja32	1f1857cc0a	Merge pull request #11257 from Karolis2011/map_capture ... Added more help/error messages to the capture tool.	2015-10-09 11:35:54 +01:00
GinjaNinja32	ace1874f37	Merge pull request #11241 from Hubblenaut/light_replacer ... Amendments to light replacer	2015-10-09 11:35:13 +01: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
HarpyEagle	fa661f998f	TTV Refactor ... Ensures TTV icon update occurs properly and removes the need for sleep() by updating tank Destroy() to account for TTVs. Collects duplicated code into a transfer_valve/remove_tank() proc.	2015-10-08 23:26:05 -04:00
HarpyEagle	40ab99b354	Rubber bullets and beanbags now check melee armour instead of bullet armour	2015-10-08 16:36:51 -04:00
HarpyEagle	38775120d7	Updates mechfab ... Robolimb manufacturers are now handled specifically instead of assuming all items follow the same constructor parameter rules.	2015-10-08 16:03:32 -04:00
mwerezak	83df0fa8f8	Makes powercells produced by the protolathe start uncharged.	2015-10-08 15:10:51 -04:00
PsiOmegaDelta	bd7c475fcc	Stack material use now depends on charge costs. ... This ensures one does not have to remember to set uses_charge equal to the length of the charge_cost list. Fixes #10943.	2015-10-08 20:29:39 +02:00
Karolis2011	fad0e0b28a	Added more help/error messages to the tool.	2015-10-08 12:36:09 +03:00
PsiOmegaDelta	8341620be4	Merge pull request #11246 from Kelenius/blobPlzGo ... Updates blob	2015-10-08 07:58:15 +02:00
Kelenius	82928d3b74	Fixes a minor blob issue, adds mecha attack message	2015-10-07 10:49:24 +03:00
PsiOmegaDelta	55c9f7533b	Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name.	2015-10-07 08:56:13 +02:00
PsiOmegaDelta	aaba2c5c8c	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/modules/mob/living/silicon/robot/robot_modules.dm	2015-10-07 08:14:30 +02:00
PsiOmegaDelta	c5d8fbfd57	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/game/antagonist/alien/borer.dm code/modules/mob/living/living_defense.dm	2015-10-07 08:07:23 +02:00
Hubblenaut	a7cad04264	Amendments to light replacer and janitor supply crate	2015-10-06 19:59:56 +02:00
Chinsky	f47a58e23e	Merge pull request #11244 from Kelenius/hackMe ... Basic encryption hack popup only shows suitable APCs	2015-10-06 20:29:51 +03:00
Chinsky	8107786cbd	Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech ... Makes silicon language handling more robust.	2015-10-06 19:32:54 +03:00