Cargo random stock and some fixes (#3609)

-tweaks cargo random stock a bit, and removes the borg chassis that caused a lot of bugs
-fixed a wrong name in some food trash type
-fixed the slime stunbaton having no in hand sprite
This commit is contained in:
Alberyk
2017-10-13 11:38:33 -03:00
committed by Erki
parent 8550e41b49
commit e7eec867bc
3 changed files with 13 additions and 25 deletions
+7 -18
View File
@@ -227,6 +227,7 @@ var/list/global/random_stock_rare = list(
"xenohide" = 0.5,
"humanhide" = 0.5,
"modkit" = 1,
"contraband" = 0.8,
"nothing" = 0)
var/list/global/random_stock_large = list(
@@ -242,7 +243,6 @@ var/list/global/random_stock_large = list(
"oxycanister" = 6,//Cargo should almost always have an oxycanister
"oxydispenser" = 5,
"bubbleshield" = 2,
"chassis" = 2,
"watertank" = 2,
"fueltank" = 2,
"airpump" = 1,
@@ -1450,7 +1450,8 @@ var/list/global/random_stock_large = list(
/obj/item/weapon/rig/ce = 2,
/obj/item/weapon/rig/hazmat = 4,
/obj/item/weapon/rig/medical = 4,
/obj/item/weapon/rig/hazard = 3
/obj/item/weapon/rig/hazard = 3,
/obj/item/weapon/rig/diving = 1
)
var/type = pickweight(rigs)
@@ -1526,6 +1527,8 @@ var/list/global/random_stock_large = list(
var/type = pick(modkits)
new type(L)
if ("contraband")
new /obj/random/contraband(L)
//Large items go below here
//=============================================================
@@ -1577,21 +1580,6 @@ var/list/global/random_stock_large = list(
var/obj/machinery/portable_atmospherics/powered/M = new /obj/machinery/portable_atmospherics/powered/scrubber(L)
if (prob(60))
M.cell = null
//Spawns a complete, but brainless robot chassis. Ready for MMI insertion
//It may be missing limbs, and if so cargo can probably scrounge some up in the warehouse.
if ("chassis")
var/obj/item/robot_parts/robot_suit/RS = new /obj/item/robot_parts/robot_suit(L)
if (prob(90))
RS.r_arm = new
if (prob(90))
RS.r_leg = new
if (prob(90))
RS.l_arm = new
if (prob(90))
RS.l_leg = new
RS.chest = new
RS.head = new
RS.updateicon()
if ("suspension")//Xenoarch suspension field generator, they need a spare
new /obj/machinery/suspension_gen(L)
@@ -1700,7 +1688,8 @@ var/list/global/random_stock_large = list(
/obj/mecha/combat/marauder = 0.6,
/obj/mecha/combat/marauder/seraph = 0.3,
/obj/mecha/combat/marauder/mauler = 0.4,
/obj/mecha/combat/phazon = 0.1
/obj/mecha/combat/phazon = 0.1,
/obj/mecha/combat/honker = 0.01
)
var/type = pickweight(randsuits)
var/obj/mecha/exosuit = new type(get_turf(L))