diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 94f2bbe0..6ae5692a 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -38,8 +38,8 @@ var/del_new_on_log = 1 // del's new players if they log before they spawn in var/feature_object_spell_system = 0 //spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard var/traitor_scaling = 0 //if amount of traitors scales based on amount of players - var/objectives_disabled = 1 //if objectives are disabled or not - var/protect_roles_from_antagonist = 1// If security and such can be traitor/cult/other + var/objectives_disabled = 0 //if objectives are disabled or not + var/protect_roles_from_antagonist = 0// If security and such can be traitor/cult/other var/continous_rounds = 1 // Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke. var/allow_Metadata = 0 // Metadata is supported. var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1. @@ -55,7 +55,7 @@ var/list/probabilities = list() // relative probability of each mode var/humans_need_surnames = 0 var/allow_random_events = 0 // enables random events mid-round when set to 1 - var/allow_ai = 1 // allow ai job + var/allow_ai = 0 // allow ai job var/hostedby = null var/respawn = 1 var/guest_jobban = 1 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 9aa2a0c5..69daf630 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -215,7 +215,7 @@ /obj/item/weapon/reagent_containers/glass/beaker/noreact name = "cryostasis beaker" - desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units." + desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 60 units." icon_state = "beakernoreact" matter = list("glass" = 500) volume = 60 diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 53f71417..f3d36b5c 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1514,7 +1514,7 @@ datum/design/bluespacebeaker datum/design/noreactbeaker name = "cryostasis beaker" - desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units." + desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 60 units." id = "splitbeaker" req_tech = list("materials" = 2) build_type = PROTOLATHE diff --git a/html/changelog.html b/html/changelog.html index 7543a95c..1ee44378 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -4,7 +4,7 @@
|
+
+
+
11 July 2015+SoundScopes updated:+
28 June 2015Skull132 updated:@@ -275,7 +291,7 @@ should be listed in the changelog upon commit though. Thanks. -->
+
@@ -1284,7 +1300,7 @@ should be listed in the changelog upon commit though. Thanks. -->
11 April 2014-Jarcolr updated:-
Jarcolr updated:+6-13-13Asanadas updated:@@ -1587,7 +1603,7 @@ should be listed in the changelog upon commit though. Thanks. -->30.04.2013Spamcat updated:@@ -1716,7 +1732,7 @@ should be listed in the changelog upon commit though. Thanks. -->March 9th 2013Cael Aislinn updated:
20/02/2013Chinsky updated:
|