cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm
This commit is contained in:
skull132
2018-05-13 19:19:52 +03:00
parent caaed22df2 c0db238c11
commit 674cd94714
21 changed files with 2159 additions and 1752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/randomstock.dm
+2 -4
View File
@@ -683,11 +683,9 @@ var/list/global/random_stock_large = list(
var/list/allgloves = typesof(/obj/item/clothing/gloves)
var/list/exclusion = list(/obj/item/clothing/gloves,
/obj/item/clothing/gloves/fluff,
/obj/item/clothing/gloves/swat/bst,
/obj/item/clothing/gloves/swat/fluff/hawk_gloves,
/obj/item/clothing/gloves/fluff/stone_ring,
/obj/item/clothing/gloves/black/fluff/kathleen_glove,
/obj/item/clothing/gloves/swat/fluff,
/obj/item/clothing/gloves/black/fluff,
/obj/item/clothing/gloves/powerfist,
/obj/item/clothing/gloves/claws)
exclusion += typesof(/obj/item/clothing/gloves/rig)