Commit Graph

29 Commits

Author SHA1 Message Date
nemvar e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
SpacePrius 361bbd3e73 Sec vendor on gulag now has ID and Cost requirements (#45466)
* makes it so the sec vendor actually works on gulag

Signed-off-by: Space Prius <bubba041102@gmail.com>

* lets see if this fixes it

Signed-off-by: Space Prius <bubba041102@gmail.com>

* minor changes.

Signed-off-by: Space Prius <bubba041102@gmail.com>

* modifying logic

Signed-off-by: Space Prius <bubba041102@gmail.com>
2019-08-02 17:05:38 -07:00
oranges d65de92ed1 Autodoc the vending machine (#45468)
* Autodoc the vending machine

* Update code/modules/vending/_vending.dm

Co-Authored-By: Tad Hardesty <tad@platymuus.com>
2019-07-26 03:00:43 -07:00
ShizCalev 6e44bd3a93 Merge pull request #44796 from kingofkosmos/addswarningspans
Adds warning-spans
2019-07-02 00:47:43 -04:00
Krysonism e5d5cef356 Move the player's selection items to the top (#44868)
The chef's compartment and any future compartments of this type are
moved to the top of the interface.

It is time to unleash the awesome power of the free market and
cultivate a spirit of entrepreneurship. By placing the chef's
compartment on top of the subsidized swill provided by tyrannical
pseudo-governmental entity know as Nanotrasen, we can promote the
commerce of those possessing a mind undulled by the poison known as
socialism. God Bless the USA
2019-06-29 15:17:17 -07:00
kingofkosmos ebf787a97a * "You should..." and "You must..." 2019-06-26 06:13:32 +03:00
moo 24790954cc Fix bags allowing invalid insertion of items into vendors (#44301) 2019-06-05 20:58:05 -07:00
moo c55dbf97f4 Vending Machine Input Framework & Clothing Vendor Inputs (#43964)
About The Pull Request

I didn't like how the wardrobe replaced lockers but you couldn't clean up after yourself say once you switched to the nurse's outfit as a doctor. Now, anyone can put clothes in a wardrobe so long as that clothing is a vendable product of said wardrobe (No engineering jumpsuits in science vendor, etc.).

Building off the previous snack machine vendor, this lays the framework for ALL vendors to allow all sorts of items to be inputted into vendors, all you have to do is change canLoadItem(obj/item/I,mob/user) to TRUE for the items you want the vendor to accept! It also has an option to restrict loading by changing canload_access_list. NOTE: having any of the access permits input instead of all access is needed to input (important distinction!)

ECONOMY: This will make it so any clothes you put in becomes a sellable product. It does NOT make it free unless you can already access the vendor's contents for free.

Code improvement + minor QoL with minute balance implications. If you want to discuss how making it easier to clean up your unused clothes makes it more difficult for antags to sneak then I'm in trouble lol.
Why It's Good For The Game
Changelog

cl ExcessiveUseOfVending
tweak: Wardrobe Vendors will now accept clothing types they sell. Now you can clean up after getting that cool alternate uniform!
code: see PR #43964 on how to easily setup a vending machine to accept items!
/cl
2019-05-27 22:24:58 +12:00
vuonojenmustaturska f5fdf4fa65 Makes vending machines use spritesheets over artisanal handwritten getflaticon memes (#43914)
About The Pull Request

Pretty much what it says on the tin.

Oh yeah I also removed the string concatenation nonsense in favor of multiline strings and a list.
Why It's Good For The Game

Removes many getFlatIcon calls during the round, also some runtimes from ephemeral items being created and immediately deleted when the vending machines are used.
Changelog

cl Naksu
tweak: vending machines now use spritesheets
/cl
2019-05-12 10:51:03 +12:00
ShizCalev 3d00e7e32f Add cooldown to vending machine purchase messages (#43554) 2019-04-09 21:06:11 -07:00
KomradeSpectre 0ceeee4d0c Port vendor icon display instead of color from Yogs (#42653)
Port of yogstation13/Yogstation-TG#2549
which is a port of Citadel-Station-13/Citadel-Station-13#7442
which is a port of OracleStation/OracleStation#50

This port visualizes items in all machines handled by _vending.dm, allowing a
person to see what they're buying before buying it. This is very useful for
clothing vendors for example, and much better than the previous system that had
vending machines choose from three colors randomly.

Credits to:
  * AndrewMontagne (Oracle, original implementation)
  * FlattestGuitar (Citadel)
  * nichlas0010 (Yogstation)
2019-02-05 20:20:38 -08:00
Dax Dupont b6be6eff5e Allow non-carbons to use off-station vending machines (#42153) 2019-01-02 15:15:16 -08:00
ShizCalev a64f5cd934 Makes the vending machine shut up (#41456) 2018-11-13 18:07:50 -05:00
ShizCalev 597bf9b557 [s] Improves AI, turret, and door logging (#41327)
cl ShizCalev
admin: Fixed AI fingersprints not getting logged
admin: Fixed some door interactions not being logged at all.
admin: Turret control interactions are now in mob combat logs
/cl

Fixes #40203

Semi WIP. Good to merge for the most part, but I would like to add logging in a couple more spots.
2018-11-12 20:54:58 +13:00
oranges 6a0b9ba591 Merge pull request #41361 from ShizCalev/vendor-exploit-fix
[s] Fixes vending machine exploit
2018-11-12 20:44:43 +13:00
ShizCalev fcfe84b9ff Allows custom pricing of premium vending machine items 2018-11-10 14:16:53 -05:00
ShizCalev f5671dcf88 Fixes vending machine exploit 2018-11-08 12:41:40 -05:00
Iamgoofball 9a39956d6c Premium Items are no longer free for departments (#40624)
Also fixes the bug with premium pricing.
2018-10-02 17:12:03 -04:00
XDTM 6f21758521 Handheld IDs are valid for authentication (#40456)
cl XDTM
tweak: Holding an ID in your hands uses it instead of your worn ID for authentication purposes.
tweak: If you don't have an ID in your id slot, the belt slot will be checked as well.
/cl

Fixes #40437

Makes sense if you want to use a specific access card without playing pocket tetris. The get_idcard has an argument for prioritizing worn id over held id, for stuff like identification.
2018-10-03 09:58:37 +13:00
Iamgoofball f735a7d34d [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 02:50:51 -04:00
Aranclanos 362651228b Fixes vending machines not updating their interface on use (#40042) 2018-09-01 18:44:55 +03:00
Garen Crownguard 291583440f screwdriver_act signal (#39877) 2018-08-27 05:56:45 -04:00
vuonojenmustaturska a1ad24904e Stops various machines from processing needlessly (#39132)
* Stops lighting from processing needlessly

* showers too

* space heaters

* broken/unpowered vending machines

* fucken status displays

* rechargers
2018-07-15 17:01:29 -04:00
AnturK d71b205133 Clears stuff detected by SM's parser. 2018-07-03 12:32:06 +02:00
Tad Hardesty 870ac15480 Improve how vending machine restocking works 2018-06-16 23:02:41 -07:00
ShizCalev 3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
Tad Hardesty 2f212e16a3 Remove redundant anchored=TRUE from machines 2018-05-27 19:23:37 -07:00
kevinz000 f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
John Ginnane 3e1db725c1 Modularises vending machines (#36508)
* Modularises vending machines

Each machine now has its own file, which includes it's refill cannister for easy maintenance

* Moved and renamed vending file
2018-03-21 16:33:39 -04:00