Commit Graph

176 Commits

Author SHA1 Message Date
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
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
RyverStyx
8b25394ca8 Grilling Sandals for Chef and Cook (#47582)
About The Pull Request

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

Grilling Sandals are a fun new type of shoe that chef's and cooks can wear. They offer no advantage and function as a normal pair of sandals. It is purely for a cosmetic difference.
Changelog

cl
add: Added grilling sandals.
add: Added grilling sandals to chefdrobe.
/cl
2019-11-05 11:51:04 +13:00
skoglol
43a41e35a7 Janitors start with holosigns again (#47513)
* Janitor start with holosign instead of barrier, barrier now only blocks carbons.

* And unconscious for the other ones too
2019-11-03 01:42:17 -08:00
AnturK
4e16cda562 Fixes ghosts getting shocked by wires 2019-10-31 13:32:45 +01:00
carlarctg
b49d3bb4ac hello (#47357) 2019-10-30 01:47:25 -07:00
Arkatos1
0a4dcb5e00 Vendor dispense function changes (#47377)
* Dispense fix

* Finished and cleanup
2019-10-27 20:35:32 +01:00
carlarctg
fe65761c93 Candy cigarettes! + cig tweaks (#47143)
* Oh dude we got a fuckin coffee cheetos chickennnnnnnnnnnnn

* Update mask.dmi
2019-10-21 13:20:45 +11:00
kingofkosmos
52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm
2019-10-17 06:02:06 +03:00
MadoFrog
f63bb8bf5a Adds Shrine Maiden's Outfit to the Costume Vendor (#47090)
* Adds Shrine Maiden's Outfit

* Adds the Shrine Maiden's Wig

* Adds the gohei as a null rod transformation

* Gives the gohei purification properties

* Shrine maiden's items now lack religious significance

There's a profound comment to be made here, but I'm not smart enough to make it.

* Icons added back after rebase

* Addresses requested changes

* Adds the gohei's hitsound

* Update suit.dmi
2019-10-15 21:41:23 -04:00
kingofkosmos
228b4282ca Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm
2019-10-13 15:21:17 +03:00
moo
81becaf5d1 Cobbduceus: That girl is POISSSONNN (C2 Tox Chem changes) (#46823)
About The Pull Request & Why It's Good (Italics)

closes #46808
Seiver (NEW, replaces Fiziver)

Fiziver has been removed in favor of a new chem, Seiver.

Seiver is a chem that focuses on radiation purging or antitoxin depending on the temperature (the holder temp, not the air temperature). Colder temps will purge rads while hotter temps will clear up your sinuses toxin! Does heart damage relative to healing done.

Fiziver didn't see much use and I grew to dislike the overall damage mods. I think this is more interesting anyways since you have to play with chemtemp, something that adds a bit more depth to the chem. You may even need to add buffer chems that are cold to retain the high healing thresholds.
Multiver

Multiver is now geared heavily towards toxpurging. It now purges non-toxins less and stops purging medicines completely while you have at least 5 unique meds (including multiver) in you.

Multiver no longer self purges

Multiver's C2 mechanic is scaled down for each unique medicine (more unique meds makes it less bad for lungs!).

Multiver's toxhealing is lowered to 0.1 per unique medicine.

I wanted multiver to compete with syrinver since it wasn't used often but also not justify an arms race, so I decided to give them unique roles. Multiver is now more oriented for chem-purging while syrin is geared towards pure tox-healing so they should both find themselves in the smart doctor's arsenal.
Syriniver

Lowered the chem-purging for syriniver, with musiver having an even lower purging mechanic. They are also less selective, purging everything (syrin will not purge itself but musiv will).

see multiver
Changelog

cl Toxicby
add: Seiver, a chem favoring radpurging (cold temps) or antitoxin (hot temps) based on temperature (NOTE: NOT ATMOS TEMP)
del: Fiziver is now removed in favore of Seiver. Seiver uses old Fiziver recipe.
balance: Multiver is now geared towards chem-purging, and the unique-med mechanic is more rewarding than just amplifying the effects. Lowered toxin damage.
balance: Syriniver is now geared towards tox-healing. Lowered chem-purging and make it nondiscriminatory barring itself. Musiver has even lower chem-purging and is completely nondiscriminatory.
balance: 2 multiver bottles in the Medivend were replaced with syriniver since they now have more distinct functionalities.
/cl
2019-10-13 16:49:00 +13:00
kingofkosmos
280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
Urumasi
6e7801550b Moves reagent fill code and adds caps to plastic water bottles (#46878)
* Adds caps to plastic bottles

* Non-crafted water bottles now spawned closed

* Added warning message for closed bottles, fixed minor bug

* meme

* Makes the warning only show up when doing valid actions with the bottle

* Clumsy people now have a chance to lose the cap

* Fix small bottle's cap when fallen over, bottles now turn upright when opened on the floor

* Add a minor positive moodlet on bottle flip

* Adds a relic lavaland water bottle that always lands upright

* Moves container fill overlay to reagent_containers, changes glass/beaker/waterbottle to glass/waterbottle

* Make actions with closed cap early return

* Minor code cleanup
2019-10-09 12:05:52 -04:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
Fikou
05f0c2c1f3 adds the GRILL (#46844)
* a

* GRILL GANG

* sipp

* sip

* seep

* grug

* FSAIUGANOHNHOE

* bru

* a

* finish him

* compilies ^w^

* WOOO

* holy crap

* woo

* a

* h

* woo

* woo

* woo

* awoo

* aa

* aw shet

* heck you floyd

* at ath

* awo

* we like compiling code

* awo

* coal mat

* awoo

* aasdga

* a

* nice

* awoo

* awwoooooooooooooooooooooooo

* awoo

* spaceport bars

* grill gang

* aw

* awooo

* yee

* aw

* flod

* awoo

* awoo

* yesyesyyes

* a

* awoo

* holy sht

* h

* awoo

* awo

* aaaaaaaaa

* awoooooooooo

* awoo

* aw man

* honk

* well boys we did it

* oh mama mia

* ok cobby flushed

* awoo

* removes fun

* yeep

* i just said something

* vruh obama

* ye

* awoo

* awooooooo
2019-10-05 13:40:40 -04:00
Kerbin-Fiber
950e8d7172 Station Donksoft Vendor Resprite (#46776) 2019-10-04 14:19:49 -04:00
cynic716
36d4ef4788 Adds a sound to vending machines when they vend something (#46843) 2019-10-03 23:59:56 +02:00
spookydonut
82504aee09 Adds linting for power_change() and obj_break() (#46608)
Adds linting for power_change() and obj_break()
2019-09-26 05:09:49 -07:00
Tlaltecuhtli
62cc2abb2d more vending fix (#46538)
* Update maps.txt

* small vendor fixes

* Update _vending.dm
2019-09-25 15:32:50 +02:00
spookydonut
860985f193 Changes obj_break on machines to use parent calls (#46485)
The way stat |= BROKEN was done was a mess, this makes everywhere use obj_break with proper parent calls and adds a signal for when a machine enters the broken state.
Why It's Good For The Game

Better code quality, more signals.
2019-09-16 16:45:24 +12:00
Krysonism
4514a98633 The gambling anticipation update. D6 resprite and more! (#46471)
About The Pull Request

This PR resprites the D6, adds two money bags and a bag of 5 d6'es to the bardrobe. Be on the look out for the expensive ebony dice.

I have also made code improvement by filling dice bags using PopulateContents() and giving the special dice their own loot spawner.
Why It's Good For The Game

I have recently in anticipation for the roulette update tried playing some simple dice games with my bar patrons to great success. I did however notice that the old d6 sprites were quite bad, so i decided it was time for a resprite,

I have also added money bags to the BarDrobe since those will be needed if more forms of gambling are added to prevent greytiders from stealing all your winnings.

DiceComparasion
EbonyDiceLarge
Changelog

cl
add: Money bags can now be obtained from the BarDrobe.
add: A bag of d6'es is now available in the BarDrone. May contain a rare die.
imageadd: New d6 base sprites and variant.
refactor: Improved the way the normal dice bags is populated.
/cl
2019-09-16 16:43:20 +12:00
Trilbyspaceclone
b8208fac37 [Ready] More cakes and pies, as well as resprites a few others (#46196)
About The Pull Request

Adds in more tarts - pies
Mime Tart, Lava Coco flow Tart, berry tart
Adds in a few more cakes
Vanilla cake - real this time
Clown cake - Honk!
New book only get able via Dinner-o-mat that teaches you how to makes these
Why It's Good For The Game

More colorful foods and crafting as well as using the locked crafting system - Maybe better looking cakes
2019-09-09 10:59:28 +12:00
Tlaltecuhtli
11024a6c74 Fix loading into the custom vending machine (#46351) 2019-09-06 21:32:32 -07:00
Tlaltecuhtli
39d3948f4d Custom Vendor Re-PR (#45736 Re-PR) (#46240)
* Update maps.txt

* 1

* 2

* designs

* oops

* ((()))

* 3

* rename with pen

* sprites+ vendomat changes

* sanized input

* Update _vending.dm

* adds admin custom vendor

* Update _vending.dm

* Update _vending.dm

* Update _vending.dm

* Update _vending.dm

* Update maps.txt

* Update device.dmi

* Update maps.txt
2019-09-03 00:22:41 -04:00
Mickyan
93c2dc0c23 [READY]Skateboard overhaul (#45657)
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
2019-08-24 21:07:26 +02:00
ATH1909
98c1ad73ac Moves the robotic voiceboxes from one of my previous PRs over to the RoboDrobe (#46076)
* Update heal.dm

* Update heal.dm

* Update fire.dm

* Update plushes.dm

* Update plushes.dm

* Update fire.dm

* Update plushes.dm

* Update robotics.dm

* Update wardrobes.dm

* Update robotics.dm

* Update wardrobes.dm
2019-08-23 16:32:46 -07:00
moo
74ed605cd7 Cobbduceus Part 1/X: Category Twos, Base(d) Healers (#45749)
* 150 hours

* it compiles guys

* PERF

* meta conflictor

* oldcabin

* Revert "meta conflictor"

This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.

* oldmeta

* TAKE 5000

* NAME THIS

Also redoes Multiver/Palletta

* FRICK U FIZ

* NERF PERF

* comment cringe

* Checks for restraints/incapacitated for ichiyuri

* URIKA

Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.

* organ

* please upvote this

* maps...

* Gives Instabitaluri a Brand Name

Oh wow it's synthflesh 😆

* Update cat2_medicine_reagents.dm

* what kinda characters is Krys using
2019-08-22 17:30:16 -07:00
Mickyan
a5b04e360c Adds more persistent photo albums (#45898)
* album

* more slots

* new icon for old photos
2019-08-17 00:42:58 -07:00