cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into universal-damage

Browse Source
This commit is contained in:
Fox McCloud
2019-09-14 21:15:31 -04:00
parent 5943ad2902 8ec0477f76
commit 1bfb442d40
212 changed files with 2977 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/hypospray.dm
+4 -4
View File
@@ -82,12 +82,12 @@
/obj/item/reagent_containers/hypospray/combat
name = "combat stimulant injector"
desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat."
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10)
amount_per_transfer_from_this = 15
possible_transfer_amounts = list(15)
icon_state = "combat_hypo"
volume = 75
volume = 90
ignore_flags = 1 // So they can heal their comrades.
list_reagents = list("epinephrine" = 30, "omnizine" = 30, "teporone" = 15)
list_reagents = list("epinephrine" = 30, "weak_omnizine" = 30, "salglu_solution" = 30)
/obj/item/reagent_containers/hypospray/combat/nanites
desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with expensive medical nanites for rapid healing."
code/modules/reagents/reagent_containers/patch.dm
+2 -2
View File
@@ -28,8 +28,8 @@
list_reagents = list("silver_sulfadiazine" = 40)
/obj/item/reagent_containers/food/pill/patch/synthflesh
name = "syntheflesh patch"
desc = "Helps with burn injuries."
name = "synthflesh patch"
desc = "Helps with brute and burn injuries."
icon_state = "bandaid_med"
instant_application = 1
list_reagents = list("synthflesh" = 20)