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

City Gamemodes Update: Bloodfiends [DONE] #2658

Merged
merged 47 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
410c06c
First commit
azenkov Nov 6, 2024
2ef16e4
blood_fiend updates
EnderMage99 Nov 6, 2024
e66e5ec
Adding Icons
EnderMage99 Nov 6, 2024
7f4b9d9
Cosmetic Changes
EnderMage99 Nov 6, 2024
5d4e61d
TIME FOR BLEED!!!
EnderMage99 Nov 6, 2024
52c536d
boss blood fiend
azenkov Nov 7, 2024
98ad21b
Better Icons
EnderMage99 Nov 7, 2024
313d09a
Blood Slowdown
EnderMage99 Nov 7, 2024
126b6fc
slash update
azenkov Nov 8, 2024
c4afd19
Diffrent Icon/Sleep Fix
EnderMage99 Nov 8, 2024
633c121
Red Mist (Real?!?)
EnderMage99 Nov 8, 2024
2377ff7
Number Changes
EnderMage99 Nov 9, 2024
294011a
minions
azenkov Nov 9, 2024
fe1341c
Blood Icon update
EnderMage99 Dec 30, 2024
23f205e
Adding Bloodfiend Gear
EnderMage99 Dec 30, 2024
3cfc48f
Adding in a Stun
EnderMage99 Dec 30, 2024
8b833fe
fix
azenkov Dec 31, 2024
0b37b35
Polishing them up
EnderMage99 Dec 31, 2024
329b4be
QoL changes
EnderMage99 Dec 31, 2024
ac7dfee
Small Nerf
EnderMage99 Jan 1, 2025
8817e89
Small Buffs
EnderMage99 Jan 1, 2025
e163660
Armor while summoning
EnderMage99 Jan 1, 2025
c55f4fe
Adding Bloodfiends to ruinned_la_mancha_land
EnderMage99 Jan 2, 2025
1b6075d
Room Updates
EnderMage99 Jan 8, 2025
8e4633b
Removing all signs
EnderMage99 Jan 9, 2025
4e377db
Revert "Adding Bloodfiends to ruinned_la_mancha_land"
EnderMage99 Jan 10, 2025
a7f455b
Please birds, don't die
EnderMage99 Jan 10, 2025
e1811a4
Rolling Back Amber
EnderMage99 Jan 10, 2025
d420f81
Rolling Back Amber spawning
EnderMage99 Jan 10, 2025
3638cb7
Adding back a space
EnderMage99 Jan 10, 2025
a7d97d1
Removing flame_fixer room changes
EnderMage99 Jan 10, 2025
941cbb7
Removing Metal Fixer changes
EnderMage99 Jan 10, 2025
c95a050
Adding Icons
EnderMage99 Jan 13, 2025
0c5790a
adding the coat
EnderMage99 Jan 13, 2025
fa49ebc
Updating Outfits
EnderMage99 Jan 13, 2025
44bec52
Removing Armor Buff
EnderMage99 Jan 14, 2025
6c9040f
Bloodfeast Info
EnderMage99 Jan 15, 2025
9f38bec
Bloodfiend Fixes
EnderMage99 Jan 17, 2025
b3bcfb5
Adding a new Book
EnderMage99 Jan 21, 2025
617a297
adding new armor recipe
EnderMage99 Jan 21, 2025
2cc1fe8
Making the self damage more clear
EnderMage99 Jan 21, 2025
4946dd2
Revert "Room Updates"
EnderMage99 Jan 28, 2025
f378643
Removing Slime Office
EnderMage99 Jan 28, 2025
6ca15c8
Bleed Cooldown
EnderMage99 Jan 28, 2025
f0ad496
Re add book sprite
azenkov Jan 28, 2025
88c42c6
Amber Fixes
EnderMage99 Jan 28, 2025
4008367
Spaces removal
EnderMage99 Jan 28, 2025
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
Binary file added ModularTegustation/Teguicons/blood_fiend_gear.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions ModularTegustation/tegu_items/associations/machines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/obj/item/food/meat/slab/buggy,
/obj/item/food/meat/slab/corroded,
/obj/item/food/meat/slab/sinnew,
/obj/item/food/meat/slab/crimson,
/obj/item/rawpe,
/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled,
)
Expand Down
1 change: 1 addition & 0 deletions ModularTegustation/tegu_items/associations/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
/obj/item/book/granter/crafting_recipe/carnival/weaving_wedge = 1,
/obj/item/book/granter/crafting_recipe/carnival/weaving_molar_boatworks = 1,
/obj/item/book/granter/crafting_recipe/carnival/weaving_rosespanner = 1,
/obj/item/book/granter/crafting_recipe/carnival/weaving_masquerade = 1,
)

default_price = 100
Expand Down
Loading
Loading