New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Чемоданчик #11398
The head ref may contain hidden characters: "\u0447\u0435\u043C\u043E\u0434\u0430\u043D\u0447\u0438\u043A"
Чемоданчик #11398
Changes from 1 commit
e80b710
a34370b
3e00eff
ef3b6c9
55c0439
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -162,26 +162,81 @@ | |
prob(100);pick(typesof(/obj/item/weapon/disk/smartlight_programm)) | ||
) | ||
|
||
/obj/random/misc/storage | ||
name = "Random Bag/Box/Case" | ||
/obj/random/misc/mine/wallet | ||
name = "Random Wallet" | ||
desc = "Кошелёк с миной или обычными деньгами." | ||
icon = 'icons/obj/storage.dmi' | ||
icon_state = "wallet" | ||
|
||
/obj/random/misc/mine/wallet/item_to_spawn() | ||
return /obj/item/weapon/storage/wallet | ||
|
||
/obj/random/misc/mine/wallet/spawn_item() | ||
var/obj/item/weapon/storage/Bag = ..() | ||
|
||
if(prob(30)) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
else | ||
spawn_money(300, Bag) | ||
|
||
/obj/random/misc/mine/box_pouch | ||
name = "Random Box" | ||
desc = "Случайная коробка с миной или обычными предметами." | ||
icon = 'icons/obj/storage.dmi' | ||
icon_state = "box" | ||
|
||
/obj/random/misc/mine/box_pouch/item_to_spawn() | ||
return pick(\ | ||
prob(20);/obj/item/weapon/storage/pouch/medium_generic,\ | ||
prob(100);/obj/item/weapon/storage/box, | ||
) | ||
|
||
/obj/random/misc/mine/box_pouch/spawn_item() | ||
var/obj/item/weapon/storage/Bag = ..() | ||
|
||
if(prob(30)) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
else | ||
for(var/i = 0, i < 4, i++) | ||
var/itemtype = pick(\ | ||
prob(25);/obj/random/foods/food_snack,\ | ||
prob(25);/obj/random/foods/drink_can,\ | ||
prob(25);/obj/random/misc/cigarettes,\ | ||
prob(25);/obj/random/misc/lightsource,\ | ||
prob(25);/obj/random/misc/lighters,\ | ||
prob(25);/obj/random/meds/pills,\ | ||
prob(25);pick(typesof(/obj/item/device/camera) - /obj/item/device/camera/siliconcam),\ | ||
prob(20);/obj/item/weapon/storage/wallet/random,\ | ||
prob(15);/obj/item/weapon/reagent_containers/spray/pepper,\ | ||
prob(10);/obj/item/device/flash, | ||
) | ||
new itemtype(Bag) | ||
|
||
/obj/random/misc/mine/backpack_satchel | ||
name = "Random Bag/Case" | ||
desc = "Случайная сумка с миной или обычными предметами." | ||
icon = 'icons/obj/storage.dmi' | ||
icon_state = "briefcase" | ||
|
||
/obj/random/misc/storage/item_to_spawn() | ||
/obj/random/misc/mine/backpack_satchel/item_to_spawn() | ||
return pick(\ | ||
prob(30);/obj/item/weapon/storage/briefcase,\ | ||
prob(30);/obj/item/weapon/storage/backpack/alt,\ | ||
prob(30);/obj/item/weapon/storage/backpack,\ | ||
prob(30);/obj/item/weapon/storage/backpack/satchel,\ | ||
prob(30);/obj/item/weapon/storage/backpack/satchel/norm,\ | ||
prob(20);/obj/item/weapon/storage/pouch/medium_generic,\ | ||
prob(10);/obj/item/weapon/storage/box,\ | ||
prob(5);/obj/item/weapon/storage/wallet, | ||
prob(100);/obj/item/weapon/storage/backpack/satchel/norm, | ||
) | ||
|
||
/obj/random/misc/storage/spawn_item() | ||
/obj/random/misc/mine/backpack_satchel/spawn_item() | ||
var/obj/item/weapon/storage/Bag = ..() | ||
LudwigVonChesterfield marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
if(prob(30)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. тут и везде переписать на вид
(т.н. "ранний возврат") |
||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
|
@@ -191,25 +246,7 @@ | |
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
else | ||
for(var/i = 0, i < 4, i++) | ||
var/itemtype | ||
if(istype(Bag, /obj/item/weapon/storage/box) || istype(Bag, /obj/item/weapon/storage/pouch/medium_generic)) | ||
itemtype = pick(\ | ||
prob(25);/obj/random/foods/food_snack,\ | ||
prob(25);/obj/random/foods/drink_can,\ | ||
prob(25);/obj/random/misc/cigarettes,\ | ||
prob(25);/obj/random/misc/lightsource,\ | ||
prob(25);/obj/random/misc/lighters,\ | ||
prob(25);/obj/random/meds/pills,\ | ||
prob(25);pick(typesof(/obj/item/device/camera) - /obj/item/device/camera/siliconcam),\ | ||
prob(20);/obj/item/weapon/storage/wallet/random,\ | ||
prob(15);/obj/item/weapon/reagent_containers/spray/pepper,\ | ||
prob(10);/obj/item/device/flash, | ||
) | ||
else if(istype(Bag, /obj/item/weapon/storage/wallet)) | ||
spawn_money(300, Bag) | ||
return | ||
else | ||
itemtype = pick(\ | ||
var/itemtype = pick(\ | ||
prob(25);/obj/random/foods/food_snack,\ | ||
prob(25);/obj/random/foods/drink_can,\ | ||
prob(25);/obj/random/misc/cigarettes,\ | ||
|
@@ -223,11 +260,11 @@ | |
prob(20);/obj/item/weapon/storage/wallet/random,\ | ||
prob(15);/obj/item/weapon/reagent_containers/spray/pepper,\ | ||
prob(10);/obj/item/device/flash,\ | ||
prob(5);/obj/item/weapon/gun/projectile/automatic/glock | ||
) | ||
new itemtype(Bag) | ||
|
||
/obj/random/misc/storage/mine | ||
/obj/random/misc/mine | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. выглядит будто это рандомная мина а не коробка с миной There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. так на картинке с ней будет сумка. так что явно будет понятно что это рандомная коробка с миной There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. названия важны. в названии написано что это мина а не сумка с миной. напиши что это сумка с миной |
||
name = "Random Bag/Box/Case with mine" | ||
desc = "Случайная сумка с миной." | ||
icon = 'icons/obj/storage.dmi' | ||
|
@@ -246,7 +283,7 @@ | |
) | ||
|
||
/obj/random/misc/storage/mine/spawn_item() | ||
var/obj/item/weapon/storage/Bag = ..() | ||
|
||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
new /obj/item/weapon/grenade/chem_grenade/mine(Bag) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
в чем прикол больше одной гранаты
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
5 гранат по 30 ломают человека но не ломают тайлы.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
а 1 граната не ломает?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ну и в любом случае заменить на