21044 Commits

Author	SHA1	Message	Date
PsiOmegaDelta	ffbac82f91	Fixes map conflicts, updates changelog.	2015-11-10 10:46:22 +01:00
PsiOmegaDelta	eb37292120	Merge remote-tracking branch 'upstream/dev-freeze' into dev	2015-11-10 10:37:22 +01:00
PsiOmegaDelta	94bb1e12d4	Merge pull request #11283 from Sligneris/patch-1 ... Overhaul of NT Default	2015-11-10 10:36:14 +01:00
PsiOmegaDelta	2968952913	Merge pull request #11438 from Baystation12/master ... Dev-freeze	2015-11-10 10:34:40 +01:00
PsiOmegaDelta	b84280871f	Merge pull request #11420 from Datraen/PlantTweaks ... [BOTANY] [Seeds] Plant trait tweaks.	2015-11-10 08:42:03 +01:00
PsiOmegaDelta	f5e565507d	Merge pull request #11429 from atlantiscze/gridcheck ... Updates gridcheck behavior	2015-11-10 08:41:54 +01:00
Atlantis	12330517a5	Minor update ... - Severity now influences gridcheck duration. - Adds changelog.	2015-11-07 18:05:47 +01:00
PsiOmegaDelta	5c587e69b6	Exploit fix. ... Players can no longer immediately respawn as mice by ghosting.	2015-11-07 17:12:50 +01:00
Atlantis	661b5968d9	Updates gridcheck behavior ... - Gridcheck random event is updated. Core behavior remains the same, but mechanism it uses to achieve power outage is changed. - Both SMESs and APCs have new variable which is set by gridcheck. This variable decrements by 1 every tick, and until it is back to zero the APC/SMES won't work. - SMESs are disabled for 60-120 seconds (random for each SMES). APCs for 120-240 seconds. - Both SMESs and APCs show error UI with timer counting down until the device restarts (begins working again). - Both SMEss and APCs may be manually restarted, on per-device basis, by clicking restart button in the UI. This is useful if you urgently need one or two devices back online, for example, medical treatment facilities, etc. This immediately skips the X second timer and restores the device to working state, while keeping the original intention of this event - allowing antagonists to use lack of power to enter areas they don't normally have access to.	2015-11-07 17:11:25 +01:00
mwerezak	db59f87cb0	Merge pull request #11424 from PsiOmegaDelta/151106-RuntimeFlashing ... Fixes #11422.	2015-11-06 13:10:24 -05:00
PsiOmegaDelta	b1fe5e3eab	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/game/antagonist/outsider/ert.dm	2015-11-06 17:50:34 +01:00
PsiOmegaDelta	e81f42840a	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/modules/mob/living/carbon/human/species/station/station.dm	2015-11-06 17:43:05 +01:00
PsiOmegaDelta	31536c6a56	Fixes #11422. ... There is nothing to see here...	2015-11-06 11:13:31 +01:00
Chinsky	bef8d99703	Merge pull request #11409 from PsiOmegaDelta/151104-DionaLanguage ... When a diona splits, the main nymph inherits all known languages.	2015-11-06 00:37:48 +03:00
PsiOmegaDelta	73f99a4c01	Secondary diona nymphs now get non-restricted/whitelisted languages on split.	2015-11-05 10:04:00 +01:00
PsiOmegaDelta	20eb505c69	Adds antag datum flag that is used to exlude the type from random selection. ... Death Commando, Mercenary Commando (inherits from death commando), and the ERT antag types added to the exclude list. Fixes #11416.	2015-11-05 08:48:05 +01:00
PsiOmegaDelta	5f4af85af9	Refactors diona split code for maximum reuse.	2015-11-05 08:15:10 +01:00
PsiOmegaDelta	daa9b0e0bc	When a diona splits, the main nymph inherits all known languages. ... Fixes #11401.	2015-11-04 17:50:51 +01:00
PsiOmegaDelta	1648e46dcf	Merge pull request #11408 from Baystation12/dev-freeze ... Dev	2015-11-03 17:50:53 +01:00
PsiOmegaDelta	1fa73c0c18	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/modules/mob/living/carbon/human/life.dm	2015-11-03 17:37:46 +01:00
PsiOmegaDelta	42b98c45e4	Merge pull request #11220 from caelaislinn/new_xenoarch_sprites ... Replaces xenoarch gun sprites with CC licenced alternatives from OpenGameArt.org	2015-11-03 11:14:03 +01:00
HarpyEagle	f49b6d7cd1	Fixes #11405	2015-11-02 23:35:25 -05:00
PsiOmegaDelta	ae4d463fcb	Map cleanup, tweaks and merge fixes.	2015-11-02 10:05:14 +01:00
PsiOmegaDelta	19051ec27e	Merge remote-tracking branch 'upstream/dev-freeze' into dev	2015-11-02 09:25:04 +01:00
PsiOmegaDelta	694a35c10b	Merge remote-tracking branch 'upstream/master' into dev-freeze	2015-11-02 09:08:06 +01:00
Chinsky	ba3c1f03d7	Merge pull request #11195 from Hubblenaut/dev ... CtrlClick deflates inflatables	2015-11-02 00:11:14 +03:00
Chinsky	1417f4f40b	Merge pull request #11344 from Hubblenaut/tape ... Tape - Sprites and Algorithm Changes	2015-11-02 00:10:03 +03:00
Chinsky	e2bdcef127	Merge pull request #11386 from Dibasic/patch-1 ... Reduces wizard subjugate duration	2015-11-02 00:09:12 +03:00
Chinsky	4ae1a45017	Merge pull request #11389 from PsiOmegaDelta/152710-MagicCrescentWindows ... Crescent windows are now near indestructible.	2015-11-02 00:08:52 +03:00
Chinsky	e05b08db10	Merge pull request #11394 from PsiOmegaDelta/151029-GasCircuits ... Atmospheric computer circuit additions.	2015-11-02 00:08:35 +03:00
PsiOmegaDelta	392fd6210d	Merge pull request #11388 from PsiOmegaDelta/151028-LiveDroneLIVE ... Allows drones to recharge their synth materials.	2015-11-01 18:43:43 +01:00
PsiOmegaDelta	8b98b059a4	Merge pull request #11397 from Baystation12/dev-freeze ... Dev freeze	2015-10-31 16:43:02 +01:00
PsiOmegaDelta	461023b5e7	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/modules/mob/living/carbon/human/life.dm	2015-10-31 16:31:05 +01:00
PsiOmegaDelta	a9f7b3a325	Merge pull request #11247 from Hubblenaut/laundry ... Adds laundry basket	2015-10-31 11:16:14 +01:00
PsiOmegaDelta	3864257e0b	Merge pull request #11321 from mwerezak/lung-rupture ... Resolves #11319	2015-10-30 19:05:05 +01:00
PsiOmegaDelta	ab2ddfcba7	Atmospheric computer circuit additions. ... Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392. Computers also no longer attemps to qdel a type on Destroy()	2015-10-29 16:55:58 +01:00
Daranz	4b42f69247	Fix a problem with solar control computers not connecting to powernets on build	2015-10-28 13:35:24 -04:00
PsiOmegaDelta	7c7ed0f3fc	Crescent windows are now indestructible.	2015-10-28 09:25:12 +01:00
PsiOmegaDelta	2ba9c7bc79	Allows drones to recharge their synth materials. ... Fixes #11387.	2015-10-28 09:17:31 +01:00
Dibasic	c905fb9bc7	Reduces wizard subjugate duration ... Reduces wizard subjugate duration to one third of previous duration. General agreement in this thread: http://baystation12.net/forums/threads/vote-remove-wizard-subjugate.1007/ Because a robeless spell shouldn't take you out of the round for as long as the respawn timer lasts.	2015-10-27 15:14:40 -05:00
PsiOmegaDelta	3dcd35508f	Compilation fixes.	2015-10-27 13:43:30 +01:00
PsiOmegaDelta	9d6c99aaf3	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: .travis.yml code/modules/mob/living/carbon/breathe.dm code/modules/mob/living/carbon/human/life.dm code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm html/changelogs/.all_changelog.yml	2015-10-27 13:08:33 +01:00
PsiOmegaDelta	dd855b5259	Compilation fixes.	2015-10-27 12:47:35 +01:00
PsiOmegaDelta	3db2c4fb49	Merge remote-tracking branch 'upstream/master' into dev-freeze ... Conflicts: code/modules/mob/living/carbon/human/life.dm code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm	2015-10-27 12:38:28 +01:00
mwerezak	2f4d1dd7b1	Adds IPC specific halloss stun messages	2015-10-25 23:39:06 -04:00
Chinsky	5acf5f1b7b	Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup ... Character setup refactor.	2015-10-26 05:44:13 +03:00
Chinsky	35ce07aa71	Merge pull request #11296 from mwerezak/pepperspray-fix ... Pepperspray and chem smoke fixes	2015-10-26 05:42:59 +03:00
PsiOmegaDelta	e37394e8fa	Merge remote-tracking branch 'upstream/dev-freeze' into dev ... Conflicts: code/modules/mob/living/carbon/human/human_helpers.dm code/modules/reagents/reagent_containers/food/snacks.dm	2015-10-25 20:28:48 +01:00
PsiOmegaDelta	a3027febee	Merge pull request #11373 from Baystation12/master ... Dev-freeze.	2015-10-25 20:00:44 +01: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