cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 12:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update VOREStation specific code to use merged in features.

Browse Source 
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
This commit is contained in:
Leshana
2018-01-19 18:15:47 -05:00
parent 3c3dac7102
commit 436d48b337
5 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_items_vr.dm
+4 -4
View File
@@ -379,19 +379,19 @@
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_st
name = "vial (stabilize)"
desc = "10 Tricordrazine, 10 Dexalin Plus, 5 Tramadol, 5 Inaprovaline"
comes_with = list("tricordrazine"=10,"dexalinp"=10,"tramadol"=5,"inaprovaline"=5)
prefill = list("tricordrazine"=10,"dexalinp"=10,"tramadol"=5,"inaprovaline"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bt
name = "vial (brute)"
desc = "25 Bicaridine, 5 Tricordrazine"
comes_with = list("bicaridine"=25,"tricordrazine"=5)
prefill = list("bicaridine"=25,"tricordrazine"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_bu
name = "vial (burn)"
desc = "10 Kelotane, 15 Dermaline, 5 Tricordrazine"
comes_with = list("kelotane"=10,"dermaline"=15,"tricordrazine"=5)
prefill = list("kelotane"=10,"dermaline"=15,"tricordrazine"=5)
/obj/item/weapon/reagent_containers/glass/beaker/vial/vr/fluff/aro_tx
name = "vial (toxins)"
desc = "25 Dylovene, 2 Hyronalin, 3 Tricordrazine"
comes_with = list("anti_toxin"=25,"hyronalin"=2,"tricordrazine"=3)
prefill = list("anti_toxin"=25,"hyronalin"=2,"tricordrazine"=3)
//Swat43:Fortune Bloise
/obj/item/weapon/storage/backpack/satchel/fluff/swat43bag