powder that makes you say yes

This commit is contained in:
Razgriz
2022-02-17 17:32:50 -07:00
committed by GitHub
parent 37e43bf832
commit c71e45a099

View File

@@ -1437,8 +1437,6 @@ End CHOMP Removal*/
from_suit = /obj/item/clothing/suit/storage/hooded/explorer
to_suit = /obj/item/clothing/suit/storage/hooded/explorer/lucky
<<<<<<< HEAD
=======
//RevolverEloise - Revolver Eloise
/obj/item/weapon/sword/fluff/revolver
name = "Catnip"
@@ -1450,4 +1448,3 @@ End CHOMP Removal*/
force = 1
sharp = TRUE
edge = TRUE
>>>>>>> 522b931dd87... Merge pull request #12244 from PastelPrinceDan/revfluff