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

Use material defines more

Browse Source
This commit is contained in:
Aronai Sieyes
2021-07-03 18:18:05 -04:00
parent 4b52bf232f
commit b71c7e7271
206 changed files with 908 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/bot/floorbot.dm
+1 -1
View File
@@ -278,7 +278,7 @@
update_icons()
else if(istype(A, /obj/item/stack/material) && amount + 4 <= maxAmount)
var/obj/item/stack/material/M = A
if(M.get_material_name() == DEFAULT_WALL_MATERIAL)
if(M.get_material_name() == MAT_STEEL)
visible_message("<span class='notice'>\The [src] begins to make tiles.</span>")
busy = 1
update_icons()
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
+1 -1
View File
@@ -237,7 +237,7 @@
/mob/living/simple_mob/protean_blob/Life()
. = ..()
if(. && istype(refactory) && humanform)
if(!healing && (human_brute || human_burn) && refactory.get_stored_material(DEFAULT_WALL_MATERIAL) >= 100)
if(!healing && (human_brute || human_burn) && refactory.get_stored_material(MAT_STEEL) >= 100)
healing = humanform.add_modifier(/datum/modifier/protean/steel, origin = refactory)
else if(healing && !(human_brute || human_burn))
healing.expire()
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
+3 -3
View File
@@ -28,13 +28,13 @@
//Organ is missing, needs restoring
if(!organs_by_name[choice] || istype(organs_by_name[choice], /obj/item/organ/external/stump)) //allows limb stumps to regenerate like removed limbs.
if(refactory.get_stored_material(DEFAULT_WALL_MATERIAL) < PER_LIMB_STEEL_COST)
if(refactory.get_stored_material(MAT_STEEL) < PER_LIMB_STEEL_COST)
to_chat(src,"<span class='warning'>You're missing that limb, and need to store at least [PER_LIMB_STEEL_COST] steel to regenerate it.</span>")
return
var/regen = tgui_alert(src,"That limb is missing, do you want to regenerate it in exchange for [PER_LIMB_STEEL_COST] steel?","Regenerate limb?",list("Yes","No"))
if(regen != "Yes")
return
if(!refactory.use_stored_material(DEFAULT_WALL_MATERIAL,PER_LIMB_STEEL_COST))
if(!refactory.use_stored_material(MAT_STEEL,PER_LIMB_STEEL_COST))
return
if(organs_by_name[choice])
var/obj/item/organ/external/oldlimb = organs_by_name[choice]
@@ -148,7 +148,7 @@
return
//Not enough resources (AND spends the resources, should be the last check)
if(!refactory.use_stored_material(DEFAULT_WALL_MATERIAL,refactory.max_storage))
if(!refactory.use_stored_material(MAT_STEEL,refactory.max_storage))
to_chat(src, "<span class='warning'>You need to be maxed out on normal metal to do this!</span>")
return
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
+1 -1
View File
@@ -231,7 +231,7 @@
/datum/modifier/protean
stacks = MODIFIER_STACK_FORBID
var/material_use = METAL_PER_TICK
var/material_name = DEFAULT_WALL_MATERIAL
var/material_name = MAT_STEEL
/datum/modifier/protean/on_applied()
. = ..()
code/modules/mob/living/silicon/robot/analyzer.dm
+1 -1
View File
@@ -12,7 +12,7 @@
throw_speed = 5
throw_range = 10
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 1, TECH_ENGINEERING = 2)
matter = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
matter = list(MAT_STEEL = 500, MAT_GLASS = 200)
var/mode = 1;
/obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
code/modules/mob/living/silicon/robot/component.dm
+1 -1
View File
@@ -212,7 +212,7 @@
name = "broken component"
icon = 'icons/obj/robot_component.dmi'
icon_state = "broken"
matter = list(DEFAULT_WALL_MATERIAL = 1000)
matter = list(MAT_STEEL = 1000)
/obj/item/broken_device/random
var/list/possible_icons = list("binradio_broken",
code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+1 -1
View File
@@ -622,7 +622,7 @@
if(istype(T,/obj/item/stack))
var/obj/item/stack/stack = T
total_material *= stack.get_amount()
if(material == DEFAULT_WALL_MATERIAL)
if(material == MAT_STEEL)
metal.add_charge(total_material)
if(material == "glass")
glass.add_charge(total_material)