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

Adds misc Cybersun stuff. Also .22 is now in cargo. #3484

Merged
merged 2 commits into from
Oct 7, 2024
Merged
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
9 changes: 9 additions & 0 deletions code/game/objects/items/documents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
/obj/item/documents/syndicate
desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence."

/obj/item/documents/syndicate/cybersun
name = "classified Cybersun documents"
desc = "\"Top Secret\" documents detailing sensitive Cybersun Virtual Solutions operational intelligence. These documents are verified with a red wax seal."
icon_state = "docs_red"

/obj/item/documents/syndicate/cybersun/biodynamics
desc = "\"Top Secret\" Cybersun Biodynamics documents, filled with patient lists and unfinished designs. These documents are verified with a teal wax seal."
icon_state = "docs_teal"

/obj/item/documents/syndicate/red
name = "red secret documents"
desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence. These documents are verified with a red wax seal."
Expand Down
17 changes: 17 additions & 0 deletions code/game/objects/items/storage/secure.dm
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,20 @@
/obj/item/storage/secure/safe/suns/PopulateContents()
. = ..()
new /obj/item/storage/belt/sabre/suns(src)

/obj/item/storage/secure/safe/cybersun
name = "Captain's secure safe"
desc = "An electronic safe manufactured by Cybersun Virtual Solutions."

/obj/item/storage/secure/safe/cybersun/PopulateContents()
new /obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag(src)
new /obj/item/ammo_box/magazine/m22lr_himehabu(src)
new /obj/item/ammo_box/magazine/m22lr_himehabu(src)

/obj/item/storage/secure/safe/cybersun/solutions/PopulateContents()
. = ..()
new /obj/item/folder/documents/syndicate/cybersun(src)

/obj/item/storage/secure/safe/cybersun/biodynamics/PopulateContents()
. = ..()
new /obj/item/folder/documents/syndicate/cybersun/biodynamics(src)
1 change: 1 addition & 0 deletions code/modules/asset_cache/asset_list_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
"stamp-bard" = 'icons/stamp_icons/large_stamp-bard.png',
"stamp-gold" = 'icons/stamp_icons/large_stamp-gold.png',
"stamp-cybersun" = 'icons/stamp_icons/large_stamp-cybersun.png',
"stamp-biodynamics" = 'icons/stamp_icons/large_stamp-biodynamics.png',
"stamp-donk" = 'icons/stamp_icons/large_stamp-donk.png'
)

Expand Down
8 changes: 8 additions & 0 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -421,3 +421,11 @@
desc = "Contains a fifty-round box of .44 roumain hollow point ammo, great against unarmored targets."
contains = list(/obj/item/ammo_box/a44roum/hp)
cost = 500

/datum/supply_pack/ammo/c22lr
name = ".22 LR Ammo Box Crate"
desc = "Contains two 75 round ammo boxes for refilling .22 LR weapons."
contains = list(/obj/item/ammo_box/c22lr_box,
/obj/item/ammo_box/c22lr_box)
crate_name = "ammo crate"
cost = 250
9 changes: 9 additions & 0 deletions code/modules/paperwork/folders_premade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@
name = "folder- 'TOP SECRET'"
desc = "A folder stamped \"Top Secret - Property of The Syndicate.\""

/obj/item/folder/documents/syndicate/cybersun
document = /obj/item/documents/syndicate/cybersun
icon_state = "folder_sred"
desc = "A folder stamped \"Top Secret - Property of Cybersun Industries.\""

/obj/item/folder/documents/syndicate/cybersun/biodynamics
document = /obj/item/documents/syndicate/cybersun/biodynamics
icon_state = "folder_sblue"

/obj/item/folder/documents/syndicate/red
document = /obj/item/documents/syndicate/red
icon_state = "folder_sred"
Expand Down
7 changes: 6 additions & 1 deletion code/modules/paperwork/stamps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,15 @@
dye_color = DYE_SYNDICATE

/obj/item/stamp/cybersun
name = "Cybersun rubber stamp"
name = "Cybersun Virtual Solutions rubber stamp"
icon_state = "stamp-cybersun"
dye_color = DYE_SYNDICATE

/obj/item/stamp/cybersun/biodynamics
name = "Cybersun Biodynamics rubber stamp"
icon_state = "stamp-biodynamics"
dye_color = DYE_CMO

/obj/item/stamp/solgov
name = "SolGov rubber stamp"
icon_state = "stamp-solgov"
Expand Down
Binary file modified icons/obj/bureaucracy.dmi
Binary file not shown.
Binary file added icons/stamp_icons/large_stamp-biodynamics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading