powder that makes you say yes

2026-08-24 13:47:33 +01:00 · 2022-11-18 03:50:08 -05:00
parent dff8d7183a
commit 223ffff44d
1 changed files with 0 additions and 3 deletions
@@ -161,8 +161,6 @@
 	cost = 300
 	containertype = /obj/structure/closet/crate
 	containername = "cordless jukebox speakers crate"
-<<<<<<< HEAD
-=======

 /datum/supply_pack/misc/explorer_headsets
 	name = "shortwave-capable headsets (x4)"
@@ -178,4 +176,3 @@
 		access_pilot
 	)
 	one_access = TRUE
->>>>>>> 1657a7f62a... Merge pull request #14092 from KillianKirilenko/kk-cargo