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.

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

Loadout Additions: Desk Flags, Action Figures, Posters and Two Neck Items #3897

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions code/game/objects/effects/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@
poster_type = /obj/structure/sign/poster/rilena/random
icon_state = "rolled_rilena"

/obj/item/poster/gec
name = "GEC poster"
poster_type = /obj/structure/sign/poster/contraband/gec
icon_state = "rolled_poster"

// The poster sign/structure

/obj/structure/sign/poster
Expand Down
9 changes: 8 additions & 1 deletion code/modules/client/loadout/loadout_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
display_name = "shemagh"
path = /obj/item/clothing/neck/shemagh

/datum/gear/accessory/shemagh
display_name = "shemagh, new gorlex"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No faction stuff in loadouts

path = /obj/item/clothing/neck/shemagh/ngr

//(The actually good scarves)

/datum/gear/accessory/scarf/striped
Expand All @@ -41,6 +45,10 @@
display_name = "striped scarf, blue"
path = /obj/item/clothing/neck/stripedbluescarf

/datum/gear/accessory/scarf/striped/solarian
display_name = "striped scarf, solarian"
path = /obj/item/clothing/neck/stripedsolgovscarf

//Ties

/datum/gear/accessory/tie
Expand Down Expand Up @@ -135,7 +143,6 @@
/datum/gear/accessory/stethoscope
display_name = "stethoscope"
path = /obj/item/clothing/neck/stethoscope
allowed_roles = list("Medical Doctor", "Chief Medical Officer")

/datum/gear/accessory/headphones
display_name = "headphones"
Expand Down
76 changes: 76 additions & 0 deletions code/modules/client/loadout/loadout_general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,38 @@
display_name = "paper bin"
path = /obj/item/paper_bin

/datum/gear/desklamp
display_name = "desk lamp"
path = /obj/item/flashlight/lamp

/datum/gear/desklamp_green
display_name = "desk lamp, old"
path = /obj/item/flashlight/lamp/green

/datum/gear/deskflag
display_name = "desk flag, white"
path = /obj/item/desk_flag

/datum/gear/deskflag_gezena
display_name = "desk flag, gezena"
path = /obj/item/desk_flag/gezena

/datum/gear/deskflag_solgov
display_name = "desk flag, solcon"
path = /obj/item/desk_flag/solgov

/datum/gear/deskflag_NGR
display_name = "desk flag, new gorlex"
path = /obj/item/desk_flag/ngr

/datum/gear/deskflag_SUNS
display_name = "desk flag, suns"
path = /obj/item/desk_flag/suns

/datum/gear/deskflag_trans
display_name = "desk flag, trans"
path = /obj/item/desk_flag/trans

/datum/gear/cane
display_name = "cane"
path = /obj/item/cane
Expand Down Expand Up @@ -128,6 +160,30 @@
display_name = "toy, rilena tali plushie"
path = /obj/item/toy/plush/tali

/datum/gear/tali_figure
display_name = "toy, rilena tali action figure"
path = /obj/item/toy/figure/tali

/datum/gear/xeno_figure
display_name = "toy, xenomorph action figure"
path = /obj/item/toy/toy_xeno

/datum/gear/inteq_figure
display_name = "toy, inteq enforcer action figure"
path = /obj/item/toy/figure/inteq

/datum/gear/nuke_figure
display_name = "toy, nuclear weapon action figure"
path = /obj/item/toy/nuke

/datum/gear/griffin_figure
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of these are kind of meh, and especially the griffin and owl ones

display_name = "toy, griffin action figure"
path = /obj/item/toy/talking/griffin

/datum/gear/owl_figure
display_name = "toy, owl action figure"
path = /obj/item/toy/talking/owl

/datum/gear/amongus
display_name = "toy, suspicious pill plushie"
path = /obj/item/toy/plush/among
Expand Down Expand Up @@ -163,6 +219,26 @@
path = /obj/item/poster/random_rilena
description = "A random poster of the RILENA series."

/datum/gear/gec_poster
display_name = "poster, gec"
path = /obj/item/poster/gec
description = "A poster representing the Galactic Engineering Concordat union."

/obj/item/poster/random_minutemen
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Posters don't feel like they really belong in loadout to me
  2. no faction stuff in loadouts

display_name = "poster, clip"

Check failure on line 228 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'display_name' on type '/obj/item/poster/random_minutemen'
path = /obj/item/poster/gec

Check failure on line 229 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'path' on type '/obj/item/poster/random_minutemen'
description = "A random poster from the Confederated League of Independent Planets."

Check failure on line 230 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'description' on type '/obj/item/poster/random_minutemen'

/obj/item/poster/random_retro
display_name = "poster, retro"

Check failure on line 233 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'display_name' on type '/obj/item/poster/random_retro'
path = /obj/item/poster/gec

Check failure on line 234 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'path' on type '/obj/item/poster/random_retro'
description = "A random retro poster from the early days of NT."

Check failure on line 235 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'description' on type '/obj/item/poster/random_retro'

/obj/item/poster/random_solgov
display_name = "poster, solcon"

Check failure on line 238 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'display_name' on type '/obj/item/poster/random_solgov'
path = /obj/item/poster/gec

Check failure on line 239 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'path' on type '/obj/item/poster/random_solgov'
description = "A random poster from the Solar Confederation."

Check failure on line 240 in code/modules/client/loadout/loadout_general.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'description' on type '/obj/item/poster/random_solgov'

/datum/gear/camera
display_name = "polaroid camera"
path = /obj/item/camera
4 changes: 0 additions & 4 deletions code/modules/client/loadout/loadout_hat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,14 @@
/datum/gear/hat/hhat_yellow
display_name = "hardhat, yellow"
path = /obj/item/clothing/head/hardhat
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician")

/datum/gear/hat/hhat_orange
display_name = "hardhat, orange"
path = /obj/item/clothing/head/hardhat/orange
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician")

/datum/gear/hat/hhat_blue
display_name = "hardhat, blue"
path = /obj/item/clothing/head/hardhat/dblue
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician")

//Berets, AKA how I lost my will to live again

Expand Down Expand Up @@ -76,7 +73,6 @@
/datum/gear/hat/beret/engineering/hazard
display_name = "beret, hazard"
path = /obj/item/clothing/head/beret/eng/hazard
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer")

//Soft caps

Expand Down
Loading