shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maybe this will work. Maybe it won't.

Browse Source
This commit is contained in:
The0bserver
2020-09-05 18:52:20 -04:00
parent ee036bec7a
commit cddd46fce3
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/datums/materials/basemats.dm
View File

@@ -285,6 +285,17 @@ Unless you know what you're doing, only use the first three numbers. They're in
beauty_modifier = -0.15
texture_layer_icon_state = "runed"
/datum/material/brass
name = "brass"
desc = "Tybel gb-Ratvar"
color = "#9B7E24"
categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
strength_modifier = 1.2
sheet_type = /obj/item/stack/tile/brass
value_per_unit = 0.75
armor_modifiers = list("melee" = 1.4, "bullet" = 1.4, "laser" = 0, "energy" = 0, "bomb" = 1.4, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5) //Brass has.. a few problems that can't easily be compensated for.
beauty_modifier = 0.3 //It really beats the cold plain plating of the station, doesn't it?
/datum/material/bronze
name = "bronze"
desc = "Clock Cult? Never heard of it."

2
code/game/objects/items/stacks/sheets/sheet_types.dm
View File

@@ -636,7 +636,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \
null, \
new/datum/stack_recipe("brass flask", /obj/item/reagent_containers/food/drinks/bottle/holyoil/empty), \
new/datum/stack_recipe("brass smith's hammer", /obj/item/melee/smith/hammer/ratvar, 6), \
new/datum/stack_recipe("brass ingot", /obj/item/ingot/bronze/ratvar, 6, time = 100), \
new/datum/stack_recipe("brass ingot", /obj/item/ingot/ratvar, 6, time = 100), \
))
/obj/item/stack/tile/brass

4
code/modules/smithing/smithed_items.dm
View File

@@ -79,10 +79,10 @@
/obj/item/ingot/bronze
custom_materials = list(/datum/material/bronze=12000)
/obj/item/ingot/bronze/ratvar
/obj/item/ingot/ratvar
material_flags = MATERIAL_COLOR
name = "brass ingnot"
desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually more structurally stable bronze. Ratvar must have transformed the brass into bronze. Somehow."
desc = "On closer inspection, what appears to be wholly-unsuitable-for-smithing brass is actually primarily replicant alloy. Nezbere must have switched it while you weren't looking."
/obj/item/smithing/attackby(obj/item/I, mob/user)