cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 22:48:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

some moire

Browse Source
This commit is contained in:
Kashargul
2024-12-06 21:54:05 +01:00
parent 80edcd2c3d
commit 429398bdd7
231 changed files with 2484 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/bags.dm
+20 -20
View File
@@ -108,26 +108,26 @@
var/current_capacity = 0
var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry.
var/list/stored_ore = list(
"sand" = 0,
"hematite" = 0,
"carbon" = 0,
"raw copper" = 0,
"raw tin" = 0,
"void opal" = 0,
"painite" = 0,
"quartz" = 0,
"raw bauxite" = 0,
"phoron" = 0,
"silver" = 0,
"gold" = 0,
"marble" = 0,
"uranium" = 0,
"diamond" = 0,
"platinum" = 0,
"lead" = 0,
"mhydrogen" = 0,
"verdantium" = 0,
"rutile" = 0)
ORE_SAND = 0,
ORE_HEMATITE = 0,
ORE_CARBON = 0,
ORE_COPPER = 0,
ORE_TIN = 0,
ORE_VOPAL = 0,
ORE_PAINITE = 0,
ORE_QUARTZ = 0,
ORE_BAUXITE = 0,
ORE_PHORON = 0,
ORE_SILVER = 0,
ORE_GOLD = 0,
ORE_MARBLE = 0,
ORE_URANIUM = 0,
ORE_DIAMOND = 0,
ORE_PLATINUM = 0,
ORE_LEAD = 0,
ORE_MHYDROGEN = 0,
ORE_VERDANTIUM = 0,
ORE_RUTILE = 0)
var/last_update = 0
/obj/item/storage/bag/ore/holding
code/game/objects/items/weapons/storage/bible.dm
+3 -3
View File
@@ -103,10 +103,10 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
/obj/item/storage/bible/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity) return
if(user.mind && (user.mind.assigned_role == JOB_CHAPLAIN))
if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
if(A.reagents && A.reagents.has_reagent(REAGENT_ID_WATER)) //blesses all the water in the holder
to_chat(user, span_notice("You bless [A]."))
var/water2holy = A.reagents.get_reagent_amount("water")
A.reagents.del_reagent("water")
var/water2holy = A.reagents.get_reagent_amount(REAGENT_ID_WATER)
A.reagents.del_reagent(REAGENT_ID_WATER)
A.reagents.add_reagent("holywater",water2holy)
/obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob)
code/game/objects/items/weapons/storage/mre.dm
+4 -4
View File
@@ -364,19 +364,19 @@ MRE Stuff
if("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders")
icon_state = "tgmcmre_entree"
nutriment_amt = 5
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
if("meatballs", "cheese spread", "beef turnover", "mashed potatoes")
icon_state = "tgmcmre_side"
nutriment_amt = 3
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE= 1)
if("biscuit", "pretzels", "peanuts", "cracker")
icon_state = "tgmcmre_snack"
nutriment_amt = 2
starts_with = list("sodiumchloride" = 1)
starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
if("spiced apples", "chocolate brownie", "sugar cookie", "choco bar")
icon_state = "tgmcmre_dessert"
nutriment_amt = 2
starts_with = list("sugar" = 1)
starts_with = list(REAGENT_ID_SUGAR = 1)
package_open_state = "tgmcmre_[flavor]"
nutriment_desc = list("[new_taste]" = nutriment_amt)
code/game/objects/items/weapons/storage/uplink_kits.dm
+6 -6
View File
@@ -196,26 +196,26 @@
var/obj/item/storage/fancy/cigarettes/pack
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
pack.desc += " 'F' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
pack.desc += " 'F' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
pack.desc += " 'S' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
pack.desc += " 'S' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
// Dylovene. Going with 1.5 rather than 1.6666666...
fill_cigarre_package(pack, list("potassium" = 1.5, REAGENT_ID_NITROGEN = 1.5, "silicon" = 1.5))
fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 1.5, REAGENT_ID_NITROGEN = 1.5, REAGENT_ID_SILICON = 1.5))
// Mindbreaker
fill_cigarre_package(pack, list("silicon" = 4.5, "hydrogen" = 4.5))
fill_cigarre_package(pack, list(REAGENT_ID_SILICON = 4.5, REAGENT_ID_HYDROGEN = 4.5))
pack.desc += " 'MB' has been scribbled on it."