Commit Graph

404 Commits

Author SHA1 Message Date
Ryll Ryll
ca0701fe65 Update _vending.dm 2020-02-28 08:55:19 -05:00
spookydonut
1a9ddbee5f Merge pull request #48959 from Ryll-Ryll/embeddead
Refactors embedding, adds harmless embeds, sticky tape, admin buttons to make everything embeddable
2020-02-24 15:43:36 +08:00
Ryll-Ryll
cb3b82bdc1 lets you update embedding behavior, also makes red pens faster 2020-02-22 02:15:19 -05:00
Krysonism
a8b96a6125 [READY]Da hydrowear update. Resprites hydro jumpsuit and adds horticultural waders. (#49164)
This PR does two things:

It resprites the default botany jumpsuit and jumpskirt.
The new jumpsuit sprites are less flat, less noisy and the green colour is a slightly bluer shade.

Secondly it adds the horticultural waders: type of apron made of thick leather, it is a bit less permeable than the normal apron but is otherwise identical in function. It is available from the hydrobe.

Why It's Good For The Game

I have always had a dislike for the standard hydro outfit. It is a mess of bright green, blue and yellow. It gets even worse when someone puts on a botany bandana. An eyesore is how i would describe it.

The problem areas in my mind are the backpack, apron and jumpsuit.

The backpack can be replaced with a leather satchel so that is a not much of an issue. But the apron doesn't have a decent replacement and i think most players will want to wear their department jumpsuit.

I personally think my new hydroponics jumpsuit looks a lot better, I know respriting such an old core sprite is going to incite controversy, let me know what you think in the comments.

The waders are a stylish and thematically appropriate option to the apron that covers up a lot of your very bright jumpsuit to prevent it from stealing the show.

They kind of looks like something a Victorian gardener would wear and they seem like they would be a good choice in the wet, thorny and dirty environment of the hydroponics lab.
2020-02-22 12:46:00 +13:00
Cobraman202
586621e786 Changed "Monk's Frock" to the more modern term of "Monk's Habit" 2020-02-21 00:12:38 -06:00
Mickyan
cebc8d428e Merge branch 'master' of https://github.com/tgstation/tgstation into chewing_gum 2020-02-20 16:09:01 +01:00
Bobbahbrown
476399a346 the span of these changes is immense (#49432) 2020-02-20 13:48:13 +01:00
ShizCalev
377d474ca2 Merge pull request #49400 from plapatin/airpods
nanotrasen-brand spacepods can play music just like headphones now
2020-02-18 22:45:20 -05:00
Mickyan
81354500be glomp 2020-02-18 18:31:00 +01:00
Ryll-Ryll
8566aa8d60 still gotta figure out how to update embedding stats on the fly 2020-02-18 02:06:35 -05:00
Mickyan
2f5f44b619 chomp 2020-02-17 22:53:54 +01:00
Mickyan
a6ff3cc65c Adds the broom (#49120)
It's a broom

The basic janitorial tool that's been missing for all these years

Demo here: https://www.youtube.com/watch?v=KHcEIhAxx0g

🆑
add: Added the broom. For sweeping.
/🆑
2020-02-17 21:39:08 +13:00
Time-Green
980837fc79 PLUMBING: Lavaland geysers, pumps and regrettable balance decisions! (#49067)
Implements the geysers and pumps I originally added along with the first draft of plumbing.

Geysers
A geyser can be plungered with a reinforced plunger to activate. At wich point, it'll either produce clf3, hollow water, protozine or rarely wittel.

Pumps
Adds the liquid pump to the plumbing RCD. Place on an active geyser and wrench it to start pumping the geyser of its delicious juicess. I also changed it to not use power, because it would be awful drawing kilometer long wires along with the ducts.

Chems
Hollow water works basically like blood and mutage, where you can mix it with 1 unit of holy water for more holy water.

Protozine has a .2 healing, down from omnizine's .5. The healing is just kind of a side thing and not really what this chem was implemented for.

If it wasn't obvious, this allows chemists to industrialize strange reagent creation, with hollow water being able to create limitless holy water alongside protozine being a valid replacement for omnizine. Getting 2 geysers with those chems and on lavaland is quite the hassle, and you still need to get some holy water from the chaplain as kickstarter. I honestly think this is fine, and otherwise I could add a unique botany catalyst, so they don't become useless in the process.

Wittel
Adds wittel, wich is rare. Does nothing, but can be processed into two fun/regrettable chems.

Adds gravitum. Metabolizes very slowly. Drinking it makes you weightless, and spraying it makes that object temporarily weightless. Make 10u by mixing 1 wittel with 10 sorium

Adds metalgen. Created by mixing it with mutagen and bluespace powder. Must then be mixed with 40u of a powedered material and 1u of liquid dark matter.
The material used becomes imprinted on the chem. It can then be applied to anything, except mobs, to turn it into that material. Radiation is bad, and no you can't turn the nuke into plasma to blow it up.
The chem is difficult to get and use, but it can turn the escape shuttle into solid gold wich looks really cool. You could also turn it into plasma and vaporize everything. It can be used to, with some effort, duplicate materials.

🆑
add: Adds geysers to lavaland! They can be activated by using a reinforced plunger found in the medical vendor. They can be harvested by using a new plumbing device, magically powered liquid pumps!
add: Adds Hollow Water to geysers, wich can be combined with Holy Water as catalyst for more Holy Water
add: Adds Protozine to geyers, a very weak version of Omnizine. Can be used in Strange Reagent mixing
add: Adds Wittel, a very rare geyser chem. Can be processed into gravitum, wich removes gravity. Can also be processed into metalgen, wich has a strange tendency to transform objects into the imprinted material.
/🆑

Why:
This is what I originally wanted to do. The idea was to have a lot more chems, but I can't focus on one thing for that long. Hopefully this'll empower the bored chemist and make the rounds just that more interesting. Hopefully this'll spark the creation of some other geyser chems aswell.

That and makes shaft miners not the only ones hunting on lavaland.
2020-02-17 21:33:19 +13:00
plapatin
a8fb93d896 nanotrasen-brand spacepod changes 2020-02-16 13:20:36 -08:00
itseasytosee
77e8fbcd32 Fix remaining wand of nothing locations (#49254)
Finishes #49240 which wasn't quite done.
2020-02-16 11:46:57 -08:00
Mickyan
0b3e1b524a Functional headphones (#48908)
* headphones

* adds element for mob icon updates

* corrects some "user" errors, literally

* now using signals

* removes extra space
2020-02-13 16:38:15 +01:00
skoglol
a28b24f149 Completely removes cloning (#48668)
* Removed from code

* Removes cloners from maps

* Some more references, now compiles.

* Reduces availability of replica pods

* DNA scanner and tech disk rebranding

* pubby door name, cargo pack description
2020-02-04 16:04:06 -05:00
skoglol
398bbdbbec Removes dorms toolboxes, tool storage insuls and multitools. (#48856)
* Replaces tool storage insulated gloves with budgets.

* Removes multitools, dorms toolboxes

* Adds multitools to youtool premium
2020-01-28 18:06:58 -05:00
Rohesie
7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +13:00
ArcaneMusic
d9a0cad8ca SOUTH BRONX PARADISE BABY!!! (New Contraband Candy Bar) (#48855)
* SOUTH BRONX PARADISE BABY!!!

* Rejiggered chemical values.

* Now with 200% more infectious insects.

* With Grammarly, you too can write professional quality letters, for a small fee!

* Clean up, keeps message spam to a minimum.

* Tral had a brilliant idea

* Review comments and review changes
2020-01-22 23:22:28 -08:00
OnlineGirlfriend
bb9c8018d4 Adds four new suits to Autodrobe (changshan, cheongsam) (#48862)
* adds blue and red changshan

adds blue and red changshan
adds changshan to autodrobe

* added cheongsam

added red and blue cheongsam
cheongsam available in autodrobe

* adds changshan, cheongsam

two colors each (red and blue)
adds to autodrobe
2020-01-22 21:49:13 -05:00
MrPerson
26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
skoglol
2028a9933f Merge pull request #48745 from Paxilmaniac/air-pods
Adds Space Pods (and makes earmuffs actually deafen you)
2020-01-20 01:06:38 +01:00
JJRcop
c314fbc6cb [READY] (nerf) Adds proximity crew pinpointer to Paramedics (#48418)
About The Pull Request

When #48236 was in progress, there was discussion about how a crew pinpointer was OP for paramedics. I immediately had an idea for a new one and made a PR to the paramedic PR. 81Denton asked me to make this its own PR after the paramedic PR was merged.

The proximity crew pinpointer does not point in the direction of the patient, but has a circle sprite that gets smaller larger as you get closer, so you have to search around, or combine it with the handheld crew monitor.

The circle is at maximum the smallest size after 29 tiles away, so you must be 28 or fewer tiles away for an indication that you are getting close. I welcome feedback on this. The handheld crew monitor can be used to find the area they are in.

proxpin

Demo video: https://youtu.be/_rXeJ49b-e8 (The pinpointer gets bigger rather than smaller now)

This is only attainable at the moment to paramedics as they spawn. Should it also be available elsewhere? now constructable from the Biological Technology techweb
Further changes

Moved Crew Pinpointer into premium nanomed items for 900 credits
Moved Handheld Crew monitor into premium nanomed items for 1750 credits, same price as before
Why It's Good For The Game

In #48236 it was stated that paramedics should start with the bare minimum equipment to do their job. The crew pinpointer that points them in exactly the right direction is pretty powerful, and this nerf will encourage them to either get used to the proximity one, or upgrade to the normal one at a price from the NanoMed or from techwebs.

Moving the Crew Monitor into premium was necessary to make it more of a luxury than an instant grab.
Feedback for nanomed premium prices on the normal pinpointer and the handheld monitor would help a lot
Changelog

cl JJRcop
add: New proximity crew pinpointer.
balance: Paramedic's crew pinpointer replaced with proximity crew pinpointer.
balance: The crew monitor was moved to premium items in nanomed, same with the handheld crew pinpointer
/cl
2020-01-14 11:18:55 +13:00
Paxilmaniac
b8b2d23616 Revert "space pods damage your ears"
This reverts commit ee400cbcb4.
2020-01-12 12:00:02 -08:00
Paxilmaniac
ee400cbcb4 space pods damage your ears
TURN YOUR FUCKING RAP MUSIC VOLUME DOWN
2020-01-12 11:37:57 -08:00
Paxilmaniac
f3d037929c subtypes are very cool
hi x2
2020-01-11 20:49:40 -08:00
Paxilmaniac
6d09cfb5a0 adds nanotrasen space pods
not those shitty space travel things, they are actually offbrand airpods
2020-01-11 19:00:16 -08:00
skoglol
36437d9c33 Removes free roundstart RCDs, adds foam grenades to EVA (#48482)
* RCD is premium, EVA RCD replaced with foam grenades, foam better

* vendor stock down to 2
2020-01-05 19:35:03 -05:00
skoglol
c7812722de Merge pull request #48466 from OnlineGirlfriend/ginger-ale
[READY] Adds Sol Dry (ginger ale) and Moscow Mule
2020-01-04 21:42:21 +01:00
TheVekter
da2b817e44 [READY] Moves Genetics to the Science department and makes Gen… (#48397)
* great googly moogly it's all gone to shit

* Fixed geneticist ID, moved in job list

* This is what I get for not building

* Fixed HUD sprite

* Finalized move to R&D code areas and updated sprites

* Mapping fixes on Meta

* Boxstation's turn and some Meta fixes

* Fixing map conflicts

* Moves genetics to science

SQUASHED:

great googly moogly it's all gone to shit

Fixed geneticist ID, moved in job list

This is what I get for not building

Fixed HUD sprite

Finalized move to R&D code areas and updated sprites

Mapping fixes on Meta

Boxstation's turn and some Meta fixes

Fixing map conflicts

* lmao travis

* okay you can pass travis this time

* DeltaStation changes

* lmao access bullshit

* Kilo also a few code/sprite fixes

* Pubbystation

* Removed gondolas because people hate fun
2020-01-02 06:15:35 -08:00
Krysonism
135db6570f [READY]Da amputation update. New premium surgical tool / tail harvesting device. (#48271)
* base

* Felinid's worst nightmare

* Apply suggestions from code review

Co-Authored-By: PKPenguin321 <pkpenguin321.git@gmail.com>

* Stronger outlines / desc / no skill benefit

* fixies for review

Co-authored-by: PKPenguin321 <pkpenguin321.git@gmail.com>
2019-12-31 19:40:58 +01:00
OnlineGirlfriend
849d680dee renames as Sol Dry 2019-12-29 19:25:27 -08:00
OnlineGirlfriend
cfab160643 fixes typos 2019-12-29 17:31:35 -08:00
OnlineGirlfriend
2c6dcfb184 Update cola.dm 2019-12-29 16:07:17 -08:00
OnlineGirlfriend
5052acfb21 Adds ginger ale and Moscow Mule 2019-12-29 15:32:15 -08:00
JJRcop
2aee4c0e30 Fix vending machines showing premium as free to dept workers (#48425)
* Fix vending machines showing premium as free to dept workers

* Fix vending contraband showing as free
2019-12-28 22:44:38 -05:00
cacogen
6b63bf7093 Changes $1 to 1 cr (#48414)
* $ to cr

* Payday messages use a proper span instead of asterisks
2019-12-28 16:29:36 +02:00
cacogen
c963b542f0 Kong whiskey and candy corn liquor (#48263) 2019-12-28 15:20:06 +01:00
Rob Bailey
7f2c1d1035 tgui-next vending machine (#48394)
* vending machine tgui

* fixes vending machines never closing

* n to cr

* rebuild
2019-12-27 10:32:39 -05:00
81Denton
3a0c5e75b3 Adds a new job: the Paramedic (#48236)
* Adds a new job: EMT

* adds code

* either adds or removes code, hard to tell at this point

* Never not on it, leanin' so hard you're ashamed
You can't dismiss this sick transmission, huffs your brain
Exhale your will and forget I ever knew you
Fuck do you do?
Fuck a man with hips for hulu
Rack a snitch, chalk and cue you
Corner pocket consume you
Too many hoes in my
Too many hoes in my motherfuckin' meal
Asking if I know how a motherfucker feels
How a motherfucker feels

* 300 hours in MS Paint

* map editing is almost as pleasant as CBT

* remove crepe

* indentation

* map merge

* crew pinpointer, EVA access

* sick sprites by twaticus

* Replaces pen acid bottle with calomel

* Moves crew monitor/pinpointer to premium

* Triple six, five, forked tongue
Subatomic penetration rapid fire through your skull
How I shot it on one taking it back to the days of trying to lose control
Swerving in a blaze of fire, raging through my bones
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah, I feel like killing it Takyon
Alright that's tight, what its like to experience Takyon
Out of the blue, in through the back
Door coming through like fuck what was that
Man I don't know, but it made me feel so heated
How we creep without showing you jack
Shit from below, give a shit if you know
'cause even if you did, you'd keep coming back
Back for more, need it man you're addicted to the heat
We make beats catch
Beat it til it bleeds to death, each track
Like EPMD snappin' necks as we tap energy
From everything on and off the map
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Takyon, shot down your throat like a keg of beer
Choke on the smoke we in and exhale 'til the whole chamber is clear
Haters act so fucking weird
Try to stain this atmosphere
But they can't 'cause its way too sheer
How to make a hater disappear
Take shit where it ain't never been
Fuck what you thought could not comprehend
This shit if I fisted your brain with it
10-9-8-7-triple 6-5-forked tongue
Criminal level crunk lightning storm
Get out the way or get up torn
Ain't a picture big enough to fit
What we dig up from the core
Of all that they forgot ever was
Militant march of this war
Takyon taking them down
All we see is blood
Takyon turning them out
How to trick out and freak that buzz
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Lunar eclipse forcing you to trip
Off the moonlit fire we spray
Cryonic haunted bullets hollow tipped with toxic waste
So here's the deal, if you don't feel ill
Don't want it nowhere near my zone
That shit is dead, can't nobody get
With that shit gets dial toned
Takyon bitch slappin pussy clots and clones
Takyon settin' off uni bombs inside your dome
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon

* YUH

* Updates sprites

* changes job order, uncomments plasmeme clothes

* Updates outfits

* last commit I swear

* bottle descriptions

* Renames EMT to paramedic

* Renames existing EMT clothes to paramedic as well

* Add missing job icons for Paramedic (#9)

SecHUD icon
ID card icon

* Improves descriptions

* Reverts vending balance change, replaces random spaces with tabs

* Resolves map conflicts

* Update strings/ion_laws.json

Co-Authored-By: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>

* Adds missing pda_slot to the paramedic outfit

* roller bed starting equipment

* Fixes map conflict

Co-authored-by: JJRcop <jrubcop@gmail.com>
Co-authored-by: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>
2019-12-27 10:29:12 -05:00
Mickyan
55f19df748 Normalizes payouts and vendor prices to an approximate of cargo's credit value (#48174)
* prices & income

* more prices

* lower megaseed premium prices

* custom prices for premium tools

* slightly lowers prices for some snacks/drinks/cigs

* hey get back here
2019-12-16 17:43:27 +01:00
Ryll Ryll
265d137763 better (#48134)
Vendor tipping fixes
2019-12-16 06:45:32 -08:00
Ryll Ryll
beff318999 Adds a bunch of new achievements (#48094)
About The Pull Request

Now that achievements are open for adding again, adds 7 new misc achievements-

    Disk, Please!: As a nuclear operative, hold up the captain with a loaded rocket launcher. The captain must be conscious for it to count!
    My Watchlist Status is Not Important: Get reported to security and medical staff by displaying antisocial tendencies in a video game.
    I Was a Teenage Anarchist: Get killed by a vending machine falling on you.
    Mister Sandman: Kill someone by botching surgery while they're asleep
    A Bowl-d New World: Die to a toilet
    How Do I Switch Hands???: Hit yourself idiot
    One Lean, Mean, Cleaning Machine: Gaze upon a fully promoted cleanbot

Why It's Good For The Game

Adds more fun things to do for the gamer cred that aren't just killing things on lavaland
Changelog

cl Ryll/Shaps
add: A bunch of new achievements have been added! To name a few, there are achievements for holding up the captain with a rocket launcher as a nuclear operative, dying to inanimate objects, dying in a toilet, and getting watchlisted! Go do some dumb stuff!
/cl
2019-12-11 14:36:31 +13:00
spookydonut
175439f63a Removes unreachable code (#48143)
About The Pull Request

As detected by SpaceManiac/SpacemanDMM#123
2019-12-10 20:52:13 +13:00
Couls
af0eb8e935 birdboat now chokes on plastic (#47551)
* birdboat now chokes on plastic

* update maps

* Update goose.dm

* cleanup and fixes

* more improvements, goose will eat any item with plastic now

* limit goose to only eating 10 food per turf

* End this nightmare

* more sanity

* Die in your own vomit you broken goose

Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>
2019-12-01 10:14:06 +01:00
Ryll Ryll
958dedc3d1 Adds beating vending machines for free stuff/getting crushed to death (#47799)
* what a way to go

* buffs crush

* squish

* better crits

* more flavor

* buckle

* per action

* better pin

* better pin and respects ranged cheese
2019-11-30 03:57:03 -08:00
ArcaneMusic
d7c6471aa8 Adds 2 Suspender Subtypes, gives suspenders a new toggle, and adds Mystic Robes (#47821)
* Blue, Gray suspenders

* Adds suit toggle for X-Y suspenders for some reason

* Psijic monk robes and hood, toggles, all good to go.

* Cleans up magic pixels, tones down colors.

* Inhand sprites are in.

* Suspenders exist on the map somewhere

* BEGONE FORELORN PIXELS OF YORE
2019-11-25 23:12:05 +01:00
Krysonism
738b4fcae7 Da bottle update. Empty glass bottles, bottle crafting, hooch & moonshine bottles. (#47696)
* bottle bottle bottle

* newline
2019-11-12 17:54:49 -05:00
RyverStyx
67c16e8af2 Grilling Shorts for Cook and Chefdrobe (#47586)
About The Pull Request

Sprited Grilling Shorts and added them to the Chefdrobe for cooks. These shorts offer no additional stats and are purely an alternative cosmetic for the Chef job.
Why It's Good For The Game

Grilling Shorts are a fun new outfit that chef's and cooks can wear to match their snazzy sandals. They offer no advantage and function as a normal uniform. It is purely for a cosmetic difference.
Changelog

cl
add: Added grilling shorts.
add: Added grilling shorts to chefdrobe.
/cl
2019-11-11 09:19:42 +13:00