* Removes tablet cell parts (#71078)
## About The Pull Request
Removes cell parts and cell part cells, now tablets directly stole a
power cell in them, and uses regular stock cells like every other
machine in the game. This also makes it less confusing because people
are more used to stock cells over computer cells. Because cells
generally hold more power than computer ones, I bumped up the active
power usage from 50 to 75.
## Why It's Good For The Game
We are nearly finished removing all parts, holy cr*p
## Changelog
🆑
balance: Tablets now use regular cells instead of computer cells.
balance: Tablets no longer need a power cell component to hold power
cells.
/🆑
* Removes tablet cell parts
* Feex
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Easy's Super Omega "unarmed strike based species var moved to limbs" refractor, unarmed strike striking with specific body parts rather than it just being flavor, and brain based attacking limb selection extra chunky edition. And also bodypart traits.
* Removed all the conflicts, and started converting all the arms and legs to the proper typepaths
* Actually makes the game compile :)
* Makes the maps compile too!
* Early mirror of #71143 because it's more relevant to us
Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Adds a new Shinto-themed Chaplain robe and holy book (#70521)
Co-authored-by: SeigaSeiga <seigacomm@ gmail.com>
* Adds a new Shinto-themed Chaplain robe and holy book
Co-authored-by: SeigaSeiga <seigashearwood@gmail.com>
Co-authored-by: SeigaSeiga <seigacomm@ gmail.com>
* Organizes the autodrobe (#70579)
About The Pull Request
There are over a hundred items in the Autodrobe, barely organized. So I have reduced the chaos a bit, by introducing categories.
Costumes
The first category is simply called Costumes. Here we have historical costumes, the station's supers, the surviving family costumes, and a few odd cases like the delinquent hat and the nurse outfit (which I have moved next to the plague doctor outfit, because its funny).
Supernatural
The supernatural category contains wizard and chaplain gear.
Entertainers
The entertainers category contains clowns, mimes, jesters, singing showgirl costumes. Robbie Rotten's suit is here, because he was a great showman, and Doc Scratch outfit is here because he is an Excellent Host.
Fancy
The fancy category contains suits, dresses and other formal gear. I considered the schoolgirl clothes fitting for this category.
Animals
The main costume category was still a bit long, so I have moved the large number of animal related costumes to their own place.
Service
Some costumes were either roundstart clothes for service members, or they had access to them. Also moved the maid outfit here because it is funny.
Other
Finally, we have the Other category. Things here were either hard to categorize, or I could tenuously justify splitting them of the long Costumes category.
This sorting has also revealed that berets and waistcoats had duplicate entries, this has been taken care of.
Feedback is appreciated, for both sorting, and category icons used!
* Organizes the autodrobe
* update modular
Co-authored-by: Profakos <profakos@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
* Moves Custom Vendor side-effects from delete to deconstruct. (#70336)
* Fixes Custom Vendor Side-Effects by moving the effects to deconstruct, which blows the contents inside up as theft-deterrent.
* Fixes Custom Vendor side-effects on delete.
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
* Fixes Weird Vending Machine Untipping Behavior (Cyborg Edition) (#70448)
* Adds an Adjacency Check for untipping Vending Machines
Hey there,
Basically, if you were a cyborg, you could untip a vending machine from halfway across the world. There was no adjacency check for pretty much anyone to untip a vending machine, and since a cyborg will always pass through on anything that interacts with an `/obj/machinery`, it would always untip no matter how far away the person was. In fact, we even have an `isAI` check down the line because I think AI's could remotely untip any vending machine (lol).
Let's just pass in an adjacency check for this. Phew.
* an even earlier return
* alright let's actually not override base behavior
* updates the check later on in the chain
* Fixes Weird Vending Machine Untipping Behavior (Cyborg Edition)
Co-authored-by: san7890 <the@san7890.com>
* The CentCom-ening part 5: I might have a problem (#70226)
add: Adds the CentVend
add: Re-adds the CentCom Official's suit
* The CentCom-ening part 5: I might have a problem
Co-authored-by: Imaginos16 <77556824+Imaginos16@users.noreply.github.com>
* Removes network cards and printers from tablets
* merge tablet_presets
* printer.dm should have been deleted, missed change
* update contractor tablet
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
* Removes AI and Charge parts from tablets, adds support for more later.
* merge conflict
* remove modular tablet loadout item
* fix SR maps referencing tablets, add clear PDA instead of modular tablet loadout
* remove pda loadout item
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
* Jean shorts are now a subtype of shorts (#69927)
jean shorts are now subtypes of regular shorts
* Jean shorts are now a subtype of shorts
* jorts loadout
Co-authored-by: skylord-a52 <skylord-a52@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
* Vending machines now support categories (and premium/contraband is moved there), adds it to the Clothesmate (#69076)
* Initial setup and data
* Work on UI
* Final UI
* Remove TODO
* Section for categories
* Vending machines now support categories (and premium/contraband is moved there), adds it to the Clothesmate
* Adds the modular version of product_categories and implements it for the Clothesmate!
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* The GAGening: Clothesmate edition
* ThisShouldWork
* hgnbhg
* would probably help to have the right .dmi
* fixed?
* Fuck you
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
* The Toiletbong and other poetical additions (*click* Noice) (#68193)
* Main
* Added deconstruction and better rotation
* Open flame during usage, emagging
* Wording fix, sound fix
* Extra-indestructable check
* Storage is now a normal datum instead of a component? Noice
* Updated harvest.dmi after bell pepper resprite
* The new atom storage broke the emag capability, added a small fix
* The Toiletbong and other poetical additions (*click* Noice)
Co-authored-by: LordVollkorn <66637090+LordVollkorn@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
* Tsu's Brand Spanking New Storage: or, How I Learned To Pass Github Copilot As My Own Code
* Delete storage.dm
* yippee
* shit
* holy shit i am stupid
* more fixes
* fuck
* woops
* Joker (2019) Suit and Coat (#68113)
* adds the comedian suit and code to the game, available in the autodrobe
* filled in hand holes on mob comedian suit sprite
* Joker (2019) Suit and Coat
Co-authored-by: 13spacemen <46101244+13spacemen@users.noreply.github.com>
* Olives! + Custom sushi/Pierogi changes (#67239)
About The Pull Request
This is a continuation of #66946 since I have enough points to finally do so.
This PR will:
Expand upon my previous sushi PR, allowing people to use an ingredient on a sushi sheet to start creating custom sushi.
Add olives! A new type of fruit that can be grown in hydroponics. When ground, it becomes olive paste which when mixed with water in a 4-1 reaction turns into 2 units of quality oil.
Make pierogis require a dough slice to craft instead of a bun.
Make quality oil cost 50 credits to order instead of 120
Why It's Good For The Game
Since my sushi PR merged, many people have asked me to add custom sushi, so here it is. This will allow chefs to make more interesting menus with added customization.
Quality oil is an extremely expensive commodity (120 credits for one 50 unit bottle, 240 if you expedite it!!!) and can only be acquired from cargo. I feel because of this, many chefs do not make lizard or mothic foods because simply acquiring the ingredients to do so is either very time consuming, expensive, or both. This will encourage people to make those foods more often since one of the key ingredients in many lizard or mothic dishes can be made by them, too. Olives themselves can be eaten as a snack and open up opportunities for new foods in the future, and it makes sense for you to make your own oil since the process is simple yet highly inefficient in real life.
This PR originally had a way to craft cornmeal as well, but that idea was adopted yesterday in #67227 which they can keep.
Lastly, it seems more reasonable for pierogis to require a dough slice instead of a burger bun. Don't think that requires more explanation.
I believe my gbp score is at -3, but I have three PRs waiting to merge currently which will boost me way above that.
Changelog
cl
add: Botany can now grow olives, which can be ground into a paste and mixed with water to make quality oil.
add: You can now make custom sushi by using an ingredient on a seaweed sheet. The sushi will be named after the first ingredient you use.
balance: Pierogis now need a dough slice instead of a bun
balance: Quality oil costs 50 credits to order instead of 120
/cl
* Olives! + Custom sushi/Pierogi changes
Co-authored-by: MidoriWroth <kodyman@att.net>
* Buffs the greedy god vending machine (#67836)
The greedy god vending machine was pretty underwhelming compared to normal custom vending machines, it only had fancy light beams, this makes it harder to break and lets it store/sell more items
* Buffs the greedy god vending machine
Co-authored-by: bob-b-b <36081010+bob-b-b@users.noreply.github.com>
* Adds the white cane. (Bounty Code) (#67801)
This PR adds the white cane.
It can be crafted using 3 iron rods. Additionally, white canes can be purchased from the medical vendor, differentiating them from the costume canes.
White canes are transforming items that can be folded down from a small size to their fully extended versions, which are too large to store in a bag.
* Adds the white cane. (Bounty Code)
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
* This tail refactor turned into an organ refactor. Funny how that works.
* Firstly, fixing all the conflicts.
* Fixes all our maps (hopefully)
* Actually, this should fix pod people hair :)
* Almost everything is working, just two major things to fix
* Fixed a certain kind of external organ
* Cleaning up some more stuff
* Turned tail_cat into tail because why the fuck are they separate?
* Moved all the tails into tails.dmi because that was just dumb to have like 3 in a different file
* Adds relevant_layers to organs to help with rendering
* Makes stored_feature_id also check mutant_bodyparts
* Fixes the icon_state names of ALL the tails (pain)
* Fixes wagging, gotta refactor most mutant bodyparts later on
* I Love Added Failures
* Fixed some organs that slipped through my searches
* This could possibly fix the CI for this?
* It doesn't look like it did fix it
* This will make it pass, even if it's ugly as sin.
* Fixed Felinids having a weird ghost tail
* Fixes instances of snouts and tails not being properly colored
Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
* Scrubber Clog Random Event Spiritual Successor -- New janitor content! (#67023)
Adds a brand new random event as a spiritual successor to the long-lost scrubber overflow event! Scrubbers (that is, a single one on the station) may now randomly become clogged with mobs, and after an alert, will begin pumping out mobs at a steady rate. The infestation can be fixed by either welding the scrubber shut and waiting for the infestation to clear, or you can use a plunger on the scrubber to clear it manually.
* Scrubber Clog Random Event Spiritual Successor -- New janitor content!
Co-authored-by: Rhials <Datguy33456@gmail.com>
