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

Merge branch 'upstream/development' into development

Browse Source 
# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm
This commit is contained in:
skull132
2016-12-18 01:06:45 +02:00
parent 30fbc7a67b 355504dabb
commit 9b094ad0eb
37 changed files with 543 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/random.dm
+17 -6
View File
@@ -510,10 +510,9 @@
/obj/random/coin/item_to_spawn()
var/list/coin = list("/obj/item/weapon/coin/iron" = 5,
"/obj/item/weapon/coin/silver" = 3,
"/obj/item/weapon/coin/gold" = 1,
"/obj/item/weapon/coin/silver" = 0.7,
"/obj/item/weapon/coin/gold" = 0.7,
"/obj/item/weapon/coin/phoron" = 0.5,
"obj/item/weapon/coin/uranium" = 0.5,
"/obj/item/weapon/coin/uranium" = 0.5,
"/obj/item/weapon/coin/platinum" = 0.2,
"/obj/item/weapon/coin/diamond" = 0.1,
)
@@ -581,7 +580,7 @@
"/obj/item/clothing/glasses/material" = 0.8,
"/obj/item/clothing/glasses/sunglasses" = 1.5,
"/obj/item/clothing/glasses/welding" = 1.2,
"/obj/item/clothing/under/captain_fly" = 0.7,
"/obj/item/clothing/under/captain_fly" = 0.5,
"/obj/item/clothing/under/rank/mailman" = 0.6,
"/obj/item/clothing/under/rank/vice" = 0.8,
"/obj/item/clothing/under/assistantformal" = 1,
@@ -591,9 +590,11 @@
"/obj/item/clothing/under/serviceoveralls" = 1,
"/obj/item/clothing/under/psyche" = 0.5,
"/obj/item/clothing/under/track" = 0.9,
"/obj/item/clothing/under/rank/dispatch" = 1,
"/obj/item/clothing/under/rank/dispatch" = 0.8,
"/obj/item/clothing/under/syndicate/tacticool" = 1,
"/obj/item/clothing/under/syndicate/tracksuit" = 0.2,
"/obj/item/clothing/under/rank/clown" = 0.1,
"/obj/item/clothing/under/mime" = 0.1,
"/obj/item/clothing/accessory/badge" = 0.2,
"/obj/item/clothing/accessory/badge/old" = 0.2,
"/obj/item/clothing/accessory/storage/webbing" = 0.6,
@@ -620,6 +621,8 @@
"/obj/item/clothing/mask/gas/syndicate" = 0.4,
"/obj/item/clothing/mask/fakemoustache" = 0.4,
"/obj/item/clothing/mask/horsehead" = 0.9,
"/obj/item/clothing/mask/gas/clown_hat" = 0.1,
"/obj/item/clothing/mask/gas/mime" = 0.1,
"/obj/item/clothing/shoes/rainbow" = 1,
"/obj/item/clothing/shoes/jackboots" = 1,
"/obj/item/clothing/shoes/workboots" = 1,
@@ -658,6 +661,7 @@
"/obj/item/device/flashlight/maglight" = 0.4,
"/obj/item/device/flashlight/flare" = 0.5,
"/obj/item/device/flashlight/lantern" = 0.4,
"/obj/item/device/taperecorder" = 0.6,
"/obj/item/weapon/reagent_containers/food/drinks/teapot" = 0.4,
"/obj/item/weapon/reagent_containers/food/drinks/flask/shiny" = 0.3,
"/obj/item/weapon/reagent_containers/food/drinks/flask/lithium" = 0.3,
@@ -679,7 +683,10 @@
"/obj/random/colored_jumpsuit" = 0.7,
"/obj/random/booze" = 1.1,
"/obj/random/belt" = 0.9,
"/obj/random/backpack" = 0.7,
"/obj/random/contraband" = 0.9,
"/obj/random/firstaid" = 0.4,
"/obj/random/medical" = 0.4,
"/obj/random/glowstick" = 0.7,
"/obj/item/weapon/caution/cone" = 0.7,
"/obj/item/weapon/staff/broom" = 0.5,
@@ -688,6 +695,10 @@
"/obj/item/weapon/storage/box/donkpockets" = 0.6,
"/obj/item/weapon/contraband/poster" = 1.3,
"/obj/item/device/magnetic_lock/security" = 0.3,
"/obj/item/device/magnetic_lock/engineering" = 0.3
"/obj/item/device/magnetic_lock/engineering" = 0.3,
"/obj/item/weapon/shovel" = 0.5,
"/obj/item/weapon/pickaxe" = 0.4,
"/obj/item/weapon/pickaxe" = 0.4,
"/obj/item/weapon/inflatable_duck" = 0.2
)
return pickweight(maint)