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

Merge branch 'master' into izac-voreupdate

Browse Source
This commit is contained in:
Izac Joof Forsgren
2020-05-13 09:16:09 +02:00
committed by GitHub
parent 1e6cc7d5a8 ede3461770
commit 19175c4c72
5 changed files with 150 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/research/designs.dm
View File

@@ -31,7 +31,9 @@ other types of metals and chemistry for reagents).
var/time = 10 //How many ticks it requires to build
var/category = null //Primarily used for Mech Fabricators, but can be used for anything.
var/sort_string = "ZZZZZ" //Sorting order
var/maxstack = 1 // yw edit, used by autolathe, says how many stacks a item can have or the limit of how many you can spawn at once
var/maxstack = 1 //YW Edit, used by autolathe, says how many stacks a item can have or the limit of how many you can spawn at once
var/autolathe_build = 0 //YW Edit, makes other designs able to be built or added in autolathe, be via design disk or something else(added due to can't have two designs with same build_path without unit test getting angry)
var/hidden = 0 //YW Edit, Used by autolathe, says if an item needs the autolathe to be hacked in order to appear
/datum/design/New()
..()

1
code/modules/research/designs/weapons.dm
View File

@@ -107,6 +107,7 @@
materials = list(DEFAULT_WALL_MATERIAL = 4000)
build_path = /obj/item/ammo_casing/a12g/stunshell
sort_string = "MABBB"
autolathe_build = 1 //Ywedit
// Phase weapons