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

makes the loadout selection less bleak #293

Merged
merged 14 commits into from
Jan 1, 2025
Merged

makes the loadout selection less bleak #293

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3be6732
its peak
Paxilmaniac Dec 18, 2024
9e7797d
s
Paxilmaniac Dec 18, 2024
2c33f44
d
Paxilmaniac Dec 18, 2024
27083ba
fixes some weird stuff
Paxilmaniac Dec 18, 2024
3390db3
techno visor
Paxilmaniac Dec 18, 2024
6bcbb49
adds red reskin
Paxilmaniac Dec 18, 2024
885282b
fake var
Paxilmaniac Dec 18, 2024
ba588da
s
Paxilmaniac Dec 18, 2024
5f1b11b
v
Paxilmaniac Dec 18, 2024
d95a536
crazy pulls
Paxilmaniac Dec 19, 2024
fb5dd53
makes tech visor reskinning and glasses colors less painful
Paxilmaniac Dec 19, 2024
80a8a87
makes the disk desc funnier than it was before, and random
Paxilmaniac Dec 21, 2024
426318c
fixes some stuff
Paxilmaniac Dec 23, 2024
59fe982
,
Paxilmaniac Dec 23, 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
4 changes: 2 additions & 2 deletions code/modules/clothing/suits/bio.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

/obj/item/clothing/head/bio_hood/Initialize(mapload)
. = ..()
if(flags_inv & HIDEFACE)
AddComponent(/datum/component/clothing_fov_visor, FOV_90_DEGREES)
/* if(flags_inv & HIDEFACE) // DOPPLER EDIT REMOVAL
AddComponent(/datum/component/clothing_fov_visor, FOV_90_DEGREES) */
AddComponent(/datum/component/adjust_fishing_difficulty, 6)
AddComponent(/datum/component/hat_stabilizer, loose_hat = TRUE)

Expand Down
8 changes: 4 additions & 4 deletions code/modules/loadout/categories/heads.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
name = "Cap (Yellow)"
item_path = /obj/item/clothing/head/soft/yellow

/datum/loadout_item/head/flatcap
/* /datum/loadout_item/head/flatcap // DOPPLER EDIT REMOVAL
name = "Cap (Flat)"
item_path = /obj/item/clothing/head/flatcap
item_path = /obj/item/clothing/head/flatcap */

/datum/loadout_item/head/beige_fedora
name = "Fedora (Beige)"
Expand Down Expand Up @@ -124,9 +124,9 @@
name ="Ushanka"
item_path = /obj/item/clothing/head/costume/ushanka

/datum/loadout_item/head/plague_doctor
/* /datum/loadout_item/head/plague_doctor // DOPPLER EDIT REMOVAL
name = "Cap (Plague Doctor)"
item_path = /obj/item/clothing/head/bio_hood/plague
item_path = /obj/item/clothing/head/bio_hood/plague */

/datum/loadout_item/head/rose
name = "Rose"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/loadout/categories/pocket.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
abstract_type = /datum/loadout_item/pocket_items/plush
can_be_named = TRUE

/datum/loadout_item/pocket_items/plush/bee
/* /datum/loadout_item/pocket_items/plush/bee // DOPPLER EDIT REMOVAL
name = "Plush (Bee)"
item_path = /obj/item/toy/plush/beeplushie

Expand Down Expand Up @@ -124,7 +124,7 @@

/datum/loadout_item/pocket_items/plush/snake
name = "Plush (Snake)"
item_path = /obj/item/toy/plush/snakeplushie
item_path = /obj/item/toy/plush/snakeplushie */

/datum/loadout_item/pocket_items/card_binder
name = "Card Binder"
Expand All @@ -146,7 +146,7 @@
name = "Dice Bag"
item_path = /obj/item/storage/dice

/datum/loadout_item/pocket_items/d1
/* /datum/loadout_item/pocket_items/d1 // DOPPLER EDIT REMOVAL
name = "D1"
item_path = /obj/item/dice/d1

Expand Down Expand Up @@ -192,4 +192,4 @@

/datum/loadout_item/pocket_items/d00
name = "D00"
item_path = /obj/item/dice/d00
item_path = /obj/item/dice/d00 */
44 changes: 44 additions & 0 deletions modular_doppler/epic_loot/code/loot_items/electronics.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,47 @@
/datum/material/silver = SMALL_MATERIAL_AMOUNT * 2,
/datum/material/gold = SMALL_MATERIAL_AMOUNT * 2,
)

