diff --git a/code/datums/components/foldable.dm b/code/datums/components/foldable.dm index 534cf24d136aa..b302ea73db4ae 100644 --- a/code/datums/components/foldable.dm +++ b/code/datums/components/foldable.dm @@ -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" + diff --git a/code/datums/syndicate_buylist.dm b/code/datums/syndicate_buylist.dm index 4611f2299f91d..2999db79d9692 100644 --- a/code/datums/syndicate_buylist.dm +++ b/code/datums/syndicate_buylist.dm @@ -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 diff --git a/code/modules/telescience/radiostation.dm b/code/modules/telescience/radiostation.dm index a7d499c0c7502..af5429d8fcf6f 100644 --- a/code/modules/telescience/radiostation.dm +++ b/code/modules/telescience/radiostation.dm @@ -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" diff --git a/icons/mob/inhand/hand_general.dmi b/icons/mob/inhand/hand_general.dmi index 7a31c3b560d5d..53a7815283dbd 100644 Binary files a/icons/mob/inhand/hand_general.dmi and b/icons/mob/inhand/hand_general.dmi differ diff --git a/icons/obj/items/storage.dmi b/icons/obj/items/storage.dmi index d8f34618256ee..82490d21bf298 100644 Binary files a/icons/obj/items/storage.dmi and b/icons/obj/items/storage.dmi differ diff --git a/icons/obj/radiostation.dmi b/icons/obj/radiostation.dmi index 1724051b99376..59b55d6f1c539 100644 Binary files a/icons/obj/radiostation.dmi and b/icons/obj/radiostation.dmi differ diff --git a/maps/z2.dmm b/maps/z2.dmm index 30a1eafe85484..73ef23a63fb68 100644 --- a/maps/z2.dmm +++ b/maps/z2.dmm @@ -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" = ( @@ -111057,7 +111058,7 @@ dir lzl cvJ cvQ -cvQ +cvV lzl dje djj @@ -111359,7 +111360,7 @@ dis lzl cgS cvR -cvV +cvQ lzl djg djj