cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update general.dm

Browse Source
This commit is contained in:
Novacat
2020-08-05 19:35:33 -04:00
committed by GitHub
parent c20bab52d4
commit 40c08685d2
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/autolathe/general.dm
View File

@@ -145,8 +145,6 @@
name = "maglight" name = "maglight"
path =/obj/item/device/flashlight/maglight path =/obj/item/device/flashlight/maglight
<<<<<<< HEAD
=======
/datum/category_item/autolathe/general/ecigcartridge /datum/category_item/autolathe/general/ecigcartridge
name = "ecigarette cartridge" name = "ecigarette cartridge"
path = /obj/item/weapon/reagent_containers/ecig_cartridge/blank path = /obj/item/weapon/reagent_containers/ecig_cartridge/blank
@@ -157,7 +155,6 @@
resources = list(DEFAULT_WALL_MATERIAL = 100, MAT_GLASS = 100, MAT_PLASTIC = 300) resources = list(DEFAULT_WALL_MATERIAL = 100, MAT_GLASS = 100, MAT_PLASTIC = 300)
man_rating = 2 man_rating = 2
>>>>>>> 282b42d... Exosuit Modular Internals, The Squeakening (#7329)
/datum/category_item/autolathe/general/handcuffs /datum/category_item/autolathe/general/handcuffs
name = "handcuffs" name = "handcuffs"
path =/obj/item/weapon/handcuffs path =/obj/item/weapon/handcuffs