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

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-4_mainlevel.dmm
This commit is contained in:
skull132
2018-06-17 23:19:10 +03:00
parent 9da929d4a1 d274dec76a
commit a276504130
11 changed files with 159 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/randomstock.dm
+4 -4
View File
@@ -684,17 +684,17 @@ 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/black/fluff,
/obj/item/clothing/gloves/white/unathi/fluff,
/obj/item/clothing/gloves/swat/bst,
/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)
exclusion += typesof(/obj/item/clothing/gloves/lightrig)
exclusion += typesof(/obj/item/clothing/gloves/watch)
exclusion += typesof(/obj/item/clothing/gloves/swat/fluff)
exclusion += typesof(/obj/item/clothing/gloves/black/fluff)
exclusion += typesof(/obj/item/clothing/gloves/white/unathi/fluff)
exclusion += typesof(/obj/item/clothing/gloves/fluff)
allgloves -= exclusion
var/number = rand(1,5)
while (number > 0)