cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [MDB IGNORE] Refactors drinks and fixes a lot of food problems [MDB IGNORE] (#15577)

Browse Source 
* [MDB IGNORE] Refactors drinks and fixes a lot of food problems

* [MDB IGNORE] Refactors drinks and fixes a lot of food problems

* forgto 2 commit

* im slowly going insane

* why does find and replace not FIND everything

* hnghnnngh

* h

* l

* a

* a

* so close...

* delta fix

* I thought I committed this already, guess not

* this PR has been the bane of my fucking life

* orange juice

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-08-25 04:17:10 +02:00
committed by GitHub
parent d14465e9f5
commit 88c85fe1f7
369 changed files with 8902 additions and 8509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
+1 -1
View File
@@ -152,7 +152,7 @@
new /obj/item/hemostat(src)
if(6)
new /obj/item/reagent_containers/glass/beaker(src)
new /obj/item/reagent_containers/cup/beaker(src)
new /obj/item/clothing/glasses/science(src)
if(7)
new /obj/item/clothing/glasses/sunglasses(src)
code/modules/mapfluff/ruins/lavalandruin_code/syndicate_base.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/item/grenade/chem_grenade/pyro = 5,
/obj/item/grenade/chem_grenade/cryo = 5,
/obj/item/grenade/chem_grenade/adv_release = 5,
/obj/item/reagent_containers/food/drinks/bottle/holywater = 1)
/obj/item/reagent_containers/cup/glass/bottle/holywater = 1)
product_slogans = "It's not pyromania if you're getting paid!;You smell that? Plasma, son. Nothing else in the world smells like that.;I love the smell of Plasma in the morning."
resistance_flags = FIRE_PROOF
code/modules/mapfluff/ruins/spaceruin_code/forgottenship.dm
+7 -7
View File
@@ -20,17 +20,17 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
/obj/item/healthanalyzer = 4,
/obj/item/reagent_containers/pill/patch/libital = 5,
/obj/item/reagent_containers/pill/patch/aiuri = 5,
/obj/item/reagent_containers/glass/bottle/multiver = 1,
/obj/item/reagent_containers/glass/bottle/syriniver = 1,
/obj/item/reagent_containers/glass/bottle/epinephrine = 3,
/obj/item/reagent_containers/glass/bottle/morphine = 3,
/obj/item/reagent_containers/glass/bottle/potass_iodide = 1,
/obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
/obj/item/reagent_containers/cup/bottle/multiver = 1,
/obj/item/reagent_containers/cup/bottle/syriniver = 1,
/obj/item/reagent_containers/cup/bottle/epinephrine = 3,
/obj/item/reagent_containers/cup/bottle/morphine = 3,
/obj/item/reagent_containers/cup/bottle/potass_iodide = 1,
/obj/item/reagent_containers/cup/bottle/salglu_solution = 3,
/obj/item/reagent_containers/syringe/antiviral = 5,
/obj/item/reagent_containers/medigel/libital = 2,
/obj/item/reagent_containers/medigel/aiuri = 2,
/obj/item/reagent_containers/medigel/sterilizine = 1)
contraband = list(/obj/item/reagent_containers/glass/bottle/cold = 2,
contraband = list(/obj/item/reagent_containers/cup/bottle/cold = 2,
/obj/item/restraints/handcuffs = 4,
/obj/item/storage/backpack/duffelbag/syndie/surgery = 1,
/obj/item/storage/medkit/tactical = 1)
code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm
+1 -1
View File
@@ -234,7 +234,7 @@
sample.sample_color = COLOR_SAMPLE_BROWN
update_appearance()
/obj/item/reagent_containers/glass/beaker/oldstation
/obj/item/reagent_containers/cup/beaker/oldstation
name = "cultivation broth"
amount_per_transfer_from_this = 50
list_reagents = list(