Skip to content
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

Merged
merged 46 commits into from
Mar 1, 2024

Conversation

GrrrKitten
Copy link
Contributor

@GrrrKitten GrrrKitten commented Feb 22, 2024

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

Screenshots & Videos

On spawn Civ CC:
image
image
image
image

The broadcasting camera and new camera inhands:
image

CC's new room with the vendor:
image

The new vendor🤢:
image

Drip:
image

Fax backpack deployed:
image

New camera wield states:
image
image

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:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge labels Feb 22, 2024
@GrrrKitten GrrrKitten marked this pull request as draft February 22, 2024 20:55
@GrrrKitten GrrrKitten marked this pull request as ready for review February 22, 2024 21:42
@GrrrKitten GrrrKitten marked this pull request as draft February 22, 2024 21:46
@GrrrKitten GrrrKitten marked this pull request as ready for review February 22, 2024 22:00
@GrrrKitten GrrrKitten marked this pull request as ready for review February 25, 2024 02:33
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sprites approved

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Feb 25, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 26, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@GrrrKitten
Copy link
Contributor Author

something with this merge conflict is busted, when the code gets approved I can just remake the PR or whatever

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 27, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

code/game/machinery/fax_machine.dm Outdated Show resolved Hide resolved
code/game/machinery/fax_machine.dm Outdated Show resolved Hide resolved
code/game/machinery/fax_machine.dm Outdated Show resolved Hide resolved
code/game/machinery/fax_machine.dm Outdated Show resolved Hide resolved
code/game/machinery/fax_machine.dm Outdated Show resolved Hide resolved
code/modules/paperwork/photography.dm Outdated Show resolved Hide resolved
code/modules/paperwork/photography.dm Outdated Show resolved Hide resolved
code/modules/paperwork/photography.dm Outdated Show resolved Hide resolved
code/modules/paperwork/photography.dm Outdated Show resolved Hide resolved
code/modules/paperwork/photography.dm Show resolved Hide resolved
@GrrrKitten GrrrKitten requested a review from SabreML March 1, 2024 01:57
@Drulikar Drulikar added this pull request to the merge queue Mar 1, 2024
Merged via the queue into cmss13-devs:master with commit 81c7806 Mar 1, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Mar 1, 2024
@dadlips
Copy link

dadlips commented Mar 7, 2024

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.

@Drulikar
Copy link
Contributor

Drulikar commented Mar 7, 2024

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants