cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source 
Also fixes a compiling error with previous PR
This commit is contained in:
Unknown
2019-03-28 17:24:03 -04:00
parent 9d056decda
commit ad181e797a
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -241,8 +241,6 @@
name = "bone repair injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one excels at treating damage to bones."
filled_reagents = list("inaprovaline" = 5, "osteodaxon" = 10)
<<<<<<< HEAD
=======
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose
name = "glucose hypo"
@@ -354,4 +352,3 @@
if(.) // Will occur if successfully injected.
infect_mob_random_lesser(H)
add_attack_logs(user, H, "Infected \the [H] with \the [src], by \the [user].")
>>>>>>> 3e9624c... Adds the Zaddat Race + Modifies pressure damage calculations (#5869)