AurouraPlays 53c9cbec6b Removes recipe conflict between Vampiro and Margarita (#32095) ...

* Removes recipe conflict between Vampiro and Tequila

* Fixes the amount of Vampiro returned to match the sum of its parts.

* Fixes Tequila Sunrise's ID in the vampiro recipe

* Correcting formatting in manuals.dm

Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com>

---------

Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>

2026-06-13 22:19:08 +00:00

..

bio_chips

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

chemical_flamethrower

Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445)

2026-01-30 21:25:40 +00:00

grenades

Attack Chain Migration: Grenades & Plastic Explosives (#31874)

2026-04-21 04:58:44 +00:00

melee

Stealth and Steel: The Space Ninja (#31497)

2026-03-25 23:11:10 +00:00

storage

Adds Security Fines (#31857)

2026-05-17 09:45:07 +00:00

alien_specific.dm

use ABSTRACT_TYPE_DESC in more places (#31409)

2026-01-25 22:52:12 +00:00

batons.dm

[IDB Ignore] Heretic: The Mansus Re-Opened (#30738)

2026-01-27 20:36:52 +00:00

bee_briefcase.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

c_foam_launcher.dm

/obj/item/projectile --> /obj/projectile (#30411)

2025-11-12 10:23:20 +00:00

chrono_eraser.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

dice.dm

Adds Reycleable Materials to a Bunch of Objects (#31320)

2025-12-25 21:03:22 +00:00

explosives.dm

Migrate /obj/item/assembly to the new attack chain. (#31987)

2026-05-17 18:42:49 +00:00

extinguisher.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

flamethrower.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

garrote.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

gift_wrappaper.dm

Migrates /obj/item/stack to the new attack chain (#31709)

2026-04-02 02:32:15 +00:00

handcuffs.dm

migrate all /obj/item from /New() to /Initialize() (#31232)

2026-01-28 19:44:32 +00:00

highlander_swords.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

holosign_projector.dm

Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445)

2026-01-30 21:25:40 +00:00

holy_weapons.dm

Add new null rods for various religions. (#31393)

2026-02-27 20:07:25 +00:00

kitchen.dm

Adds Rations for the TSF, USSP, and ERTs (#31795)

2026-04-11 04:59:54 +00:00

knuckledusters.dm

massive burndown (#29894)

2025-07-27 20:52:39 +00:00

legcuffs.dm

migrate all /obj/item from /New() to /Initialize() (#31232)

2026-01-28 19:44:32 +00:00

manuals.dm

Removes recipe conflict between Vampiro and Margarita (#32095)

2026-06-13 22:19:08 +00:00

misc_items.dm

blind cane craft (#31962)

2026-05-13 22:11:06 +00:00

mop.dm

Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445)

2026-01-30 21:25:40 +00:00

pneumaticCannon.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

powerfist.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

scissors.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

shards.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

shields.dm

Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445)

2026-01-30 21:25:40 +00:00

stunbaton.dm

[IDB Ignore] Heretic: The Mansus Re-Opened (#30738)

2026-01-27 20:36:52 +00:00

teleprod.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

thurible.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00

twohanded.dm

Migrates /obj/item/clothing to the New Attack Chain (#31421)

2026-02-09 19:36:38 +00:00

weaponry.dm

Improves Baseball Bat Deflect Mechanics (#31918)

2026-05-07 02:21:59 +00:00

whetstone.dm

Convert most spans to defines (#31080)

2025-12-13 23:55:48 +00:00