cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moves charcoal out from under the contraband wire in nanomeds(the wall ones) (#22329)

Browse Source 
* charcoal? contraband??

* guh

* fixes gatto ass sorting

* i conflicted myself!

* gawd damn it
This commit is contained in:
1080pCat
2023-09-28 19:31:09 -04:00
committed by GitHub
parent eee4d8b3d2
commit 416f4580f0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vendors/contraband_vendors.dm
Vendored
+3 -3
View File
@@ -16,12 +16,12 @@
req_access_txt = "150"
products = list(/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/ointment = 2,
/obj/item/reagent_containers/syringe/charcoal = 4,
/obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4,
/obj/item/healthanalyzer = 1)
contraband = list(/obj/item/reagent_containers/syringe/charcoal = 4,
/obj/item/reagent_containers/syringe/antiviral = 4,
/obj/item/reagent_containers/food/pill/tox = 1)
contraband = list(/obj/item/reagent_containers/syringe/antiviral = 4,
/obj/item/reagent_containers/food/pill/tox = 1)
/obj/machinery/economy/vending/syndicigs
name = "\improper Suspicious Cigarette Machine"
code/game/machinery/vendors/generic_vendors.dm
Vendored
+2 -2
View File
@@ -1250,11 +1250,11 @@
tiltable = FALSE
products = list(/obj/item/stack/medical/bruise_pack = 2,
/obj/item/stack/medical/ointment = 2,
/obj/item/reagent_containers/syringe/charcoal = 4,
/obj/item/reagent_containers/hypospray/autoinjector/epinephrine = 4,
/obj/item/healthanalyzer = 1)
contraband = list(/obj/item/reagent_containers/syringe/charcoal = 4,
/obj/item/reagent_containers/syringe/antiviral = 4,
contraband = list(/obj/item/reagent_containers/syringe/antiviral = 4,
/obj/item/reagent_containers/food/pill/tox = 1)
armor = list(MELEE = 50, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)