cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #452 from Fox-McCloud/RND-Fixes-Balance

Browse Source 
RnD Fixes and Tweaks
This commit is contained in:
ZomgPonies
2015-02-28 22:16:37 -05:00
parent b24ed71ec6 923ba5932f
commit 43783ca583
12 changed files with 70 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending.dm
+7 -3
View File
@@ -847,9 +847,13 @@
product_slogans = "Carts to go!"
icon_state = "cart"
icon_deny = "cart-deny"
products = list(/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/security = 10,
/obj/item/weapon/cartridge/janitor = 10,/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/device/pda/heads = 10,
/obj/item/weapon/cartridge/captain = 3,/obj/item/weapon/cartridge/quartermaster = 10)
products = list(/obj/item/device/pda =10,/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/chemistry = 10,
/obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/atmos = 10,/obj/item/weapon/cartridge/janitor = 10,
/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/weapon/cartridge/signal = 10,/obj/item/weapon/cartridge = 10)
contraband = list(/obj/item/weapon/cartridge/clown = 1,/obj/item/weapon/cartridge/mime = 1)
prices = list(/obj/item/device/pda =300,/obj/item/weapon/cartridge/medical = 200,/obj/item/weapon/cartridge/chemistry = 150,/obj/item/weapon/cartridge/engineering = 100,
/obj/item/weapon/cartridge/atmos = 75,/obj/item/weapon/cartridge/janitor = 100,/obj/item/weapon/cartridge/signal/toxins = 150,
/obj/item/weapon/cartridge/signal = 75,/obj/item/weapon/cartridge = 50)
/obj/machinery/vending/cigarette
name = "Cigarette machine" //OCD had to be uppercase to look nice with the new formating
code/game/objects/items/weapons/storage/belt.dm
-10
View File
@@ -318,16 +318,6 @@
max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2. This is deliberate
origin_tech = "bluespace=4"
can_hold = list()
New()
if(prob(5))
//Sometimes people choose justice.
//Sometimes justice chooses you.
visible_message("That doesn't look like a normal Toolbelt of Holding...")
new /obj/item/weapon/storage/belt/bluespace/owlman(loc)
spawn(1)
del src
return
..()
proc/failcheck(mob/user as mob)
if (prob(src.reliability)) return 1 //No failure