diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 26bc6746ad..ab849bafce 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -115,22 +115,6 @@ H.equip_to_slot_if_possible(musicaltuner, ITEM_SLOT_BACKPACK) H.regenerate_icons() -/datum/quirk/photographer - name = "Photographer" - desc = "You know how to handle a camera, shortening the delay between each shot." - value = 1 - mob_trait = TRAIT_PHOTOGRAPHER - gain_text = "You know everything about photography." - lose_text = "You forget how photo cameras work." - medical_record_text = "Patient mentions photography as a stress-relieving hobby." - -/datum/quirk/photographer/on_spawn() - var/mob/living/carbon/human/H = quirk_holder - var/obj/item/camera/camera = new(get_turf(H)) - H.put_in_hands(camera) - H.equip_to_slot(camera, ITEM_SLOT_BACKPACK) //SPLURT Edit - H.regenerate_icons() - /datum/quirk/selfaware name = "Self-Aware" desc = "You know your body well, and can accurately assess the extent of your wounds." diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 4db3d688ce..b62e55778a 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -182,3 +182,25 @@ /datum/quirk/dullahan/post_add() quirk_holder.AddComponent(/datum/component/dullahan) + +/datum/quirk/photographer + name = "Photographer" + desc = "You carry your camera and personal photo album everywhere you go - and you're quicker at taking pictures." + value = 0 + mob_trait = TRAIT_PHOTOGRAPHER + gain_text = "You know everything about photography." + lose_text = "You forget how photo cameras work." + medical_record_text = "Patient mentions photography as a stress-relieving hobby." + +/datum/quirk/photographer/on_spawn() + var/mob/living/carbon/human/H = quirk_holder + var/obj/item/storage/photo_album/photo_album = new(get_turf(H)) + H.put_in_hands(photo_album) + H.equip_to_slot(photo_album, ITEM_SLOT_BACKPACK) + photo_album.persistence_id = "personal_[H.mind.key]" // this is a persistent album, the ID is tied to the account's key to avoid tampering + photo_album.persistence_load() + photo_album.name = "[H.real_name]'s photo album" + var/obj/item/camera/camera = new(get_turf(H)) + H.put_in_hands(camera) + H.equip_to_slot(camera, ITEM_SLOT_BACKPACK) //SPLURT Edit + H.regenerate_icons() diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm index 48a9203553..edb4e2b3d2 100644 --- a/code/modules/photography/photos/album.dm +++ b/code/modules/photography/photos/album.dm @@ -3,12 +3,14 @@ */ /obj/item/storage/photo_album name = "photo album" + desc = "A big book used to store photos and mementos." icon = 'icons/obj/items_and_weapons.dmi' icon_state = "album" - item_state = "briefcase" - lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' + item_state = "album" + lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' resistance_flags = FLAMMABLE + w_class = WEIGHT_CLASS_SMALL var/persistence_id /obj/item/storage/photo_album/Initialize(mapload) @@ -54,22 +56,29 @@ qdel(P) /obj/item/storage/photo_album/HoS + name = "photo album (Head of Security)" persistence_id = "HoS" /obj/item/storage/photo_album/RD + name = "photo album (Research Director)" persistence_id = "RD" /obj/item/storage/photo_album/HoP + name = "photo album (Head of Personnel)" persistence_id = "HoP" /obj/item/storage/photo_album/Captain + name = "photo album (Captain)" persistence_id = "Captain" /obj/item/storage/photo_album/CMO + name = "photo album (Chief Medical Officer)" persistence_id = "CMO" /obj/item/storage/photo_album/QM + name = "photo album (Quartermaster)" persistence_id = "QM" /obj/item/storage/photo_album/CE + name = "photo album (Chief Engineer)" persistence_id = "CE" diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index c363c549de..5b4db7ddb3 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -97,3 +97,6 @@ if(n_name && (loc == usr || loc.loc && loc.loc == usr) && CHECK_MOBILITY(L, MOBILITY_USE)) name = "photo[(n_name ? text("- '[n_name]'") : null)]" add_fingerprint(usr) + +/obj/item/photo/old + icon_state = "photo_old" diff --git a/icons/mob/inhands/misc/books_lefthand.dmi b/icons/mob/inhands/misc/books_lefthand.dmi index df662a413b..7748d281f1 100644 Binary files a/icons/mob/inhands/misc/books_lefthand.dmi and b/icons/mob/inhands/misc/books_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/books_righthand.dmi b/icons/mob/inhands/misc/books_righthand.dmi index afa4a7a5fb..285b89b258 100644 Binary files a/icons/mob/inhands/misc/books_righthand.dmi and b/icons/mob/inhands/misc/books_righthand.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index b958ca201c..b9378bb018 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm index eb557e3ddc..f7785cfc7e 100644 --- a/modular_splurt/code/datums/traits/good.dm +++ b/modular_splurt/code/datums/traits/good.dm @@ -1,18 +1,3 @@ -//Main code edits -/datum/quirk/photographer - desc = "You carry your camera and personal photo album everywhere you go, and you're quicker at taking pictures." - -/datum/quirk/photographer/on_spawn() - . = ..() - var/mob/living/carbon/human/H = quirk_holder - var/obj/item/storage/photo_album/photo_album = new(get_turf(H)) - H.put_in_hands(photo_album) - H.equip_to_slot(photo_album, ITEM_SLOT_BACKPACK) - photo_album.persistence_id = "personal_[H.mind.key]" // this is a persistent album, the ID is tied to the account's key to avoid tampering - photo_album.persistence_load() - photo_album.name = "[H.real_name]'s photo album" - -//Own stuff /datum/quirk/tough name = "Tough" desc = "Your body is abnormally enduring and can take 10% more damage." diff --git a/modular_splurt/code/modules/photography/photos/album.dm b/modular_splurt/code/modules/photography/photos/album.dm deleted file mode 100644 index f7795a670e..0000000000 --- a/modular_splurt/code/modules/photography/photos/album.dm +++ /dev/null @@ -1,27 +0,0 @@ -/obj/item/storage/photo_album - desc = "A big book used to store photos and mementos." - item_state = "album" - lefthand_file = 'modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi' - righthand_file = 'modular_splurt/icons/mob/inhands/misc/books_righthand.dmi' - w_class = WEIGHT_CLASS_SMALL - -/obj/item/storage/photo_album/HoS - name = "photo album (Head of Security)" - -/obj/item/storage/photo_album/RD - name = "photo album (Research Director)" - -/obj/item/storage/photo_album/HoP - name = "photo album (Head of Personnel)" - -/obj/item/storage/photo_album/Captain - name = "photo album (Captain)" - -/obj/item/storage/photo_album/CMO - name = "photo album (Chief Medical Officer)" - -/obj/item/storage/photo_album/QM - name = "photo album (Quartermaster)" - -/obj/item/storage/photo_album/CE - name = "photo album (Chief Engineer)" diff --git a/modular_splurt/code/modules/photography/photos/photo.dm b/modular_splurt/code/modules/photography/photos/photo.dm deleted file mode 100644 index 3eb0f70752..0000000000 --- a/modular_splurt/code/modules/photography/photos/photo.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/item/photo/old - icon = 'modular_splurt/icons/obj/items_and_weapons.dmi' - icon_state = "photo_old" diff --git a/modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi b/modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi deleted file mode 100644 index cd59fe6d03..0000000000 Binary files a/modular_splurt/icons/mob/inhands/misc/books_lefthand.dmi and /dev/null differ diff --git a/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi b/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi deleted file mode 100644 index a2fc3cc73b..0000000000 Binary files a/modular_splurt/icons/mob/inhands/misc/books_righthand.dmi and /dev/null differ diff --git a/modular_splurt/icons/obj/items_and_weapons.dmi b/modular_splurt/icons/obj/items_and_weapons.dmi index a5b3d02d5b..0dd0e88c6a 100644 Binary files a/modular_splurt/icons/obj/items_and_weapons.dmi and b/modular_splurt/icons/obj/items_and_weapons.dmi differ diff --git a/tgstation.dme b/tgstation.dme index f44fd0b527..46f4010275 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4874,8 +4874,6 @@ #include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\penguinhiero.dm" #include "modular_splurt\code\modules\mob\living\simple_animal\hostile\megafauna\sand.dm" #include "modular_splurt\code\modules\paperwork\pen.dm" -#include "modular_splurt\code\modules\photography\photos\album.dm" -#include "modular_splurt\code\modules\photography\photos\photo.dm" #include "modular_splurt\code\modules\power\cell.dm" #include "modular_splurt\code\modules\power\reactor\fluffed.dm" #include "modular_splurt\code\modules\power\reactor\rbmk.dm"