cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
This commit is contained in:
Fox McCloud
2019-09-21 12:40:07 -04:00
parent aa49033844 2ec03f63e5
commit 238ea19d09
280 changed files with 2015 additions and 77150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/syringes.dm
+16 -1
View File
@@ -327,4 +327,19 @@
desc = "A syringe recovered from a dread place. It probably isn't wise to use."
amount_per_transfer_from_this = 1
volume = 1
list_reagents = list("gluttonytoxin" = 1)
list_reagents = list("gluttonytoxin" = 1)
/obj/item/reagent_containers/syringe/capulettium_plus
name = "capulettium plus syringe"
desc = "For silencing targets. Allows for fake deaths."
list_reagents = list("capulettium_plus" = 15)
/obj/item/reagent_containers/syringe/sarin
name = "sarin syringe"
desc = "A deadly neurotoxin, for killing."
list_reagents = list("sarin" = 15)
/obj/item/reagent_containers/syringe/pancuronium
name = "pancuronium syringe"
desc = "A powerful paralyzing poison."
list_reagents = list("pancuronium" = 15)