Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test fixes #87

Merged
merged 79 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
dd6b7a2
more .proc to type_proc
xTrainx Mar 29, 2024
67ba216
more fixes for types
xTrainx Mar 29, 2024
1379405
spaceman fix
xTrainx Mar 29, 2024
bc0d66d
mising proc
xTrainx Mar 29, 2024
3f28aac
fix globar proc error?
xTrainx Mar 29, 2024
c198e6f
name of to name of static
xTrainx Mar 29, 2024
f52d860
name of fix
xTrainx Mar 29, 2024
502def9
ANNYOING RUNTIME OF SEEDLINGS
xTrainx Mar 29, 2024
13cccae
fixes varsacks
xTrainx Mar 29, 2024
10ee20f
Merge branch 'master' of https://github.com/Foundation-19/Hail-Mary
xTrainx Apr 10, 2024
976d9be
loadout screen fixes
xTrainx Apr 10, 2024
c1b8c96
Merge branch 'master' of https://github.com/Foundation-19/Hail-Mary i…
xTrainx Apr 17, 2024
93031f1
disable backpacks from loadouts
xTrainx Apr 17, 2024
ada5394
Invicta
Pebblesthe2nd Jan 16, 2023
9f44d60
Update legio_invicta.dm
Pebblesthe2nd Jan 16, 2023
24f202d
Update legio_invicta.dm
Pebblesthe2nd Jan 16, 2023
563b10f
Update additions.dm
Pebblesthe2nd Jan 17, 2023
53f3635
invictastuffadded
Pebblesthe2nd Jan 19, 2023
255025a
f
xTrainx Apr 17, 2024
f2cf6b5
smithening
Pebblesthe2nd Jan 17, 2023
e23136b
eg
xTrainx Apr 18, 2024
8f390b0
eg2
xTrainx Apr 18, 2024
8be2b3b
artadditions
Pebblesthe2nd Jan 16, 2023
376a37d
Update crates.dm
Pebblesthe2nd Jan 16, 2023
06426cd
enabler
Pebblesthe2nd Jan 17, 2023
b6f1ce4
finish ports
xTrainx Apr 18, 2024
22ae0f0
map linters
xTrainx Apr 18, 2024
471b13f
magazine fix
xTrainx Apr 19, 2024
c9c7d48
radio music broadcasting
xTrainx Mar 3, 2024
966aa91
re adds delay
xTrainx Mar 3, 2024
a858d72
wastify recipe and fixes
xTrainx Mar 3, 2024
ce56569
no overleys
xTrainx Mar 3, 2024
3aae6ee
Removes smoke machine and cryo casing from R&D, adds the recharger gu…
biotear Mar 6, 2024
b9ec72e
removes pda radios, add togles to pda, pda defaults to off music
xTrainx Mar 7, 2024
e0849c1
add toggles in preferencce and radios
xTrainx Mar 9, 2024
a3886d7
tf is a trailing comma
xTrainx Mar 9, 2024
adecc46
Adds handcuffs to lathe
spackorp Mar 17, 2024
bf978a7
adds handcuffs to the other lathe
spackorp Mar 17, 2024
019e149
Update robot_modules.dm (#374)
BrotherHangyul Mar 22, 2024
7e5a5c9
music stream message goes through preferences
xTrainx Apr 12, 2024
7246c43
notifies when a song doesn't play because of preferences
xTrainx Apr 12, 2024
ec8a838
Fixes Centurion armor having no wound prot
BadAtThisGame302 Feb 3, 2023
fb4659c
initial release
xTrainx Jan 7, 2023
15c478d
good to go
xTrainx Jan 7, 2023
9273825
so you can't delete default tracks with disks
xTrainx Jan 7, 2023
cc6a46c
fixes
xTrainx Feb 12, 2023
d598634
Update .gitignore
tichys Feb 13, 2023
fe22e17
Update tgs.dm
xTrainx Feb 14, 2023
04760ee
revert Update tgs.dm
xTrainx Feb 14, 2023
14d066e
Update ci_suite.yml
xTrainx Feb 15, 2023
a921b37
Update ci_suite.yml
xTrainx Feb 15, 2023
ab7ca1e
Update ci_suite.yml
xTrainx Feb 15, 2023
29908a9
Update ci_suite.yml
xTrainx Feb 15, 2023
30ef93d
Furnabuse (#121)
xTrainx Feb 15, 2023
cfde9aa
Fixes maybe?
xTrainx Feb 15, 2023
cb4a5ef
revert "FIX"
xTrainx Feb 15, 2023
526d29c
enables legacy admins
xTrainx Feb 15, 2023
529ec96
enable legacy bans
xTrainx Feb 15, 2023
36f402b
restore format
xTrainx Feb 16, 2023
edf8481
disables admin and ban legacy system
xTrainx Feb 16, 2023
1dbf71d
Debug outfit upgrade (#201)
projectkepler-ru Feb 17, 2023
e0fecb7
remove recorder from craftables (adminspawn)
xTrainx Feb 18, 2023
9458ad7
oof
xTrainx Feb 18, 2023
efe12a7
how do i reach
xTrainx Feb 18, 2023
de1fb67
indenting?
xTrainx Feb 18, 2023
078534a
INDENT
xTrainx Feb 18, 2023
27f2489
Please...
xTrainx Feb 18, 2023
6000175
GIVE ME GREEN
xTrainx Feb 18, 2023
d484677
GUREEN
xTrainx Feb 18, 2023
6308d62
maybe thistime...
xTrainx Feb 18, 2023
150a966
Oof
xTrainx Feb 18, 2023
75a6b28
aaaaaaaaaaaa
xTrainx Feb 18, 2023
b3ba54c
12 lints
xTrainx Feb 18, 2023
6a801e8
ug
xTrainx Feb 18, 2023
b73a176
review changes
xTrainx Feb 19, 2023
07722f2
<
xTrainx Feb 22, 2023
bf76d13
restore shit
xTrainx Apr 19, 2024
683125c
finish porting recorder and radio station
xTrainx Apr 19, 2024
a6c8623
unrestores shit
xTrainx Apr 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/cfg/**/*

# Ignore compiled linux libs in the root folder, e.g. librust_g.so
/*.so

#Ignore compiled files and other files generated during compilation.
*.mdme
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Fortress Nash/FortNash1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -38978,7 +38978,7 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/floor/plasteel,
/area/f13/building)
"jbE" = (
Expand Down
24 changes: 12 additions & 12 deletions _maps/map_files/Pahrump-AB/Pahrump-AB-Lower.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2032,8 +2032,8 @@
"bHh" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
/obj/item/ingot/silver,
/obj/item/ingot/silver,
/obj/item/blacksmith/ingot/silver,
/obj/item/blacksmith/ingot/silver,
/obj/item/coin/silver,
/obj/item/coin/silver,
/obj/item/coin/silver,
Expand Down Expand Up @@ -11627,12 +11627,12 @@
/area/f13/caves)
"hqo" = (
/obj/structure/rack,
/obj/item/ingot/iron,
/obj/item/ingot/iron,
/obj/item/ingot/titanium,
/obj/item/ingot/titanium,
/obj/item/ingot/adamantine,
/obj/item/ingot/adamantine,
/obj/item/blacksmith/ingot/iron,
/obj/item/blacksmith/ingot/iron,
/obj/item/blacksmith/ingot/titanium,
/obj/item/blacksmith/ingot/titanium,
/obj/item/blacksmith/ingot/adamantine,
/obj/item/blacksmith/ingot/adamantine,
/turf/open/floor/plating/tunnel{
icon_state = "tunnelchess"
},
Expand Down Expand Up @@ -24731,10 +24731,10 @@
/area/f13/caves)
"tfm" = (
/obj/structure/table,
/obj/item/ingot/uranium,
/obj/item/ingot/uranium,
/obj/item/ingot/uranium,
/obj/item/ingot/uranium,
/obj/item/blacksmith/ingot/uranium,
/obj/item/blacksmith/ingot/uranium,
/obj/item/blacksmith/ingot/uranium,
/obj/item/blacksmith/ingot/uranium,
/turf/open/floor/plating/rust,
/area/f13/radiation)
"tfn" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Pahrump-AB/Pahrump-AB.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -43220,7 +43220,7 @@
/area/f13/wasteland)
"mFn" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
color = "#e4e4e4"
},
Expand Down Expand Up @@ -60632,7 +60632,7 @@
/area/f13/wasteland)
"uIx" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/anvil/obtainable/legion,
/obj/structure/blacksmith/anvil/obtainable/legion,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
color = "#e4e4e4"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -34981,7 +34981,7 @@
/turf/open/floor/plating/tunnel,
/area/f13/caves)
"vdZ" = (
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building)
"vep" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2329,7 +2329,7 @@
/turf/open/floor/plasteel/f13/vault_floor/white,
/area/f13/village)
"aVn" = (
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"aVq" = (
Expand Down Expand Up @@ -13038,7 +13038,7 @@
/turf/open/floor/f13/wood,
/area/f13/building)
"fxC" = (
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"fxD" = (
Expand Down Expand Up @@ -23515,7 +23515,7 @@
/obj/machinery/light/small{
dir = 4
},
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"jKT" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Pahrump-Sunset - Backup/MapGuide.dmm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/obj/effect/turf_decal/weather/dirt{
dir = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11054,7 +11054,7 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/floor/plasteel,
/area/f13/building)
"aMG" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13500,7 +13500,7 @@
},
/area/f13/wasteland)
"gxZ" = (
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/floor/plasteel/cult,
/area/f13/building/tribal)
"gyv" = (
Expand Down Expand Up @@ -25240,7 +25240,7 @@
},
/area/f13/building/tribal)
"mdu" = (
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/building)
"mdO" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,7 @@
/turf/open/floor/plasteel/f13/vault_floor/white,
/area/f13/village)
"aVn" = (
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"aVq" = (
Expand Down Expand Up @@ -23889,7 +23889,7 @@
/obj/machinery/light/small{
dir = 4
},
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
"jKT" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35056,7 +35056,7 @@
/turf/open/floor/plating/tunnel,
/area/f13/caves)
"vdZ" = (
/obj/structure/furnace,
/obj/structure/blacksmith/furnace,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/building)
"vep" = (
Expand Down
50 changes: 50 additions & 0 deletions code/__DEFINES/melee.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,53 @@
#define WEAPON_BLUNT_TWOHAND_MULT 1
/// Blunt wound addition
#define WEAPON_BLUNT_WOUND_ADD 100 // limb wrecker
// MORE MELEE DEFINES

/// Weapon baseplate values
#define WEAPON_FORCE_SMALL_TOOL 12
#define WEAPON_FORCE_BIG_TOOL 20
#define WEAPON_FORCE_KNIFE 27
#define WEAPON_FORCE_BIG_KNIFE 30
#define WEAPON_FORCE_SWORD 35
#define WEAPON_FORCE_SPEAR 24
#define WEAPON_FORCE_SPEAR_WIELDED 32
#define WEAPON_FORCE_FIST_WEAPON 29
#define WEAPON_FORCE_CLUB 30
#define WEAPON_FORCE_CLUB_WIELDED 39
#define WEAPON_FORCE_BRUTAL 45
#define WEAPON_FORCE_MASSIVE 55

/// Thrown forces
#define THROWING_PATHETIC 4
#define THROWING_POOR 10
#define THROWING_DECENT 20
#define THROWING_EFFECTIVE 25
#define THROWING_GOOD 30
#define THROWING_SUPREME 40

/// Melee attack speed
#define MELEE_SPEED_FASTEST 6
#define MELEE_SPEED_FAST 7
#define MELEE_SPEED_NORMAL 8
#define MELEE_SPEED_SLOW 9
#define MELEE_SPEED_SLOWER 10
#define MELEE_SPEED_SLOWEST 14

/// Melee armor piercing
#define PIERCING_MINOR 0.1
#define PIERCING_MODERATE 0.2
#define PIERCING_MAJOR 0.3

/// Melee wound bonuses
#define WOUNDING_MALUS_SHALLOW -10
#define WOUNDING_BONUS_TINY 4
#define WOUNDING_BONUS_SMALL 8
#define WOUNDING_BONUS_MODEST 12
#define WOUNDING_BONUS_BIG 20
#define WOUNDING_BONUS_HUGE 30

/// Throwing distances
#define THROWRANGE_BAD 3
#define THROWRANGE_AVERAGE 5
#define THROWRANGE_GOOD 6
#define THROWRANGE_JAVELIN 7
3 changes: 2 additions & 1 deletion code/__DEFINES/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
#define DISABLE_DEATHRATTLE (1<<12)
#define DISABLE_ARRIVALRATTLE (1<<13)
#define COMBOHUD_LIGHTING (1<<14)
#define MUSIC_RADIO (1<<15)
// Gap in prefs between tg and fortune13 prefs.
#define SPLIT_ADMIN_TABS (1<<23)

#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|MUSIC_RADIO|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)

//Chat toggles
#define CHAT_OOC (1<<0)
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/lists/loadout_categories.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GLOBAL_LIST_INIT(loadout_categories, list(
LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS/*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
//LOADOUT_CATEGORY_BACKPACK = list(LOADOUT_SUBCATEGORY_BACKPACK_GENERAL,/* LOADOUT_SUBCATEGORY_BACKPACK_TOYS,*/ LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS, LOADOUT_SUBCATEGORY_BACKPACK_RATIONS/*, LOADOUT_SUBCATEGORY_BACKPACK_VAULTGUNS*/),
LOADOUT_CATEGORY_NECK = list(LOADOUT_SUBCATEGORY_NECK_GENERAL,/* LOADOUT_SUBCATEGORY_NECK_TIE,*/ LOADOUT_SUBCATEGORY_NECK_SCARVES),
LOADOUT_CATEGORY_MASK = list(LOADOUT_SUBCATEGORY_MASK_GENERAL, LOADOUT_SUBCATEGORY_MASK_BANDANA/*, LOADOUT_SUBCATEGORY_MASK_MISCELLANEOUS*/),
LOADOUT_CATEGORY_HANDS = LOADOUT_SUBCATEGORIES_NONE,
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ GLOBAL_LIST_EMPTY(trash_piles) //list of all trash_piles
GLOBAL_LIST_EMPTY(money_piles)

GLOBAL_LIST_EMPTY(lamppost) //list of all lampposts
GLOBAL_LIST_EMPTY_TYPED(radio_list, /obj/item/radio) //For the radio station. See radio_station.dm
16 changes: 15 additions & 1 deletion code/controllers/subsystem/jukeboxes.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SUBSYSTEM_DEF(jukeboxes)
name = "Jukeboxes"
wait = 5
var/list/songs = list()
var/list/datum/track/songs = list()
var/list/activejukeboxes = list()
var/list/freejukeboxchannels = list()

Expand Down Expand Up @@ -115,3 +115,17 @@ SUBSYSTEM_DEF(jukeboxes)
M.playsound_local(currentturf, null, 100, channel = jukeinfo[2], S = song_played)
CHECK_TICK
return
//BIG IRON EDIT start
/datum/controller/subsystem/jukeboxes/proc/add_song(datum/track/NS) //proc usted to add a song, when a disk is added to a jukebox
if(SSjukeboxes.songs.len)
for(var/datum/track/CT in SSjukeboxes.songs)
if(NS.song_associated_id == CT.song_associated_id)
return FALSE
SSjukeboxes.songs += NS

/datum/controller/subsystem/jukeboxes/proc/remove_song(datum/track/NS) //proc usted to remove a song, when a disk is removed from a jukebox
for(var/datum/track/RT in SSjukeboxes.songs)
if(NS.song_associated_id == RT.song_associated_id)
SSjukeboxes.songs -= NS
return TRUE
//BIG IRON EDIT -end
31 changes: 9 additions & 22 deletions code/datums/components/crafting/recipes/recipes_forge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
/obj/item/wirecutters = 1,
/obj/item/stack/sheet/metal = 20,
)
time = 400
time = 30 SECONDS
category = CAT_CRAFTING
subcategory = CAT_FORGING

/datum/crafting_recipe/tableanvil
name = "Table Anvil"
result = /obj/structure/anvil/obtainable/table
time = 300
result = /obj/structure/blacksmith/anvil/obtainable/table
time = 20 SECONDS
reqs = list(
/obj/item/stack/sheet/metal = 8,
/obj/item/stack/rods = 8,
Expand All @@ -31,8 +31,8 @@

/datum/crafting_recipe/anvil
name = "Anvil"
result = /obj/structure/anvil/obtainable/basic
time = 450
result = /obj/structure/blacksmith/anvil/obtainable
time = 30 SECONDS
reqs = list(
/obj/item/stack/sheet/metal = 50,
/obj/item/stack/sheet/mineral/titanium = 15,
Expand All @@ -43,17 +43,17 @@

/datum/crafting_recipe/sandvil
name = "Sandstone Anvil"
result = /obj/structure/anvil/obtainable/sandstone
time = 300
result = /obj/structure/blacksmith/anvil/obtainable/sandstone
time = 25 SECONDS
reqs = list(/obj/item/stack/sheet/mineral/sandstone = 16)
tools = list(TOOL_CROWBAR)
category = CAT_CRAFTING
subcategory = CAT_FORGING

/datum/crafting_recipe/furnace
name = "Furnace"
result = /obj/structure/furnace
time = 300
result = /obj/structure/blacksmith/furnace/sandstone
time = 20 SECONDS
reqs = list(
/obj/item/stack/sheet/mineral/sandstone = 20,
/obj/item/stack/sheet/metal = 6,
Expand Down Expand Up @@ -85,19 +85,6 @@
category = CAT_CRAFTING
subcategory = CAT_FORGING

/datum/crafting_recipe/bone_ingot
name = "Processable bone"
result = /obj/item/ingot/bone
time = 100
reqs = list(
/obj/item/stack/sheet/bone = 2,
/obj/item/crafting/wonderglue = 1,
/obj/item/stack/rods = 2
)
tools = list(TOOL_WORKBENCH)
category = CAT_CRAFTING
subcategory = CAT_FORGING

//KNIVES//

/datum/crafting_recipe/melee/forged/cleaver
Expand Down
4 changes: 2 additions & 2 deletions code/datums/materials/basemats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
name = "pre-war steel"
desc = "A powerful material made out of magic, I mean science!"
color = "#6d7e8e"
strength_modifier = 1.3
strength_modifier = 1.2
categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/adamantine
value_per_unit = 0.25
Expand Down Expand Up @@ -310,7 +310,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
name = "bronze"
desc = "Clock Cult? Never heard of it."
color = "#92661A"
strength_modifier = 1.15
strength_modifier = 1
categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
sheet_type = /obj/item/stack/sheet/bronze
value_per_unit = 0.025
Expand Down
Loading
Loading