From 79b156ca6bb9c4d8d1437b44a08a7249944f5e35 Mon Sep 17 00:00:00 2001 From: Sonoida Date: Thu, 16 Feb 2023 17:53:28 +0100 Subject: [PATCH] fixing someone's errors what a goober, amirite --- code/modules/antagonists/nukeop/equipment/nuclearbomb.dm | 1 - .../food_and_drinks/recipes/tablecraft/recipes_cake.dm | 4 ++-- code/modules/projectiles/projectile/magic.dm | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 4a79b5d0..2ad009cd 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -664,7 +664,6 @@ This is here to make the tiles around the station mininuke change when it's arme loneop.weight += 1 // if(loneop.weight % 5 == 0) // message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].") // Commenting this out because it's a fucking pain for the admins - Sono - return log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].") else lastlocation = newturf diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index fa4c9603..02af84d9 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -201,5 +201,5 @@ /datum/reagent/consumable/sprinkles = 5, /datum/reagent/teslium = 1 //To shock the whole thing into life ) - result = /mob/living/simple_animal/cakegolem - subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Catpeople + // result = /mob/living/simple_animal/cakegolem + // subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Catpeople diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 6e86a933..4970b2ef 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -209,7 +209,7 @@ /mob/living/simple_animal/hostile/lizard, /mob/living/simple_animal/pet/fox, /mob/living/simple_animal/butterfly, - /mob/living/simple_animal/cakegolem //pet/cat/cak, + // /mob/living/simple_animal/cakegolem //pet/cat/cak, /mob/living/simple_animal/chick) new_mob = new path(M.loc) @@ -506,4 +506,4 @@ return var/turf/T = get_turf(target) for(var/i=0, i<50, i+=10) - addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, T, -1, exp_heavy, exp_light, exp_flash, FALSE, FALSE, exp_fire), i) \ No newline at end of file + addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, T, -1, exp_heavy, exp_light, exp_flash, FALSE, FALSE, exp_fire), i)