monster860
009dcaa2d8
Merge branch 'master' into w_class
2016-07-10 09:29:12 -04:00
monster860
3df85518e1
Removes .0 at the end of w_class numbers
2016-07-08 12:26:34 -04: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
Fox-McCloud
fa240a7c56
tweaks
2016-07-01 19:59:09 -04:00
Fox-McCloud
cf1a584995
Instant Patch Features
2016-06-30 09:55:35 -04: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
TheDZD
c6b4539548
Finishing touches
2016-06-08 15:11:24 -04:00
TheDZD
e7aa12e339
Merge pull request #4573 from Fox-McCloud/mocha
...
Adds in Cafe Mocha
2016-06-04 21:19:43 -04:00
Fox-McCloud
7c38aa036b
Fixes Ice Reagent
2016-06-03 05:57:03 -04:00
Fox-McCloud
6abe982844
Adds in Cafe Mocha
2016-06-02 21:21:47 -04:00
Fox McCloud
97309c5392
Merge pull request #4543 from TechDragon610/patch-2
...
makes ice regent melt when heated
2016-06-01 07:28:44 -04:00
TheDZD
8dcf46bf91
Sprites & fixes
2016-05-31 22:50:57 -04:00
TheDZD
a4e950d21a
Compiles, and guns work™
2016-05-31 22:50:55 -04:00
TheDZD
95d7a68a75
Here we go again...
2016-05-31 22:50:53 -04:00
TechDragon610
60a0f97334
Update chemical_reaction_food.dm
2016-05-31 00:00:12 -04:00
TechDragon610
c51040066c
Update chemical_reaction_food.dm
2016-05-30 22:43:52 -04:00
TechDragon610
03cc9cf551
Update chemical_reaction_food.dm
2016-05-30 22:40:58 -04:00
TechDragon610
d72145486b
makes ice regent melt when heated
...
pretty self explanatory. it really bothered me that water froze but ice didn't melt. compiled fine.
2016-05-30 22:34:49 -04:00
SamCroswell
821f7cf578
XENOBIO PLS
2016-05-30 11:40:22 -04:00
Fox McCloud
4735879fc6
Removes Ghost Chilli Juice and Dragon's Breath ( #4495 )
2016-05-25 17:09:18 -04:00
TheDZD
6e2b236f81
Merge pull request #4480 from Fox-McCloud/simple-animal-loot-refactor
...
Simple Animal Loot Refactor
2016-05-22 18:31:43 -04:00
TheDZD
db7ba34b7b
Merge pull request #4479 from Fox-McCloud/snack-tweaks
...
Snack Tweaks to Donk Pockets
2016-05-22 18:16:26 -04:00
TheDZD
2e97cb8cd0
Merge pull request #4478 from DaveTheHeadcrab/SyringeIcons
...
Updates Syringe Icons
2016-05-22 16:32:47 -04:00
SamCroswell
1bf59c22ef
Bows Down to Overlord DZD
2016-05-22 16:28:23 -04:00
Fox McCloud
17f9b25e30
Merge pull request #4477 from FalseIncarnate/kitchen
...
More Fudge Flavors
2016-05-21 20:38:50 -04:00
Tastyfish
487778eb3d
Removes air pill thing completely
2016-05-21 11:56:45 -04:00
Fox-McCloud
54b02d7ea0
Simple Animal Loot Refactor
2016-05-20 21:48:29 -04:00
Fox-McCloud
f93b696d4d
Snack Tweaks to Donk Pockets
2016-05-20 19:35:42 -04:00
FalseIncarnate
720aba1fa5
More Fudge Flavors
...
Adds 4 new fudge flavors!
Peanut Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, and 3 peanuts
Cherry Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, 3 cherries
Cookies 'n' Cream Fudge:
- Made with 5u milk, 5u sugar, 5u cream, 1 chocolate bar, 1 cookie
Turtle Fudge:
- Made with 5u milk, 5u sugar, 1 chocolate bar, 1 peanut, 1 caramel
Also adjusts the standard fudge recipe
- Now 5u milk, 5u sugar, 1 chocolate bar
- Fixes #4457
- REMINDER: These use chocolate bars made via reaction, not the candy
bars you make / buy from machines
2016-05-20 14:58:29 -04:00
Tastyfish
afe2aa8e31
Makes gas reagents have standardized behavior, skrell liver behavior generalized
2016-05-20 04:27:59 -04:00
TheDZD
cb5f572969
Merge pull request #4423 from Fox-McCloud/foam
...
Foam Fixes+Changes
2016-05-16 20:15:39 -04:00
Fox-McCloud
e22bc8a42b
Foam Fixes+Changes
2016-05-12 23:47:30 -04:00
KasparoVy
1d0965b1f9
Back up to date.
2016-05-10 00:25:42 -04:00
KasparoVy
13003fe351
Merge branch 'temp2' into temp
2016-05-10 00:10:15 -04:00
TheDZD
f5c35a6486
Merge pull request #4357 from Fox-McCloud/chem-stuff-disease
...
A Few More Disease and Reagents
2016-05-06 18:12:18 -04:00
Fox-McCloud
52bc145c17
botany and more reagents
2016-05-06 03:43:31 -04:00
Fox-McCloud
38278e2f58
random drugs
2016-05-05 22:50:46 -04:00
TheDZD
b4e923fa5c
Merge pull request #4353 from Fox-McCloud/food-tweak
...
Mushrooms No Longer Taste Nasty
2016-05-05 21:22:14 -04:00
Fox-McCloud
1facb7a397
love and hugs
2016-05-05 19:50:29 -04:00
Fox-McCloud
d8375f09f2
initro, why not
2016-05-05 07:13:25 -04:00
