Commit Graph

79 Commits

Author SHA1 Message Date
Mickyan
e831716127 Hairstyling update (#42907)
* good hair day

* fluff

* vendor/fixes

* removes redundant loc check

* cobby reviews
2019-03-05 12:23:00 -05:00
ShizCalev
25d142e917 Fixes janitors not spawning with the proper janitor holobarriers (#42921)
* Fixes janitors not spawning with the proper janitor holobarriers

* one more
2019-03-02 09:46:22 +13:00
gy1ta23
b547cc9bfb Fixes immersion ruining clothesmate line (#42684)
* Update clothesmate.dm

* Update code/modules/vending/clothesmate.dm

Co-Authored-By: gy1ta23 <44277885+gy1ta23@users.noreply.github.com>
2019-02-07 15:00:55 -05: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
Name
004792ba05 Rebase due to mime trickery
Cuts something that should be there


hardens pp


largens pp further


maximiezes pp 


fixes code


Auto stash before merge of "forth-times-the-yeah" and "BuffEngineering/forth-times-the-yeah"
Adds Initialize()


First Draft

Mostly works
Removes redundant code, adds other colors, adds to CE locker


oops forgot to


hardens pp


maximiezes pp 


Adds Initialize()


Auto stash before merge of "forth-times-the-yeah" and "BuffEngineering/forth-times-the-yeah"
oops forgot to


Attempts to balance the hardhat, adds to EngiDrobe


Removes unnecessary code and sprite, adds necessary sprite


How can commas be real if our eyes aren't real


Fixes bad slash


Fixes runtime


Optimizes code after runtime fix


Removes redundant code


Fixes 3/4


*scream


Makes visor coverage consistent with new sprites


Actually fixes the issue


samus? its an honor


Makes requested changes


Doesn't delete welding hardhat sprites
2019-01-28 16:28:40 -05:00
wesoda25
a3fb736e89 Lowers Nuka Cola Speed by 25% & Increases Soda Premium Drink Costs (#42271)
* Slows Down Nuka Cola a Little

* replaces nuka cola in vending machines

* adds fernet cola to drinkingglass

* removes speed change

* slows down nuka cola again

* Update drinkingglass.dm

* Update cola.dm

* bumps premium drink prices up $5
2019-01-09 16:13:53 -05:00
duckay
5c79d91f0b About that beer I owed ya. Adds blueshirt items to sectech and defines them better. (#42203)
* beer

* beer

* beer

* beer

* beer

* better descriptionhelmet

* better descriptionarmorname

* blue-shirt

* Update security.dm

* beer

* hey catch me later i'll buy you a

* thanks cobble

Co-Authored-By: duckay <41324849+duckay@users.noreply.github.com>

* helpies

* helpies

* discount for meme helmet

only 450 whoppers!
2019-01-04 15:12:34 -05:00
Dax Dupont
b6be6eff5e Allow non-carbons to use off-station vending machines (#42153) 2019-01-02 15:15:16 -08:00
81Denton
4eeab6634c [Ready] Makes kitchen cold rooms actually cold (Metastation) (#41799)
cl Denton
tweak: Metastation's kitchen cold room is now really cold! Make sure to wear warm clothing.
tweak: The kitchen clothing vendor now stocks two winter jackets by default.
tweak: Goats are now fine with temperatures as low as 180°K. This is so that Pete doesn't freeze to death inside the cold room.
code: Added a kitchen area subtype for cold rooms and adjusted chef CQC to work inside it (no gameplay changes).
/cl

You know how it's called a cold room, looks like a cold room but is actually just another storage room?

I made the Meta kitchen cold room spawn at -80°C and added a freezer to it. Originally I wanted to pick a more realistic temperature (like -25°C), but the way body temperature works means that you'd have to sit inside it for minutes to feel an effect.

Now, you can store bodies inside it, trap people and let them freeze to death, or lower the temperature even further and use it as a ghetto cryo chamber.

Also:
Kitchen clothing vendor gets two winter jackets and goats survive at lower temperatures (so Pete doesn't just die).
2018-12-10 09:35:28 +13:00
moo
d057de9b6e Merge pull request #41468 from Steelpoint/AdvMedkit
Advanced First Aid Kit
2018-12-05 11:01:48 -05:00
coiax
446641f329 Repath blindfolds to prevent regular sunglasses creation exploit (#41710)
Blindfolds don't actually need to inherit anything from sunglasses, from what I
can see, unless there's some bad type checking somewhere in the code that I'm
not aware of.

Exploit is: cloth makes blindfold + medHUD -> medHUD sunglasses -> remove
medHUD, regular sunglasses.
2018-11-30 14:21:22 -08:00
Qustinnus
b9f5dbac6b Adds a new race: Ethereal (also adds wrappers for nutrition adjustment) (#40995)
cl Qustinnus / Floyd / Ethereal sprites by Space, is that it? / Alerts and food sprites by MrDroppodBringer
add: Adds Ethereal; a race which lives off of electricity and shines bright. If they are healthy they shine a bright green light, and the more damaged they are, the less they shine and the greyer they become. Their punches do burn damage and they are weak to blunt attacks!
They dont need to eat normal food and dont have nutrition, Instead they gain charge by going into borg rechargers, eating ethereal food or doign specific interactions.
refactor: all nutrition changes now go through a proc so we can override behavior
/cl

Adds Ethereal. A race which is essentialy inspired by Zoltan but then with different mechanics to make it fit with SS13 more. I'm trying to stay away from making them actually provide power but the change from nutrition to electricity seemed kind of fun.

They have the following specifications:

    They are walking lights; and shine bright and green if healthy, and get greyer and darker the more damaged they are. When dead they are just a grey unlit corpse.
    They do burn punch damage instead of blunt.
    They are weaker to blunt; especially when low on charge
    They have charge instead of nutrition. Charge is gained by some interactions or by going into a borg charger. or eating new ethereal food.
    They are slightly stronger to shock damage, and gain charge from it a bit; however, it is still deadly to them and thus they aren't free insulated gloves.
2018-11-29 10:09:56 +13:00
ShizCalev
a64f5cd934 Makes the vending machine shut up (#41456) 2018-11-13 18:07:50 -05:00
Steelpoint
20927f7f02 InitialCommit 2018-11-13 12:49:55 +08: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
oranges
8b6fb11e38 Merge pull request #41399 from ShizCalev/vending-fix
Allows custom pricing of premium vending machine items
2018-11-12 20:41:38 +13:00
Steelpoint
b9391bf203 Security Webbing (#41394)
This PR sees the addition of an expensive item to the Security vendor, the security webbing. A unique chest rig.

The concept of this item is to give Officers something to spend their money on when they save up.

webbing

The chest rig is intended as an expensive minor upgrade over the standard security belt that security personal can purchase. Functionally it is identical to the security belt except it can hold one extra item, up to 6 from 5.

The belt costs $800, meaning round start Officers will be unable to afford it. The sec vendor holds five of these webbings.

cl Steelpoint
add: Nanotrasen Security has unveiled a newly designed Security Webbing, a minor upgrade over the standard issue security belt that is comfortable, tactical and able to hold an extra security item.
add: However, the webbing is not considered standard issue, so any interested officers will need to buy the item from a SecVendor out of their own pay.
/cl
2018-11-12 20:36:01 +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
Mickyan
c0ac8d514f Adds new moodlets, psychotropic drugs (#41207)
cl Mickyan
add: Added various new moodlets
add: Most notably, the Laughter chemical and breathing small quantities of N2O can improve mood
add: Psicodine: a new chemical that can restore sanity levels to normal and temporarily suppress phobias
add: Happiness: a homemade drug that supposedly gives a feeling of total bliss and.. emptiness? That can't be healthy... watch out for side effects.
fix: The suffocation moodlet now triggers correctly
fix: The drunk moodlet now clears as soon as the drunkenness wears off
/cl

Fixes #41170

List of new moodlets:
Jittery
Vomiting, vomiting all over yourself (gross)
Painful medicine application (silver sulfazine/styptic powder/syntflesh) - very short duration
Chemical euphoria (breathing N2O)
Laughter/Superlaughter reactions
Happiness drug related reactions

Psicodine: keeps your sanity at least above neutral level and suppresses phobias as long as it's in your system. Also available from pill bottles at the medivend at a premium.

Happiness: loosely inspired by Joy from LISA, very addictive, does minor brain damage, withdrawal makes you slowly go insane and overdose makes your mood jump all over the place. Also suppresses phobias. Good if you need a very quick and powerful boost but not very practical for keeping your mood up for long periods.
2018-11-04 15:01:05 +13:00
moo
c07f2a65da Streamlines beacon types (#41192)
* Streamlines beacons

* Adds a comment on how to use this.

* When the item spawns in the angels now sing

* haha it's a webedit guys!

* Let Centcomm know!

Co-Authored-By: ExcessiveUseOfCobblestone <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* musicly fans rejoice

Co-Authored-By: ExcessiveUseOfCobblestone <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2018-11-01 07:52:43 -04:00
Denton
759aac316c Adds hydroponics guard armbands to hydro clothes vendors 2018-10-26 08:27:36 +02:00
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