Commit Graph

10 Commits

Author SHA1 Message Date
Matt Atlas
b65a598b85 Completely removes Vox from the game. (#10028) 2020-10-07 13:52:08 +02:00
SueTheCake
84794c6e65 Mechs 3: Electric Boogaloo (#7486) 2019-11-25 23:04:19 +01:00
Werner
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
Nerrathiel
ae86b7b8b5 Merchant code adjustments (#6791) 2019-08-04 21:14:24 +02:00
Mykhailo Bykhovtsev
a43e3fc66e Bugfixes (#5682)
Wanted to fix one bug, but couldn't stop.

- Farmbot now have harvesting animation. 

- Farmbots no longer have two water tanks inside of them, that was causing them to use hidden water tank and not let it be refilled. Fixes #5677 

- Farmbots now will wait for weedlevel to be 5 or higher, that is when the alarm is triggered. And call `update_icon()` when it is done. Otherwise people wouldn't notice if they were killing weeds

- Vending machine now accept only items of the same type as defined in their product list. So you can no longer insert cult's ritual knife into Dinnerware. Fixes #5671 

- Merchants cannot by generic mech's weapon, it was replaced with UT AC 2 and Scatterbox. Fixes #5675 

- Ghosts cannot be teleported by telescience. Fixes #5688
2018-12-04 19:48:59 +01:00
Alberyk
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
Alberyk
b58a3037c1 Some small fixes and tweaks (#3933) 2017-12-08 17:10:02 -06:00
Alberyk
2d52377ad8 Fixes the merchant job showing up in the id's console (#3737) 2017-10-29 13:17:07 +02:00
Alberyk
ff67db51c9 Fixes messed up belt_mirror sprites, bag missing sprite and merchant mecha weapons (#3712)
-fixes #3707
-fixes #3711
-fixes the science courier bag having no sprite
-fixes a lot of items being brown by accident
2017-10-20 14:18:39 +03:00
Alberyk
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