Commit Graph

1419 Commits

Author SHA1 Message Date
TheDZD
5c29bf3a64 Merge pull request #5074 from Fox-McCloud/adminbus-reagent
Tweaks Adminordrazine, Cleans up Reagents, Fixes body temperature adjustments, and makes a few tweaks
2016-07-18 14:41:45 -04:00
Fox-McCloud
4d40c32f70 more tweaks and optimizations 2016-07-17 07:07:58 -04:00
Fox-McCloud
2710eeff5f less copy-pasta, better sprinkles, and vitamins 2016-07-17 04:06:23 -04:00
Fox-McCloud
db297e027f more cleanup 2016-07-17 02:24:14 -04:00
Fox-McCloud
f0b8d3b097 more cleanup 2016-07-17 00:44:58 -04:00
Fox-McCloud
7dccd3cedc fixes 2016-07-16 23:40:43 -04:00
Fox-McCloud
a4619fbd38 clean up 2016-07-16 23:11:32 -04:00
Fox-McCloud
d9d933224b tweaks and fixes 2016-07-16 14:09:46 -04:00
Fox McCloud
744777a944 Merge pull request #4971 from monster860/datum_browserify
Makes a bunch of UI's use /datum/browser
2016-07-16 08:52:18 -04:00
monster860
e32418956e open(0) 2016-07-16 08:27:37 -04:00
Fox-McCloud
b8f13dd693 Tweaks Adminordrazine 2016-07-16 02:50:32 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
Fox McCloud
66d7b89d9a Merge pull request #4838 from FalseIncarnate/paradise_pop
Paradise Pop
2016-07-14 23:58:24 -04:00
FalseIncarnate
0c4f898d95 more styling and gap removal
from here out, the commit names are going to get remarkably less useful
as i become more frustrated with krausus pointing things out
post-commit.
2016-07-13 22:46:43 -04:00
FalseIncarnate
7d8080e489 spacing 2016-07-13 22:26:26 -04:00
monster860
717bdf79c0 ChemMaster fixes 2016-07-13 19:15:03 -04:00
Fox McCloud
b787af15f8 Merge pull request #4934 from Chakirski/BACON!
Adds AUTHENTIC, JUICY, AMAZING BACON!
2016-07-11 21:23:41 -04:00
Chakirski
a031ebe889 Update snacks.dm 2016-07-11 20:17:30 -05:00
Fox McCloud
665fb967b2 Merge pull request #4961 from monster860/chemmaster-nanoui
The Long-Requested Nano-UI-ification of the ChemMaster
2016-07-11 21:02:25 -04:00
TheDZD
ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor
Blood Refactor+Fixes
2016-07-11 20:57:25 -04:00
Isaac Erwin
2509969a65 Fixes the brownstar reagent's description 2016-07-11 19:48:16 -04:00
Chakirski
7635de3020 Sliceable cutlets are sliceable not sliceable 2016-07-10 18:22:32 -05:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860
10292105ad Makes a bunch of UI's use /datum/browser 2016-07-10 09:19:14 -04:00
Fox-McCloud
7165360832 Blood Refactor+Fixes 2016-07-10 02:58:00 -04:00
monster860
aa51c925ea The Long-Requested Nano-UI-ification of the ChemMaster 2016-07-09 20:34:57 -04:00
Chakirski
8f23ac930a Revert "sync"
This reverts commit 3700a7ff8b.
2016-07-08 15:42:15 -05:00
Chakirski
3700a7ff8b sync 2016-07-08 15:33:26 -05:00
Chakirski
d432cf1239 Pink bacon 2016-07-08 14:58:46 -05:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Chakirski
f2cf93226e Amazing! 2016-07-08 00:26:37 -05:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Fox-McCloud
b39baaa733 Changes Mix Sound for Azide and Firefighting+CLF3 2016-07-03 15:29:53 -04:00
Crazylemon64
0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
Fox-McCloud
fa240a7c56 tweaks 2016-07-01 19:59:09 -04:00
FalseIncarnate
496c3a7843 Paradise Pop
Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!

Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes

The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.

Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!

Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)

Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
2016-07-01 13:31:09 -04:00
Fox-McCloud
cf1a584995 Instant Patch Features 2016-06-30 09:55:35 -04:00
Crazylemon64
dd98f1c868 Merge remote-tracking branch 'Krausus/InvestigateFix' into space_ruins
@tigercat2000 is a butt
2016-06-24 16:42:47 -07:00
Crazylemon64
a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00
LittleBigKid2000
9df0329088 Fixes candy corn not having an icon (#4765) 2016-06-24 09:30:27 -04:00
tigercat2000
732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
Mieszko Jędrzejczak
1a4f8cb518 Alcohol refactor v12413526345. (#4647)
* Refactors booze. Yes. I killed other commits.

* Lime juice
2016-06-19 11:52:44 -04:00
TheDZD
831ab328e5 Merge pull request #4683 from Fox-McCloud/patch-tweaks
Chem Patch Tweaks
2016-06-16 10:27:14 -04:00
Fox-McCloud
4835482c53 Chem Patch Tweaks 2016-06-15 06:45:00 -04:00
Aurorablade
fe6c3e3626 is making a commit its looke like they are trying to commit... (#4657) 2016-06-13 23:02:30 -04:00
TheDZD
a2f2da09b9 Merge pull request #4608 from Fox-McCloud/remove-mindslave
Can Deconvert Mindslaves and Vampire Thralls
2016-06-11 12:11:34 -04:00
Fox-McCloud
e6801a98e3 fixes and tweaks 2016-06-09 03:19:27 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00