Commit Graph

52 Commits

Author SHA1 Message Date
BeeSting12
f6f508fa73 Allow prisoners to get food for free (#40449)
Sustenance vendors should be free so perma prisoners can eat without having to
pay.
2018-09-25 09:10:30 +01:00
Ling
b2b7479f2a Fix some bugs 2018-09-23 20:56:39 +02:00
Ling
6061c0be60 Fix merge conflicts 2018-09-23 18:50:07 +02:00
Iamgoofball
428a033e39 [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 10:45:14 +01:00
nichlas0010
9656029ba2 Update _vending.dm 2018-09-15 21:08:58 +02:00
Nich
9a089a7e05 icons over colours 2018-09-15 17:36:26 +02:00
fluffe9911
186fa2a7f7 Merge branch 'master' into CLUWNE 2018-09-03 01:06:07 -04:00
Fluffe9911
7024e40c74 Adds Cluwnes Fixes Dolphins and ... Something Else 2018-09-03 01:02:21 -04:00
Aranclanos
aae00cd352 Fixes vending machines not updating their interface on use (#40042) 2018-09-01 16:44:56 +01:00
Garen Crownguard
f2cd8a131d screwdriver_act signal (#39877) 2018-08-27 10:56:40 +01:00
ShizCalev
8bc3635844 Fixes var set lists on maps (#39615) 2018-08-10 20:35:11 +01:00
fluffe9911
0a244c690c 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 01:04:21 +01:00
barbedwireqtip
ad6ae6e779 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 21:31:51 +02:00
WJohn
46c227bde2 Fixes boozemat and medplus dispensers in syndie lavaland base. (#39332) 2018-07-25 18:33:08 +02:00
81Denton
57c6a328ab Tweaks wardrobe vendor contents, adds old shaft miner jumpsuit as premium (#39133) 2018-07-20 02:15:33 +01:00
vuonojenmustaturska
47e7cd7f61 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-16 16:32:44 +02:00
Letter N
4440de6ce1 Adds narsie plushie and ratvar plushie on chaplain vendor (#38949) 2018-07-12 22:24:01 +01:00
Jordan Brown
150af0d2c9 Merge pull request #38888 from AnturK/ilovethisparser
Clears stuff detected by SM's parser.
2018-07-04 15:11:05 +01:00
81Denton
9cc0359443 Adds patriotism to Liberation Station (#38739)
* Adds ancient patriotism to Liberation Station

* I was clapping the whole time this was compiling
2018-06-30 01:05:05 +01:00
Nich
6c879778b6 spellchecks tg whatever 2018-06-28 21:26:38 +02:00
oranges
27f5d95851 Merge pull request #38726 from Mickyan/fernet_fix
Fixes a bug with Branca Menta and moves Fernet to contraband
2018-06-27 09:59:21 +01:00
Dax Dupont
03a36249cf Introduces actual liberty to liberation station vendors, removes sec access requirement (#38725)
* Remove access requirements from lib

* a
2018-06-26 21:35:26 +01:00
Nich
b1b47fd264 Merge pull request #1375 from yogstation13/upstream-merge-38603
[MIRROR] Fixes access reqs on public autodrobes/boozeomats
2018-06-20 07:03:14 +02:00
81Denton
0cffab8001 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-20 00:45:50 +01:00
Jordan Brown
0422970905 Merge pull request #38549 from AutomaticFrenzy/patch/vending-machines
Improve how vending machine restocking works
2018-06-20 00:44:37 +01:00
Jordan Brown
cf71ca73e1 Merge pull request #38580 from Hyacinth-OR/pinkscarf
Adds a pink scarf
2018-06-19 18:21:45 +01:00
81Denton
e08935526a 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-18 01:51:03 +01:00
Nich
ee523d7548 Merge pull request #1285 from yogstation13/upstream-merge-38287
[MIRROR] Signal define
2018-06-15 20:42:54 +02:00
Tad Hardesty
10e0fa2560 Merge pull request #38287 from ninjanomnom/signal-define
Use a define to speed up sending signals to datums with no signals
2018-06-15 12:40:41 +01:00
81Denton
a24b57b19f Pubby: fixes boozeomat and disposals issues (#38466)
* removes duplicate poster, moves disposals bin

* boozeomat x2
2018-06-14 22:11:04 +01:00
oranges
424a65b3e6 Merge pull request #38360 from ShizCalev/key-cleanup
Cleans up some logging
2018-06-12 00:49:00 +01:00
Ling
778318a782 Merge pull request #1195 from yogstation13/upstream-merge-38328
[MIRROR] Add kahki pants to the sec wardrobe
2018-06-08 16:59:19 +02:00
oranges
fe6376dc98 Add kahki pants to the sec wardrobe (#38328) 2018-06-08 15:42:20 +01:00
81Denton
be51aa33f1 Uses defines for vending machine access (#38336)
* Uses defines for vending machine access

* delet
2018-06-08 13:46:01 +01:00
81Denton
df90e38629 Fixes Pubby maint boozeomat (#38300) 2018-06-06 08:36:12 +01:00
Jordan Brown
f9e709c18c Merge pull request #38116 from AutomaticFrenzy/patch/anchored
Refactor machinery to default to being anchored
2018-06-01 17:28:09 +01:00
Armhulen
c4d3f2ac7c 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 21:51:31 +01:00
Nich
dbbd605a50 Merge branch 'master' into prsfixed 2018-05-24 13:01:20 +02:00
cyclowns
7a4b7e7f2f 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-24 12:29:22 +02:00
Firecage
66e70d1a46 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-22 00:12:30 +01:00
Nich
da199685c0 Merge pull request #832 from yogstation13/upstream-merge-37785
[MIRROR] Replaces loose tech storage boards with spawners
2018-05-18 08:42:41 +02:00
ThePainkiller
a53dc59d0b 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:55:07 +01:00
Dax Dupont
1c8819df26 Fixes wrong circuits (#37853)
* Fixes wrong circuits

* this too
2018-05-17 09:46:55 +01:00
Jordan Brown
ddeb53e1d6 Merge pull request #37785 from 81Denton/circboard_spawners
Replaces loose tech storage boards with spawners
2018-05-14 21:17:47 +01:00
Firecage
297a8bba41 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 06:49:29 +01:00
Hyacinth-OR
05ec8afe41 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 19:12:41 +01:00
europax
0d3bbd4075 Adds 5 new drinks (#37589)
* Added 4 sprites

Added sprites for Alexander, Between the Sheets, Kamikaze and Sidecar.

* Added recipes for 5 drinks

Added recipes for Alexander, Between the Sheets, Kamikaze, Mojito and Sidecar.

* Added 5 drinks

Added Alexander, Between the Sheets, Kamikaze, Mojito and Sidecar.

* Added Creme de Menthe to Mojito

* Changed Creme de Menthe to Menthol in Mojito

* Adds menthol and sake to the dispensers

* Adds menthol to drink reagents

* Removes menthol from drug reagents

* Added the box of menthol

* Adds menthol to the booze-o-mat

* Adds the menthol box sprite
2018-05-01 19:43:25 +01:00
Jordan Brown
d7e20c806a Ports sake with new sprites 2018-04-30 18:50:52 +01:00
Fox McCloud
d42a67da02 Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 14:01:33 +01:00
kevinz000
9ba8e6df20 Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 12:46:50 +01:00