Skip to content
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.

Sign up for GitHub

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

Update loot in maintenance #1

Open
wants to merge 30 commits into
base: dev
Choose a base branch
from
Open

Update loot in maintenance #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
724d9ef
LOOOOOOOOOOOOT
i1yadobr Oct 14, 2024
8c3b19a
Something new
i1yadobr Oct 20, 2024
fac40d5
Hello my name is Car
i1yadobr Oct 22, 2024
bb80b85
Shields
i1yadobr Oct 22, 2024
3afe446
Balance
i1yadobr Oct 22, 2024
5bbb447
Balance 2
i1yadobr Oct 23, 2024
b736255
Balance3
i1yadobr Oct 25, 2024
3b840d7
Useless description
i1yadobr Oct 25, 2024
624dc60
Fix
i1yadobr Oct 25, 2024
1722b96
Fix2
i1yadobr Oct 25, 2024
2efec10
Fix4
i1yadobr Oct 25, 2024
b8b2876
Something new
i1yadobr Oct 26, 2024
283e1dc
Fix5
i1yadobr Oct 27, 2024
b4c4383
Fix6
i1yadobr Oct 28, 2024
f1069df
fix9
i1yadobr Oct 31, 2024
97039a3
fix10
i1yadobr Oct 31, 2024
96601d9
fix11
i1yadobr Oct 31, 2024
2b149b1
fix12
i1yadobr Oct 31, 2024
90488b0
fix12
i1yadobr Oct 31, 2024
caa57cd
Balance4
i1yadobr Oct 31, 2024
9ff81b0
Balance5
i1yadobr Oct 31, 2024
88b7277
fix13
i1yadobr Oct 31, 2024
a66cbac
Balance
i1yadobr Oct 31, 2024
63604f6
Balance!
i1yadobr Oct 31, 2024
d2e1ea7
Balance!!
i1yadobr Oct 31, 2024
adee50b
Balance!!!
i1yadobr Oct 31, 2024
defaac7
Balance!!!!
i1yadobr Nov 2, 2024
58b5bb9
Fix13
i1yadobr Nov 2, 2024
53bc08d
BalanceIForgotWhatNumberIsNext
i1yadobr Nov 17, 2024
313b8c6
.
i1yadobr Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions baystation12.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,6 +1396,7 @@
#include "code\game\objects\structures\crates_lockers\closets\gimmick.dm"
#include "code\game\objects\structures\crates_lockers\closets\job_closets.dm"
#include "code\game\objects\structures\crates_lockers\closets\l3closet.dm"
#include "code\game\objects\structures\crates_lockers\closets\maintenance.dm"
#include "code\game\objects\structures\crates_lockers\closets\malfunction.dm"
#include "code\game\objects\structures\crates_lockers\closets\statue.dm"
#include "code\game\objects\structures\crates_lockers\closets\syndicate.dm"
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/trash.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
mod_handy = 0.25

/obj/item/trash/dish
name = "dish"
icon_state = "dish"
var/list/stack = list()
var/max_stack = 5

Expand Down Expand Up @@ -125,6 +127,8 @@
icon_state = "surstromming"

/obj/item/trash/cans
name = "\improper Can"
icon_state = "can"
matter = list(MATERIAL_STEEL = 500)
var/base_state = ""

Expand Down
284 changes: 283 additions & 1 deletion code/game/objects/random/random.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,31 @@
/obj/random/tool = 5,
/obj/item/tape_roll = 2)

/obj/random/computer_hardware
name = "random computer hardware"
icon_state = "landmark_hardware"
spawn_nothing_percentage = 33

/obj/random/computer_hardware/spawn_choices()
return list(/obj/item/computer_hardware/ai_slot = 1,
/obj/item/computer_hardware/battery_module = 3,
/obj/item/computer_hardware/battery_module/advanced = 1,
/obj/item/computer_hardware/battery_module/micro = 2,
/obj/item/computer_hardware/battery_module/nano = 4,
/obj/item/computer_hardware/card_slot = 1,
/obj/item/computer_hardware/hard_drive = 2,
/obj/item/computer_hardware/hard_drive/advanced = 1,
/obj/item/computer_hardware/hard_drive/micro = 2,
/obj/item/computer_hardware/hard_drive/small = 3,
/obj/item/computer_hardware/hard_drive/portable = 4,
/obj/item/computer_hardware/nano_printer = 1,
/obj/item/computer_hardware/network_card = 1,
/obj/item/computer_hardware/processor_unit = 2,
/obj/item/computer_hardware/processor_unit/small = 3,
/obj/item/computer_hardware/tesla_link = 1,
/obj/item/modular_computer/tablet = 2,
/obj/item/modular_computer/laptop = 2)

