cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Syndicate borg update, add medical syndicate borg, energy sword refactor

Browse Source
This commit is contained in:
Markolie
2015-10-01 04:21:24 +02:00
parent 700baff0ff
commit d18b18b5b4
33 changed files with 445 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/reagents/reagent_containers/borghydro.dm
View File

@@ -22,6 +22,14 @@
/obj/item/weapon/reagent_containers/borghypo/crisis
reagent_ids = list("salglu_solution", "epinephrine", "sal_acid")
/obj/item/weapon/reagent_containers/borghypo/syndicate
name = "syndicate cyborg hypospray"
desc = "An experimental piece of Syndicate technology used to produce powerful restorative nanites used to very quickly restore injuries of all types. Also metabolizes potassium iodide, for radiation poisoning, and morphine, for offense."
icon_state = "borghypo_s"
charge_cost = 20
recharge_time = 2
reagent_ids = list("omnizine", "salbutamol", "mannitol", "mutadone", "charcoal", "potass_iodide")
/obj/item/weapon/reagent_containers/borghypo/New()
..()

2
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -184,7 +184,7 @@
)
else if( \
istype(W, /obj/item/weapon/circular_saw) || \
istype(W, /obj/item/weapon/melee/energy/sword) && W:active || \
istype(W, /obj/item/weapon/melee/energy/sword/saber) && W:active || \
istype(W, /obj/item/weapon/melee/energy/blade) || \
istype(W, /obj/item/weapon/shovel) || \
istype(W, /obj/item/weapon/hatchet) \