/obj/item/computer_disk/all_of_them
max_capacity = 128
starting_programs = list(
/datum/computer_file/program/arcade/eazy, // 6 GQ
/datum/computer_file/program/radar/lifeline, // 5 GQ
/datum/computer_file/program/radar/custodial_locator, // 2 GQ
/datum/computer_file/program/supermatter_monitor, // 5 GQ
/datum/computer_file/program/newscaster, // 2 GQ
/datum/computer_file/program/secureye/syndicate, // 5 GQ
/datum/computer_file/program/status, // 1 GQ
/datum/computer_file/program/maintenance/phys_scanner, // 2 GQ
/datum/computer_file/program/maintenance/camera, // 4 GQ
/datum/computer_file/program/maintenance/modsuit_control, // 2 GQ
/datum/computer_file/program/maintenance/spectre_meter, // 7 GQ
/datum/computer_file/program/maintenance/cool_sword, // 1 GQ
/datum/computer_file/program/maintenance/theme/cat, // 2 GQ
/datum/computer_file/program/maintenance/theme/lightmode, // 2 GQ
/datum/computer_file/program/maintenance/theme/spooky, // 2 GQ
/datum/computer_file/program/ntnet_dos, // 20 GQ
/datum/computer_file/program/revelation, // 13 GQ
/datum/computer_file/program/ai_restorer, // 12 GQ
/datum/computer_file/program/ntnetmonitor, // 12 GQ
)
/// List of random things that will be mentioned in the desc
var/list/hackerman_bits = list(
"Some Tunes",
"钱",
"Software Testing Prototype",
"CLASSIFIED",
"Free Download",
"!! EVIL VIRUS !!",
"📸",
">;3",
"@AOL.com",
"$$$",
"Comedy",
"For Whom The Bell Tolls",
)

/obj/item/computer_disk/all_of_them/Initialize(mapload)
. = ..()
desc = "Removable disk used to store data, with a paper label adhered to the side. \
This one has '[pick(hackerman_bits)]' ominously written on it."
12 changes: 12 additions & 0 deletions modular_doppler/loadout_categories/categories/backpacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,15 @@
/datum/loadout_item/backpack/messenger/industrial
name = "Custom Industrial Messenger Bag"
item_path = /obj/item/storage/backpack/messenger/eng/custom

/datum/loadout_item/backpack/frontier
name = "Frontier Backpack"
item_path = /obj/item/storage/backpack/industrial/frontier_colonist

/datum/loadout_item/backpack/frontier_messenger
name = "Frontier Messenger Bag"
item_path = /obj/item/storage/backpack/industrial/frontier_colonist/messenger

/datum/loadout_item/backpack/frontier_satchel
name = "Frontier Satchel"
item_path = /obj/item/storage/backpack/industrial/frontier_colonist/satchel
50 changes: 5 additions & 45 deletions modular_doppler/loadout_categories/categories/belts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,6 @@
name = "Black Fannypack"
item_path = /obj/item/storage/belt/fannypack/black

/datum/loadout_item/belts/fanny_pack_blue
name = "Blue Fannypack"
item_path = /obj/item/storage/belt/fannypack/blue

/datum/loadout_item/belts/fanny_pack_brown
name = "Brown Fannypack"
item_path = /obj/item/storage/belt/fannypack

/datum/loadout_item/belts/fanny_pack_cyan
name = "Cyan Fannypack"
item_path = /obj/item/storage/belt/fannypack/cyan

/datum/loadout_item/belts/fanny_pack_green
name = "Green Fannypack"
item_path = /obj/item/storage/belt/fannypack/green

/datum/loadout_item/belts/fanny_pack_orange
name = "Orange Fannypack"
item_path = /obj/item/storage/belt/fannypack/orange

/datum/loadout_item/belts/fanny_pack_pink
name = "Pink Fannypack"
item_path = /obj/item/storage/belt/fannypack/pink

/datum/loadout_item/belts/fanny_pack_purple
name = "Purple Fannypack"
item_path = /obj/item/storage/belt/fannypack/purple

/datum/loadout_item/belts/fanny_pack_red
name = "Red Fannypack"
item_path = /obj/item/storage/belt/fannypack/red

/datum/loadout_item/belts/fanny_pack_yellow
name = "Yellow Fannypack"
item_path = /obj/item/storage/belt/fannypack/yellow

/datum/loadout_item/belts/fanny_pack_white
name = "White Fannypack"
item_path = /obj/item/storage/belt/fannypack/white
Expand All @@ -69,10 +33,6 @@
name = "Lantern"
item_path = /obj/item/flashlight/lantern

/datum/loadout_item/belts/candle_box
name = "Candle Box"
item_path = /obj/item/storage/fancy/candle_box

/datum/loadout_item/belts/champion
name = "Champion's Belt"
item_path = /obj/item/storage/belt/champion
Expand Down Expand Up @@ -105,14 +65,14 @@
name = "Compact Utility Belt"
item_path = /obj/item/storage/belt/utility/invisible

/datum/loadout_item/belts/utility/chief
name = "Chief Engineer's Utility Belt"
item_path = /obj/item/storage/belt/utility/chief

/datum/loadout_item/belts/mining
name = "Explorer's Webbing"
item_path = /obj/item/storage/belt/mining

/datum/loadout_item/belts/mining_alt
name = "Explorer's Webbing (Alt)"
item_path = /obj/item/storage/belt/mining/alt

/datum/loadout_item/belts/boarding_rig
name = "Chest Rig"
item_path = /obj/item/storage/belt/military
Expand All @@ -130,7 +90,7 @@
item_path = /obj/item/storage/medkit/frontier/stocked

/datum/loadout_item/belts/deforest_surgical
name = "Firest Responder Med-kit"
name = "First Responder Med-kit"
item_path = /obj/item/storage/backpack/duffelbag/deforest_surgical

/datum/loadout_item/belts/crusader_belt
Expand Down
Loading
Loading