/obj/random/medical
name = "random medical equipment"
desc = "This is a random medical item."
Expand Down Expand Up @@ -192,6 +217,35 @@
/obj/item/storage/firstaid/fire = 6,
/obj/item/storage/firstaid/antirad = 2)

/obj/random/pill
name = "random pill"
icon_state = "landmark_pill"
spawn_nothing_percentage = 50

/obj/random/pill/spawn_choices()
return list(/obj/item/reagent_containers/pill/albumin = 4,
/obj/item/reagent_containers/pill/bicaridine = 3,
/obj/item/reagent_containers/pill/dermaline = 3,
/obj/item/reagent_containers/pill/dexalin_plus = 3,
/obj/item/reagent_containers/pill/dylovene = 4,
/obj/item/reagent_containers/pill/hyronalin = 2,
/obj/item/reagent_containers/pill/inaprovaline = 2,
/obj/item/reagent_containers/pill/noexcutite = 2,
/obj/item/reagent_containers/pill/paracetamol = 4,
/obj/item/reagent_containers/pill/happy = 5,
/obj/item/reagent_containers/pill/zoom = 5,
/obj/item/reagent_containers/pill/peridaxon = 1,
/obj/item/reagent_containers/pill/spaceacillin = 3,
/obj/item/reagent_containers/pill/tricordrazine = 4,
/obj/item/reagent_containers/pill/citalopram = 4,
/obj/item/reagent_containers/pill/methylphenidate = 3,
/obj/item/reagent_containers/pill/paroxetine = 2,
/obj/item/reagent_containers/pill/antidexafen = 4,
/obj/item/reagent_containers/pill/oxycodone = 1,
/obj/item/reagent_containers/pill/tramadol = 2,
/obj/item/reagent_containers/pill/alkysine = 1,
/obj/item/reagent_containers/pill/imidazoline = 1)

/obj/random/contraband
name = "random illegal item"
desc = "Hot Stuff."
Expand Down Expand Up @@ -452,7 +506,235 @@
/obj/structure/closet/wardrobe/white = 3,
/obj/structure/closet/wardrobe/orange = 3,
/obj/structure/closet/crate/secure/loot = 1,
/obj/structure/closet/secure_closet/freezer/kitchen = 3)
/obj/structure/closet/secure_closet/freezer/kitchen = 3,
/obj/structure/closet/maintenance/prefilled = 5,
/obj/structure/closet/maintenance/closet/prefilled = 4,
/obj/structure/closet/maintenance/medical/prefilled = 3,
/obj/structure/closet/maintenance/medicalalt/prefilled = 3,
/obj/structure/closet/maintenance/fridge/prefilled = 3,
/obj/structure/closet/maintenance/cargo/prefilled = 2,
/obj/structure/closet/maintenance/security/prefilled = 1,
/obj/structure/closet/maintenance/science/prefilled = 2,
/obj/structure/closet/maintenance/hydro/prefilled = 2,
/obj/structure/closet/maintenance/engineering/prefilled = 2,
/obj/structure/closet/maintenance/bio/prefilled = 2,
/obj/structure/closet/maintenance/nanotrasen/prefilled = 1)

/obj/random/closet/maint
name = "random maintenance closet trash"
icon_state = "landmark_maint"
spawn_nothing_percentage = 50

/obj/random/closet/maint/spawn_choices()
return list(/obj/random/junk = 10,
/obj/random/cash = 5,
/obj/random/maintenance/clean = 5,
/obj/random/music_tape = 1)

/obj/random/closet/maint/closet
name = "random maintenance better closet trash"
icon_state = "landmark_maint_closet"

/obj/random/closet/maint/closet/spawn_choices()
return list(/obj/random/junk = 10,
/obj/random/tech_supply= 7,
/obj/random/drinkbottle = 7,
/obj/random/cash = 5,
/obj/random/snack = 3,
/obj/random/maintenance/clean = 3)

/obj/random/closet/maint/medical
name = "random maintenance medical trash"
icon_state = "landmark_maint_med"

