cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Raeschen
2023-06-19 12:32:36 +02:00
parent db38ed93c0
commit 74765cf864
6 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/salvageable.dm
-4
View File
@@ -400,9 +400,6 @@
/obj/item/weapon/computer_hardware/card_slot = 40,
/obj/item/weapon/computer_hardware/network_card/advanced = 40
)
<<<<<<< HEAD
=======
/obj/structure/salvageable/slotmachine1
name = "broken slot machine"
@@ -429,4 +426,3 @@
/obj/item/weapon/stock_parts/capacitor = 60,
/obj/item/weapon/computer_hardware/network_card/advanced = 40
)
>>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2