Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The big ayylmao improvement PR (#1621)
* Abductor improvements * Makes abductor organ surgery consistent with other surgeries (#76124) ## About The Pull Request Just swaps the Hemo and Retractor steps to make it more in line with other surgeries ## Why It's Good For The Game This might just be me but I always forget that the order is different and it throws off my muscle memory ## Changelog :cl: qol: Abductor organ surgery steps shifted around to match other surgeries /:cl: * Abductees strapped to the abductor operating table are now properly layed down (#75524) ## About The Pull Request This gives the abductor surgery table a buckle angle, so buckled humans lie down on it properly. This wasn't an issue for sleeping test subjects, but awake ones would look like they're standing on the table instead of buckled. This also changes a the table's can_buckle boolean arg from a 1 to a TRUE, because I was right next to it. ## Why It's Good For The Game Reduces confusion, goofiness, etc. ## Changelog :cl: Rhials fix: Humans who wake up buckled to the abductor surgery table will no longer look as if they are standing on it. /:cl: * Abductors can now use batons in general. (not just their specialized baton) (#75561) Abductors can now use any baton instead of just their special baton. Abductors are a bit fucked if they lose their baton and are unable to buy one from their shop. Sure they can just use flashes or maint-fu but those methods are hard and or unreliable. (if they manage to lose their baton, they probably aren't that robust anyways). This PR gives more leeway if you fuck up as an abductor. :cl: balance: The mothership which abductors came from has worked very hard to train their field agents how to use batons from their specimen's habitat /:cl: --------- Co-authored-by: san7890 <the@san7890.com> * Gives abductors three new equipment shop purchase options, splits up abductor_gear.dm (#76101) Three new items have been added to the abductor credit store. One carries concrete utility, with the other two being useful for pranking/mind games. The first is an alien hypertool with toolsets for either hacking or surgery equipment. Toggle by right-clicking the item in your hand!  This can be an equipment upgrade, or replacement, for either member of the team. It costs 2 research credits to purchase. Also on the list of new stuff to buy (and stuff shown in the gif above) -- You can spend extra points on abductorized versions of existing posters. They can be used as decoration, or to troll and assert dominance over the crew. You can also buy a cow. It comes with some wheat. Now, let's talk about all of the impulsive code changes I made while making this PR: - abduction_gear.dm has been split up into abductor_clothing.dm, abductor_items.dm, and abductor_structures.dm because the file was getting huge and I didn't want to make it bigger. - There is now a runtime prevention check for trying to probe non-humanoid subjects (like a cow). - The abductor shop now uses defines for its categories, and uses lists for build paths similarly to cargo crates. Lastly, to facilitate the hanging of posters on the abductor ship, posters can now be placed on indestructible walls. The code associated with hanging posters (/turf/closed/wall/proc/place_poster) has been moved to the /turf/closed level. The scope of this PR kind of spiraled out of control with the file splitting and the change to indestructible walls, I'm hoping it isn't too much. As for the spritework, most of it was done through the cannibalization and recycling of other, existing sprites. Things may not look good (I'm a coder not a spriter!) and I am open to interjections on what can be improved. The hypertool allows for both the scientist and agent to replace their lost tools (with the same toolspeed), as well as upgrade their current toolset if they have the spare points. Many use cases, all for the same 2 credit package. The posters, while providing no mechanical advantage, are a nice decoration (for an otherwise cramped, totally undecoratable ship) or way of rubbing your success in the noses of the crew. The cow is a dual-purpose psychological support/hindrance tool. He can keep you from getting lonely on the mothership, or be beamed down to the crew to annoy them. Each of these are luxury items that give thriving abductor teams something to spend their excess credits on. :cl: add: The abductor equipment vendor now offers a hacking/medical hypertool, at a price of 2 research points. add: The abductor equipment vendor now sells decorative abductor posters, at a price of 1 research point. add: The abductor equipment vendor now sells a cow, at the price of 1 research point. fix: Fixes a runtime when trying to probe non-human mobs. image: Some abductorized versions of existing wall posters and an alien hypertool. code: The abductor shop listings now use lists of items, rather than single build paths. code: The abductor_gear.dm file has been split up into a few different files. code: Posters can now be hung on indestructible walls. /:cl: * Blacklist abductor posters from spawning (#76876) * Abductor / general "Summon Item" spell QoL (#77419) - Abductor Baton Recall now starts linked to the Abductor's Baton - Did some misc. spell changed to the abductor baton recall to make it less spell-like - Fixes Instant Summon's name not changing to "Recall whatever item" when an item is marked - Instant Summons now displays the item marked on the button Having to mark the abductor baton is bad UX, when making it start marked is pretty trivial. Also this just helps it be a lot more obvious what is linked to what if you end up having more than one instant summons known. :cl: Melbert qol: Abductor Baton Recall now starts linked to their baton, and you can no longer unlink your baton qol: Instant Summons now shows what item is marked over the icon fix: Fixes Instant Summon's name not updating when marking an item /:cl: * Use stamina containers * Posters return to your hand when cut down/not hung up, abductor posters more resilient to wirecutters (#81924) ## About The Pull Request Posters now drop into your hand when you cancel the hanging process, or snip them down with wirecutters. If they can't drop into your hands, they go to the floor. Oh, also, this makes it so that abductor wirecutters (or any wirecutters with a toolspeed better than 0.2 in case of varedits/future additions) are too weak to cut down abductor posters. ## Why It's Good For The Game Posters getting dropped to the ground when cancelling the hanging process has always really annoyed me and I want it to not happen anymore. If you want to get those unsightly abductor posters out of your department you'll have to loot the abductor scientist first (or just take the wall down but that's admitting defeat). ## Changelog :cl: Rhials qol: Posters now return to your hand when the hanging process is cancelled, or they are snipped down. qol: Abductor posters can now only be cut down with abductor-tier wirecutters. /:cl: * better abductor vendor; give abductors defibs * More fixups/improvements * remove batong recall * make slimes non-passive * Update screenshot test * Allow abductors to brainwash once they've done all their objectives * Eh, they can do it once they've passed 3 abductions * Improve code * I'm an idiot --------- Co-authored-by: DaydreamIQ <62606051+DaydreamIQ@users.noreply.github.com> Co-authored-by: Rhials <Datguy33456@gmail.com> Co-authored-by: Singul0 <127663818+Singul0@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com> Co-authored-by: BlueMemesauce <47338680+BlueMemesauce@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
- Loading branch information
8 people
authored
Apr 30, 2024
1 parent
c2cbcac
commit ef12b56