Skip to content

WIP: The tribe-core PR (Pottery, stone tools) #368

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.

Sign up for GitHub

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

Merged
Mario90900 merged 4 commits into from
Mar 27, 2026
Merged

WIP: The tribe-core PR (Pottery, stone tools) #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a415121
FirstPass
Ghostcoffeee Mar 20, 2026
da31c24
MarkingChanges
Ghostcoffeee Mar 20, 2026
9efa093
Preglazed
Ghostcoffeee Mar 20, 2026
8948cfc
BetterPainting
Ghostcoffeee Mar 20, 2026
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: 1 addition & 0 deletions code/__DEFINES/combat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ Medical defines
#define VISMSG_ARMOR_INT_STAGETHREE "<span class='armoralert'><b> Crumbling!</b></span>"

//Cast time reduction
#define CRYSTMANA_CAST_TIME_REDUCTION 0.05 // Caustic edit
#define TOPER_CAST_TIME_REDUCTION 0.1
#define EMERALD_CAST_TIME_REDUCTION 0.15
#define SAPPHIRE_CAST_TIME_REDUCTION 0.2
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/effects/spawners/clutter_spawner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/obj/item/bouquet/calendula = 1,
/obj/item/flowercrown/rosa = 1,
/obj/item/reagent_containers/glass/bottle/claybottle = 1,
/obj/item/reagent_containers/glass/bottle/clayvase = 1,
/obj/item/reagent_containers/glass/bottle/claybottle/vase = 1, // Caustic Edit
/obj/item/roguestatue/clay = 1,
/obj/item/flint = 1,
/obj/item/rogue/instrument/lute = 1,
Expand All @@ -34,7 +34,7 @@
icon_state = "hiclutter"
lootcount = 1
loot = list(
/obj/item/reagent_containers/glass/bottle/clayfancyvase = 1,
/obj/item/reagent_containers/glass/bottle/claybottle/vase/fancy = 1, // Caustic edit
/obj/item/roguestatue/glass = 1,
/obj/item/needle = 1,
/obj/item/roguestatue/gold/loot = 1,
Expand Down
Loading
Loading