-
Notifications
You must be signed in to change notification settings - Fork 523
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
Combat Correspondent Expansion Pt. 1 #5784
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sprites approved
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
something with this merge conflict is busted, when the code gets approved I can just remake the PR or whatever |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
Co-authored-by: SabreML <[email protected]>
Co-authored-by: SabreML <[email protected]>
…nto CC-expansion
So, when you admin reply to a fax that was made on the CC's fax machine nothing happens. It doesn't print it physically, and it doesn't show up in staff IC. However, it does show up in view-faxes, but noone can really see it there. The issue persists whether or not the fax machine is deployed. |
This would be better reported as an https://github.com/cmss13-devs/cmss13/issues but yes even requiring deployment to receive faxes is a bit weird. |
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
-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
-Civilian CC now has a different gear loadout on start
-Adds new deployable fax backpack for the Civilian CC to spawn with
-Adds new broadcasting camera for the Civilian CC to spawn with
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)
-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
Screenshots & Videos
On spawn Civ CC:
The broadcasting camera and new camera inhands:
CC's new room with the vendor:
The new vendor🤢:
Drip:
Fax backpack deployed:
New camera wield states:
Changelog
🆑
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: