cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update buffs.dm

Browse Source
This commit is contained in:
Nichlas Pihl
2019-07-08 08:07:18 +02:00
committed by GitHub
parent 988e73bd68
commit 07803db1aa
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/status_effects/buffs.dm
View File

@@ -485,11 +485,7 @@
else else
owner.visible_message("[owner]'s soul is absorbed into the rod, relieving the previous snake of its duty.") owner.visible_message("[owner]'s soul is absorbed into the rod, relieving the previous snake of its duty.")
var/mob/living/simple_animal/hostile/retaliate/poison/snake/healSnake = new(owner.loc) var/mob/living/simple_animal/hostile/retaliate/poison/snake/healSnake = new(owner.loc)
<<<<<<< HEAD
var/list/chems = list("bicaridine", "salbutamol", "kelotane", "antitoxin")
=======
var/list/chems = list(/datum/reagent/medicine/bicaridine, /datum/reagent/medicine/perfluorodecalin, /datum/reagent/medicine/kelotane, /datum/reagent/medicine/antitoxin) var/list/chems = list(/datum/reagent/medicine/bicaridine, /datum/reagent/medicine/perfluorodecalin, /datum/reagent/medicine/kelotane, /datum/reagent/medicine/antitoxin)
>>>>>>> 405205843f... Merge pull request #44279 from ExcessiveUseOfCobblestone/breathe-into-me
healSnake.poison_type = pick(chems) healSnake.poison_type = pick(chems)
healSnake.name = "Asclepius's Snake" healSnake.name = "Asclepius's Snake"
healSnake.real_name = "Asclepius's Snake" healSnake.real_name = "Asclepius's Snake"