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

Survey scanner #2103

Closed
wants to merge 65 commits into from
Closed

Survey scanner #2103

wants to merge 65 commits into from

Conversation

Erikafox
Copy link
Contributor

About The Pull Request

Adds survey scanners and survey points.
A survey scanner is a backpack slot piece of equipment that holds a survey scanner, and allows you to scan a survey point.
Scanning a survey point creates science points, like the survey scanner of ole.
https://github.com/shiptest-ss13/Shiptest/assets/94164348/848f3fe3-af38-4a7c-b5c9-bd14a9f9ad8b

Dissections have been fairly heavily nerfed to account for this, and to make surveying a desirable thing to do.

All sprites are placeholder.

Also adds a framework for other tools that require a backpack to use.

Why It's Good For The Game

Less Dissections, More Exploration

Changelog

🆑
add: Survey Backpacks! You can buy them at the outpost and use them to survey new survey points on planets
del: Survey Handhelds have been nuked
balance: Dissection science has been decreased across the board

/:cl:

@github-actions github-actions bot added DME Edit Code change Watch something violently break. labels Jun 26, 2023
@Erikafox Erikafox requested a review from a team as a code owner June 26, 2023 23:54
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Jun 26, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 30, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 6, 2023
@Erikafox Erikafox requested a review from a team as a code owner July 15, 2023 07:31
@github-actions github-actions bot added the Sprites A bikeshed full of soulless bikes. label Jul 15, 2023
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Nov 11, 2023
@@ -282,6 +282,7 @@
* SEE_TURFS // can see all turfs (and areas), no matter what
* SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are
* // in a lit area (via pixel_x,y or smooth movement), can see those pixels
* SEE_SCIENCE // can see science points
Copy link
Member

Choose a reason for hiding this comment

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

That's not how this works at all.
These are BYOND defines you cannot extend this functionality.
https://www.byond.com/docs/ref/#/mob/var/sight

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh that's leftover.

Copy link
Member

@thgvr thgvr left a comment

Choose a reason for hiding this comment

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

nitpicks

code/modules/cargo/packs/exploration.dm Outdated Show resolved Hide resolved
code/modules/cargo/packs/exploration.dm Outdated Show resolved Hide resolved
code/game/objects/items/survery_handheld.dm Outdated Show resolved Hide resolved
code/game/objects/items/survery_handheld.dm Outdated Show resolved Hide resolved
if(user)
UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
if(user != loc)
to_chat(user, "<span class='notice'>[src] snap back into the main unit.</span>")
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
to_chat(user, "<span class='notice'>[src] snap back into the main unit.</span>")
to_chat(user, "<span class='notice'>[src] snaps back into the main unit.</span>")

code/game/objects/items/gear_packs.dm Outdated Show resolved Hide resolved
code/game/objects/items/gear_packs.dm Outdated Show resolved Hide resolved
ok

Co-authored-by: thgvr <81882910+thgvr@users.noreply.github.com>
Signed-off-by: Erika Fox <94164348+Bjarl@users.noreply.github.com>
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 18, 2023
Copy link
Contributor

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

@Erikafox Erikafox closed this Nov 19, 2023
github-merge-queue bot pushed a commit that referenced this pull request Oct 5, 2024
…ead of mining (and base gearpacks) (#3146)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
re-implements #1716 as a base and adds cutter functionality to plasma
cutters
also implements and uses gear packs from #2103 that never got in.
makes plasma cutters unable to mine, shorter range, and do burn instead
of brute.
angle grinders are integrated into grinder packs, like water backtanks.
Also draws power from a cell.
jackhammers can no longer break down walls and girders.
### Cutters can currently deconstruct:
- girders
- walls
- reinforced walls
- airlocks
- airlock frames
- grilles
- machine frames
- computer frames
- catwalks
- chairs
- beds
- tables
- lockers & crates
- salvage machines (the wasteplanet ones)
- railings
- lattice
- wooden barricades

cutters can also cut open safes and locked lockers & crates

attempted to revert map changes but using git checkout doesn't
completely revert the gecko. Will try again later.

adds a mech salvage saw and a prototype energy saw. Doesn't make either
available yet.

sprites by me

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/65bd6b99-d63d-4c75-9227-a9987fddf9d2)


https://github.com/shiptest-ss13/Shiptest/assets/90987989/12262338-055f-4c7c-86d1-d31279ab953c

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Jackhammers as a main salvage tool is dumb, and angle grinders and
cutters make more sense and have better functionality. Cutting apart old
ruins and ships should be a reasonable source of material and shouldn't
take years.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog



:cl:
add: angle grinders for salvage
add: reworks plasma cutters for salvage
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: HelmCrab <90987989+Thera-Pissed@users.noreply.github.com>
Co-authored-by: ritorizo <ritorizo@localhost>
Co-authored-by: FalloutFalcon <falloutfalconplays@gmail.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Oct 6, 2024
…ead of mining (and base gearpacks) (shiptest-ss13#3146)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
re-implements shiptest-ss13#1716 as a base and adds cutter functionality to plasma
cutters
also implements and uses gear packs from shiptest-ss13#2103 that never got in.
makes plasma cutters unable to mine, shorter range, and do burn instead
of brute.
angle grinders are integrated into grinder packs, like water backtanks.
Also draws power from a cell.
jackhammers can no longer break down walls and girders.
### Cutters can currently deconstruct:
- girders
- walls
- reinforced walls
- airlocks
- airlock frames
- grilles
- machine frames
- computer frames
- catwalks
- chairs
- beds
- tables
- lockers & crates
- salvage machines (the wasteplanet ones)
- railings
- lattice
- wooden barricades

cutters can also cut open safes and locked lockers & crates

attempted to revert map changes but using git checkout doesn't
completely revert the gecko. Will try again later.

adds a mech salvage saw and a prototype energy saw. Doesn't make either
available yet.

sprites by me

![image](https://github.com/shiptest-ss13/Shiptest/assets/90987989/65bd6b99-d63d-4c75-9227-a9987fddf9d2)


https://github.com/shiptest-ss13/Shiptest/assets/90987989/12262338-055f-4c7c-86d1-d31279ab953c

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Jackhammers as a main salvage tool is dumb, and angle grinders and
cutters make more sense and have better functionality. Cutting apart old
ruins and ships should be a reasonable source of material and shouldn't
take years.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog



:cl:
add: angle grinders for salvage
add: reworks plasma cutters for salvage
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: HelmCrab <90987989+Thera-Pissed@users.noreply.github.com>
Co-authored-by: ritorizo <ritorizo@localhost>
Co-authored-by: FalloutFalcon <falloutfalconplays@gmail.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Merge Conflict Use Git Hooks, you're welcome. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants