Commit Graph

1625 Commits

Author SHA1 Message Date
Geeves
d09cf4c5b3 Ouerean dishes renaming (#8459) 2020-03-16 18:04:02 +01:00
Doxxmedearly
e7a07e7f8c Animal eating bugfix/cleanup (#8420) 2020-03-14 14:37:41 +01:00
Doxxmedearly
cd9faeeebc Aiding the Food/Drink Refactor: Bottle Edition (#8408) 2020-03-13 13:04:04 +01:00
Wowzewow (Wezzy)
4d51fdc72a you can shake drink shakers to make a shaking sound to simulate shaking the drink (#8399) 2020-03-11 03:00:27 -03:00
Doxxmedearly
118145f421 Soy Latte invisibility fix (#8388) 2020-03-04 11:08:51 -03:00
Doxxmedearly
d105998c9c Drink vanish bugfix (#8355) 2020-02-27 11:48:46 +01:00
Wowzewow (Wezzy)
ffe96a44aa Food refactor, Trash states for drinks and updated icons (#8285) 2020-02-24 15:04:57 +01:00
mikomyazaki
1f30e4675d Using a gun whilst cloaked will decloak you. (#8317) 2020-02-23 02:45:02 -03:00
mikomyazaki
21f348ec57 Adds a unit test to check for any missing initial icon states (#8332) 2020-02-23 02:43:12 -03:00
mikomyazaki
3acac2a8c4 Adds root beer to the soft drink dispenser (#8309) 2020-02-22 00:05:29 -03:00
mikomyazaki
6074224d00 dreamchecker (#8233)
Implements dreamchecker plus fixes all errors
2020-02-16 20:42:32 +02:00
Wowzewow (Wezzy)
8cb59cbab0 Hypospray sprite change and some tweaks (#8216) 2020-02-15 17:27:03 -03:00
Wowzewow (Wezzy)
a25e235b6a Play the proper sound on glass shatter (#8275) 2020-02-15 12:53:51 -03:00
fernerr
5837b427b1 Adds a missing exclamation mark (#8272) 2020-02-14 19:12:31 +01:00
Matt Atlas
201b465e34 Fixes rags, buckets, etc shattering when hit. (#8271) 2020-02-14 18:54:06 +01:00
Werner
9ba9a7cdd9 Removes the supply_packs from the code as they are no longer used (#8226) 2020-02-12 20:34:43 +01:00
Doxxmedearly
70e1632596 Sensible Utensil and Meat Interactions (#8248) 2020-02-12 20:30:23 +01:00
Matt Atlas
16aeb5c9d9 Many balance changes to halloss and damage. (#8160) 2020-02-08 15:39:06 +01:00
Wowzewow (Wezzy)
6c3fbbfa76 Adds button and switch sounds when using machinery (#8195) 2020-02-07 14:33:30 +01:00
Alberyk
e47d9d139d Added new hypospray sprites. (#8161) 2020-02-06 21:54:29 +01:00
TheGoret
d589073611 RMT pills now metabolise at 0.2u/tick (#8156) 2020-02-04 12:38:29 +01:00
Geeves
d93a0030db Makes All Guns Contained Sprites (#8105) 2020-01-31 20:27:03 +01:00
Wowzewow (Wezzy)
0c1d2d35c7 no drinking soup with fork & utensils no longer destroy trash item (#8117) 2020-01-30 23:59:05 +01:00
Geeves
11c7d0d297 Xenobio Touch-ups (#7993) 2020-01-24 15:03:55 +01:00
Joshie
d277343bd8 Hot Chocolate Sprite Tweak (#8061) 2020-01-23 14:22:11 +01:00
mikomyazaki
081782f403 Diona can now have viruses cured by radiation exposure or radium injections. (#8039) 2020-01-18 17:53:13 +01:00
MarinaGryphon
34de84e5ec Nitroglycerin Explosion Fix (#8028) 2020-01-17 07:57:18 +01:00
Sindorman
3f1f05b664 Merge remote-tracking branch 'upstream/master' into Sindorman/runtimes 2019-12-29 02:20:25 -08:00
Alberyk
b58463fe61 Fixes long hair not being caught in some machines (#7819)
This feature was broken due to some hair name changes. The entire stuff was remade to be a proc in the machinery object, that also checks for any hair with a length longer than four.
2019-12-28 20:10:38 +02:00
Matt Atlas
2e8aeb2f6d Removes the Bicaridine/Kelotane side effects. (#7795)
Why:
The side effects are incredibly annoying right now, knocking you out constantly - somehow being worse than the previous ones. I've thought about replacing them but I can't come up with anything that's not gonna be a pain in the ass for the player, one way or the other. I guess CE_DROPITEM is a possibility but I'm not sure if people would like that.

Thus, I opted to remove them altogether. Slowing down REM is enough in my opinion.
2019-12-27 13:26:58 +02:00
Werner
cb4a712851 Enforces Lineendings and adds Editorconfig (#7657) 2019-12-21 16:19:24 +01:00
Wowzewow (Wezzy)
ff25557eb8 The Rollable Cigs and Chews Update (#7631) 2019-12-20 23:48:17 +01:00
Matt Atlas
bbecc7b461 Many vore improvements. (#7686) 2019-12-19 20:06:14 +01:00
Matt Atlas
ab2723a3c5 Security equip. fixes/buffs, general brainmed fixes, agony + halloss into pain (#7699)
tweak: "Security's base nonlethal equipment - tasers and rubbers - is now a bit better."
    bugfix: "Fixed teargas doing practically nothing."
    bugfix: "Fixed a lot of stuff not applying pain damage. Ow."
    bugfix: "Fixed undefined values on the CMC."
    bugfix: "Fixed dionae not regenerating damage."
2019-12-18 09:15:17 +02:00
Mykhailo Bykhovtsev
0fe4b75d4c Merge branch 'master' into Sindorman/runtimes 2019-12-17 22:16:23 -08:00
Sindorman
67ffbcd60e Temp save 2019-12-17 22:15:16 -08:00
Erki
a4845ede9a Revert "Fixes Beaker Breaking (#7676)" (#7703)
This reverts commit a45d218610.
2019-12-17 00:11:06 +02:00
Doxxmedearly
f014fddf01 Medborg Updates (#7659)
Rescue borgs now have adrenaline. Not added to regular medical borg since they have the ability to create it in chemistry.

Chemistry gripper for med borgs renamed to medical gripper. It's not just used for chemistry.

Medical grippers can now hold blood bags (so they can put them on IVs), medical cups (to give patients liquid medication), and paper cups (to give water for patient care or with pills).
2019-12-16 21:14:42 +02:00
Matt Atlas
47633e184e Nerfs adrenaline (#7668)
Currently adrenaline allows you to keep standing after quite a lot of inflicted pain. That's because, for some reason, it's equal to tramadol in low dosage. That's a big no-no.
2019-12-16 21:14:30 +02:00
Kaedwuff
a45d218610 Fixes Beaker Breaking (#7676)
Due to some of the, er, interesting decisions made when writing the code for beakers shattering when you throw them, not only was it possible to shatter containers made of non-glass materials into glass fragments - such as cryostasis and bluespace beakers, and wooden buckets - but most of the actual glass beakers were impossible to break with your bare hands.

I have corrected both these issues in addition to making it possible for glass beakers that are tougher to still shatter even if you don't throw them with the force of a mass driver. And they make a noisy shatter sound now, too.
2019-12-16 21:13:59 +02:00
BurgerLUA
0b50956656 Properly Balanced Healing Chemicals (#7656) 2019-12-15 14:13:43 +01:00
Matt Atlas
37abd8f771 Brainmed Code Quality + Organ Scarring (#7645)
Organ scarring has been made into a better system.

New healthdoll.

Other misc code cleanup attempts.

Fixes #7647
2019-12-14 00:10:53 +02:00
Doxxmedearly
1d35f2ec00 Stop spraying yourself (#7667)
Fixes #7666
Since you can spray people and objects, it would spray your coat (and therefore you) if you clicked on it.
Added a check to make sure the thing you're spraying isn't on your person.

Removed redundant safety checks for pepperspray.
2019-12-13 16:24:45 +02:00
Doxxmedearly
455eab7a34 Essential Pet Interactions (#7633)
tweak: "Pets have more discipline regarding food. They will no longer beg for food, seek it out, run towards it, steal it, or eat like there's an endless void in their stomachs. They'll still eat food on their tile if sufficiently hungry, and you can still feed pets by hand, if you'd like. Chefs, rejoice!"
    tweak: "Corgi stomach capacity adjusted to a way more sane level."
    rscdel: "Removed guilty messages about pets starving when you examine them; they won't go hungry in a single shift, don't worry."
    rscadd: "You can brush most friendly animals. Combs work for fuzzy and feathered animals, rags work on other ones."
    tweak: "There's a small chance that when you pet a guard dog (like Columbo) on help intent (and aren't his master), he won't immediately maul your face off; instead, he will growl at you to warn you not to do that. I still don't recommend it."
    tweak: "Like other pets, baby carp can eat now. But not a lot."
2019-12-13 08:25:43 +02:00
Matt Atlas
df0cd6189a Brainmed Update (#7502)
gamer time.
2019-12-10 20:41:15 +02:00
Kaedwuff
876b1b776a nosoylent (#7612) 2019-12-09 07:35:05 +01:00
Doxxmedearly
9484b98e93 Preventing Bottle-Based Face Injuries (#7601)
Currently, if you harm intent click yourself with a bottle, thinking that you might get a refreshing drink after securing your valids, you instead smash it over your stupid head like an animal.

Funny as hell OOCly. Not so great ICly.

Now there's a prompt asking you to confirm if you really wanted to do that. This is ONLY for clicking yourself, so there's no interrupting flow during your barfight. Since harm intent is also linked to splashing reagents, "splash reagents" is also an option if for whatever reason you wanted to pour the reagents on yourself without smashing your face open.
2019-12-08 13:25:50 +02:00
Wowzewow (Wezzy)
a6688878a4 Bedsheet inhands and other fixes (#7559)
Adds more bedsheet inhands, because immersion.
Penlight has an inhand now.
Lanterns have new inhands.
Ashtray cigarette extinguish now properly plays the sound.
You can put cigarette butts in cigarette packets

also some more stupid drop sounds
2019-12-05 23:43:49 +02:00
Kaedwuff
9b75bfa022 Better Parapens (#7428) 2019-12-03 19:42:05 +01:00
Geeves
587b219cfd Cardox Buff (#7471) 2019-11-25 12:45:32 +01:00