From 82dcf22d592944579a57f9ee0b7fe7a3419901e4 Mon Sep 17 00:00:00 2001 From: "firecage@hotmail.com" Date: Thu, 14 Jul 2011 19:19:16 +0000 Subject: [PATCH] hydro mutations are fixed thanks to Urist. Also....Superxpdude. Check your paths next time for guns. Since you put M1911 with a capital M, but put it with a lowcase m in the pathname. Thus it would not compile. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1849 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/hydroponics.dm | 26 ++++++++++++-------------- code/game/objects/livestock.dm | 6 +++--- code/modules/admin/verbs/debug.dm | 2 +- tgstation.dme | 1 + 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 8c584f91200..f7ec2e5bd32 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -311,11 +311,11 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant! else if ( istype(src.myseed, /obj/item/seeds/berryseed )) del(src.myseed) - src.myseed = new /obj/item/seeds/poisonberryseed - - else if ( istype(src.myseed, /obj/item/seeds/berryseed )) - del(src.myseed) - src.myseed = new /obj/item/seeds/glowberryseed + switch(rand(1,100)) + if(1 to 50) + src.myseed = new /obj/item/seeds/poisonberryseed + if(51 to 100) + src.myseed = new /obj/item/seeds/glowberryseed else if ( istype(src.myseed, /obj/item/seeds/poisonberryseed )) del(src.myseed) @@ -323,15 +323,13 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant! else if ( istype(src.myseed, /obj/item/seeds/tomatoseed )) del(src.myseed) - src.myseed = new /obj/item/seeds/bluetomatoseed - - else if ( istype(src.myseed, /obj/item/seeds/tomatoseed )) - del(src.myseed) - src.myseed = new /obj/item/seeds/bloodtomatoseed - - else if ( istype(src.myseed, /obj/item/seeds/tomatoseed )) - del(src.myseed) - src.myseed = new /obj/item/seeds/killertomatoseed + switch(rand(1,100)) + if(1 to 35) + src.myseed = new /obj/item/seeds/bluetomatoseed + if(36 to 70) + src.myseed = new /obj/item/seeds/bloodtomatoseed + if(71 to 100) + src.myseed = new /obj/item/seeds/killertomatoseed else if ( istype(src.myseed, /obj/item/seeds/grapeseed )) del(src.myseed) diff --git a/code/game/objects/livestock.dm b/code/game/objects/livestock.dm index 25c47e37f3a..619e57ed193 100644 --- a/code/game/objects/livestock.dm +++ b/code/game/objects/livestock.dm @@ -444,10 +444,10 @@ desc = "Oh shit, you're really fucked now." icon_state = "killertomato" species = "killertomato" - aggressive = 1 + cowardly = 1 health = 75 maxhealth = 75 - strength = 19 + strength = 0 cycle_pause = 10 patience = 10 view_range = 14 @@ -460,7 +460,7 @@ new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src) special_attack() if (prob(stun_chance)) - target:stunned = max(target:stunned, (strength / 1)) + target:stunned = max(target:stunned, (strength / 2)) /obj/livestock/walkingmushroom name = "Walking Mushroom" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 651dd44f666..e18fc9d0f21 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -611,7 +611,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(new /obj/item/clothing/glasses/thermal/eyepatch(M), M.slot_glasses) M.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar/havanian(M), M.slot_wear_mask) M.equip_if_possible(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), M.slot_head) - M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/m1911(M), M.slot_belt) + M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), M.slot_belt) M.equip_if_possible(new /obj/item/weapon/zippo(M), M.slot_r_store) M.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(M), M.slot_back) diff --git a/tgstation.dme b/tgstation.dme index ed72d2a7e91..d6779e42b12 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -131,6 +131,7 @@ #define FILE_DIR "icons/turf" #define FILE_DIR "interface" #define FILE_DIR "maps" +#define FILE_DIR "maps/backup" #define FILE_DIR "sound" #define FILE_DIR "sound/ambience" #define FILE_DIR "sound/announcer"