Skip to content

Commit

Permalink
Syndicate portable record player (goonstation#20985)
Browse files Browse the repository at this point in the history
  • Loading branch information
JORJ949 authored Oct 19, 2024
1 parent 5537a4f commit 874a861
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 9 deletions.
5 changes: 5 additions & 0 deletions code/datums/components/foldable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,8 @@ TYPEINFO(/datum/component/foldable)
blue_green_stripe
icon_state = "hopcaseC"
item_state = "hopcaseC"
syndicate
w_class = W_CLASS_NORMAL //So you can fit it in your backpack
icon_state = "syndiecase"
item_state = "syndiecase"

10 changes: 10 additions & 0 deletions code/datums/syndicate_buylist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,16 @@ ABSTRACT_TYPE(/datum/syndicate_buylist/traitor)
desc = "A regular looking rose hiding a poison capable of muting and briefly incapacitating anyone who smells it."
job = list("Mime")

/datum/syndicate_buylist/traitor/record_player
name = "Portable Record player"
item = /obj/submachine/record_player/portable
cost = 2
vr_allowed = FALSE
not_in_crates = TRUE
desc = "A portable record player, so you can play tunes while committing crimes!"
job = list("Radio Show Host")
can_buy = UPLINK_TRAITOR

/datum/syndicate_buylist/traitor/chicken_grenade
name = "Chicken Grenade"
item = /obj/item/old_grenade/chicken
Expand Down
16 changes: 16 additions & 0 deletions code/modules/telescience/radiostation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,22 @@
else
boutput(user, "You can feel heat emanating from the record player. You should probably wait a while before touching it. It's kinda old and you don't want to break it.")

/obj/submachine/record_player/portable
name = "portable record player"
desc = "An old school record player, painted in a cool syndicate-red."
icon_state = "portable_record"
density = 0

New()
..()
src.AddComponent(/datum/component/foldable,/obj/item/objBriefcase/syndicate)
var/datum/component/foldable/fold_component = src.GetComponent(/datum/component/foldable) //Fold up into a briefcase the first spawn
if(!fold_component?.the_briefcase)
return
var/obj/item/objBriefcase/briefcase = fold_component.the_briefcase
if (briefcase)
briefcase.set_loc(get_turf(src))
src.set_loc(briefcase)
// Records
/obj/item/record
name = "record"
Expand Down
Binary file modified icons/mob/inhand/hand_general.dmi
Binary file not shown.
Binary file modified icons/obj/items/storage.dmi
Binary file not shown.
Binary file modified icons/obj/radiostation.dmi
Binary file not shown.
19 changes: 10 additions & 9 deletions maps/z2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -32526,16 +32526,17 @@
/turf/unsimulated/floor/carpet/red/fancy/edge/se,
/area/syndicate_station/battlecruiser)
"cvV" = (
/obj/stool/chair/office/red{
dir = 1
},
/turf/unsimulated/floor/circuit/red,
/area/syndicate_station/battlecruiser)
"cvW" = (
/obj/storage/crate/wooden,
/obj/item/storage/box/record/radio/host,
/obj/item/radio_tape/audio_book/commander_resignation,
/obj/item/radio_tape/audio_book/commander_support,
/obj/item/radio_tape/audio_book/commander_resignation,
/turf/unsimulated/floor/circuit/red,
/area/syndicate_station/battlecruiser)
"cvW" = (
/obj/table/wood/auto,
/obj/submachine/record_player/portable{
pixel_y = 5
},
/turf/unsimulated/floor/circuit/red,
/area/syndicate_station/battlecruiser)
"cvZ" = (
Expand Down Expand Up @@ -111057,7 +111058,7 @@ dir
lzl
cvJ
cvQ
cvQ
cvV
lzl
dje
djj
Expand Down Expand Up @@ -111359,7 +111360,7 @@ dis
lzl
cgS
cvR
cvV
cvQ
lzl
djg
djj
Expand Down

0 comments on commit 874a861

Please sign in to comment.