From 80d18c4b1e335cc2b8fb78163fc9173d435b644f Mon Sep 17 00:00:00 2001 From: "Kortgstation@gmail.com" Date: Sun, 14 Oct 2012 19:05:48 +0000 Subject: [PATCH] Mediborg's hypospray produces Doctor's Delight instead of Tricord. CMO's hypo starts filled with Doctor's Delight. Syndicate simple animals have a higher block chance vs projectiles than they do vs melee attacks (there are just way too many guns strewn about my map for them to live long otherwise) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4877 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/simple_animal/syndicate.dm | 6 +++--- code/modules/reagents/reagent_containers/borghydro.dm | 4 ++-- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/syndicate.dm b/code/modules/mob/living/simple_animal/syndicate.dm index ccf5f97c8b6..bbe5588d8a4 100644 --- a/code/modules/mob/living/simple_animal/syndicate.dm +++ b/code/modules/mob/living/simple_animal/syndicate.dm @@ -157,8 +157,8 @@ ///////////////Sword and shield//////////// /mob/living/simple_animal/syndicate/melee - melee_damage_lower = 15 - melee_damage_upper = 20 + melee_damage_lower = 20 + melee_damage_upper = 25 icon_state = "syndicatemelee" icon_living = "syndicatemelee" weapon1 = /obj/item/weapon/melee/energy/sword/red @@ -179,7 +179,7 @@ /mob/living/simple_animal/syndicate/melee/bullet_act(var/obj/item/projectile/Proj) if(!Proj) return - if(prob(80)) + if(prob(65)) src.health -= Proj.damage else visible_message("\red [src] blocks [Proj] with its shield!") diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 374a7857593..4bc5fd91dc1 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -34,7 +34,7 @@ if(R && R.cell) if(mode == 1 && reagents.total_volume < 30) //Don't recharge reagents and drain power if the storage is full. R.cell.use(charge_cost) //Take power from borg... - reagents.add_reagent("tricordrazine",5) //And fill hypo with reagent. + reagents.add_reagent("doctorsdelight",5) //And fill hypo with reagent. if(mode == 2 && reagents.total_volume < 30) R.cell.use(charge_cost) reagents.add_reagent("inaprovaline", 5) @@ -78,7 +78,7 @@ mode = 1 charge_tick = 0 reagents.clear_reagents() - user << "\blue Synthesizer is now producing 'Tricordrazine'." + user << "\blue Synthesizer is now producing 'Doctor's Delight'." return /obj/item/weapon/reagent_containers/borghypo/examine() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 5779fea6967..c5eef80558b 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -20,7 +20,7 @@ /obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty ..() - reagents.add_reagent("tricordrazine", 30) + reagents.add_reagent("doctorsdelight", 30) return /obj/item/weapon/reagent_containers/hypospray/attack(mob/M as mob, mob/user as mob)