Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ready]You can now select what your pills will look like when making pills from the Chem Master #41825

Merged
merged 11 commits into from Dec 15, 2018

Conversation

@Qustinnus
Copy link
Contributor

commented Dec 5, 2018

馃啈 Floyd/Qustinnus, paid for by Kryson
add: You can now select what your pills will look like when making pills from the Chem Master
/馃啈

we had 21 pill sprites and used 1. waste. now you can pick from our list of 21 and it'll show you beforehand what they look like

https://streamable.com/445u8

@Qustinnus

This comment has been minimized.

Copy link
Contributor Author

commented Dec 5, 2018

updated so they now have names so oranges doesnt string me up

@ExcessiveUseOfCobblestone

This comment has been minimized.

Copy link
Contributor

commented Dec 5, 2018

LOUIS!

@coiax

This comment has been minimized.

Copy link
Contributor

commented Dec 5, 2018

At the risk of making you cry, could you try to make the "choose pill style" a seperate tgui menu which has all the options shown?

But this is definitely cool.

@Qustinnus

This comment has been minimized.

Copy link
Contributor Author

commented Dec 5, 2018

i might make it so it just puts all the pills on the chem master menu. seperate interface sounds like hell and idk how to do it but I might try.

@Tlaltecuhtli

This comment has been minimized.

Copy link
Contributor

commented Dec 5, 2018

quinnus = god

@nicbn

This comment has been minimized.

Copy link
Contributor

commented Dec 5, 2018

Can you please make it so that there are right and left buttons to change it instead of having the popup selection window?

@Qustinnus

This comment has been minimized.

Copy link
Contributor Author

commented Dec 5, 2018

sounds equally annoying due to there being 21 options so it mgiht give people pain in their finger especially seeing as its tgui and will probably lag

@nicbn

This comment has been minimized.

Copy link
Contributor

commented Dec 5, 2018

Make it show a spoiler-like section then, please.
Spawning a new tgui window is quite an overkill and adds one extra window to player (who probably already has both the chem master and chem dispenser windows open).

@Qustinnus

This comment has been minimized.

Copy link
Contributor Author

commented Dec 5, 2018

this is currently not opening another tgui menu, can you explain what you mean with a spoiler like section?

@nicbn

This comment has been minimized.

Copy link
Contributor

commented Dec 5, 2018

A show/hide button that makes a section with the options appear

@Shadowflame909

This comment has been minimized.

Copy link
Contributor

commented Dec 6, 2018

what kind of chemicals are we putting in these pills to change their color!

THEY COULD SEEP INTO THE WATER

@davethwave

This comment has been minimized.

Copy link
Contributor

commented Dec 6, 2018

Food coloring?

@kriskog

This comment has been minimized.

Copy link
Contributor

commented Dec 6, 2018

Very nice!
Can you give them descriptive names? Think "Round Green" or "Red" or whatever they are.

@Qustinnus

This comment has been minimized.

Copy link
Contributor Author

commented Dec 6, 2018

im colorblind so can you make a suggesed change for all names ud like?

if("pillStyle")
var/pill_name = input(usr, "Choose your desired pill style:", "Pill Style") as null|anything in list("capsule 1", "capsule 2", "capsule 3", "capsule 4", "capsule 5", "capsule 6", "capsule 7", "capsule 8", "capsule 9", "capsule 10", "tablet 1", "tablet 2", "tablet 3", "tablet 4", "tablet 5", "tablet 6", "tablet 7", "tablet 8", "tablet 9", "tablet 10", "tablet 11")
switch(pill_name)
if("capsule1")

This comment has been minimized.

Copy link
@ShizCalev

ShizCalev Dec 6, 2018

Member

don't these all have spaces?

@Razharas

This comment has been minimized.

Copy link
Contributor

commented Dec 6, 2018

Choosing red colour should give you a message about wondering why lizard people make up 20% of station population but comitt 80% of the crime

Qustinnus added some commits Dec 6, 2018

if("capsule 9")
pill_style = 20
if("capsule 10")
pill_style = 20

This comment has been minimized.

Copy link
@Mickyan

Mickyan Dec 6, 2018

Contributor

duplicate? also missing styles 21 and 22

This comment has been minimized.

Copy link
@Qustinnus

Qustinnus Dec 6, 2018

Author Contributor

22 isnt used

This comment has been minimized.

Copy link
@Qustinnus

Qustinnus Dec 6, 2018

Author Contributor

rather; its not supposed to be

Qustinnus and others added some commits Dec 6, 2018

thanks mr mrdoombringer
* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8.

* [maximum peepee]

* u got a boyfriend

i bet he ddoesnt kiss ya
@Qustinnus

This comment has been minimized.

Copy link
Contributor Author

commented Dec 6, 2018

he knows his Tgui

@Qustinnus

This comment has been minimized.

Copy link
Contributor Author

commented Dec 6, 2018

image
thank mrdoombringer for being my best girlfriend ever

@Ziiro

This comment has been minimized.

Copy link

commented Dec 6, 2018

Based and Floorpilled

@PKPenguin321

This comment has been minimized.

Copy link
Contributor

commented Dec 6, 2018

Option for random?

@Qustinnus

This comment has been minimized.

Copy link
Contributor Author

commented Dec 6, 2018

smh its never enough with you people

jk ill look into it

@epochayur

This comment has been minimized.

Copy link
Contributor

commented Dec 6, 2018

based doombringer

@MACIEKBAKI

This comment has been minimized.

Copy link

commented Dec 6, 2018

now i can make cyanide pills that look like cyanide pills at my local chem master!

@davethwave

This comment has been minimized.

Copy link
Contributor

commented Dec 6, 2018

This will make the chem/medical traitor roll more interesting

@RobustAndrun

This comment has been minimized.

Copy link

commented Dec 7, 2018

Who's spriting a Xanax bar

Qustinnus added some commits Dec 10, 2018

@Qustinnus Qustinnus changed the title You can now select what your pills will look like when making pills from the Chem Master [Ready]You can now select what your pills will look like when making pills from the Chem Master Dec 13, 2018

@optimumtact optimumtact merged commit 14bd2ef into tgstation:master Dec 15, 2018

2 of 4 checks passed

Diffs - Pull Request #41825 No Modified Icons
Details
Map Diff Renders - Pull Request #41825 No Modified Maps
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

tgstation-server added a commit that referenced this pull request Dec 15, 2018

@davethwave

This comment has been minimized.

Copy link
Contributor

commented Dec 16, 2018

YAY

HonkBot added a commit to HippieStation/HippieStation that referenced this pull request Dec 16, 2018

DominikPanic added a commit to DominikPanic/tgstation that referenced this pull request May 6, 2019

[Ready]You can now select what your pills will look like when making 鈥
鈥ills from the Chem Master (tgstation#41825)

cl Floyd/Qustinnus, paid for by Kryson
add: You can now select what your pills will look like when making pills from the Chem Master
/cl

we had 21 pill sprites and used 1. waste. now you can pick from our list of 21 and it'll show you beforehand what they look like

== Original commit names==

* pillshere

* names for fruit-kun

* they do

* they do

* done

* thanks mr mrdoombringer

* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8.

* [maximum peepee]

* u got a boyfriend

i bet he ddoesnt kiss ya

* redpilled

* adds random pills

* boom

* mrdoombringer is fat

DominikPanic added a commit to DominikPanic/tgstation that referenced this pull request May 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can鈥檛 perform that action at this time.