From df3861c086a1ab67acf9e52d03910159ed8a4329 Mon Sep 17 00:00:00 2001 From: Duck- Date: Thu, 28 Aug 2014 15:22:06 -0400 Subject: [PATCH 1/2] Woops. Goldslimes. Re-enables, hopefully properly this time? Yay. Still figuring out cloneloss. Not enough time before update. Will puzzle more later or probably give up. I'm a giverupper. --- code/modules/reagents/Chemistry-Recipes.dm | 24 ++++++++-------------- data/investigate/gravity.html | 4 ++-- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 00ad5725..99d219f2 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1072,10 +1072,6 @@ datum required_container = /obj/item/slime_extract/gold required_other = 1 on_reaction(var/datum/reagents/holder) - for(var/mob/O in viewers(get_turf(holder.my_atom), null)) - O.show_message(text("The slime extract begins to vibrate violently !"), 1) - spawn(50) - var/blocked = list(/mob/living/simple_animal/hostile, /mob/living/simple_animal/hostile/pirate, /mob/living/simple_animal/hostile/pirate/ranged, @@ -1100,7 +1096,6 @@ datum for(var/mob/living/carbon/human/M in viewers(get_turf_loc(holder.my_atom), null)) if(M:eyecheck() <= 0) flick("e_flash", M.flash) - for(var/i = 1, i <= 5, i++) var/chosen = pick(critters) var/mob/living/simple_animal/hostile/C = new chosen @@ -1141,14 +1136,14 @@ datum /mob/living/simple_animal/hostile/alien/queen/large, /mob/living/simple_animal/hostile/retaliate, /mob/living/simple_animal/hostile/retaliate/clown, -/* /mob/living/simple_animal/hostile/mushroom, - /mob/living/simple_animal/hostile/asteroid, - /mob/living/simple_animal/hostile/asteroid/basilisk, - /mob/living/simple_animal/hostile/asteroid/goldgrub, - /mob/living/simple_animal/hostile/asteroid/goliath, - /mob/living/simple_animal/hostile/asteroid/hivelord, - /mob/living/simple_animal/hostile/asteroid/hivelordbrood, - /mob/living/simple_animal/hostile/carp/holocarp*/ + /mob/living/simple_animal/hostile/mushroom, +/* /mob/living/simple_animal/hostile/asteroid, + /mob/living/simple_animal/hostile/asteroid/basilisk, + /mob/living/simple_animal/hostile/asteroid/goldgrub, + /mob/living/simple_animal/hostile/asteroid/goliath, + /mob/living/simple_animal/hostile/asteroid/hivelord, + /mob/living/simple_animal/hostile/asteroid/hivelordbrood, + /mob/living/simple_animal/hostile/carp/holocarp*/ Monsters we don't have )//exclusion list for things you don't want the reaction to create. var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs @@ -1161,8 +1156,7 @@ datum var/chosen = pick(critters) var/mob/living/simple_animal/hostile/C = new chosen C.faction |= "neutral" - C.loc = get_turf(holder.my_atom) -*/ + C.loc = get_turf(holder.my_atom)*/ //Silver slimebork diff --git a/data/investigate/gravity.html b/data/investigate/gravity.html index 53516da6..c3b98f4e 100644 --- a/data/investigate/gravity.html +++ b/data/investigate/gravity.html @@ -1,2 +1,2 @@ -11:12 [0x200775e] (92,152,1) || the gravitational generator has regained power.
-11:12 [0x200775e] (92,152,1) || the gravitational generator is now charging.
+14:59 [0x200777c] (92,152,1) || the gravitational generator has regained power.
+14:59 [0x200777c] (92,152,1) || the gravitational generator is now charging.
From 6b4c959e0542c376ab8d0a93724f5c15ab57fa9a Mon Sep 17 00:00:00 2001 From: Duck- Date: Thu, 28 Aug 2014 15:29:21 -0400 Subject: [PATCH 2/2] Hacky vamp patchjob I probably should have left it alone! --- code/game/gamemodes/vampire/vampire.dm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index dd5f272b..188108cf 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -10,7 +10,7 @@ restricted_jobs = list("AI", "Cyborg", "Mobile MMI", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Security Pod Pilot", "Nanotrasen Recruiter", "Magistrate") //Consistent screening has filtered all infiltration attempts on high value jobs protected_jobs = list() required_players = 1 - required_players_secret = 15 + required_players_secret = 10 required_enemies = 1 recommended_enemies = 4 @@ -77,7 +77,8 @@ for(var/datum/mind/vampire in vampires) grant_vampire_powers(vampire.current) vampire.special_role = "Vampire" - forge_vampire_objectives(vampire) + if(!config.objectives_disabled) + forge_vampire_objectives(vampire) greet_vampire(vampire) spawn (rand(waittime_l, waittime_h)) @@ -121,13 +122,13 @@ special_role_text = lowertext(vampire.special_role) else special_role_text = "antagonist" - - if(traitorwin) - text += "
The [special_role_text] was successful!" - feedback_add_details("traitor_success","SUCCESS") - else - text += "
The [special_role_text] has failed!" - feedback_add_details("traitor_success","FAIL") + if (!config.objectives_disabled) + if(traitorwin) + text += "
The [special_role_text] was successful!" + feedback_add_details("traitor_success","SUCCESS") + else + text += "
The [special_role_text] has failed!" + feedback_add_details("traitor_success","FAIL") world << text return 1 @@ -152,6 +153,9 @@ /datum/game_mode/proc/forge_vampire_objectives(var/datum/mind/vampire) //Objectives are traitor objectives plus blood objectives + if (config.objectives_disabled) + return + var/datum/objective/blood/blood_objective = new blood_objective.owner = vampire blood_objective.gen_amount_goal(150, 400)