Commit Graph

56 Commits

Author SHA1 Message Date
granpawalton
b30c9213f7 adds in Grey Bull a new soda (#40982)
* adds grey bull as a soda in the drink machine

* grammer

* changes desc to  and can amount to 20u

* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm

Co-Authored-By: granpawalton <trentc7@yahoo.com>
2018-10-22 16:16:47 +03:00
Mickyan
d1b10b2691 Vendor tweaks & prices: take 2 (#40927)
* vendor tweaks

* i was never good at cooking

* soda

* boozeomat sorting

* updated ramen desc
2018-10-22 08:40:24 +13:00
Mark9013100
342b7c5ac4 Adds a new engineering jumpsuit (#40853) 2018-10-16 12:12:42 +03:00
FantasticFwoosh
9a9a9f4506 Historic Heroes Unite!: Adds the historic beacon curator sets. (#40845)
* Adds the hero beacon

A Curator item with three preset uniforms availible to choose from.

* Changes curadrobe inventory content

Adds 'library supplies' of glasses & pens & removes the explorer gear.

* Replaces the curator's whip with a beacon

Its within the hero pack now.

* Creates the curators claymore

A ceremonial scottish sword for a hero pack.

* Pushes a line back into place

He who commiteth PR without fault, cast the first stone.

* Adjusts to one hero per beacon

Too many heroes may upset the time continuum.

* resolves merge conflict

I am thoroughly anti skub after this, conflict resolution for #40845

* Adds periods.

No timetravel pun intended, bad grammar is a crime. Period.

* Corrects advert typo

* Relocates skub

Pushes down the list to be with its relevant code split apart by the hero beacon rather than disjointed.

* cleans up code & spacing

Removes redundant code & spacing

* Cuts away more redundant code

Adds args to canUseTopic & removed !in_range
2018-10-15 21:39:48 -04:00
BeeSting12
e51d8d173c Makes the prices more reasonable. (#40532)
* flashlight

* YouTool check

* bar vendor

* shadycigs and kitchen

* engivend

* subject217s autodrobe stuff

* vendomat and botany

* merge conflict

* megaseed vendor

* emergency nanomed is down to 25

* medical vendor
2018-10-12 15:04:03 +02:00
MMMiracles
5ee8a6bb1f Adds clothing production for Botany (#40563)
cl MMMiracles
add: Botany can now grow cotton to produce cloth for various jumpsuits.
add: Cotton can be mutated into a much more durable strand, allowing for the production of crude armor.
add: Rainbow flowers, an alternative for clothing dyeing, is obtainable through cargo's exotic seed crate.
add: A loom can now be crafted with some planks so you can actually weave that cotton into a usable fabric.
add: Fannypacks, softcaps, beanies and scarves are now craftable with cloth and dyeable.
/cl

[why]: A way to produce clothing and naturally obtain cloth past ripping up other stuff seemed useful and with the economy aspect, might actually have some extra use.
2018-10-03 10:13:34 +13: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
cacogen
00feea5594 Janitor balance changes (#40141)
cl cacogen
balance: Space cleaner in spray bottles travels 5 tiles instead of 3 (doesn't affect other reagents)
balance: Trash bag fits in exosuit slot of janitor biosuit
balance: All soaps are faster
balance: Soaps now clean all decals on a tile instead of just one
balance: Soap now has limited uses (100 for most, 300 for NT brand which janitor gets)
balance: Mops are considerably faster
balance: Basic mop holds twice the reagents
balance: Janitorial cart now refills mops completely with one click
balance: Basic and advanced mops are more robust (8 force and 12 force)
balance: Galoshes no longer leave bloody footprints
balance: Chameleon noslips no longer leave bloody footprints
fix: Bulb boxes can be used on light replacers refill them in bulk
balance: Light replacer can be used in-hand to change all bulbs on a tile
add: Custodial barrier projector which creates solid wet floor signs that force people to walk to pass (available through service protolathe)
/cl

Janitor's been an exercise in futility for years, and the job is made redundant by janitor cyborgs who can't even keep up with the mess themselves. Spreading blood is instant, but takes a lot longer to clean. The goal here is to make it easier to keep up with the mess and make the controls less finicky while avoiding affecting combat too much (the mop and spray bottle are is a good weapons after all).
2018-09-28 09:21:14 +12:00
bgobandit
ced3668ebc Prison food tastes gross now. (#40421)
* Prison food tastes bad.

* typo

* less clunky writing??
2018-09-25 12:55:36 -06:00
BeeSting12
9a1ef0c9d2 Allow prisoners to get food for free (#40449)
Sustenance vendors should be free so perma prisoners can eat without having to
pay.
2018-09-24 13:24:08 -07: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
ShizCalev
600586c72b Fixes var set lists on maps (#39615) 2018-08-09 17:04:25 -04:00
fluffe9911
6fa2dcf54e Multiple Color Clown Costumes! (#39435)
This pr adds new clown costumes that come in a variety of colors including blue, green, yellow, purple, orange and now rainbow! so now clowns can go out in the station in the latest clown style!
2018-08-01 12:05:08 +12:00
barbedwireqtip
8044054412 Add the half-life security guard outfit to the secdrobe (#39460)
I saw this outfit in the code, thought it'd be pretty neat to add to the
secdrobe.
2018-07-31 01:57:01 -07:00
WJohn
babf3af751 Fixes boozemat and medplus dispensers in syndie lavaland base. (#39332) 2018-07-25 07:27:13 -04:00
81Denton
d2eb3e83ed Tweaks wardrobe vendor contents, adds old shaft miner jumpsuit as premium (#39133) 2018-07-19 21:15:41 -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
Letter N
373c66de0c Adds narsie plushie and ratvar plushie on chaplain vendor (#38949) 2018-07-12 15:22:29 -04:00
AnturK
d71b205133 Clears stuff detected by SM's parser. 2018-07-03 12:32:06 +02:00
81Denton
f247f3722b Adds patriotism to Liberation Station (#38739)
* Adds ancient patriotism to Liberation Station

* I was clapping the whole time this was compiling
2018-06-30 12:04:12 +12:00
Jordan Brown
26b6fab1fe Merge branch 'pr-38604'
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2018-06-28 14:22:03 -04:00
oranges
a3b4099f0c Merge pull request #38726 from Mickyan/fernet_fix
Fixes a bug with Branca Menta and moves Fernet to contraband
2018-06-27 20:58:34 +12:00
ShizCalev
89752866aa Merge branch 'master' into spellcheck 2018-06-26 16:43:41 -04:00
Dax Dupont
bcf00e2157 Introduces actual liberty to liberation station vendors, removes sec access requirement (#38725)
* Remove access requirements from lib

* a
2018-06-26 16:34:45 -04:00
Mickyan
3423fb8ce0 branca menta fix, move fernet to contraband 2018-06-25 18:16:12 +02:00
81Denton
07c44a1f44 Fixes access reqs on public autodrobes/boozeomats (#38603)
* Fixes access reqs on Delta+Meta autodrobes/boozeomats

* box boozeomat

* come ON travis

* do it
2018-06-19 19:45:39 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
Tad Hardesty
eaf8bc3b42 Merge remote-tracking branch 'upstream/master' into patch/vending-machines 2018-06-19 13:07:13 -07:00
Hyacinth
fe1b73f070 Adds pink scarf to vendomat 2018-06-18 10:01:28 -07:00
81Denton
3125b2ebba Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
2018-06-17 17:50:21 -07:00
Tad Hardesty
870ac15480 Improve how vending machine restocking works 2018-06-16 23:02:41 -07:00
Tad Hardesty
2f8f166d88 Merge pull request #38287 from ninjanomnom/signal-define
Use a define to speed up sending signals to datums with no signals
2018-06-14 22:17:01 -07:00
81Denton
842a952f9f Pubby: fixes boozeomat and disposals issues (#38466)
* removes duplicate poster, moves disposals bin

* boozeomat x2
2018-06-14 17:10:48 -04:00
ninjanomnom
d483ff3ef0 Regexes
`([^_\.])SendSignal\((.+?)\)` -> `\1SEND_SIGNAL(src, \2)`
`([\.\w]+?)\.SendSignal\((.+?)\)` -> `SEND_SIGNAL(\1, \2)`
2018-06-13 19:19:23 -04:00
ShizCalev
3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
oranges
76f3deaa98 Add kahki pants to the sec wardrobe (#38328) 2018-06-08 10:41:49 -04:00
81Denton
02a076d2ee Uses defines for vending machine access (#38336)
* Uses defines for vending machine access

* delet
2018-06-08 15:46:03 +03:00
81Denton
486df3271a Fixes Pubby maint boozeomat (#38300) 2018-06-06 00:35:33 -07:00
Tad Hardesty
2f212e16a3 Remove redundant anchored=TRUE from machines 2018-05-27 19:23:37 -07:00
Armhulen
5d826f2ca4 Custom Chaplain Armor Kits (#37569)
* giant dad set

* twop underway

* initial

* initial

* no special armors :((((

* bye twop

* no more special armors

* f

* more removals

* fixes

* normieizing the armors pt1

* ok, finally

* I'M DONE I DID IT

* removals

* this will not compile but next commit in two commits it will

* this will not compile but next commit it will

* it compiles 20 dollars says it compiles

* i am so sorry

* fixes everything, >:(

* *coughs up hairball*

* cobby's suggestion

* pbool'f fhttrfgvba

* OOOOOOOOH YEAAAAAAAH BABY

* quieter

* AH OKAY THERE
2018-05-27 13:50:59 -07:00
cyclowns
49b4aa928e Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-23 13:38:59 +12:00
Firecage
c1f10aecce Adds department wardrobe vendors to the code and to Boxstation. (#37859)
* Adds wardrobe vending machines.

* Adds the refill cartridges to cargo.

* Removes access requierments and fixes spelling errors.

* More spelling errors fixed, curse the English language.

* Added sec skirts and grey uniforms to the sec vendor, and added formal uniforms as premium items to it.

* Fixing some grammer/spelling errors and adds the purple bartender uniform to the vendor.

* .

* Does Shizzy's requested changes.

* Adds these machines as options at the vendor circuit board. Adds more product ads.

* Fixes compile error.

* Sprite fix and two more things to the MediDrobe.

* adds the sprites

* Adds the vendors to box station.

* splits the supply packs up into different departments. Costs adjusted to be consistent with the autodrobe crate.
2018-05-21 19:12:22 -04:00
ThePainkiller
703ab07fac Adds Fernet, a digestif that reduces your satiety. (#37869)
* Added Fernet and subdrinks

Added sprites for Fernet (bottle), and glasses of pure Fernet, Fernet Cola, Fanciulli and Branca Menta

* Adds Fernet and drinks made out of it

Added Fernet, Fernet Cola, Fanciulli and Branca Menta

* Adds reactions to fernet

* Adds Bottle of Fernet to the list

Spriting by the wonderful NeoExperiences

* Adds Fernet to the Borg's Shaker

They can help you indulge in more hedonism now.

* Adds Fernet to the Booze Dispenser

* Adds Bottle of Fernet to the list

* Updated Fanciulli, Branca Menta

Oops, nearly made two of the drinks not cause the satiety reduction.

* Fixed a missing comma on reagent list

I'm dumb, I forgot this was a list

* Fixed the procs on stamina and hunger

I'm sorry I'm sleepy and retarded to mistake an L for an M

* Changes the recipe of Fanciulli to include Manhattan

They were conflicting, and the description of the glass already says it's just Manhattan with Fernet, so it's consistent.

* Removes glass_icon_state from pure fernet

Cobby said it was pointless since the spritework was lazy
2018-05-17 18:19:19 +03:00
Dax Dupont
8b24f10b63 Fixes wrong circuits (#37853)
* Fixes wrong circuits

* this too
2018-05-16 13:03:18 -04:00
Denton
353af378cb adds circuit board spawners, adds missing electronics to engivend
replaces tech storage circ boards with spawners
2018-05-10 21:50:55 +02:00
Firecage
7ff845f372 Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values. (#37683)
* removes the block chance from the Roman Shield.

* replaces the Roman Shield in the autodrobe with a toy version with no block chance.

* replaces the armoured roman helmets from the autodrobe with fake ones.
2018-05-09 07:48:57 +02:00
Hyacinth-OR
b0b7f2df9a Adds grenadine. (#37598)
* Adds the grenadine sprite to drinks.dmi

* Everything else, woops!

* Sprite tweaks.

* Requested changes!

* hopefully fixes merge conflict issues.

* Removes bad files!

* Messed that one up!

* dupe!

* dupes...
2018-05-02 14:12:37 -04:00