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

Random spawn changes (#3317)

Browse Source 
* Random chance stuff

* changelong for merchant

* cigarrete changes
This commit is contained in:
Alberyk
2017-08-25 19:01:35 +02:00
committed by Werner
parent 4204624b6e
commit 27aecda0d1
4 changed files with 115 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/fancy.dm
+1 -1
View File
@@ -134,9 +134,9 @@
icon_type = "cigarette"
/obj/item/weapon/storage/fancy/cigarettes/Initialize()
. = ..()
flags |= NOREACT
create_reagents(15 * storage_slots) //so people can inject cigarettes without opening a packet, now with being able to inject the whole one
. = ..()
/obj/item/weapon/storage/fancy/cigarettes/fill()
for(var/i = 1 to storage_slots)
code/game/objects/random/random.dm
+106 -27
View File
@@ -176,16 +176,26 @@
// spawn_nothing_percentage = 50
problist = list(
/obj/item/weapon/storage/pill_bottle/tramadol = 3,
/obj/item/weapon/haircomb = 4,
/obj/item/weapon/storage/pill_bottle/happy = 2,
/obj/item/weapon/storage/pill_bottle/zoom = 2,
/obj/item/weapon/reagent_containers/glass/beaker/vial/random/toxin = 1,
/obj/item/weapon/contraband/poster = 5,
/obj/item/weapon/material/butterfly = 2,
/obj/item/weapon/material/butterflyblade = 3,
/obj/item/weapon/material/butterflyhandle = 3,
/obj/item/weapon/material/wirerod = 3,
/obj/item/weapon/melee/baton/cattleprod = 1,
/obj/item/weapon/material/hatchet/tacknife = 1,
/obj/item/weapon/material/kitchen/utensil/knife/boot = 2,
/obj/item/weapon/storage/secure/briefcase/money = 1,
/obj/item/weapon/material/butterfly/switchblade = 1,
/obj/item/weapon/reagent_containers/syringe/drugs = 1
/obj/item/weapon/reagent_containers/syringe/drugs = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap = 2,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris = 2,
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus = 1,
/obj/item/seeds/ambrosiavulgarisseed = 2,
/obj/item/seeds/ambrosiadeusseed = 1,
/obj/item/clothing/mask/gas/voice = 1
)
/obj/random/energy
@@ -341,8 +351,8 @@
/obj/item/weapon/storage/backpack/virology = 3,
/obj/item/weapon/storage/backpack/chemistry = 3,
/obj/item/weapon/storage/backpack/cloak = 2,
/obj/item/weapon/storage/backpack/syndie = 2,
/obj/item/weapon/storage/backpack/wizard = 2,
/obj/item/weapon/storage/backpack/syndie = 1,
/obj/item/weapon/storage/backpack/wizard = 1,
/obj/item/weapon/storage/backpack/satchel = 3,
/obj/item/weapon/storage/backpack/satchel_norm = 3,
/obj/item/weapon/storage/backpack/satchel_eng = 3,
@@ -353,15 +363,15 @@
/obj/item/weapon/storage/backpack/satchel_tox = 3,
/obj/item/weapon/storage/backpack/satchel_sec = 3,
/obj/item/weapon/storage/backpack/satchel_hyd = 3,
/obj/item/weapon/storage/backpack/satchel_cap = 2,
/obj/item/weapon/storage/backpack/satchel_syndie = 2,
/obj/item/weapon/storage/backpack/satchel_wizard = 2,
/obj/item/weapon/storage/backpack/ert = 2,
/obj/item/weapon/storage/backpack/ert/security = 2,
/obj/item/weapon/storage/backpack/ert/engineer = 2,
/obj/item/weapon/storage/backpack/ert/medical = 2,
/obj/item/weapon/storage/backpack/satchel_cap = 1,
/obj/item/weapon/storage/backpack/satchel_syndie = 1,
/obj/item/weapon/storage/backpack/satchel_wizard = 1,
/obj/item/weapon/storage/backpack/ert = 1,
/obj/item/weapon/storage/backpack/ert/security = 1,
/obj/item/weapon/storage/backpack/ert/engineer = 1,
/obj/item/weapon/storage/backpack/ert/medical = 1,
/obj/item/weapon/storage/backpack/duffel = 3,
/obj/item/weapon/storage/backpack/duffel/cap = 2,
/obj/item/weapon/storage/backpack/duffel/cap = 1,
/obj/item/weapon/storage/backpack/duffel/hyd = 3,
/obj/item/weapon/storage/backpack/duffel/vir = 3,
/obj/item/weapon/storage/backpack/duffel/med = 3,
@@ -370,8 +380,20 @@
/obj/item/weapon/storage/backpack/duffel/sec = 3,
/obj/item/weapon/storage/backpack/duffel/gen = 3,
/obj/item/weapon/storage/backpack/duffel/chem = 3,
/obj/item/weapon/storage/backpack/duffel/syndie = 2,
/obj/item/weapon/storage/backpack/duffel/wizard = 2
/obj/item/weapon/storage/backpack/duffel/syndie = 1,
/obj/item/weapon/storage/backpack/duffel/wizard = 1,
/obj/item/weapon/storage/backpack/messenger = 2,
/obj/item/weapon/storage/backpack/messenger/chem = 2,
/obj/item/weapon/storage/backpack/messenger/med = 2,
/obj/item/weapon/storage/backpack/messenger/viro = 2,
/obj/item/weapon/storage/backpack/messenger/tox = 2,
/obj/item/weapon/storage/backpack/messenger/gen = 2,
/obj/item/weapon/storage/backpack/messenger/com = 1,
/obj/item/weapon/storage/backpack/messenger/engi = 2,
/obj/item/weapon/storage/backpack/messenger/hyd = 2,
/obj/item/weapon/storage/backpack/messenger/sec = 2,
/obj/item/weapon/storage/backpack/messenger/syndie = 1,
/obj/item/weapon/storage/backpack/messenger/wizard = 1
)
/obj/random/voidsuit
@@ -434,7 +456,9 @@
/obj/machinery/vending/tool = 1,
/obj/machinery/vending/engivend = 0.6,
/obj/machinery/vending/engineering = 1,
/obj/machinery/vending/robotics = 1
/obj/machinery/vending/robotics = 1,
/obj/machinery/vending/tacticool = 0.2,
/obj/machinery/vending/tacticool/ert = 0.1
)
has_postspawn = TRUE
@@ -508,8 +532,19 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/brandy,
/obj/item/weapon/reagent_containers/food/drinks/bottle/guinnes,
/obj/item/weapon/reagent_containers/food/drinks/bottle/drambuie,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cremeyvette,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cremewhite,
/obj/item/weapon/reagent_containers/food/drinks/bottle/chartreuseyellow,
/obj/item/weapon/reagent_containers/food/drinks/bottle/chartreusegreen,
/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine,
/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao,
/obj/item/weapon/reagent_containers/food/drinks/bottle/bitters,
/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne,
/obj/item/weapon/reagent_containers/food/drinks/bottle/mintsyrup,
/obj/item/weapon/reagent_containers/food/drinks/bottle/sarezhiwine,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/xuizijuice
)
/obj/random/melee
@@ -547,6 +582,21 @@
/obj/item/weapon/coin/diamond = 0.1
)
/obj/random/spacecash
name = "random credit chips"
desc = "This is a random credit ships."
icon = 'icons/obj/items.dmi'
icon_state = "spacecash1"
problist = list(
/obj/item/weapon/spacecash/c1 = 6,
/obj/item/weapon/spacecash/c10 = 3,
/obj/item/weapon/spacecash/c20 = 2,
/obj/item/weapon/spacecash/c50 = 1,
/obj/item/weapon/spacecash/c100 = 0.3,
/obj/item/weapon/spacecash/c200 = 0.2,
/obj/item/weapon/spacecash/c1000 = 0.1
)
/obj/random/energy_antag
name = "random energy weapon"
desc = "This is a random energy weapon."
@@ -557,14 +607,18 @@
/obj/item/weapon/gun/energy/xray,
/obj/item/weapon/gun/energy/gun,
/obj/item/weapon/gun/energy/pistol,
/obj/item/weapon/gun/energy/rifle,
/obj/item/weapon/gun/energy/mindflayer,
/obj/item/weapon/gun/energy/toxgun,
/obj/item/weapon/gun/energy/vaurca/gatlinglaser,
/obj/item/weapon/gun/energy/vaurca/blaster,
/obj/item/weapon/gun/energy/crossbow/largecrossbow,
/obj/item/weapon/gun/energy/rifle,
/obj/item/weapon/gun/energy/rifle/laser,
/obj/item/weapon/gun/energy/rifle/laser/heavy,
/obj/item/weapon/gun/energy/rifle/laser/xray,
/obj/item/weapon/gun/energy/net
/obj/item/weapon/gun/energy/net,
/obj/item/weapon/gun/energy/laser/shotgun,
/obj/item/weapon/gun/energy/decloner
)
/obj/random/colored_jumpsuit
@@ -625,7 +679,7 @@
/obj/item/clothing/accessory/badge/old = 0.2,
/obj/item/clothing/accessory/storage/webbing = 0.6,
/obj/item/clothing/accessory/storage/knifeharness = 0.3,
/obj/item/clothing/head/collectable/petehat = 0.3,
/obj/item/clothing/head/collectable/petehat = 0.1,
/obj/item/clothing/head/hardhat = 1.2,
/obj/item/clothing/head/redcoat = 0.4,
/obj/item/clothing/head/syndicatefake = 0.5,
@@ -643,12 +697,17 @@
/obj/item/clothing/mask/balaclava = 1,
/obj/item/clothing/mask/gas = 1.5,
/obj/item/clothing/mask/gas/cyborg = 0.7,
/obj/item/clothing/mask/gas/owl_mask = 0.8,
/obj/item/clothing/mask/gas/owl_mask = 0.5,
/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/horsehead = 0.5,
/obj/item/clothing/mask/gas/clown_hat = 0.1,
/obj/item/clothing/mask/gas/mime = 0.1,
/obj/item/clothing/mask/pig = 0.3,
/obj/item/clothing/mask/muzzle = 0.2,
/obj/item/clothing/mask/luchador = 0.1,
/obj/item/clothing/mask/luchador/tecnicos = 0.1,
/obj/item/clothing/mask/luchador/rudos = 0.1,
/obj/item/clothing/shoes/rainbow = 1,
/obj/item/clothing/shoes/jackboots = 1,
/obj/item/clothing/shoes/workboots = 1,
@@ -657,6 +716,7 @@
/obj/item/clothing/shoes/slippers_worn = 0.5,
/obj/item/clothing/shoes/combat = 0.2,
/obj/item/clothing/shoes/clown_shoes = 0.1,
/obj/item/clothing/shoes/winter = 0.3,
/obj/item/clothing/suit/storage/hazardvest = 1,
/obj/item/clothing/suit/storage/leather_jacket/nanotrasen = 0.7,
/obj/item/clothing/suit/ianshirt = 0.5,
@@ -671,13 +731,17 @@
/obj/item/clothing/gloves/boxing/green = 0.3,
/obj/item/clothing/gloves/botanic_leather = 0.7,
/obj/item/clothing/gloves/combat = 0.2,
/obj/item/clothing/gloves/latex = 0.5,
/obj/item/clothing/gloves/latex/nitrile = 0.4,
/obj/item/toy/bosunwhistle = 0.5,
/obj/item/toy/balloon = 0.4,
/obj/item/weapon/haircomb = 0.5,
/obj/item/weapon/lipstick = 0.6,
/obj/item/weapon/material/knife/hook = 0.3,
/obj/item/weapon/material/hatchet/tacknife = 0.4,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 1.2,
/obj/item/weapon/storage/fancy/cigarettes = 1.2,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 0.8,
/obj/item/weapon/storage/fancy/cigarettes/killthroat = 0.3,
/obj/item/weapon/storage/bag/plasticbag = 1,
/obj/item/weapon/extinguisher = 1.3,
/obj/item/weapon/extinguisher/mini = 0.9,
@@ -692,6 +756,8 @@
/obj/item/weapon/reagent_containers/food/drinks/flask/lithium = 0.3,
/obj/item/bodybag = 0.7,
/obj/item/weapon/reagent_containers/spray/cleaner = 0.6,
/obj/item/weapon/reagent_containers/spray/sterilizine = 0.4,
/obj/item/weapon/reagent_containers/spray/waterflower = 0.2,
/obj/item/weapon/tank/emergency_oxygen = 0.7,
/obj/item/weapon/tank/emergency_oxygen/double = 0.4,
/obj/item/clothing/mask/smokable/pipe/cobpipe = 0.5,
@@ -701,6 +767,7 @@
/obj/item/device/gps/engineering = 0.6,
/obj/item/device/megaphone = 0.5,
/obj/item/device/floor_painter = 0.6,
/obj/item/device/wormhole_jaunter = 0.1,
/obj/random/toolbox = 1,
/obj/random/coin = 1.2,
/obj/random/tech_supply = 1.2,
@@ -713,17 +780,30 @@
/obj/random/firstaid = 0.4,
/obj/random/medical = 0.4,
/obj/random/glowstick = 0.7,
/obj/random/tool = 1,
/obj/random/plushie = 0.7,
/obj/item/weapon/caution/cone = 0.7,
/obj/item/weapon/staff/broom = 0.5,
/obj/item/weapon/soap = 0.4,
/obj/item/weapon/storage/fancy/crayons = 0.5,
/obj/item/weapon/storage/box/donkpockets = 0.6,
/obj/item/weapon/storage/box/masks = 0.5,
/obj/item/weapon/storage/box/syringes = 0.3,
/obj/item/weapon/storage/box/smokebombs = 0.1,
/obj/item/weapon/storage/box/drinkingglasses = 0.2,
/obj/item/weapon/storage/box/condimentbottles = 0.2,
/obj/item/weapon/storage/box/mousetraps = 0.3,
/obj/item/weapon/storage/box/lights = 0.5,
/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/weapon/shovel = 0.5,
/obj/item/weapon/pickaxe = 0.4,
/obj/item/weapon/inflatable_duck = 0.2,
/obj/random/hoodie = 0.5
/obj/random/hoodie = 0.5,
/obj/random/junk = 0.9,
/obj/item/weapon/spacecash/ewallet/lotto = 0.3,
/obj/random/spacecash = 0.3
)
/obj/random/hoodie
@@ -750,9 +830,8 @@
icon = 'icons/obj/items.dmi'
icon_state = "coin_diamond"
problist = list(
/obj/item/bluespace_crystal = 7,
/obj/item/weapon/storage/secure/briefcase/money = 5,
/obj/item/stack/telecrystal{amount = 10} = 7,
/obj/item/bluespace_crystal = 5,
/obj/item/stack/telecrystal{amount = 10} = 5,
/obj/item/clothing/suit/armor/reactive = 0.5,
/obj/item/clothing/glasses/thermal = 0.5,
/obj/item/weapon/gun/projectile/automatic/rifle/shotgun = 0.5,
@@ -762,7 +841,6 @@
/obj/item/weapon/gun/projectile/automatic/terminator = 0.5,
/obj/item/weapon/rig/military = 0.5,
/obj/item/weapon/rig/unathi/fancy = 0.5,
/obj/item/clothing/mask/ai = 0.5,
/obj/item/weapon/anomaly_core = 0.5
)
@@ -848,3 +926,4 @@
/obj/item/weapon/material/sword/dao,
/obj/item/weapon/material/sword/gladius
)
code/modules/client/preferences_spawnpoints.dm
+2 -1
View File
@@ -44,7 +44,7 @@ var/list/spawntypes = list()
/datum/spawnpoint/cyborg
display_name = "Cyborg Storage"
msg = "has been activated from storage"
restrict_job = list("Cyborg", "Merchant")
restrict_job = list("Cyborg")
/datum/spawnpoint/cyborg/New()
..()
@@ -55,4 +55,5 @@ var/list/spawntypes = list()
restrict_job = list("Merchant")
/datum/spawnpoint/merchant/New()
..()
turfs = latejoin_merchant
html/changelogs/alberyk-PR-3317.yml
+6
View File
@@ -0,0 +1,6 @@
author: Alberyk
delete-after: True
changes:
- rscadd: "Ported the baystation12 merchant jobs, with additions and proper modifications."