cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mediborg's hypospray produces Doctor's Delight instead of Tricord.

Browse Source 
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
This commit is contained in:
Kortgstation@gmail.com
2012-10-14 19:05:48 +00:00
parent edb2283ab4
commit 80d18c4b1e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/syndicate.dm
+3 -3
View File
@@ -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 <B>[src] blocks [Proj] with its shield!</B>")
code/modules/reagents/reagent_containers/borghydro.dm
+2 -2
View File
@@ -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()
code/modules/reagents/reagent_containers/hypospray.dm
+1 -1
View File
@@ -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)