Commit Graph

2725 Commits

Author SHA1 Message Date
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
Vile Beggar d13420801b Properly adds a Janitor ERT (#42659)
* does the thing

* adds the regen thing to the sprayer

* adds a quite important addition to a comment

* capitalizes janitorial response

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds cobby's process suggestion
2019-02-06 15:56:31 -05:00
wesoda25 0761441250 Nitrous Oxide (Reagent) Anemiates (anemiates??) Blood faster (#42557)
* changes how nitrous oxide causes you to lose blood

* increases loss of blood volume
2019-02-05 13:37:55 -05:00
wesoda25 26a5db4389 Makes Ephedrine a less Viable Combat Drug (#42553)
* fuck you

* bumps up chance to drop items

* lowers the chance a bit

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

Co-Authored-By: wesoda25 <37246588+wesoda25@users.noreply.github.com>

* cobby suggestion
2019-02-05 13:35:15 -05:00
4dplanner 9b1ff3f4c3 Rebalances perfluorodecalin (#42528)
* Reduces toxin damage and increases metabolisation rate of
perfluorodecalin

* Adjusts to 0.3 toxloss, no brute + burn healing

* Boosts metabolisation rate back up to original
2019-02-04 11:42:01 -05:00
Tlaltecuhtli 3e99cc4119 [READY] reworked neurotoxin (#42507)
cl
balance: neurotoxin doesnt insta stun but gives you limb paralysis overtime and heart attacks if it stays in for too long and it is also alcholic
/cl
2019-02-04 10:32:31 +13:00
Name 983997c81c Fixes other thing I noticed 2019-01-31 19:09:45 -05:00
Name 6eb07a41db Fixes it 2019-01-31 18:04:28 -05:00
actioninja 894062efb5 less shit 2019-01-30 04:59:54 -08:00
Hathkar ad01090438 Nicotine Nerf
Reduced stun reduction from -20 to -5. -20 is equal to adrenals and ephedrine.
2019-01-28 22:39:30 -05:00
Yenwodyah bafcb1816e Fixed grinder interaction with empty beaker (#42513) 2019-01-28 03:11:26 -05:00
wesoda25 604a059eaf Mime Foods/Drinks Now Silence the Mime (#42499)
Mime stuff silences the mime now
cl
tweak: The nothing, silencer, and blank paper beverages now apply a mute on the mime for their duration (and a bit after).
cl

If you want to heal as a mime, you should not be allowed to speak. By extension things such as mime burgers will have this effect given the fact that they have nothing inside them (the reagent).
2019-01-28 09:11:21 +13:00
4dplanner 1fb33ec33d Removes the mute aspect of perfluorodecalin (#42501)
cl
balance: perfluorodecalin no longer mutes
balance: it also heals brute and burn 3x faster (a new rate of 0.25 of each a second)
balance: it also causes toxin buildup over time
/cl
2019-01-26 12:22:21 +13:00
Time-Green 5621143421 Gibbing transfers reagents to meat (#42492)
* adds reagent from mob to meat

* actually makes reagents transfer on gibbing

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>
2019-01-25 02:50:56 +11:00
Kierany9 2991ce761c capital 2019-01-20 01:58:23 +01:00
kevinz000 7370de6961 Fixes projectiles not hitting people resting, a bit of refactoring of how projectile target collision is done (#42241)
* Fixes projectiles not hitting mobs, some refactoring too

* some stuff for projectile can hit target to work with not being ontop of an object

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* CanPass returns true to projectiles regardless of hit

* snakecase?
2019-01-19 11:17:42 +13:00
Cauã dos Santos Rebelo 5e22e87bf0 Adds Blank Paper, a new mime cocktail (#42366)
Adds a new drink, made by mimes, for everyone! It was based in a costum drink that had the flavour text of eraser, nothing and future! 

Recipe is 1 part Silencer, 1 part Nothing and 1 Part Nuka Cola (it also heals mime like most mime drinks do)

cl BebeYoshi & Hexmaniacosanna
add: A new drink called Blank Paper was added to the bar menu, it was made by a mime and it represents a new start.
/cl

[why]: This was a special costum drink and we thought it deserved its own cocktail, besides, mimes needs more unique things (even if you don't even need a mime to make it).
2019-01-17 23:18:05 +13:00
Qustinnus e1d360ff05 [ready] Golem DLC pass 2018 (Adds new golem types) (#41951)
* Bronze golem

* adds creation

ad

* removes shit adds shit

* temp

* fff

* bone, leather and cardboard

* fff

* boneyard

* temp

* ahahahha dumb moron

* adds durathread golem sprites

* reee

* ass

* Auto stash before merge of "golemgang" and "origin/golemgang"

* fix

* uuh

* d

doned

* remove dupe
2019-01-16 13:42:20 -05:00
coiax d8f84ca966 Desc/iconifies various pills, admin floorpill bottles (#42229)
* Renames aranesp, desc/iconifies various pills, admin floorpill bottles

* Unrenames
2019-01-14 17:32:40 -05:00
carshalash 312a49dfc0 Alcohol value tweaking (#42349)
* Update alcohol_reagents.dm

* Update alcohol_reagents.dm
2019-01-14 10:01:59 -05:00
Jack Edge 7e49d1d022 The signature barman booze sliding is now granted by their beer goggles
🆑 coiax
tweak: Bartenders now gain their ability to "booze slide" from their
beer googles, rather than from a granter book in their backpacks.
/🆑

Less action button clutter, the ability to disable it if required (at
the cost of style), still keeping it possible for non-roundstart bartenders
(provided of course, you have the shades for it), as well as a less
janky way of checking than just looking through someone's action
buttons.
2019-01-10 19:23:28 +00:00
wesoda25 a3fb736e89 Lowers Nuka Cola Speed by 25% & Increases Soda Premium Drink Costs (#42271)
* Slows Down Nuka Cola a Little

* replaces nuka cola in vending machines

* adds fernet cola to drinkingglass

* removes speed change

* slows down nuka cola again

* Update drinkingglass.dm

* Update cola.dm

* bumps premium drink prices up $5
2019-01-09 16:13:53 -05:00
coiax 00b53b276a Improves quality of flavoured cigarettes (#42181)
* Improves quality of flavoured cigarettes

* Menthol cigs taste equally of smoke and mint while still buffing
2019-01-09 14:00:54 -05:00
coiax cf0bb75600 Glowing goo glows more; roundstart goo contains radium or uranium (#42235)
* Glowing goo glows more, and always contains radium

🆑 coiax
tweak: Glowing goo now glows a lot more noticably in the dark, and
always contains radium.
/🆑

You can barely see it in the dark, should glow more. Also, the normal
in-game method of creating it is spilling radium on the floor, so all
glowing goo should have radium in it, even the roundstart stuff.

* Roundstart goo now contains either radium or uranium

* Radium is now a subtype of uranium, because nearly-identical behaviour
2019-01-07 21:07:54 +11:00
coiax 56305454bf Cleans up shower code (#41884)
cl coiax
fix: Monkey cubes now expand in a running shower!
fix: Slimes now die in running showers.
/cl

Showers now apply 200 water reagent via TOUCH every tick to anything under them.
This doesn't actually add reagent to the atoms it touches though.
Showers now use timers rather than spawn for the mist creation.
Mist isn't recreated every time the shower is turned on and off.
All living mobs are burned by hot showers, not just carbons.
This means that slimes are healed by hot showers.
Showers are now in a separate file.
Shower temperatures now use defines.

Fixes #41773.
2019-01-07 19:20:45 +13:00
coiax 7528a529ab Added Curse of Madness to Summon Event pool (#42100)
* Added Curse of Madness to Summon Event pool

🆑 coiax
add: Curse of Madness can now be triggered by a wizard's Summon Events,
at the same chance as Summon Guns or Summon Magic.
admin: When an admin triggers Curse of Madness manually, they can
specify their own dark truth to horrify the station with.
/🆑

Random Curse of Madness events pick a line from the redpill.json file,
which I've added some more entries to.

* REDPILL_FILE
2019-01-07 19:19:12 +13:00
Tlaltecuhtli b0038caf76 add alt click to eject beaker + beaker swapping to chem dispenser and chem master [READY] (#41969)
* commit 1

* commit 2

* e

* changes

* fix

* e

* meme

* e

* e

* e

* e
2019-01-06 20:34:54 -05:00
Jack Edge d541d11a15 Less special-casing for loving sprinkles and fancy security drinks 2019-01-05 13:07:47 +00:00
Jack Edge c70aeb8dc9 Fixes Spontaneous Brain Trauma runtimes
🆑 coiax
fix: The Spontaneous Brain Trauma event now has a range of possible severities,
and no longer runtimes.
/🆑

In addition, I changed the description/names of some pills to make them more
accurate, and added some neurine pills, because I needed them for testing.

With thanks to @oranges for spotting the runtime in the first place.
2019-01-02 23:25:33 +00:00
Denton d8fd65d2d7 Adds jitter animation to strange reagent 2018-12-28 15:06:05 +01:00
81Denton a91b4e6dbd Improves strange reagent feedback/desc, fixes missing delay/ghost notification (#42086)
* Improves strange reagent feedback/desc

* fixes ghost notify and intended delay

* removes !M
2018-12-28 21:11:27 +11:00
Jordie c192ece1b3 Merge pull request #41997 from coiax/removes-container-type
Refactors `container_type` into `reagents.flags`
2018-12-23 16:45:10 +11:00
Mickyan e6de5b36eb Adds the Hypersensitive and Light Drinker quirks (#41984)
* newquirks

* revert

* hypersensitive/light drinker

* this is a commit

* may as well

* increments + fix

* i never liked math anyway

* I really dont like math
2018-12-18 15:03:57 -05:00
Jack Edge 054647c382 Refactors container_type into reagents.flags 2018-12-18 13:47:11 +00:00
XDTM c05b0eaef9 Turns TRAIT_NOCLONE into TRAIT_BADDNA for consistency (#41819)
cl XDTM
balance: DNA-damaging methods (changeling draining, mainly) no longer prevent alternative revival methods, but can no longer be circumvented by upgrading DNA scanners.
balance: Any source of husking now prevents cloning on unupgraded cloning scanners, instead of only husking caused by changelings.
balance: Husking now fully prevents revival from several non-cloning methods, including defibrillation, surgery, and strange reagent.
/cl

Why? Consistency! Also, the removal of prescanning/autocloning really simplifies this.

Changeling draining effectively prevents cloning until you transfer the brain to an intact body.
2018-12-17 13:05:02 +13:00
skoglol 021a8c0fc6 Fixes chem dispenser macro granularity (#41939)
cl Skoglol
fix: Chem dispenser macros now function properly with higher tier manipulator.
/cl

Fixes #37706

Old system required the macros input numbers to be divisible by the macro resolution. This makes it use the resolution as a minimum instead. It never made sense for t2 and t3 to be unable to make a recipe a t1 could.
Also fixed a rounding error in the part status readout.

* Fixes chem dispenser macro granularity

* fixes rounding error
2018-12-16 13:28:25 +13:00
nicbn 2914bd44bf Formats grinder text, requires to be near to examine (#41873)
Observers can now examine grinder contents, and non silicons need to be near the grinder to examine it.

You can't examine its contents if it's running.

Now the text is nice, blue and formatted in a list style.
2018-12-16 12:58:22 +13:00
Qustinnus 14bd2ef2eb [Ready]You can now select what your pills will look like when making pills from the Chem Master (#41825)
cl Floyd/Qustinnus, paid for by Kryson
add: You can now select what your pills will look like when making pills from the Chem Master
/cl

we had 21 pill sprites and used 1. waste. now you can pick from our list of 21 and it'll show you beforehand what they look like

== Original commit names==

* pillshere

* names for fruit-kun

* they do

* they do

* done

* thanks mr mrdoombringer

* reeling it in

* Revert "reeling it in"

This reverts commit 2b795a8baf5eec89fdc1e6b6a6ef9d36276c2e62.

* [maximum peepee]

* u got a boyfriend

i bet he ddoesnt kiss ya

* redpilled

* adds random pills

* boom

* mrdoombringer is fat
2018-12-16 12:57:36 +13:00
coiax d27c64c3a8 Christmas code changes (#41763)
* Christmas code changes

🆑 coiax
add: Santa can now examine presents to see what's inside.
del: Santa no longer has a mass summon presents spell, because of his
new regenerating bag!
add: Santa's bag regenerates presents as long as Santa is holding it.
balance: You can only find one gift under a christmas tree per round, no
matter how many trees you search.
balance: Santa's teleport does not announce where he's going.
fix: Fixed Santa not having a full head and beard of white hair.
fix: Fixed Santa not being genetically white-haired.
fix: Fixed Concentrated Barber's Aid not growing extreme amounts of
hair.
/🆑

The `box` var has been moved down from `/datum/outfit/job` to
`/datum/outfit`.

Added unlimited christmas tree with presents, for testing.

Santa's restriction against opening presents is now done by
TRAIT_CANNOT_OPEN_PRESENTS. Santa's ability to see inside presents is
done by the TRAIT_PRESENT_VISION, which also determines if Santa's Bag
will regenerate presents every 30 to 60 seconds.

Santa no longer starts with a breath mask and O2 tank, but instead has
an internals box. Santa no longer has a no-access gold ID, he can
teleport from room to room!

Gifts determine what type is inside them on initialization, rather than
when unwrapped.

- Reasoning -

Unlike last year, there are various possible methods of accessing
christmas trees spawners, allowing for an unlimited number of anything
presents. Cutting down the presents to one per round regardless of tree
count will avoid this.

Santa should be able to see what he's giving, because then he can reward
the naughty and nice children with different gifts.

* Missed a merge

* Adds present investigate logs, and visible messages

* Use the body+mind checking of mob.has_trait

* Less globals, more static vars on types; also event renaming
2018-12-16 12:44:53 +13:00
81Denton fdd2a1d8e9 Red pills sometimes make people think (#41883)
Remember that scene from The Matrix? This PR adds a 5% chance that swallowing red pills makes you think about stuff the average Nanotrasen employee isn't supposed to pay attention to.
2018-12-11 10:43:40 +13:00
Time-Green 29ecfa47bf [READY] Goon Genetics (#41258)
GENETICS

    The random hexadecimal rng game has been replaced with gene sequencing from goon.

    Adds mutation activators and mutators

    You can now store mutations

    Everyone now has their own set of unique mutations

    Limited mutations per person to 8 (including one always being monkey)

    Adds race specific mutations (See fire breathing for lizads)

    You can inspect discovered mutations, undiscovered mutations use an alias to recognize them by

    Adds a sequence analyzer. Can be used to scan someones genes sequence. Useful for determing what mutations they can safely have and or collecting data for very difficult sequences

    Adds mutation combining. It's currently only RADIOACTIVE + STRONG = HULK (So yes you will now need 2 mutations for to get hulk)

    Adds several other mutations. Telepathy, firebreath, glowy, radioactive and strength

cl Time-Green
add: Goon genetics!
add: More mutations! Fire breath for lizards! Radioactive! Telepathy! Glowy! Strength, though its cosmetic and should be combined with radioactivity instead! Fiery sweat!
add: Adds void magnet mutation by @tralezab !
/cl
2018-12-09 23:26:04 +13:00
Qustinnus 9d28bd7244 Crushes some Ethereal bugs and adds bloodbags for them (#41745)
cl Floyd / Qustinnus
add: Bloodbags for ethereal filled with liquid electricity
fix: Ethereals cant clone lightbulbs anymore
fix: Fixes runtime in Ethereal charge handling
/cl
2018-12-09 23:09:24 +13:00
Unknown 70c62fe355 T/F pill.dm
this time with no merge conflicts
2018-12-05 23:14:32 -08:00
moo d057de9b6e Merge pull request #41468 from Steelpoint/AdvMedkit
Advanced First Aid Kit
2018-12-05 11:01:48 -05:00
ShizCalev 9997f956b0 Fixes ODing on crank/other chems, viruses, and other things damaging/healing robotic limbs. (#41593)
cl ShizCalev
fix: Fixed chem OD's causing damage to robotic limbs.
fix: Fixed wood golems repairing robotic limbs every tick of life()
fix: Fixed vampires repairing robotic limbs every tick of life()...
fix: Fixed shadowpeople healing robotic limbs every tick of life()
fix: Fixed poppeople healing robotic limbs every tick of life()
fix: Fixed adjustBruteLoss and adjustFireLoss not properly discriminating for limb status types.
tweak: Fixed bibles healing robotic limbs, because your false deity can't fix SCIENCE.
fix: Fixed the Starlight Condensation, Nocturnal Regeneration, Tissue Hydration, Regenerative Coma, and Radioactive Resonance virus symptoms repairing robotic limbs.
/cl

Gonna be away the next two weeks, so if there's anything major after today just go ahead and close it and I'll fix it when I get back.
2018-12-02 20:12:22 +13:00