Commit Graph

3098 Commits

Author SHA1 Message Date
spookydonut 49eab491b4 Gamer skill (#49618)
* gaming.dm added

* initial changes

* gamer god trait

* finalization after testing

* spellcheck + flavortext

* phone gamer support

* incorporates review suggestions

* tiny flavor change in pwr game desc

* more trait-related touchups and minor fluff

* adds and removes ?s where needed

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:06:33 +08:00
skoglol d519dda70f Merge pull request #49638 from XDTM/zombieMeta
Properly fixes zombie powder permastun
2020-03-01 15:20:27 +01:00
skoglol 4f54159718 Merge pull request #49545 from ATH1909/itsspelledwithanhdamnit
Cleans up some of the code for unhusking people with chems, also reduces the amount of synthflesh required to unhusk someone
2020-02-29 23:23:06 +01:00
XDTM 69fbfcf9b3 Properly fixes zombie powder 2020-02-29 12:38:43 +01:00
ATH1909 8ed78fca5d kriskog this was exactly what this PR was supposed to fix ahhhhhh 2020-02-29 05:36:32 -06:00
nightred 70a3925567 fever and shivers change body temp normal 2020-02-27 20:22:05 -06:00
LemonInTheDark df9d859da8 Fixes tesla bugs, makes code better (#49260)
* Cleans shit up, adds some upper limits on zap count, makes explosions less commen. Need to fix apc issue before
I test how it plays

* Mood, buffs and nerfs tesla

* Cherry-Picking

* eyyo

* back to basics

* aight

* broooooooooooooooooo

* adds else

* range

* fixes shit

* Sure

* Cleans shit up

* Fixes prob issue

* Gee I like this spooky guy

* I swear to god if prob picks just makes a list I am gonna blow a gasket
2020-02-27 12:06:52 +01:00
ATH1909 d457b2ecb1 Update code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>
2020-02-26 13:55:51 -06:00
AnturK a2ff959950 Batch of runtime fixes. (#49568)
* Fixes secret sauce recipe paper.

* Fixes say runtime

* Fixes modular computer on holodeck runtime

* Fixes bee runtime

* Fixes grav holopara runtime

* Fixes olfaction runtime

* Fixes zombie runtime.

* Cleanup
2020-02-26 20:47:31 +08:00
skoglol 2220049fc2 Fixes blindfolds not properly counting as being blind (#49541)
* Fixes blindfolds not properly counting as being blind

* Call the proper proc
2020-02-25 19:15:33 +01:00
Time-Green e114d67d02 kills all reac bugs with the power shame (#49504) 2020-02-25 16:16:22 +01:00
ATH1909 ab8a673886 Update cat2_medicine_reagents.dm 2020-02-24 04:08:47 -06:00
ATH1909 c6c9a06d4d Update cat2_medicine_reagents.dm 2020-02-24 04:06:26 -06:00
ATH1909 6236b786f8 Merge branch 'master' into itsspelledwithanhdamnit 2020-02-24 03:59:37 -06:00
ATH1909 7ce2a68cae Update cat2_medicine_reagents.dm 2020-02-24 03:56:05 -06:00
ATH1909 6fae824bba Update cat2_medicine_reagents.dm 2020-02-24 03:38:57 -06:00
ATH1909 7d676ec9fa Update medicine_reagents.dm 2020-02-24 03:37:20 -06:00
ATH1909 f3ae2cf8ff Update cat2_medicine_reagents.dm 2020-02-24 03:35:33 -06:00
ShizCalev 0228bc2fbe Call the proper proc 2020-02-24 01:31:38 -05:00
bumtickley00 ddc02aba55 cobby 2020-02-22 11:21:35 -05:00
moo 0133414559 Cobbduceus: (Baby) C2 Additions (Rhig,Troph) and Changes (Helbital) (#49356)
It's the year of the rat sisters, and now it's time to cut out those pesky C3s in your life!

Why It's Good For The Game

Rhig and Troph are no brainers considering they're on the same level of ease2make as the C2s and have no downside. They will still be good but they have some C2 component now. Kinda minor compared to the others but I'll see how it plays out.
Changelog

🆑
balance: Helbital now is more simple to use and is based off not crit/softcrit/hardcrit. You want to be in hardcrit for the best brute healing.
tweak: Troph has now been converted into a C2 with tweaks, now named Probital. Same recipe. Downside is stamina damage
tweak: Rhig has now been converted into a C2 with tweaks, now named Hercuri. Same Recipe. Downside is it can cool to dangerous levels.
/🆑
2020-02-22 22:24:36 +13:00
spookydonut 1a958408ee Add autodocs for reagents (#49478) 2020-02-22 22:20:06 +13:00
Mickyan cebc8d428e Merge branch 'master' of https://github.com/tgstation/tgstation into chewing_gum 2020-02-20 16:09:01 +01:00
Bobbahbrown 476399a346 the span of these changes is immense (#49432) 2020-02-20 13:48:13 +01:00
spookydonut 6401ba5708 Merge pull request #49421 from ShizCalev/define-cleanup
Cleans up redundant math defines
2020-02-20 19:32:36 +08:00
ShizCalev 8cc290474e Removes depreciated chem reaction vars (#49440) 2020-02-19 06:16:00 +01:00
ShizCalev 71f584f39e Merge pull request #49325 from itseasytosee/Hiveminderaser
Adds a new drink. The Hivemind eraser.
2020-02-18 23:45:11 -05:00
ShizCalev b73946f957 Merge pull request #49329 from nemvar/goodbye
Removes reaction id and name.
2020-02-18 23:44:34 -05:00
ShizCalev 7209ac3c93 Removes unnessacary math defines 2020-02-17 23:09:09 -05:00
JJRcop a1392847bd Remove ismovableatom macro (#9) 2020-02-17 15:03:16 +01:00
spookydonut 221d321d8b Fixes compile errors (#49410)
* Double ended fuck up

* list

* templatessssssssssssssssssss
2020-02-17 04:48:59 -05:00
Time-Green 980837fc79 PLUMBING: Lavaland geysers, pumps and regrettable balance decisions! (#49067)
Implements the geysers and pumps I originally added along with the first draft of plumbing.

Geysers
A geyser can be plungered with a reinforced plunger to activate. At wich point, it'll either produce clf3, hollow water, protozine or rarely wittel.

Pumps
Adds the liquid pump to the plumbing RCD. Place on an active geyser and wrench it to start pumping the geyser of its delicious juicess. I also changed it to not use power, because it would be awful drawing kilometer long wires along with the ducts.

Chems
Hollow water works basically like blood and mutage, where you can mix it with 1 unit of holy water for more holy water.

Protozine has a .2 healing, down from omnizine's .5. The healing is just kind of a side thing and not really what this chem was implemented for.

If it wasn't obvious, this allows chemists to industrialize strange reagent creation, with hollow water being able to create limitless holy water alongside protozine being a valid replacement for omnizine. Getting 2 geysers with those chems and on lavaland is quite the hassle, and you still need to get some holy water from the chaplain as kickstarter. I honestly think this is fine, and otherwise I could add a unique botany catalyst, so they don't become useless in the process.

Wittel
Adds wittel, wich is rare. Does nothing, but can be processed into two fun/regrettable chems.

Adds gravitum. Metabolizes very slowly. Drinking it makes you weightless, and spraying it makes that object temporarily weightless. Make 10u by mixing 1 wittel with 10 sorium

Adds metalgen. Created by mixing it with mutagen and bluespace powder. Must then be mixed with 40u of a powedered material and 1u of liquid dark matter.
The material used becomes imprinted on the chem. It can then be applied to anything, except mobs, to turn it into that material. Radiation is bad, and no you can't turn the nuke into plasma to blow it up.
The chem is difficult to get and use, but it can turn the escape shuttle into solid gold wich looks really cool. You could also turn it into plasma and vaporize everything. It can be used to, with some effort, duplicate materials.

🆑
add: Adds geysers to lavaland! They can be activated by using a reinforced plunger found in the medical vendor. They can be harvested by using a new plumbing device, magically powered liquid pumps!
add: Adds Hollow Water to geysers, wich can be combined with Holy Water as catalyst for more Holy Water
add: Adds Protozine to geyers, a very weak version of Omnizine. Can be used in Strange Reagent mixing
add: Adds Wittel, a very rare geyser chem. Can be processed into gravitum, wich removes gravity. Can also be processed into metalgen, wich has a strange tendency to transform objects into the imprinted material.
/🆑

Why:
This is what I originally wanted to do. The idea was to have a lot more chems, but I can't focus on one thing for that long. Hopefully this'll empower the bored chemist and make the rounds just that more interesting. Hopefully this'll spark the creation of some other geyser chems aswell.

That and makes shaft miners not the only ones hunting on lavaland.
2020-02-17 21:33:19 +13:00
Mickyan 56d08f9908 space drugs 2020-02-16 16:49:37 +01:00
spookydonut 1a68654a90 Merge pull request #49295 from kriskog/grammars
Fixes synthflesh unhusking message
2020-02-14 12:45:16 +08:00
nemvar a0fb648324 forgot to assign a variable. Deleted a line too much. 2020-02-13 11:22:12 +01:00
nemvar 797f2a8cb7 Shamelessly 850 useless lines 2020-02-13 10:53:39 +01:00
Unknown b12f916f2c Eraser* 2020-02-12 22:04:41 -06:00
Mickyan 84aadd8897 things 2020-02-11 20:37:23 +01:00
skoglol 5ecd4c0974 Fixes synthflesh unhusking message 2020-02-11 03:28:48 +01:00
itseasytosee 870a6e5bbd [READY] Omega soap (#49265)
* Omega soap

* Update code/game/objects/items/clown_items.dm

Co-Authored-By: swindly <swindly_tg13@aol.com>

Co-authored-by: swindly <swindly_tg13@aol.com>
2020-02-10 20:03:29 +01:00
itseasytosee de8c5192d3 Gramma (#49241) 2020-02-08 14:52:39 -05:00
moo 2432f17ac9 Strange Reagent Rebalance (Mainly Nerfs to Min Req and Free Healing) (#49082)
* 🐈

* 🐕

* it now churns out at 0.5 instead of 0.5 * define

and now uses ingest

* 🐟

* desc
2020-02-08 00:16:57 +01:00
SteelSlayer 21fd1b25ee Adds the dunkable element (#49192)
* Adds the dunkable component

* Makes this an element instead

* early return

* makes this a bespoke element

* istype check for container
2020-02-07 10:30:06 -05:00
ArcaneMusic 38a675b544 [READY]Adds a new minor reward to the BEPIS, Party Pods. (#48654)
* Initial commit, adding to minor techs after

* Adjusts window size, adds as a minor reward.

* english good me do

* I swear, really officer, I'm not drunk, I just can't type

* Alright fine maybe I should sleep

* FINE we'll go with this. I legitimately don't even drink

* Alright this clearly isn't working yet.

* Fixes touch reagents, and gives lead acetate some real-life symptoms thanks EOB

* _Perfection_

* Nobody told me I was conflict with my own file!

* Allows for touch reactions in a slightly more sane way. Hopefully.

* alright holup

* Minor minor change to the UI so that the menu doesn't clip anymore, swapped for the other barber's aid.

* Hairgrowth works now

* Fixes merge conflicts?
2020-02-07 14:52:29 +01:00
skoglol 60820383ec Cleans up beaker swapping (#49126) 2020-02-03 13:09:01 -05:00
skoglol a97b90bc3f Slight adrenal buffs (#49140) 2020-02-03 12:23:46 -05:00
OnlineGirlfriend 7f081640a3 [READY] Adds pineapple juice, creme de coconut, Pina Colada; adds Painkiller drink; adjusts Bahama Mama and pineapple snowcone (#48783)
This adds two drink ingredients: creme de coconut (a coconut liqueur obtainable in the booze dispenser) and pineapple juice (obtainable in the soda dispenser or via juicing pineapples). It further adds the Pina Colada and Painkiller cocktails & corresponding sprites, and it adjusts the recipe for Bahama Mama. The recipe for pineapple snowcones was also adjusted to require pineapple juice rather than pineapple slices.

Finally, pineapple juice can be found in a carton or craftable juice box, and I've added sprites for this.
Why It's Good For The Game

First off, more drink ingredients equal more realistic drink mixes and more variety, which means more fun for bartenders.

Pineapple snowcones are better off using pineapple juice as opposed to pineapple slices. Previously the recipe called for two pineapple slices; you can now juice those two pineapple slices to produce pineapple juice sufficient for the snowcone.

Regarding the changes to the Bahama Mama recipe: With these changes, the recipe now more closely represents the classic Bahama Mama, which involves coconut, coffee, rum, and pineapple juice as its base ingredients. I removed orange juice to prevent conflict with the Painkiller recipe, but also feel justified in doing so because orange juice is not an essential ingredient of a Bahama Mama, nor is lime.
Changelog

🆑
add: pineapple juice, creme de coconut
add: Pina Colada cocktail
add: Painkiller cocktail
add: pineapples and pineapple slices can be juiced
tweak: Bahama Mama recipe, pineapple snowcone recipe
imageadd: pineapple juicebox sprite, pineapple juice carton sprite, Painkiller sprite, Pina Colada sprite
/🆑
2020-01-29 11:45:21 +13:00
ATH1909 328a8db26a Update pill.dm (#48927) 2020-01-26 23:06:16 -05:00
AnturK b04934a0d1 Fixes runtimes & some cleanup (#48776)
* Keyless emote sanity.

* Camera bug runtime

* SM runtime

* Removes random <br>'s in atmos logs

* light spark runtime

* uranium splashing on walls runtime

* throwing clown with clown shoes runtime.

* beam rifle runtime

* Don't warn on mesageless keyless emotes.

* Fixup
2020-01-24 13:23:59 -05:00
Rohesie 7bef84f009 Mass-replacement of stat to machine_stat (#48758)
Living and machine stat vars are pretty different, one uses flags and other number-defines.
This should make some other mass-replacements and searches a bit easier.
2020-01-24 12:37:17 +13:00