mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
powder that makes you say yes
This commit is contained in:
@@ -1437,8 +1437,6 @@ End CHOMP Removal*/
|
|||||||
from_suit = /obj/item/clothing/suit/storage/hooded/explorer
|
from_suit = /obj/item/clothing/suit/storage/hooded/explorer
|
||||||
to_suit = /obj/item/clothing/suit/storage/hooded/explorer/lucky
|
to_suit = /obj/item/clothing/suit/storage/hooded/explorer/lucky
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
//RevolverEloise - Revolver Eloise
|
//RevolverEloise - Revolver Eloise
|
||||||
/obj/item/weapon/sword/fluff/revolver
|
/obj/item/weapon/sword/fluff/revolver
|
||||||
name = "Catnip"
|
name = "Catnip"
|
||||||
@@ -1450,4 +1448,3 @@ End CHOMP Removal*/
|
|||||||
force = 1
|
force = 1
|
||||||
sharp = TRUE
|
sharp = TRUE
|
||||||
edge = TRUE
|
edge = TRUE
|
||||||
>>>>>>> 522b931dd87... Merge pull request #12244 from PastelPrinceDan/revfluff
|
|
||||||
|
|||||||
Reference in New Issue
Block a user