Commit Graph

3295 Commits

Author SHA1 Message Date
SkyratBot
aa97fe9b31 [MIRROR] [Ready]Medipens no longer instantly inject if you walk while do_after is still going (#242)
* [Ready]Medipens no longer instantly inject if you walk while do_after is still going (#52712)

* E

* E

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

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>

* [Ready]Medipens no longer instantly inject if you walk while do_after is still going

Co-authored-by: EdgeLordExe <42111655+EdgeLordExe@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-08-08 00:41:25 +01:00
SkyratBot
a00c65aad6 [MIRROR] Lazylists some /mob and /living stuff (#238)
* Lazylists some /mob and /living stuff (#52750)

* lazy

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: TiviPlus <TiviPlus>
Co-authored-by: Rohesie <rohesie@gmail.com>

* Lazylists some /mob and /living stuff

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-08-07 18:44:40 +01:00
SkyratBot
ee324ab3c2 [MIRROR] Cleanup up all instances of using var/ definitions in proc parameters. (#240)
* Cleanup up all instances of using var/ definitions in proc parameters. (#52728)

* var/list cleanup

* The rest of the owl

* plushvar bad

* Can't follow my own advice.

* Cleanup up all instances of using var/ definitions in proc parameters.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-08-07 18:26:21 +01:00
SkyratBot
0d76d34e33 [MIRROR] medipens can be quickused when resting (#234)
* Merge pull request #52690 from Tlaltecuhtli/medipenssss

medipens can be quickused when resting

* medipens can be quickused when resting

Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
2020-08-07 11:11:15 +02:00
SkyratBot
dc9563c742 [MIRROR] Revives metalgen as a secret chem (#228)
* Revives metalgen as a secret chem (#52547)

* Revives metalgen as a secret chem

* input and output amount are somewhat the same now

* Sets catalyst amount to always be one

* recipey to recipe

* Revives metalgen as a secret chem

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2020-08-07 11:05:39 +02:00
SkyratBot
1765eb894c [MIRROR] Screwdriver and Doctors Delight now use position lists instead of magic strings (Affects who benefits from DD) (#219)
* Screwdriver and Doctors Delight now use position lists instead of magic strings (Affects who benefits from DD) (#52677)

* list

* no lists

Co-authored-by: bumtickley00 <pebis@lol.com>

* Screwdriver and Doctors Delight now use position lists instead of magic strings (Affects who benefits from DD)

Co-authored-by: Tony <19880843+AdmiralPancakes1@users.noreply.github.com>
Co-authored-by: bumtickley00 <pebis@lol.com>
2020-08-07 01:38:18 +01:00
SkyratBot
c5c00fc6ff [MIRROR] Confusion will no longer continue to confuse after being cured (#213)
* Confusion will no longer continue to confuse after being cured (#52286)

* Confusion will no longer continue to confuse after being cured

* Grammar comment fix

* Move to status effect

* Remove test per request

* Make confusion a status effect, confusion curing now completely neuters the confusion

* set_confusion changes, get_confusion

* Fix confusion going down twice per tick

* Change strength = to proc

* Move procs to status_procs

* Confusion will no longer continue to confuse after being cured

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-08-06 01:02:19 +01:00
SkyratBot
4fb755d84b [MIRROR] Adds shock immunity to rubberneck (#191)
* Adds shock immunity to rubberneck (#52162)

* Reee why did this not work before

* Update alcohol_reagents.dm

* Adds shock immunity to rubberneck

Co-authored-by: girl <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-08-04 12:18:59 +02:00
SkyratBot
724f9632b5 [MIRROR] [READY]syriniver nerfix / syringe projectile fix + various fixes requested by maintainer (#190)
* [READY]syriniver nerfix /  syringe projectile fix + various fixes requested by maintainer (#52019)

* syringe projectile fix

* greenman review

* oversight fix

* [READY]syriniver nerfix /  syringe projectile fix + various fixes requested by maintainer

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2020-08-04 12:18:41 +02:00
SkyratBot
5dfd1cc353 [MIRROR] Adds a coder override emote so manual custom emotes work properly (#186)
* Adds a coder override emote so manual custom emotes work properly (#52602)

* Adds a coder override emote to skip dumb shit with me

* I know this sucks, I can't comprehend how to do this cleanly without a full rewrite

* cleaner now

* Adds a coder override emote so manual custom emotes work properly

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2020-08-03 16:38:29 +02:00
KathyRyals
7af74a91ac Fixes a runtime caused by an improperly affected variable. (#52628)
* Fixes a runtime caused by an improperly affected variable.

* Updated iscleanable()

* Update code/__DEFINES/is_helpers.dm

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2020-08-01 13:51:15 -04:00
SkyratBot
efdbd930b4 [MIRROR] Remove instances of var varname in dm code (#133)
* Merge pull request #52580 from Cyberboss/CleanBadVars

Remove instances of `var varname` in dm code

* Remove instances of `var varname` in dm code

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-07-31 00:24:48 +02:00
SkyratBot
676952afe0 [MIRROR] Dismemberment wound tweaks, zombies are easy to wound/dismember, tweaks to head vulnerability (#130)
* Dismemberment wound tweaks, zombies are easy to wound/dismember, tweaks to head vulnerability (#52534)

* adds wound armor to helmets + such, nerfs standard head resist

* dismember + wound species balance, retitle traits

* Dismemberment wound tweaks, zombies are easy to wound/dismember, tweaks to head vulnerability

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-07-31 00:22:04 +02:00
Couls
35f50b14de Drinks can now carry diseases, Wipe down your glasses with rags bartenders! (#52421)
* Drinks can now infect you, Wipe down your glasses with rags bartenders!

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/datums/components/infective.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/datums/components/infective.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-29 20:08:37 -04:00
Gandalf
65895fa8e3 Merge pull request #122 from Skyrat-SS13/upstream-merge-52477
[MIRROR] Cleanable cleanup
2020-07-30 00:33:12 +01:00
Daniel Hultgren
bae9371da5 Cleanable cleanup (#52477)
* Don't initialize the atom_colours list on atoms until it's actually needed

* Moved bloody_hands var to mob/living/carbon/human instead

* Added COMSIG_COMPONENT_CLEAN_RADIATION signal to reduce moms spaghetti

The shower and suit storage unit now calls this signal instead of either doing it manually or doing it via the washed proc

* Cleaned up carbon washing, renamed washed to wash

* The wash proc now doesn't take the washer as first arg because that wasn't used anywhere
* The wash strength is no longer optional
* Carbons now overrides the wash proc instead of using the signal
* Properly check for obscuredness before washing any equipped items
* Properly wash all items and bloody hands etc
* Added clean_lips proc for humans for cleaning any lipstick

* Cleaned up washing. Washy stuff now calls wash instead of calling the clean signal directly

* Renamed is_cleanable to ismopable, gives this category a more fitting purpose. Many things beyond floor decals are cleanable. It is now also determined using the atom layer instead to make it more generic.
* Properly utilize the is_cleanable define
* Added wash override for turfs where they also wash any mopables on the same tile
* Space cleaner and cleaning element etc now simply washes the mob instead of doing its own manual cleaning on ~some~ equipped items

* Non-component washables now simply override wash instead of registering for the clean signal

* Fixed some left over clean signal registers not returning true

* Added clean_strength var to space cleaner

* Moved human wash proc next to the other washing procs

* Also wash glasses and mask if not obscured when washing face

* Fixed attempting to "scoop up" cleanable decals using a rag

* Fixed plasmaman spacehelm icon not updating when washed

Also removed a duplicated worn_overlays proc

* Fixed head icon not updating when washing lipstick

* Moved radioactive clean signal register to where it should be

* Added atom radiate VV verb for debugging

* Redesigned the CLEAN constants into a more sensible flags setup

This makes it more dynamic, cleaning apparatuses can clean more specific than just a cleaning strength.

* CLEAN_TYPE_* flags indicate a specific cleanable, such as blood, fingerprints or disease
* CLEAN_* consts consist of a combination of cleaning types to make cleaning apparatuses have a consistent behaviour on what they clean

* Fixed broken rad removal logic in showers

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Removed unneccesary bool from sink code

* Fixed wrongly named variable in turf wash

* Renamed bloody_hands to blood_in_hands

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-29 08:32:30 -04:00
AnturK
1f5e905c0d Simple skill/skillchip framework (#52314)
* Simple skills framework.

* Map changes.

* Adds skillchips to vendor

* Adds skill stations to the map.

* Circuitboards

* Fix typo

* Some minimal instability

* Fixes,tweaks etc

* Suggest better names or we'll end up with these.

* sharpness thing

* tgui build

* Makes wine from booze synthetizer show to wine tasters.

* Makes wine from dispenser have taste for wine tasters.

* Apply suggestions from code review

Co-authored-by: Rohesie <rohesie@gmail.com>

* Swaps to carbon var.

* wordy helper proc

* While i'm at it, other relaymoves

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-29 04:14:10 -04:00
Time-Green
528f5a6e5d Renames instabitaluri to syntflesh (#52523)
* Renames instabitulari to synthflesh

* Recommits Jared Foggles correction
2020-07-27 17:05:49 -04:00
skoglol
bb92b91148 Merge pull request #52501 from AnturK/chem_mob_react_fix
Fixes mob react recipes blocking other recipes.
2020-07-26 11:20:29 -04:00
Azarak
63b3d2f2e7 Merge pull request #71 from Skyrat-SS13/upstream-merge-52435
[MIRROR] Fixes secret sauce resetting too often and adds some logging.
2020-07-26 02:51:46 +02:00
Azarak
232203ab66 Merge pull request #62 from Skyrat-SS13/upstream-merge-52433
[MIRROR] Add unit tests for metabolizing of all reagents and fix the ones that failed
2020-07-26 02:02:18 +02:00
Azarak
7189041c4e Merge pull request #45 from Skyrat-SS13/upstream-merge-52375
[MIRROR] Cleans up food and drink recipes
2020-07-26 01:56:51 +02:00
Azarak
0d90ac69fa Merge pull request #41 from Skyrat-SS13/upstream-merge-52383
[MIRROR] Fix leading slashes and turn on linting for it
2020-07-26 01:13:53 +02:00
skoglol
4bf19c1a6e Merge pull request #52435 from AnturK/notsosecret
Fixes secret sauce resetting too often and adds some logging.
2020-07-25 13:23:26 -04:00
ShizCalev
ea351bc9ac Merge pull request #52433 from Jared-Fogle/metabolization-tests
Add unit tests for metabolizing of all reagents and fix the ones that failed
2020-07-24 22:30:15 -04:00
Ryll Ryll
a97c51b30b [READY] Wounds part 2: Piercing wounds, dismemberment changes, housekeeping (#51786)
* pierce the heavens

* starts doing projs

* continue pierce

* before armor

* before sharpness redefine

* rename sharp defines, before further implementation

* finishing undoing atk_type back to sharpness

* neatens up sharpness defines, FALSE -> SHARP_NONE

* more piercing, removes brute damage bleed, bubblegum no longer wound

* starts letting embeds get in on the fun

* half with embed

* work on dismembering

* continued embed work

* more moving bandaging to limbs

* more dismemberment work

* removing embed pierce stuff

* tweaking bullets

* more docs and work on dismemberment

* spans, piercing, guns

* dismemberment and scar fixes

* bee changes

* bullets embedding

* more bullet and dismember work

* dismemberment, surgery, piercing, formaldehyde,

* pleases travis

* pierce smite

* nicer on blood

* Auto stash before rebase of "tgstation/master"

* more neatening

* wounds only consider up to 35 damage, wounds on l6 and 762

* updates hulk

* balance

* defines

* lower slug to 50 brute to accommodate wounds

* adds differentiation for having flesh/bones/both in mobs

* moves scar descs to json, renames organic_state

* excises removed healing skill

* fixes logs, inconsistencies, some balance changes

* untab

* slight compress

* a

* kills pointed global list

* dmdoc

* halfway through roh

* finishes roh review

* okay NOW i finished roh's reviews

* roh roh roh your boat

* gently down the stream

* global lists

* list ops, fix scanner for bone gel improvised fix

* travis moment

* sounds added and moved

* pellet clouds can join the fun fully, slight gun balancing for wounds

* doc moment

* unconflicts myself

* update hulk

* Update code/_onclick/item_attack.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* crying ascii face

* final rohview

* oops

* final final

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-23 22:20:09 -04:00
skoglol
40b2dcf57e Merge pull request #52375 from OnlineGirlfriend/fooddrink
Cleans up food and drink recipes
2020-07-23 11:47:46 -04:00
skoglol
ef4836c1a5 Merge pull request #52383 from spookydonut/leadingslash
Fix leading slashes and turn on linting for it
2020-07-23 11:35:57 -04:00
skoglol
e41c7ee289 Nerfs electrolysis reaction (#52373) 2020-07-22 18:38:06 -04:00
AnturK
260be64005 Merge pull request #52339 from Jared-Fogle/youre-at-the-party-and-you-notice-that-the-drugs-arent-metabolizing
Fix colorful reagent, red powder, and hair dye breaking metabolization
2020-07-21 19:36:05 +02:00
ArcaneMusic
fad1911968 Plant Belt sprites are fixed, Engy Sprites too (#52330) 2020-07-20 18:41:07 -04:00
Fikou
3a17b9b56d changes morphine description to be more accurate (#52345) 2020-07-20 09:57:44 -04:00
MrMelbert
789aa2b6ba Adds an item proc for accidental consumption and implements it in food containers (bread, cake, cheese) (#51925)
* cronch monch ow, i'm dyin bros

* oopsies

* also should've removed that

* first round of fixes, thanks bros

* fk

* Some post cleanup

* ?

* if-else begone

* gotta sweep sweep sweep

* proper math

* Update code/modules/projectiles/ammunition/_ammunition.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-20 09:40:46 -04:00
Jared-Fogle
b9c6ee9445 Fix colorful reagent, red powder, and hair dye breaking metabolization 2020-07-19 02:02:06 -07:00
Omega_DarkPotato
53798766a1 Brings burn patches in line with brute patches. (#52278)
After seeing a whole lot of complaints about burn patches only containing 1u of Aiuri, I decided to do an amazing whole 1-line change bringing the burn patches in line with the brute patches. (both contain 2u now of their respective chem)
2020-07-18 14:04:01 -04:00
Aleksej Komarov
0cf00a2645 tgui 4.0 (#52085)
* tgui 4.0 hyper squash

* Upgrade dependencies
2020-07-16 20:13:04 +02:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
LemonInTheDark
1c31dc43d5 Adds hot ice coffee (#52208) 2020-07-14 20:07:01 -04:00
EdgeLordExe
7cc4073b93 [READY] Addictions: 3 new drugs to show off a fun feature. (#51930)
* E

* EE

* AAA

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

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* ee

* e

* e

* EE

* Apply suggestions from code review

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>

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

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* performance!

* E

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

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* E

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-13 13:20:45 -04:00
LemonInTheDark
c4daec7c4c I'm dumb + refactors some unused returns 2020-07-09 18:11:58 -07:00
LemonInTheDark
987ac2a310 Handles some silly uses of radiation, adds a check for the immunity trait in rad apply code, changes some 0/1 to defines, and a FALSE to 0, as it represented a percentage 2020-07-09 18:02:03 -07:00
LemonInTheDark
f59207ec83 Converts rad_flags to flags_1, holy shit why 2020-07-09 00:20:46 -07:00
LemonInTheDark
c87583007f Splits TRAIT_RADIMMUNE into one trait that prevents radiation damage, and one that prevents genetic mutation TRAIT_GENELESS 2020-07-08 22:59:19 -07:00
Fikou
a8f5bbc2fb manly dorf now doesnt work on alcohol tolerance, ups boozepower for dorfs (#51940)
* manly dorf now still gets you drunk with dorf mutation

* ok i guess

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

YEAH OK MR COBBLESTONE I WILL DO IT!!!!!!!!!

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-07 16:00:16 -04:00
skoglol
7868297a9a Merge pull request #51894 from EdgeLordExe/nacid
Nitric Acid changes
2020-07-06 23:09:03 +02:00
skoglol
7c6211dcc5 Merge pull request #51989 from ShizCalev/inducer-fix
Fixes inducers not working on some stuff due to missing get_cell() checks
2020-07-06 23:05:19 +02:00
skoglol
1b4300a15f Merge pull request #52026 from ATH1909/patch-47
makes unholy water and eldritch essence use metabolization_rate, like most other chems in the game
2020-07-06 22:22:13 +02:00
Unknown
afb5e47781 ! 2020-07-06 02:46:17 +02:00
EdgeLordExe
d1669cea72 [READY]New Quirk: Extreme Medicine Allergy (#51870)
* e

* meds e

* e

* e

* e

* E

* E

* Update code/datums/traits/negative.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* c

* c2

* more blacklistings

* dogtag

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

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* E

* E

* Update code/modules/clothing/under/accessories.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* E

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-05 18:42:22 -04:00
MrMelbert
3b851845d4 Minor Adjustments to the "Brain Tumor" Quirk (#51770)
* brain tumor adjustments

* some requested changes + defines

* trait

* READ

* > self-merging

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-05 18:21:41 -04:00