/obj/random/closet/maint/medical/spawn_choices()
return list(/obj/random/junk = 10,
/obj/item/clothing/mask/surgical = 7,
/obj/item/clothing/suit/surgicalapron = 7,
/obj/item/clothing/under/rank/medical/scrubs/blue = 7,
/obj/item/clothing/gloves/latex/nitrile = 7,
/obj/item/clothing/accessory/armband/med = 7,
/obj/random/pill = 5,
/obj/item/storage/box/syringes = 5,
/obj/item/storage/box/autoinjectors = 5,
/obj/item/clothing/accessory/storage/white_vest/alt = 3,
/obj/item/clothing/accessory/storage/white_vest = 3,
/obj/random/firstaid = 3,
/obj/item/scalpel = 1,
/obj/item/circular_saw = 1,
/obj/item/bonesetter = 1,
/obj/item/bonegel = 1,
/obj/item/FixOVein = 1,
/obj/item/cautery = 1,
/obj/item/hemostat = 1)

/obj/random/closet/maint/medicalalt
name = "random maintenance medical lite trash"
icon_state = "landmark_maint_medalt"

/obj/random/closet/maint/medicalalt/spawn_choices()
return list(/obj/random/junk = 10,
/obj/random/medical/lite = 7,
/obj/random/pill = 5,
/obj/item/reagent_containers/hypospray/autoinjector/pain = 1,
/obj/item/reagent_containers/hypospray/autoinjector/dexalinp = 1,
/obj/item/reagent_containers/hypospray/autoinjector/dermaline = 1,
/obj/item/reagent_containers/hypospray/autoinjector/bicaridine = 1)

/obj/random/closet/maint/fridge
name = "random maintenance fridge trash"
icon_state = "landmark_maint_fridge"

/obj/random/closet/maint/fridge/spawn_choices()
return list(/obj/random/snack = 10,
/obj/random/drinkbottle = 7,
/obj/random/junk = 5,
/obj/item/reagent_containers/food/meat/monkey = 5,
/obj/item/reagent_containers/food/sausage = 5,
/obj/item/reagent_containers/food/fries = 5,
/obj/item/reagent_containers/food/friedegg = 5,
/obj/item/reagent_containers/food/cheeseburrito = 5,
/obj/item/reagent_containers/food/packaged/hematogen = 5,
/obj/item/reagent_containers/food/sliceable/meatbread = 3,
/obj/item/material/knife/butch/kitchen = 1,
/obj/item/reagent_containers/food/meat/human = 1)

/obj/random/closet/maint/cargo
name = "random maintenance cargo trash"
icon_state = "landmark_maint_cargo"

/obj/random/closet/maint/cargo/spawn_choices()
return list(/obj/random/junk = 10,
/obj/item/storage/box = 7,
/obj/random/cash = 5,
/obj/random/smokes = 5,
/obj/item/clothing/accessory/armband/cargo = 5,
/obj/item/clothing/gloves/thick = 5,
/obj/item/storage/backpack/dufflebag = 5,
/obj/item/stamp = 3,
/obj/item/tape_roll = 3,
/obj/item/packageWrap = 3,
/obj/item/hand_labeler = 3,
/obj/item/circuitboard/arcade/orion_trail = 2,
/obj/item/circuitboard/arcade/battle = 2,
/obj/item/material/twohanded/baseballbat/metal = 1)

/obj/random/closet/maint/security
name = "random maintenance security trash"
icon_state = "landmark_maint_sec"

/obj/random/closet/maint/security/spawn_choices()
return list(/obj/random/junk = 50,
/obj/random/cash = 25,
/obj/item/storage/secure/briefcase = 25,
/obj/item/storage/box/security = 20,
/obj/item/device/flashlight/flare = 20,
/obj/item/device/flashlight/maglight = 15,
/obj/item/cell/device/high = 15,
/obj/item/clothing/accessory/armband = 15,
/obj/item/clothing/accessory/storage/black_vest = 10,
/obj/item/clothing/accessory/storage/black_vest/alt = 10,
/obj/item/device/taperecorder = 10,
/obj/item/grenade/smokebomb = 5,
/obj/item/clothing/glasses/sunglasses = 5,
/obj/item/clothing/shoes/jackboots = 3,
/obj/item/clothing/head/helmet = 2,
/obj/item/clothing/suit/armor/vest = 2,
/obj/item/melee/baton = 1,
/obj/item/storage/secure/briefcase/money = 1)

/obj/random/closet/maint/science
name = "random maintenance science trash"
icon_state = "landmark_maint_science"

