-
Notifications
You must be signed in to change notification settings - Fork 565
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Combat Correspondent Expansion Pt. 1 (#5784)
# About the pull request All changes: Minor Changes: -Updates some older fax code and makes it more robust with iconstates for versatility -Splits all of the CC's outfits into seperate outfits not determined by camo -Makes all cameras start on 7 range (there was no reason for it to be 3, just a noobtrap that discouraged people from using cameras) -Makes photo album able to hold 28 photos (more space QoL and now it fits 4 rows of pics instead of cutting off) -Fixes some severe bugs with camera code that let you have infinite photos -Allows you to refill the camera without it being on 0 photos (if you can fit 10 more photos) -Fixes bug that caused camera to lie to you about the amount of photos left (and wouldnt let you refill when you ran out) -Makes taking photos faster and more responsive --- Major Changes: -Big boy camera changes * Cameras are now wieldable * Removes the ability to turn cameras off (it just led to people missing photos/thinking their camera was broken because it was so easy to accidentally turn off) * Cameras now have to be wielded to take photos * Gives the polaroid camera inhands and worn iconstates -Adds new CC vendor (devs didnt want me giving all of CC's outfits in a single locker like CL's which I disagree with but whatever :/) **See pic of it below** * Three non-starting undersuits tossed into the vendor * Four non-starting oversuits + Armor + B/W hazard vest in vendor * Basic backpack gear moved from starting into vendor under Essentials * Adds refill section from some of the stuff that was in locker and some other basic gear that noone cares about -Civilian CC now has a different gear loadout on start * Backpack gear moved to vendor in essentials * Given new portable fax backpack (see below) * GIven new broadcasting camera (see below) * Polaroid now starts on belt (with new iconstate to match) * Given single large pouch for storage for compensation now that they dont have an open backpack and beltslot -Adds new deployable fax backpack for the Civilian CC to spawn with * Doesn't require power to use * Most be deployed (similar to a m2c/m56d) to use * Cannot receive faxes while on the back * To be used for on the field (or not having to run back everytime) reporting -Adds new broadcasting camera for the Civilian CC to spawn with * Can take up to 20 photos before needing to be refilled * Can be wielded (looks dope) * Cannot be easily stored note: this is just an RP fluff item, it serves no real benefit besides storing 10 extra photos, it just looks cool. I may expand it in the future. Some people want it to broadcast to CIC/Lobby screen but eh, not for this PR. -CC room changes (Almayer) * New CC vendor * Adds a new Toner and Film in compensation for lost items -Redoes both Military and Civilian CC basic inventory to fit with new items + new vendor # Explain why it's good for the game CC, especially Civilian CC, can feel very limited at times. This PR seeks to give a general boost to QoL along with adding some new items for better RP. CC's often have to break from their groundside RP or whatever is going on to get a fax out (when faxes are pretty useless most the time in the grand scheme of things) so the backpack fax fixes that. The broadcasting camera is also just a cute little RP item that serves no real benefit but tell me you don't want to lug that big camera around on your shoulder while begging marines for attention # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> On spawn Civ CC: ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/18c8c2e1-19e2-4d1b-af0c-3177e256e1e0) ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/b9f1a6ae-4a54-4eff-8f2e-f682d022eb6a) ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/eaf777bf-a5a6-4e9a-9747-5f36390cc997) ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/0ab0ba59-9b4f-45d2-a438-47ece6deb5bb) The broadcasting camera and new camera inhands: ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/b75cfd32-d60f-4e20-b868-d7b711efb2cf) CC's new room with the vendor: ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/f4e194ab-8ba6-4250-ab7d-4ad22c87b779) The new vendor🤢: ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/c3c1d194-679a-4c95-9bc3-ccf22333aab5) Drip: ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/4be45d42-7e10-403d-9dbd-7533d898a510) Fax backpack deployed: ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/88893f43-4313-451b-8293-297a8ba5ec25) New camera wield states: ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/66342716-42ef-45ae-9ec0-3872267fad34) ![image](https://github.com/cmss13-devs/cmss13/assets/158611449/3978c1c2-bf00-479b-a46d-46e59700af5b) </details> # Changelog :cl: add: New Deployable Fax Backpack for the Civilian Combat Correspondent add: New Wieldable Broadcasting Camera for the Civilian Combat Correspondent add: Cameras can no longer be turned off but have to be wielded to take photos add: Add's new Combat Correspondent vendor with CC's basic outfits and standard gear fix: Fixes numerous camera/photo bugs imageadd: Adds new itemstates for the polaroid camera /:cl: --------- Co-authored-by: Drathek <[email protected]> Co-authored-by: SabreML <[email protected]>
- Loading branch information
1 parent
a4f3805
commit 81c7806
Showing
26 changed files
with
2,272 additions
and
2,116 deletions.
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
51 changes: 51 additions & 0 deletions
51
code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm
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 |
---|---|---|
@@ -0,0 +1,51 @@ | ||
//------------ CC CLOTHING VENDOR--------------- | ||
|
||
GLOBAL_LIST_INIT(cm_vending_clothing_combat_correspondent, list( | ||
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), | ||
list("Essential Reporter's Set", 0, /obj/effect/essentials_set/cc, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), | ||
list("Portable Press Fax Machine", 0, /obj/item/device/fax_backpack, CIVILIAN_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), | ||
list("Press Broadcasting Camera", 0, /obj/item/device/camera/broadcasting, CIVILIAN_CAN_BUY_UTILITY, VENDOR_ITEM_RECOMMENDED), | ||
list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), | ||
|
||
list("UNIFORM (CHOOSE 1)", 0, null, null, null), | ||
list("Black Uniform", 0, /obj/item/clothing/under/marine/reporter/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Orange Uniform", 0, /obj/item/clothing/under/marine/reporter/orange, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
list("Red Uniform", 0, /obj/item/clothing/under/marine/reporter/red, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), | ||
|
||
list("ARMOR (CHOOSE 1)", 0, null, null, null), | ||
list("Combat Correspondent's Armor", 0, /obj/item/clothing/suit/storage/marine/light/reporter, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), | ||
list("Blue Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Black Vest", 0, /obj/item/clothing/suit/storage/hazardvest/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Black Coat", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
list("Green Coat", 0, /obj/item/clothing/suit/storage/jacket/marine/reporter/green, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), | ||
|
||
list("HELMET (CHOOSE 1)", 0, null, null, null), | ||
list("Combat Correspondent's Helmet", 0, /obj/item/clothing/head/helmet/marine/reporter, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), | ||
list("Combat Correspondent's Cap", 0, /obj/item/clothing/head/cmcap/reporter, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), | ||
list("Fedora", 0, /obj/item/clothing/head/fedora, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), | ||
|
||
list("REFILLS", 0, null, null, null), | ||
list("Camera", 10, /obj/item/device/camera, null, VENDOR_ITEM_REGULAR), | ||
list("Camera Film", 5, /obj/item/device/camera_film, null, VENDOR_ITEM_REGULAR), | ||
list("Toner", 5, /obj/item/device/toner, null, VENDOR_ITEM_REGULAR), | ||
list("Regulation Tapes", 15, /obj/item/storage/box/tapes, null, VENDOR_ITEM_REGULAR), | ||
list("Paper Bin", 10, /obj/item/paper_bin/uscm, null, VENDOR_ITEM_REGULAR), | ||
)) | ||
|
||
/obj/structure/machinery/cm_vending/clothing/combat_correspondent | ||
name = "\improper ColMarTech Combat Correspondent Equipment Rack" | ||
desc = "An automated rack hooked up to a colossal storage of Reporter standard-issue equipment." | ||
req_access = list(ACCESS_PRESS) | ||
vendor_role = list(JOB_COMBAT_REPORTER) | ||
|
||
/obj/structure/machinery/cm_vending/clothing/combat_correspondent/get_listed_products(mob/user) | ||
return GLOB.cm_vending_clothing_combat_correspondent | ||
|
||
/obj/effect/essentials_set/cc | ||
spawned_gear_list = list( | ||
/obj/item/device/flashlight, | ||
/obj/item/tool/pen, | ||
/obj/item/device/binoculars, | ||
/obj/item/notepad, | ||
/obj/item/device/taperecorder, | ||
) |
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
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
Oops, something went wrong.