Angle grinder AGAIN! Also, makes plasma cutters used for salvage instead of mining (and base gearpacks) #3146
Conversation
…roc and the signal that goes with it
github-actions
bot
added
the
Map Change
|
couple maps tweaked to have roundstart cutters and packs |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
the mudskipper has a surgical saw in a "salvage supplies" crate iirc which i'm pretty confident is meant to represent an angle grinder |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
There was a problem hiding this comment.
Good stuff, really support the plasma cutter changes
Where your checking for two separate tools is really asking for us to port tools having multiple tool qualities. Remind me at some point to work on that augh.
Could use some span defines on some stuff but I don't care all that much,
| @@ -15,6 +15,7 @@ | |||
| name = "earmuffs" | |||
| desc = "Protects your hearing from loud noises, and quiet ones as well." | |||
| icon_state = "earmuffs" | |||
| slot_flags = ITEM_SLOT_EARS | |||
| if(!I.tool_start_check(user, amount=0)) | ||
| return FALSE | ||
| if (I.use_tool(src, user, decon_time, volume=100)) | ||
| to_chat(user, "<span class='warning'>You shatter [src] with the [I].</span>") |
There was a problem hiding this comment.
| to_chat(user, "<span class='warning'>You shatter [src] with the [I].</span>") | |
| to_chat(user, span_warning("You shatter [src] with the [I].")) |
| if(!I.tool_start_check(user, amount=0)) | ||
| return FALSE | ||
| if (I.use_tool(src, user, 1 SECONDS, volume=0)) | ||
| to_chat(user, "<span class='warning'>You cut [src] into sheets.</span>") |
There was a problem hiding this comment.
| to_chat(user, "<span class='warning'>You cut [src] into sheets.</span>") | |
| to_chat(user, span_warning("You cut [src] into sheets.")) |
| @@ -162,7 +143,7 @@ | |||
| S.use(1) | |||
| to_chat(user, "<span class='notice'>You fully reinforce the wall.</span>") | |||
| var/turf/T = get_turf(src) | |||
| T.PlaceOnTop(/turf/closed/wall/r_wall) | |||
| T.PlaceOnTop(/turf/closed/) | |||
There was a problem hiding this comment.
| T.PlaceOnTop(/turf/closed/) | |
| T.PlaceOnTop(/turf/closed) |
| if(!item) | ||
| return FALSE |
There was a problem hiding this comment.
Already opened a seperate pr for this.
| SIGNAL_HANDLER | ||
|
|
||
| playsound(src, 'sound/weapons/chainsawhit.ogg', 100, TRUE) | ||
| force = 24 |
There was a problem hiding this comment.
mabye add a force_unwielded and force_wielded var for these
Quick refactor to deconstuct for closets
other PR uses obj/item/attachment and its getting in first. I will win the PR race one of these days.
…/Shiptest into angle-grinder-again
new green & purple slicing animation for advanced cutters (and when I add a funny angle grinder). Better to_chat from review. Mech saw that's currently the best saw available, but stops your mech until the task completes (otherwise you could psychic saw and walk away).
since destructible walls changes a load of maps, I'm waiting for that to go through before I tweak plasma cutters again.
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:
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
2024-06-23.21-43-32.mp4
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.
Changelog
🆑
add: angle grinders for salvage
add: reworks plasma cutters for salvage
/:cl: