mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 22:18:27 +01:00
removes var/ inside all procs (#19450)
* removes var/ inside all procs * . * ugh
This commit is contained in:
@@ -250,7 +250,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
|
||||
var/wiki_flag = 0
|
||||
|
||||
// Placeholders for light tiles and rglass.
|
||||
/datum/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
|
||||
/datum/material/proc/build_rod_product(mob/user, obj/item/stack/used_stack, obj/item/stack/target_stack)
|
||||
if(!rod_product)
|
||||
to_chat(user, span_warning("You cannot make anything out of \the [target_stack]"))
|
||||
return
|
||||
@@ -263,7 +263,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
|
||||
S.add_fingerprint(user)
|
||||
S.add_to_stacks(user)
|
||||
|
||||
/datum/material/proc/build_wired_product(var/mob/living/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
|
||||
/datum/material/proc/build_wired_product(mob/living/user, obj/item/stack/used_stack, obj/item/stack/target_stack)
|
||||
if(!wire_product)
|
||||
to_chat(user, span_warning("You cannot make anything out of \the [target_stack]"))
|
||||
return
|
||||
@@ -288,7 +288,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
|
||||
shard_icon = shard_type
|
||||
|
||||
// This is a placeholder for proper integration of windows/windoors into the system.
|
||||
/datum/material/proc/build_windows(var/mob/living/user, var/obj/item/stack/used_stack)
|
||||
/datum/material/proc/build_windows(mob/living/user, obj/item/stack/used_stack)
|
||||
return 0
|
||||
|
||||
// Weapons handle applying a divisor for this value locally.
|
||||
@@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
|
||||
return hardness //todo
|
||||
|
||||
// Snowflakey, only checked for alien doors at the moment.
|
||||
/datum/material/proc/can_open_material_door(var/mob/living/user)
|
||||
/datum/material/proc/can_open_material_door(mob/living/user)
|
||||
return 1
|
||||
|
||||
// Currently used for weapons and objects made of uranium to irradiate things.
|
||||
@@ -324,7 +324,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
|
||||
supply_conversion_value = 0
|
||||
|
||||
// Places a girder object when a wall is dismantled, also applies reinforced material.
|
||||
/datum/material/proc/place_dismantled_girder(var/turf/target, var/datum/material/reinf_material, var/datum/material/girder_material)
|
||||
/datum/material/proc/place_dismantled_girder(turf/target, datum/material/reinf_material, datum/material/girder_material)
|
||||
var/obj/structure/girder/G = new(target)
|
||||
if(reinf_material)
|
||||
G.reinf_material = reinf_material
|
||||
@@ -335,17 +335,17 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
|
||||
|
||||
// General wall debris product placement.
|
||||
// Not particularly necessary aside from snowflakey cult girders.
|
||||
/datum/material/proc/place_dismantled_product(var/turf/target, var/amount = 1) //Added an amount var to this. Lets multi-dropped walls to drop all of their sheets together. Woo!
|
||||
/datum/material/proc/place_dismantled_product(turf/target, amount = 1) //Added an amount var to this. Lets multi-dropped walls to drop all of their sheets together. Woo!
|
||||
place_sheet(target, amount)
|
||||
|
||||
// Debris product. Used ALL THE TIME.
|
||||
/datum/material/proc/place_sheet(var/turf/target, amount)
|
||||
/datum/material/proc/place_sheet(turf/target, amount)
|
||||
amount = round(amount)
|
||||
if(stack_type && amount > 0)
|
||||
return new stack_type(target, amount)
|
||||
|
||||
// As above.
|
||||
/datum/material/proc/place_shard(var/turf/target)
|
||||
/datum/material/proc/place_shard(turf/target)
|
||||
if(shard_type)
|
||||
return new /obj/item/material/shard(target, src.name)
|
||||
|
||||
@@ -353,11 +353,11 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
|
||||
/datum/material/proc/is_brittle()
|
||||
return !!(flags & MATERIAL_BRITTLE)
|
||||
|
||||
/datum/material/proc/combustion_effect(var/turf/T, var/temperature)
|
||||
/datum/material/proc/combustion_effect(turf/T, temperature)
|
||||
return
|
||||
|
||||
// Used by walls to do on-touch things, after checking for crumbling and open-ability.
|
||||
/datum/material/proc/wall_touch_special(var/turf/simulated/wall/W, var/mob/living/L)
|
||||
/datum/material/proc/wall_touch_special(turf/simulated/wall/W, mob/living/L)
|
||||
return
|
||||
|
||||
/datum/material/proc/get_recipes()
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
..()
|
||||
|
||||
/obj/item/stack/material/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
||||
/obj/item/stack/material/attack_generic(mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
||||
if(user.handle_eat_minerals(src))
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
..()
|
||||
|
||||
@@ -12,15 +12,15 @@
|
||||
wiki_flag = WIKI_SPOILER
|
||||
supply_conversion_value = 0
|
||||
|
||||
/datum/material/cult/place_dismantled_girder(var/turf/target)
|
||||
/datum/material/cult/place_dismantled_girder(turf/target)
|
||||
new /obj/structure/girder/cult(target, MAT_CULT)
|
||||
|
||||
/datum/material/cult/place_dismantled_product(var/turf/target)
|
||||
/datum/material/cult/place_dismantled_product(turf/target)
|
||||
new /obj/effect/decal/cleanable/blood(target)
|
||||
|
||||
/datum/material/cult/reinf
|
||||
name = MAT_CULT2
|
||||
display_name = "human remains"
|
||||
|
||||
/datum/material/cult/reinf/place_dismantled_product(var/turf/target)
|
||||
/datum/material/cult/reinf/place_dismantled_product(turf/target)
|
||||
new /obj/effect/decal/remains/human(target)
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
/*
|
||||
// Commenting this out while fires are so spectacularly lethal, as I can't seem to get this balanced appropriately.
|
||||
/datum/material/phoron/combustion_effect(var/turf/T, var/temperature, var/effect_multiplier)
|
||||
/datum/material/phoron/combustion_effect(turf/T, temperature, effect_multiplier)
|
||||
if(isnull(ignition_point))
|
||||
return 0
|
||||
if(temperature < ignition_point)
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
rod_product = /obj/item/stack/material/glass/reinforced
|
||||
supply_conversion_value = 0.25
|
||||
|
||||
/datum/material/glass/build_windows(var/mob/living/user, var/obj/item/stack/used_stack)
|
||||
/datum/material/glass/build_windows(mob/living/user, obj/item/stack/used_stack)
|
||||
|
||||
if(!user || !used_stack || !created_window || !created_fulltile_window || !window_options.len)
|
||||
return 0
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT)
|
||||
supply_conversion_value = 0.25
|
||||
|
||||
/datum/material/steel/hull/place_sheet(var/turf/target) //Deconstructed into normal steel sheets.
|
||||
/datum/material/steel/hull/place_sheet(turf/target) //Deconstructed into normal steel sheets.
|
||||
new /obj/item/stack/material/steel(target)
|
||||
|
||||
/datum/material/plasteel/hull
|
||||
@@ -26,7 +26,7 @@
|
||||
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
|
||||
composite_material = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
|
||||
|
||||
/datum/material/plasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets.
|
||||
/datum/material/plasteel/hull/place_sheet(turf/target) //Deconstructed into normal plasteel sheets.
|
||||
new /obj/item/stack/material/plasteel(target)
|
||||
|
||||
/datum/material/durasteel/hull //The 'Hardball' of starship hulls.
|
||||
@@ -41,7 +41,7 @@
|
||||
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
|
||||
composite_material = list(MAT_DURASTEEL = SHEET_MATERIAL_AMOUNT)
|
||||
|
||||
/datum/material/durasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal durasteel sheets.
|
||||
/datum/material/durasteel/hull/place_sheet(turf/target) //Deconstructed into normal durasteel sheets.
|
||||
new /obj/item/stack/material/durasteel(target)
|
||||
|
||||
/datum/material/titanium/hull
|
||||
@@ -53,7 +53,7 @@
|
||||
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
|
||||
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT)
|
||||
|
||||
/datum/material/titanium/hull/place_sheet(var/turf/target) //Deconstructed into normal titanium sheets.
|
||||
/datum/material/titanium/hull/place_sheet(turf/target) //Deconstructed into normal titanium sheets.
|
||||
new /obj/item/stack/material/titanium(target)
|
||||
|
||||
/datum/material/morphium/hull
|
||||
@@ -65,7 +65,7 @@
|
||||
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
|
||||
composite_material = list(MAT_MORPHIUM = SHEET_MATERIAL_AMOUNT)
|
||||
|
||||
/datum/material/morphium/hull/place_sheet(var/turf/target)
|
||||
/datum/material/morphium/hull/place_sheet(turf/target)
|
||||
new /obj/item/stack/material/morphium(target)
|
||||
|
||||
/datum/material/plastitanium/hull
|
||||
@@ -79,7 +79,7 @@
|
||||
flags = MATERIAL_NO_SYNTH
|
||||
composite_material = list(MAT_PLASTITANIUM = SHEET_MATERIAL_AMOUNT)
|
||||
|
||||
/datum/material/plastitanium/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets.
|
||||
/datum/material/plastitanium/hull/place_sheet(turf/target) //Deconstructed into normal plasteel sheets.
|
||||
new /obj/item/stack/material/plastitanium(target)
|
||||
|
||||
/datum/material/gold/hull
|
||||
@@ -92,5 +92,5 @@
|
||||
flags = MATERIAL_NO_SYNTH
|
||||
composite_material = list(MAT_GOLD = SHEET_MATERIAL_AMOUNT)
|
||||
|
||||
/datum/material/gold/hull/place_sheet(var/turf/target) //Deconstructed into normal gold sheets.
|
||||
/datum/material/gold/hull/place_sheet(turf/target) //Deconstructed into normal gold sheets.
|
||||
new /obj/item/stack/material/gold(target)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
/datum/material/diona/place_dismantled_product()
|
||||
return
|
||||
|
||||
/datum/material/diona/place_dismantled_girder(var/turf/target)
|
||||
/datum/material/diona/place_dismantled_girder(turf/target)
|
||||
spawn_diona_nymph(target)
|
||||
|
||||
/datum/material/chitin
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
stack_type = /obj/item/stack/material/resin
|
||||
supply_conversion_value = 2
|
||||
|
||||
/datum/material/resin/can_open_material_door(var/mob/living/user)
|
||||
/datum/material/resin/can_open_material_door(mob/living/user)
|
||||
var/mob/living/carbon/M = user
|
||||
if(istype(M) && locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
|
||||
return TRUE
|
||||
@@ -23,7 +23,7 @@
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/datum/material/resin/wall_touch_special(var/turf/simulated/wall/W, var/mob/living/L)
|
||||
/datum/material/resin/wall_touch_special(turf/simulated/wall/W, mob/living/L)
|
||||
var/mob/living/carbon/M = L
|
||||
if(istype(M) && locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
|
||||
to_chat(M, "\The [W] shudders under your touch, starting to become porous.")
|
||||
|
||||
@@ -72,13 +72,13 @@
|
||||
return "There [amount == 1 ? "is" : "are"] [amount] [material.sheet_singular_name]\s in the [material.sheet_collective_name]."
|
||||
return ..()
|
||||
|
||||
/obj/item/stack/material/use(var/used)
|
||||
/obj/item/stack/material/use(used)
|
||||
. = ..()
|
||||
if(QDELETED(src))
|
||||
return
|
||||
update_strings()
|
||||
|
||||
/obj/item/stack/material/transfer_to(obj/item/stack/S, var/tamount=null, var/type_verified)
|
||||
/obj/item/stack/material/transfer_to(obj/item/stack/S, tamount=null, type_verified)
|
||||
var/obj/item/stack/material/M = S
|
||||
if(!istype(M) || material.name != M.material.name)
|
||||
return 0
|
||||
@@ -96,7 +96,7 @@
|
||||
if(!material.build_windows(user, src))
|
||||
tgui_interact(user)
|
||||
|
||||
/obj/item/stack/material/attackby(var/obj/item/W, var/mob/user)
|
||||
/obj/item/stack/material/attackby(obj/item/W, mob/user)
|
||||
if(istype(W,/obj/item/stack/cable_coil))
|
||||
material.build_wired_product(user, W, src)
|
||||
return
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
stacktype = "hide"
|
||||
no_variants = TRUE
|
||||
// This needs to be very clearly documented for players. Whether it should stay in the main description is up for debate.
|
||||
/obj/item/stack/animalhide/examine(var/mob/user)
|
||||
/obj/item/stack/animalhide/examine(mob/user)
|
||||
. = ..()
|
||||
. += description_info
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
max_amount = 20
|
||||
stacktype = "hairlesshide"
|
||||
|
||||
/obj/item/stack/hairlesshide/examine(var/mob/user)
|
||||
/obj/item/stack/hairlesshide/examine(mob/user)
|
||||
. = ..()
|
||||
. += description_info
|
||||
|
||||
/obj/item/stack/hairlesshide/water_act(var/wateramount)
|
||||
/obj/item/stack/hairlesshide/water_act(wateramount)
|
||||
. = ..()
|
||||
wateramount = min(amount, round(wateramount))
|
||||
for(var/i in 1 to wateramount)
|
||||
@@ -35,7 +35,7 @@
|
||||
// Increment the amount
|
||||
src.use(1)
|
||||
|
||||
/obj/item/stack/hairlesshide/proc/rapidcure(var/stacknum = 1)
|
||||
/obj/item/stack/hairlesshide/proc/rapidcure(stacknum = 1)
|
||||
stacknum = min(stacknum, amount)
|
||||
|
||||
while(stacknum)
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
var/dry_type = /obj/item/stack/material/leather
|
||||
|
||||
/obj/item/stack/wetleather/examine(var/mob/user)
|
||||
/obj/item/stack/wetleather/examine(mob/user)
|
||||
. = ..()
|
||||
. += description_info
|
||||
. += "\The [src] is [get_dryness_text()]."
|
||||
@@ -42,7 +42,7 @@
|
||||
use(get_amount())
|
||||
return L
|
||||
|
||||
/obj/item/stack/wetleather/transfer_to(obj/item/stack/S, var/tamount=null, var/type_verified)
|
||||
/obj/item/stack/wetleather/transfer_to(obj/item/stack/S, tamount=null, type_verified)
|
||||
. = ..()
|
||||
if(.) // If it transfers any, do a weighted average of the wetness
|
||||
var/obj/item/stack/wetleather/W = S
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
visible_message("The [drying] is dry!")
|
||||
update_icon()
|
||||
|
||||
/obj/structure/tanning_rack/examine(var/mob/user)
|
||||
/obj/structure/tanning_rack/examine(mob/user)
|
||||
. = ..()
|
||||
if(drying)
|
||||
. += "\The [drying] is [drying.get_dryness_text()]."
|
||||
@@ -34,7 +34,7 @@
|
||||
else
|
||||
add_overlay("leather_dry")
|
||||
|
||||
/obj/structure/tanning_rack/attackby(var/atom/A, var/mob/user)
|
||||
/obj/structure/tanning_rack/attackby(atom/A, mob/user)
|
||||
if(istype(A, /obj/item/stack/wetleather))
|
||||
if(!drying) // If not drying anything, start drying the thing
|
||||
if(user.unEquip(A, target = src))
|
||||
@@ -46,7 +46,7 @@
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
/obj/structure/tanning_rack/attack_hand(var/mob/user)
|
||||
/obj/structure/tanning_rack/attack_hand(mob/user)
|
||||
if(drying)
|
||||
var/obj/item/stack/S = drying
|
||||
if(!drying.wetness) // If it's dry, make a stack of dry leather and prepare to put that in their hands
|
||||
@@ -63,5 +63,5 @@
|
||||
drying = null
|
||||
update_icon()
|
||||
|
||||
/obj/structure/tanning_rack/attack_robot(var/mob/user)
|
||||
/obj/structure/tanning_rack/attack_robot(mob/user)
|
||||
attack_hand(user) // That has checks to
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
color = "#6f432a"
|
||||
plank_type = /obj/item/stack/material/wood/hard
|
||||
|
||||
/obj/item/stack/material/log/attackby(var/obj/item/W, var/mob/user)
|
||||
/obj/item/stack/material/log/attackby(obj/item/W, mob/user)
|
||||
if(!istype(W) || W.force <= 0)
|
||||
return ..()
|
||||
if(W.sharp && W.edge)
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
w_class = min(5, round(amount / 10) + 1)
|
||||
throw_range = round(amount / 7) + 1
|
||||
|
||||
/obj/item/stack/material/supermatter/use(var/used)
|
||||
/obj/item/stack/material/supermatter/use(used)
|
||||
. = ..()
|
||||
update_mass()
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user