-
-
Notifications
You must be signed in to change notification settings - Fork 540
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
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
display_name = "poster, clip" | ||
path = /obj/item/poster/gec | ||
description = "A random poster from the Confederated League of Independent Planets." | ||
|
||
/obj/item/poster/random_retro | ||
display_name = "poster, retro" | ||
path = /obj/item/poster/gec | ||
description = "A random retro poster from the early days of NT." | ||
|
||
/obj/item/poster/random_solgov | ||
display_name = "poster, solcon" | ||
path = /obj/item/poster/gec | ||
description = "A random poster from the Solar Confederation." | ||
|
||
/datum/gear/camera | ||
display_name = "polaroid camera" | ||
path = /obj/item/camera |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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