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

Quick create improvements

Browse Source
This commit is contained in:
Kates
2020-07-14 04:26:01 +02:00
committed by VirgoBot
parent fa65a3f226
commit b6003d6cd0
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/modules/admin/create_object.dm
View File

@@ -15,7 +15,24 @@
var/quick_create_object_html = null
var/pathtext = null
<<<<<<< HEAD
pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj","/obj/structure","/obj/item","/obj/item/device","/obj/item/weapon","/obj/item/weapon/gun","/obj/item/weapon/reagent_containers","/obj/item/weapon/reagent_containers/food","/obj/item/clothing","/obj/machinery","/obj/mecha","/obj/item/mecha_parts/part","/obj/mecha_parts/mecha_equipement","/obj/item/weapon/storage/box/fluff") //VOREStation Edit - Added fluff boxes
=======
pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") as null|anything in list("/obj",
"/obj/structure",
"/obj/item",
"/obj/item/device",
"/obj/item/weapon",
"/obj/item/weapon/gun",
"/obj/item/weapon/reagent_containers",
"/obj/item/weapon/reagent_containers/food",
"/obj/item/clothing",
"/obj/machinery",
"/obj/mecha",
"/obj/item/mecha_parts",
"/obj/item/mecha_parts/mecha_equipment")
>>>>>>> 124ac24... Make the quick create less less ugly & re-add proper mecha after their last item path change. (#7327)
if(!pathtext)
return
var path = text2path(pathtext)