24 Commits
Author SHA1 Message Date
Cody BrittainandGitHub 3f62424312 [MDB Ignore] [IDB Ignore] Kills off /obj/item/device (#21774)
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>
2026-02-01 05:14:26 +00:00
Wowzewow (Wezzy)andGitHub 186f94ff58 Sick Bugfixes (#20466)
Fixes #20458
Fixes #20456
Fixes #20455
Fixes #20449
Fixes #20447
Fixes #20440
Fixes #20434
Fixes #18515
Fixes #20443

Ugh. I'm still sick.
2025-02-16 18:18:45 +00:00
FluffyandGitHub 3dc4cce9c2 Minor span refactoring (#19177)
Minor span refactoring
2024-05-19 16:37:29 +00:00
47ae292bac Merchant Traders now have greetings for Species + Biases (#18825)
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>
2024-05-01 22:35:49 +00:00
SleepyGemmyandGitHub 241350481c Combat Robot Tweaks (#14955) 2022-10-30 11:47:32 +01:00
AlberykandGitHub c0dbe3e275 Merchant NBT Update (#14603) 2022-10-09 17:59:21 +02:00
connorjg1andGitHub b714794eb9 Vaurca Blaster buff and Vaurca merchant changes. (#14247) 2022-06-11 16:12:13 +02:00
DoxxmedearlyandGitHub 3acb186b26 Removes Wizard + Conflux (#12067) 2021-06-30 19:55:06 -03:00
AlberykandGitHub da4f065701 Where No Spaceman Has Gone Before: a space sector system (#11801) 2021-05-31 00:32:07 +02:00
Matt AtlasandGitHub b65a598b85 Completely removes Vox from the game. (#10028) 2020-10-07 13:52:08 +02:00
Matt AtlasandAlberyk 409ad05b69 Nerfs the Cyndie Kate merchant. (#8083)
Right now you can trade some really easy to get items for really dumb bullshit. Look at this:

A single telecrystal = any of these: energy axe, lwap, combat mech, merc rig, force gloves, A SYNDICATE CYBORG.
2020-01-27 14:00:56 -03:00
SueTheCakeandWerner 84794c6e65 Mechs 3: Electric Boogaloo (#7486) 2019-11-25 23:04:19 +01:00
Matt AtlasandWerner 5da2a9c24b Splits organs into organ/internal (#7441) 2019-11-20 23:07:10 +01:00
WernerandGitHub af16a489a6 Removes Weapons (#7415)
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
2019-11-16 18:36:13 +01:00
NerrathielandWerner 0ce18a64d0 Simple Merchant Changes (#6958) 2019-09-10 23:01:53 +02:00
NerrathielandWerner ae86b7b8b5 Merchant code adjustments (#6791) 2019-08-04 21:14:24 +02:00
AlberykandWerner ed0297a697 The Tau Ceti Foreign Legion (#5779)
This pr adds the Tau Ceti Foreign Legion, at the request of the lore team, to replace/be an alternative to the ert.
2018-12-30 12:06:21 +01:00
AlberykandWerner 68104f9f02 Merchant fix (#5728)
-fixes #4967 
-fixes #5667
2018-12-08 22:57:48 +01:00
AlberykandWerner 3485f05668 Small merchant and sword sprites changes (#5584)
-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
2018-11-15 20:13:37 +01:00
BurgerLUAandErki bb87563e6d The k'ois nerf to end all k'ois nerfs (#4304)
Overview
K'ois bars are now replaced with a less dangerous variant with the same name. These K'ois bars do not cause medical nightmares to occur, however the dangerous ones are moved to the "contraband" section of the vending machine and can be vended for free.

New Chemicals
Unfiltered K'ois can still be found in K'ois spores. They can be filtered by grinding them up and adding Cardox . Cooking recipes are untouched, and still contain unfiltered K'ois.

Platinum can now be put into reagent form by grinding up platinum.

Cardox is a new chemical designed by nanotrasen that eliminates liquid phoron. It can be made by mixing Platinum, Sterilzine, and Carbon.
2018-03-03 00:34:48 +02:00
RonandErki 842f20e137 Bug Fixes (#4076)
Fixes #4074
Fixes #4047
Fixes #4005
Fixes #3995
Fixes #3953
Fixes #3855
Fixes #3426
2018-01-14 22:14:11 +02:00
AlberykandErki 36b6642c83 Fixes merchants making a lot of money with little effort (#3815)
This should fix merchants getting insane ammounts of credits due to plasma.

Also, fix an issue with a vampire message check.
2017-11-05 12:50:45 +02:00
AlberykandErki d1c3a58c87 Adds the merchant station, the shuttle and the station's dock (#3254)
This pr adds the second essential part of the merchant's implementation, mapping the merchant's shuttle, base and the dock. And more merchant related fixes and tweaks.
2017-08-13 23:31:50 +03:00
AlberykandErki b4fa4a8b3a Baystation12 merchant port (#3155)
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.
2017-08-04 21:36:04 +03:00