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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ghettochem #3793

Merged
merged 13 commits into from
Apr 16, 2015
Merged

Ghettochem #3793

merged 13 commits into from
Apr 16, 2015

Conversation

Kurfursten
Copy link
Collaborator

  • Adds the Electrolyzer (plus construction)
  • Adds the Centrifuge (plus construction)
  • Adds the Mortar (plus construction)
  • Sulphuric Acid can now be made with its real life formula. 2 S + 3 O2 + 2 H2O → 2 H2SO4
  • Busta Nuts are now more salty, like Busta
  • Bowls may now be made with 1 Wooden Plank
  • Iron may now be obtained by grinding metal sheets

+Fully tested!

For more info on how Ghettochem tools work, check out this Wiki page: http://ss13.pomf.se/wiki/index.php/User:Kurfurst/Ghettochem

if(open && cistern && !state && istype(I,/obj/item/stack/rods))
user << "<span class='notice'>You add the rods to the toilet.</span>"
var/obj/item/stack/rods/R = I
R.use(2)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a similar check for 2

@ComicIronic ComicIronic added the Conflicts Conflicts with something. label Apr 6, 2015
@Iamgoofball
Copy link
Contributor

👍 creative use of Discount Dan's

@PJB3005
Copy link
Contributor

PJB3005 commented Apr 6, 2015

👍 Dis is amazing, now people can brew up their own drugs and sell them in the maint shafts.

@ComicIronic ComicIronic added System Modifies an underlying system within the game, may not affect players in any way. and removed Conflicts Conflicts with something. labels Apr 7, 2015
@@ -1153,6 +1153,7 @@
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("bustanut", 6)
reagents.add_reagent("sodiumchloride", 6)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to provide greytide with more ready access to salt if the chef is being uncooperative.

This amount of salt should be harmless. I thought Busta's salty nature made it fitting.

@SkowronX
Copy link
Contributor

SkowronX commented Apr 7, 2015

In light of these new methods, you should also make dispensers access restricted to scientists and chemists only.

@Iamgoofball
Copy link
Contributor

@SkowronX no

ID locks a shit

@PJB3005
Copy link
Contributor

PJB3005 commented Apr 8, 2015

goofball obviously doesn't observe the scientists during a regular round with miners.

if(R.amount < 2) return
user << "<span class='notice'>You add the rods to the toilet.</span>"
R.use(2)
state++
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really like how states are used like this, could you change these to be defines so we can know exactly what state an object is in?

@Kurfursten
Copy link
Collaborator Author

One last bug to fix: need to make beakers not splash away contents when inserted into centrifuge (other containers like cans still work fine)

@Iamgoofball
Copy link
Contributor

@Kurfursten add it to the whitelist in glass.dm

@Kurfursten
Copy link
Collaborator Author

@Iamgoofball With spectacular tunnel vision I actually already added the electrolyzer to that whitelist, but forgot the centrifuge.

@Iamgoofball
Copy link
Contributor

10/10

coil.use(2)
var/obj/item/weapon/electrolyzer/E = new /obj/item/weapon/electrolyzer
user.before_take_item(src)
user.put_in_hands(E)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotta qdel(src) somewhere.

@d3athrow d3athrow merged commit 5baff0a into vgstation-coders:Bleeding-Edge Apr 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
System Modifies an underlying system within the game, may not affect players in any way.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants