Commit Graph

2769 Commits

Author SHA1 Message Date
OnlineGirlfriend
85cb421806 [READY] Adds lemonade and lemonade sprite, adjusts Arnold Palmer recipe. (#44085)
* Adds lemonade and lemonade sprite, adjusts Arnold Palmer recipe.

* Tweaked lemonade recipe, new lemonade sprite, changed lemonade taste description
2019-05-23 09:20:58 -04:00
4dplanner
559a8d65da Fixes between the sheets (#44053) 2019-05-22 10:07:42 -04:00
skoglol
5316926510 Fixes some missing adjancency checks. (#44020) 2019-05-21 11:43:35 +02:00
nemvar
a37923ceb8 Makes podcloning transfer quirks. (#44001)
* Lolwut

* Update other_reagents.dm
2019-05-19 13:04:20 -04:00
erwgd
6cc42aa2cf Adds potassium iodide to NanoMed Plus (#43963)
* Added antihol bottle, corazone pill, potass_iodide pill and pill bottle
Added Potassium iodide bottle and pills  to smartfridge preload
Added medicines to NanoMed and NanoMed Plus

* Added small number of potass iodide pills to NanoMed Plus
Removed other medicines being added to vendors in last commit

* Added potass iodide bottle to NanoMed Plus, removed epinephrine bottle and potass iodide pills

* removed unused prebuilt meds
2019-05-18 15:20:17 -04:00
CrazyClown12
d5f71e722a changes sleepy pens to be slightly less bad, same with emagged borg cookies, removes chloralhydratedelayed (#43973)
* changes sleepy pens to be slightly less bad

They have special snowflake chloral hydrate that is literally chloral hydrate but worse. Let's make it chloral hydrate but literally chloral hydrate. Maybe then people will actually use the chems in a sleepy pen instead of emptying it and bitching about how bad it is on discord.

* nerfs the cakehat (not a shitpost)

It's pretty retarded that a single candle on a meme hat is treated as an infinite fuel welder

* Revert "Merge pull request #1 from CrazyClown12/CrazyClown12/cakehat"

This reverts commit 4806c57780a3d6f564b2ec58685b3c9005642892, reversing
changes made to 95b82ed3fd48f7ac7e7ce06fd76afb03860b3e8d.

* remove chloralhydratedelayed

I'm gonna fuck this up again

* delete chloral hydrate delayed from reagents
2019-05-17 16:26:47 -04:00
Yenwodyah
15ae598f8b Fixes pancake bounty (#43983)
* Fixed pancake bounty

* Grammer
2019-05-16 14:59:48 +02:00
Krysonism
9dd94322ef Adds 10 new drinks, some food reagents and goofconomizes champagne (#43825)
* Adds 10 new drinks + related stuff.

* Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

Co-Authored-By: Krysonism <49783092+Krysonism@users.noreply.github.com>

* Update alcohol_reagents.dm

* Fixes the pwr game soda I messed up

* gives champagne the intended price

* Tries to fix the atrocious spelling and grammar

* Adds period

* Tries to appease cobby

Removes Mandela(RIP)
Makes misc changes cobby wanted to the best of my limited ability.

* Taking "catsip" out behind the shed

The drink catsip has been axed. Rest in peace.

* Reworks turbo to be more unique

Turbo no longer boosts your speed, but instead restores stamina based on how drunk you are. Enjoy responsibly, or get shitfaced and fight with security.
2019-05-13 16:46:52 -04:00
anconfuzedrock
bd37a5d9c9 [Ready I guess] adds saline drip (#43773)
* adds saline drip

* moves the stuff all nice-like

* makes description less ugly

* does src properly
2019-05-13 10:27:45 -04:00
vuonojenmustaturska
e2104ed3c8 Blob refactor (#43872)
* blob refactor

* blobtype -> blobstrain

* fixes, chemical -> strain

* only /mob/living experience Life, blobs and other cameras can process if they need to

also other fixes

* call_life goes out

* ispath thing
2019-05-12 23:59:36 +02:00
vuonojenmustaturska
fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
blessedmulligan
9f2e55e83c Adds garlic (#43815)
* adds garlic, garlic bread, and garlic juice (reagent).

Changes khinkali (a meat snack) to require garlic in its crafting, added some nutriment to khinkalis.

* reduces garlic juice healing to bring it more in line with sprinkles/banana juice/nothing. Still gives a bit more HP, but much, much slower

* Garlic juice now prevents vampires from draining you, stuns vampires if in their bloodstream.

Also fixed garlicbread sprite

* fixed typo

* Update code/modules/mob/living/carbon/human/species_types/vampire.dm

Co-Authored-By: blessedmulligan <30278162+blessedmulligan@users.noreply.github.com>

* Cleaned up isvampire

thanks cobblestone-senpai

* Rebalanced metabolism time, cook heal, vampire effects, and stink rate

* typo

* typo
2019-05-06 10:50:11 -04:00
YPOQ
ab088c94f8 Fixes strange seeds producing invalid reagents (#43762) 2019-05-01 08:54:11 -04:00
Tlaltecuhtli
e36a283b41 [ready]ghetto grinder (#43600)
* 1

* 2

* 3

* 4

* grammar

* grinds stack items + no do_after spam

* sprites

* fixix

* Update code/modules/reagents/reagent_containers/glass.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/glass.dm

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* low energy

* fix

* Update glass.dm
2019-04-30 10:12:49 -04:00
carshalash
10ba9a25bd Pressurized Slime: Buff to oxygen and SILICON components (#43689)
* Update blob_reagents.dm

* Update blob_reagents.dm
2019-04-29 10:19:15 -04:00
mikolaj007
00ceb257b0 Fixes Adminordrazine not giving blood back (#43704)
* Fixes bloodloss

* Update medicine_reagents.dm
2019-04-26 11:55:39 -04:00
imsxz
bac523a66c adds overdose to syndie medborg nanites (#43541)
* Automatic changelog generation for PR #42911 [ci skip]

* x

* nonlethal

* copypasta strikes
2019-04-16 21:43:53 +12:00
Ordonis
b0c5b143af Adds Several New Alcoholic Beverages (#43416)
* Adds Champagne, Bug Spray, and Wizz Fizz

Three new drinks. How did we not have champagne already?

* REEEE COMMA

REEEEE

* Fixing stupid mistake and beginning BUG fixing

Observe good pun

* Less direct referencing of vars and defines

Also screaming

* Adds applejack, fixes small errors in coloration

Horsepuns HONK

* Adds sprites, includes sprites for bottles of champagne/applejack

Does what it says on the tin.

* Adds sprites.

* Fixes champagne and applejack being nice drinks.

* Adds bottles for the new pure drinks

Does not add them to the boozeomatic yet.

* Switches to Nemvar/Kryson sprites

These are better. Also it means wizz fizz is animated.

* nerfs bugspray

* Nerfs Wizzfizz and Bugspray, adds Jack Rose

see title

* Changes how wiz is checked, removes vestigal code, FUCK

* Changes screaming to on_mob_add like ATATH suggested earlier and cleans up healing code

*scream

* Adds applejack and Champagne to Booze-o-mat
2019-04-15 11:05:42 -04:00
imsxz
a4906f2382 [s] adds actual logging to spray bottles (#43627)
adds logging to spraybottle usage. spraying in general is logged in game to track people spreading plasma/lube/whatever. theres transferring reagents to people via spraying logged in attack.
2019-04-15 18:33:02 +12:00
81Denton
eb90e2a3ad Adds friendly life reaction to chemistry (#43529)
* Adds friendly life reaction to chemistry

* replaces blood with pax

* Update others.dm

* Replaces pax with sugar
2019-04-10 16:41:08 -04:00
Tad Hardesty
af81aceab4 Fix chem dispensers starting with an extra power cell (#43526) 2019-04-08 15:55:40 -04:00
Tad Hardesty
38977aa740 Fix Alt-Click to rotate soda and booze dispensers (#43522) 2019-04-08 10:37:39 +02:00
QFMVC
8054bc34db Give space cleaner the ability to clean people (#43494)
Space cleaner sprayed, splashed or vaporised onto someone will slightly
improve their hygiene. Effective janitors can spray stinky spessmen to
stave off the stench long enough for the offender to have a shower. Space
cleaner will only stop you from stinking for a short time, unlike a shower
which will keep you fresh for much longer.

The amount of cleanliness from a single application of space cleaner is
capped, so a chemist dumping a bluespace beaker of space cleaner on their
head is not going to be as effective as a shower.

Giving janitors an extra way to help the crew is probably good, especially
because this additional mechanic can't be replaced by janiborgs or
cleanbots.
2019-04-07 00:34:53 -07:00
Rob Bailey
f9a6864774 ez clean buff (#43444) 2019-04-02 12:41:47 -04:00
Tlaltecuhtli
85c1485bab [ready] beepsky smash change (#43228)
* 1

* 2

* 3

* temp

* r

* rogue space

* e

* e

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* restarts appveyor
2019-03-25 12:03:51 -04:00
Mickyan
589c9a76f4 Makes strong booze more dangerous (#43145)
* your 12 steps program starts now

* typo slaying

* better approach
2019-03-23 23:59:45 -04:00
ShizCalev
0c8e40c23b Fix grinder runtime (#43206) 2019-03-20 15:46:27 -07:00
4dplanner
34a90c6af9 makes quantisation level for chemistry finer (#43135)
* Quantises liver purging

* Moves quantisation to holder procs

* Finer quantisation

* Scanners display to 3dp
2019-03-18 11:02:35 -04:00
oranges
b526be704c TGUI and asset cache sending improvements (#43090)
Pills are now two spreadsheets instead of individual icons.

This reduces assets sent by about 19-20.

Furthermore tgui has been extended with a new proc ui_base_html which
allows a user to customise the html sent as the base for a tgui window.
This allows someone to provide custom spritesheet css as links in a
specific tgui window without having to add it to the global html.
2019-03-17 09:47:48 -07:00
ShizCalev
8777f319b3 Fix blind people being able to see when their drinks are cosby'd (#43121) 2019-03-16 19:10:59 -07:00
4dplanner
8773ca52ce Quantises liver purging (#43027)
* Quantises liver purging

* Moves quantisation to holder procs
2019-03-15 11:29:06 -04:00
4dplanner
190199520d Sepia extract rebalance [TM Cand/Ready] (#42933)
* Sepia slime has a timer before activating

* Chilling and recurring

* Rewind camera

* Camera variable to disable customisation

* Removes unnecessary selfieing

* Changes rewind time to 10 seconds

* Simple animal fixes

* properly freezes bots

* Mech timestop

* P -> M

* Gives a warning message

* This should have commited with the last set

* Just screw my line lengths up

* Big changes

Adds pre-move COMSIG
Cuts down on lists in timestop
Adds the overlay to frozen projectiles
Timestopped things have INFINITY move_resist as opposed to being
anchored
Timestop will now unfreeze things that somehow leave it
Cleans up timestop code
mobs in the middle of a walk_to will have their walk stopped by timestop
mobs that are stunned will be stopped mid walk as well
Slimes respect mobility_flags & MOBILITY_MOVE
Slimes no longer automatically regain MOBILITY_MOVE whenever not cold

* Pulling and swapping places respect move_force

* Update code/modules/research/xenobiology/crossbreeding/_misc.dm

Co-Authored-By: 4dplanner <3combined@gmail.com>
2019-03-11 12:05:25 -04:00
imsxz
d9fc092a27 please fire shizcalev NOW 2019-03-08 18:08:19 -05:00
imsxz
b30561e26a =< looks like a frowny face :( 2019-03-08 15:04:16 -05:00
imsxz
0b02473878 haha i lagged 2019-03-07 23:37:26 -05:00
imsxz
90238ae5aa atropine too i guess 2019-03-07 10:48:35 -05:00
imsxz
87fa99eb6f magic numbers bad 2019-03-07 10:46:37 -05:00
imsxz
3881548d54 oopsie woopsie!! 2019-03-05 14:36:18 -05:00
imsxz
043cfddb40 Update medicine_reagents.dm 2019-03-05 14:05:53 -05:00
Time-Green
ad1dd38655 Adds snailpeople as a rare genetic meltdown effect (#42889)
Meant to be part of #42864 , but got a little big so I'll add it to wichever gets merged last.
[Snailcrawl demonstration](https://youtu.be/IL7WFpfRo4c)

PROS

- Gets snailcrawl, wich makes them greatly faster and gives them a lube trail

- Their blood is spacelube

- They get a cool armored nodrop snail shell

- They don't slip

CONS

- Very slow

- Punch is pathetic

- Tttaaalllkkk llliiikkkeee ttthhhiiisss

- Extremely vulnerable to salt

- Can't wear glasses

Adds gastrolisis, wich is pretty much [this](https://www.youtube.com/watch?v=lFbPi8o0OEU) spongebob episode where they slowly turn into snails

You can also get gastrolisis by random_reagent_id, so maintpills and botany

🆑
add: Adds snailpeople as a rare genetics accident.
sprite: Snailshell sprites by nickvr628
/🆑
Snailshell sprites by @nickvr628

Why: It's a silly gimmicky race and it's a rare occurence. Also extremely highly requested for some reason
2019-03-02 09:40:56 +13:00
oranges
c9d2b8c5f8 Logging tweaks and fixes (#42817)
* Add a virus log, plus a log for facehuggers

Logs each infect event and contains detailed descriptions of the virus

I also added a log message for printing virus culture bottles including
who printed them

Finally i tacked on a change to adding a game log entry for facehuggers
because why not

* Further logging fixes and updates

Medbots now combat log

combat log no longer tries to run keyname on an object because that
doesn't make much sense

* Dead say no longer logs twice

* tabs to spaces
2019-02-26 21:13:36 +11:00
Tad Hardesty
99c8de0435 Remove parent calls from procs with no parent 2019-02-23 19:57:54 -08:00
4dplanner
c5136eeaea fixes erroneous typecast (#42808) 2019-02-18 12:34:16 -05:00
81Denton
cd603b9998 Rebalances bluespace beakers (#42792)
* Rebalances bluespace beakers

* based

Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>

* fixes wrong diamond amount
2019-02-17 20:53:08 +11:00
oranges
7915f92860 Revert "Update glass.dm"
This reverts commit 601d0ead30.
2019-02-14 02:41:02 +00:00
oranges
bbf29ec971 Revert "Update glass.dm"
This reverts commit 1edc2ac52d.
2019-02-14 02:40:55 +00:00
oranges
3c3d52b5fb Merge remote-tracking branch '5dplanner/5dplanner-patch-1' into upstreamunsafemaster 2019-02-14 02:40:08 +00:00
5dplanner
1edc2ac52d Update glass.dm 2019-02-13 18:40:40 +00:00
5dplanner
601d0ead30 Update glass.dm 2019-02-13 18:29:06 +00:00
Time-Green
acfd3f8253 [GOONETICS] Chromosomes (#42151)
* adds chromosomes

* Makes the framework nice and functional

* Adds chromosome interaction

* Makes chromosomes work

* removes the double instability update

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* more review stuff

also fixed some inconsistencies in chromosomes

* unfucks defines

* Fixes saved mutations runtiming with empty pods

* Adds stability to the dna console and advanced health scanner

* removes a random bug i stumbled upon

* Update code/game/machinery/computer/dna_console.dm

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* makes chromosomes harder to get

fixes double mutations, adds reinforcer and nerfs stabilizer

* fixes edge case where fireballs would be harmless

* cleans up find/replace all mess and 1 in 10 trillion chance of fireball breaking
2019-02-10 20:45:09 -05:00