/obj/random/closet/maint/science/spawn_choices()
return list(/obj/random/junk = 30,
/obj/random/computer_hardware = 25,
/obj/item/stack/material/glass/ten = 10,
/obj/item/stack/material/steel/ten = 10,
/obj/item/rcd_upgrade/anti_interrupt = 7,
/obj/item/rcd_upgrade/cooling = 7,
/obj/item/rcd_upgrade/frames = 7,
/obj/item/rcd_upgrade/furnishing = 7,
/obj/item/rcd_upgrade/simple_circuits = 7,
/obj/item/clothing/glasses/hud/standard/science = 5,
/obj/item/cell/infinite = 1)

/obj/random/closet/maint/hydro
name = "random maintenance hydro trash"
icon_state = "landmark_maint_hydro"

/obj/random/closet/maint/hydro/spawn_choices()
return list(/obj/random/junk = 10,
/obj/random/pottedplant = 6,
/obj/item/storage/plants = 6,
/obj/item/clothing/accessory/armband/hydro = 5,
/obj/item/clothing/gloves/thick/botany = 5,
/obj/item/device/analyzer/plant_analyzer = 5,
/obj/item/material/hatchet = 4,
/obj/item/material/minihoe = 4,
/obj/item/reagent_containers/vessel/plastic/eznutrient = 3,
/obj/item/reagent_containers/vessel/plastic/robustharvest = 3,
/obj/item/reagent_containers/vessel/plastic/left4zed = 3,
/obj/structure/flora/pottedplant/dead = 1,
/obj/item/seeds/random = 1)

/obj/random/closet/maint/engineering
name = "random maintenance engineering trash"
icon_state = "landmark_maint_eng"

/obj/random/closet/maint/engineering/spawn_choices()
return list(/obj/random/junk = 10,
/obj/random/tool = 8,
/obj/item/clothing/accessory/armband/engine = 7,
/obj/item/clothing/mask/gas = 7,
/obj/item/device/flashlight/upgraded = 6,
/obj/item/clothing/gloves/insulated/cheap = 6,
/obj/item/clothing/accessory/storage/brown_vest = 5,
/obj/item/clothing/accessory/storage/brown_vest/alt = 5,
/obj/random/toolbox = 3,
/obj/item/device/multitool = 3,
/obj/item/clothing/gloves/insulated = 1,
/obj/item/clothing/shoes/magboots = 1)

/obj/random/closet/maint/bio
name = "random maintenance bio trash"
icon_state = "landmark_maint_bio"

/obj/random/closet/maint/bio/spawn_choices()
return list(/obj/random/junk = 10,
/obj/item/reagent_containers/vessel/beaker/vial = 7,
/obj/item/clothing/head/bio_hood/general = 5,
/obj/item/clothing/suit/bio_suit/general = 5,
/obj/item/clothing/mask/gas/clear = 4,
/obj/item/tank/emergency/oxygen/double = 4,
/obj/item/tank/emergency/oxygen/engi = 4,
/obj/item/storage/box/masks = 3,
/obj/item/storage/box/gloves = 3,
/obj/item/storage/box/syringes = 3,
/obj/item/clothing/glasses/hud/standard/medical = 2,
/obj/item/reagent_containers/vessel/bottle/chemical/spaceacillin = 2,
/obj/item/virusdish/random = 1)

/obj/random/closet/maint/nanotrasen
name = "random maintenance nanotrasen closet trash"
icon_state = "landmark_maint_nanotrasen"

/obj/random/closet/maint/nanotrasen/spawn_choices()
return list(/obj/random/junk = 10,
/obj/random/cash = 8,
/obj/item/clothing/head/soft/sec/corp/guard = 7,
/obj/item/clothing/accessory/armband/whitered = 7,
/obj/item/clothing/under/track_pants/trackpantswhite = 7,
/obj/item/clothing/gloves/white = 7,
/obj/item/clothing/shoes/white = 7,
/obj/item/storage/backpack/nanotrasen = 6,
/obj/item/storage/briefcase = 6,
/obj/item/device/radio/headset = 6,
/obj/item/book/wiki/chain_of_command = 4,
/obj/item/book/wiki/nt_regs = 4,
/obj/item/clothing/accessory/holster/thigh = 2,
/obj/item/clothing/suit/armor/pcarrier/light/cheap = 1)

/obj/random/coin
name = "random coin"
Expand Down
Loading