Changes:
> - rscadd: "Added two new tajaran loadout options: pants and skirts +
shirts. Summer pants and dress (renamed to skirt) have been put there."
> - bugfix: "The tajaran summer dress and pants have been made into
pants slot items and should now display properly."
In the effort to fix the summer dress and pants not displaying properly
in the loadout selection they have been split up to their own respective
loadout options.
- Assunzioni Sera Stellata di Dalyan Wine can be ordered again.
- Sandals now default to being wood colored if not otherwise given
color.
- Added camera film to the toy shelf storage and briefcases and canes to
the clothing shelf storage.
- Fixed that the operations lobby was powered by the wrong grid.
- Added some custom items to the merchant blacklist.
This has zero reason to exist in our code base. We have no procs or
variables tied to this. I removed it to make future modifications
cleaner.
---------
Signed-off-by: Cody Brittain <1779662+Generalcamo@users.noreply.github.com>
From previous PR:
- Fixes Quick Equip (Thanks, Matt)
- Fixes Loadout Preview, will override uniforms properly now
- Turns shirts into uniform items, so you can attach accessories to them
This also fixes the issue of people spawning in shirtless if they didn't
attach properly to the pants.
Additions:
- Shifts suspenders, leather chaps, and kneepads to be pants
accessories.
(This fixes the issue of accessories staying even without pants, e.g.
assless chaps)
(In future, hip holsters are to be added to this accessory list)
Anyway, that's the long and short of it. Have fun.
---------
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Does what it says on the tin. Purely cosmetic for now. This is step
zero.
Basically, clothing is starting to get real bloated with a lot of
variants.
More pressingly, accessories as well, and we're probably going to get
accessories of accessories.
After seeing what's going on with arm guards, leg guards, plate carriers
and the like,
it's heading towards a really messy level of abstraction.
Hopefully this will nip it in the bud, so to speak.
I've also added the layering feature used in watches, so you can tuck in
your uniform in your pants, or your coat in your pants if you're so
inclined to.
This also means that in the near future, we'll finally have the ROLL
PANTS feature that has escaped us for so long.
For reviewers :
This PR is majority legwork of simply adding the new pants slot in. Very
similar to my previous Wrist slot PR.
The rest is just changing the existing pants/skirts over to a new
loadout slot and changing paths.
---------
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Traders used to only do greetings based on each subspecies, due to
significant overlap for some (ie, IPCs), functionality added for traders
to greet based on general species, if a specific subspecies is not
found.
Adds new defines for each species that is a list that has all subspecies
for them (ALL_IPC covers all frames for examples)
Biases for Species
DENY: "No service for Bots here"
UPCHARGE: Service, but prices higher
DISCOUNT: Special prrrices forrr comrrrades
---------
Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
PDAs are dead, long live PDAs. All trace of old PDAs has been scoured from the codebase, and in its place are modular computer PDAs that are feature-equivalent. Essentially every PDA function except the Syndicate detonation feature and Notepad has been ported over, and battery life for handheld computers has been boosted alongside the addition of charging cables to make things easier.
-adds framework for weapons based martial arts, implementing a very basic swordsmanship
-makes the martial art books more modular
-fixes some minor issues with some of the martial art code
-adds amohdan swordsmen gear, to be used in a future event/sold by the merchant
- fixes#6083
-tweaks some of the merchant's grammar
-fixes the antique shop missing the zweihander like it was supossed to have and the padded cap
-adds belt sprites to the claymore and dao, made by dronz
-fixes an exploit to allowed merchants to make dash money due to how the pet trader worked, it should now sell all mudane animals and buy only rare ones
-removed some items that could not be moved from the merchant list
This prs adds some new melee weapons, besides some sprites fixes and changes.
-adds pikes and friends, sprited by thegreatjorge, weapons that can attack two titles away from the target
-adds the zweihander at fowl's request
-adds explosive spears, that you can craft by using a grenade on a spear, they will explode when throw or when you attack someone
-adds a whip, that can disarm people by attacking their hands and arms
Port of the merchant mechanics from baystation12.
All of the trader, prices and most essential system are done, as well the job datum and the like. Mapping the shuttle, the base and a new dock will be done in a later pr.
Also adds phazon construction and several other items used in this pr.
The chance of the merchant slow being open at round start can be changed via the config, it is 20% by default.
Batrachophreno
