cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-23 13:17:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into tgui4.0-and-camera-console

Browse Source
This commit is contained in:
ShadowLarkens
2020-08-06 21:29:47 -07:00
parent 971a95bc0a 920fdec7e3
commit 7349c62356
247 changed files with 5334 additions and 1793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/autolathe/arms.dm
+24
View File
@@ -33,6 +33,12 @@
path =/obj/item/ammo_casing/a12g/stunshell
hidden = 1
/datum/category_item/autolathe/arms/flechetteshell
name = "ammunition (flechette cartridge, shotgun)"
path =/obj/item/ammo_casing/a12g/flechette
hidden = 1
man_rating = 2
//////////////////
/*Ammo magazines*/
//////////////////
@@ -64,6 +70,18 @@
name = "pistol magazine (.45 flash)"
path =/obj/item/ammo_magazine/m45/flash
/datum/category_item/autolathe/arms/pistol_45ap
name = "pistol magazine (.45 armor piercing)"
path =/obj/item/ammo_magazine/m45/ap
hidden = 1
resources = list(DEFAULT_WALL_MATERIAL = 500, MAT_PLASTEEL = 300)
/datum/category_item/autolathe/arms/pistol_45hp
name = "pistol magazine (.45 hollowpoint)"
path =/obj/item/ammo_magazine/m45/hp
hidden = 1
resources = list(DEFAULT_WALL_MATERIAL = 500, MAT_PLASTIC = 200)
/datum/category_item/autolathe/arms/pistol_45uzi
name = "uzi magazine (.45)"
path =/obj/item/ammo_magazine/m45uzi
@@ -138,6 +156,12 @@
name = "top-mounted SMG magazine (9mm flash)"
path =/obj/item/ammo_magazine/m9mmt/flash
/datum/category_item/autolathe/arms/smg_9mmap
name = "top-mounted SMG magazine (9mm armor piercing)"
path =/obj/item/ammo_magazine/m9mmt/ap
hidden = 1
man_rating = 2
/////// 10mm
/datum/category_item/autolathe/arms/smg_10mm
name = "SMG magazine (10mm)"
code/datums/autolathe/autolathe.dm
+1
View File
@@ -71,6 +71,7 @@ var/datum/category_collection/autolathe/autolathe_recipes
var/is_stack // Creates multiple of an item if applied to non-stack items
var/max_stack
var/no_scale
var/man_rating = 0
/datum/category_item/autolathe/dd_SortValue()
return name
code/datums/autolathe/general.dm
+22
View File
@@ -54,6 +54,10 @@
name = "jar"
path =/obj/item/glass_jar
/datum/category_item/autolathe/general/fishtank
name = "fish tank"
path =/obj/item/glass_jar
/datum/category_item/autolathe/general/radio_headset
name = "radio headset"
path =/obj/item/device/radio/headset
@@ -94,6 +98,18 @@
is_stack = TRUE
no_scale = TRUE //prevents material duplication exploits
/datum/category_item/autolathe/general/plasteel
name = "plasteel sheets"
path =/obj/item/stack/material/plasteel
is_stack = TRUE
no_scale = TRUE //prevents material duplication exploits
/datum/category_item/autolathe/general/plastic
name = "plastic sheets"
path =/obj/item/stack/material/plastic
is_stack = TRUE
no_scale = TRUE //prevents material duplication exploits
//TFF 24/12/19 - Let people print more spray bottles if needed.
/datum/category_item/autolathe/general/spraybottle
name = "spray bottle"
@@ -133,6 +149,12 @@
name = "ecigarette cartridge"
path = /obj/item/weapon/reagent_containers/ecig_cartridge/blank
/datum/category_item/autolathe/general/idcard
name = "ID Card"
path = /obj/item/weapon/card/id
resources = list(DEFAULT_WALL_MATERIAL = 100, MAT_GLASS = 100, MAT_PLASTIC = 300)
man_rating = 2
/datum/category_item/autolathe/general/handcuffs
name = "handcuffs"
path =/obj/item/weapon/handcuffs