cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24024 from RandomMarine/pillsplitter

Browse Source 
Splits charcoal pills apart
This commit is contained in:
Jordie
2017-02-14 10:57:44 +11:00
committed by GitHub
parent 4af765bbc6 6cfa865b4c
commit ff77631a8d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/weapons/storage/firstaid.dm
View File

@@ -60,10 +60,10 @@
..()
if(empty) return
icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
for(var/i in 1 to 3)
for(var/i in 1 to 4)
new /obj/item/weapon/reagent_containers/syringe/charcoal(src)
for(var/i in 1 to 3)
new /obj/item/weapon/reagent_containers/pill/charcoal(src)
for(var/i in 1 to 2)
new /obj/item/weapon/storage/pill_bottle/charcoal(src)
new /obj/item/device/healthanalyzer(src)
return

2
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
View File

@@ -399,7 +399,7 @@
desc = "A refrigerated storage unit for medicine storage."
var/list/spawn_meds = list(
/obj/item/weapon/reagent_containers/pill/epinephrine = 12,
/obj/item/weapon/reagent_containers/pill/charcoal = 1,
/obj/item/weapon/reagent_containers/pill/charcoal = 5,
/obj/item/weapon/reagent_containers/glass/bottle/epinephrine = 1,
/obj/item/weapon/reagent_containers/glass/bottle/charcoal = 1)

2
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -103,7 +103,7 @@
name = "antitoxin pill"
desc = "Neutralizes many common toxins."
icon_state = "pill17"
list_reagents = list("charcoal" = 50)
list_reagents = list("charcoal" = 10)
roundstart = 1
/obj/item/weapon/reagent_containers/pill/epinephrine
name = "epinephrine pill"