Commit Graph

12206 Commits

Author SHA1 Message Date
SkyratBot
d44362146e [MIRROR] repaths neurotoxin + embedding changes in bullets + adds effects when you shoot energy weapons (#132)
* repaths neurotoxin + embedding changes in bullets + adds effects when you shoot energy weapons (#52543)

* how

* Update alien_powers.dm

* adds impact effects, makes thinks that shouldnt embed not embed

* rogue pixel moment

* repaths neurotoxin + embedding changes in bullets + adds effects when you shoot energy weapons

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-07-31 00:24:09 +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
Gandalf
65895fa8e3 Merge pull request #122 from Skyrat-SS13/upstream-merge-52477
[MIRROR] Cleanable cleanup
2020-07-30 00:33:12 +01:00
Gandalf
242f38df81 Merge pull request #121 from Skyrat-SS13/upstream-merge-52427
[MIRROR] Renames smooth var to smoothing_flags
2020-07-30 00:33:02 +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
Rohesie
e7941a25ce Renames smooth var to smoothing_flags (#52427)
* smooth_flags

* SMOOTH_FALSE

* smooth_flags
2020-07-29 04:20:34 -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
Azarak
b658ceb00d Merge pull request #102 from Skyrat-SS13/upstream-merge-52441
[MIRROR] Dead chat can only see AI law changes when dead
2020-07-28 05:09:41 +02:00
NightRed
3cc86e17e8 Dead chat can only see AI law changes when dead (#52441)
* dead check on ai law change readout

* chat notice on deny
2020-07-27 22:20:35 -04:00
MrMelbert
169e6ec24b Fixes another borg runtime + middle click cycling for borgs (#52476)
* zoom

* aight then
2020-07-27 22:16:15 -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
Azarak
3ce69ab02c Merge pull request #93 from Skyrat-SS13/upstream-merge-52498
[MIRROR] Fix multiple message prefixes being allowed at a time. AKA, you can now start messages with ellipses again.
2020-07-27 12:50:23 +02:00
Jared-Fogle
dd6e5a96c0 Fix multiple message prefixes being allowed at a time. AKA, you can now start messages with ellipses again. (#52498) 2020-07-26 22:08:27 -04:00
skoglol
1fc4fca2f9 Fixes statues casting spells (#52511) 2020-07-26 22:08:22 -04:00
Azarak
7e83c1a4f8 Merge pull request #85 from Skyrat-SS13/upstream-merge-52472
[MIRROR] Validate client when rolling guardian
2020-07-26 22:37:02 +02:00
Azarak
cf37c554fd Merge pull request #84 from Skyrat-SS13/upstream-merge-52497
[MIRROR] Smartfridges will now drop boards set to the type of fridge they were when deconstructed
2020-07-26 22:36:45 +02:00
Azarak
ce5d976227 Merge pull request #77 from Skyrat-SS13/upstream-merge-52494
[MIRROR] Fixes failure message being sent to player when an emagged borg is self destructed
2020-07-26 22:34:14 +02:00
Azarak
ff6987d2ac Merge pull request #80 from Skyrat-SS13/upstream-merge-52479
[MIRROR] Fixes the "See runechat emotes" pref doing nothing
2020-07-26 22:33:16 +02:00
NightRed
8363b16f3a Validate client when rolling guardian (#52472) 2020-07-26 13:44:02 -04:00
ShizCalev
f475d7030e Smartfridges will now drop boards set to the type of fridge they were when deconstructed (#52497) 2020-07-26 13:42:54 -04:00
skoglol
dd18f9efce Merge pull request #52479 from Wayland-Smithy/runechat_pref_fix
Fixes the "See runechat emotes" pref doing nothing
2020-07-26 11:31:13 -04:00
skoglol
cac095d850 Merge pull request #52481 from ShizCalev/singularity-pull
move_resist INFINITY items/mobs can no longer be pulled by the singularity
2020-07-26 11:31:07 -04:00
skoglol
962e66ba90 Merge pull request #52494 from ShizCalev/fixes-mmi-qdel-message
Fixes failure message being sent to player when an emagged borg is self destructed
2020-07-26 11:22:40 -04:00
Azarak
90d622cb2f Merge pull request #69 from Skyrat-SS13/upstream-merge-52445
[MIRROR] SimpleMob AI now enters IDLE state when a client enters a z level
2020-07-26 02:50:34 +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
c61fc99205 Merge pull request #56 from Skyrat-SS13/upstream-merge-51558
[MIRROR] [READY] Swarmer Rework
2020-07-26 01:59:38 +02:00
Azarak
25564d3da1 Merge pull request #49 from Skyrat-SS13/upstream-merge-52207
[MIRROR] You can now take off clothes while on stasis
2020-07-26 01:59:07 +02:00
Azarak
5da2332838 Merge pull request #46 from Skyrat-SS13/upstream-merge-52409
[MIRROR] Fixes buckling issue on borgs
2020-07-26 01:57:13 +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
Azarak
18655d6146 Merge pull request #55 from Skyrat-SS13/upstream-merge-52377
[MIRROR] All antag types are now recognized for admin chat
2020-07-26 01:13:06 +02:00
Azarak
e4a4c5d923 Merge pull request #54 from Skyrat-SS13/upstream-merge-52419
[MIRROR] Moves AI eye to their shell upon disconnecting
2020-07-26 01:12:46 +02:00
skoglol
77de95878c Merge pull request #52445 from optimumtact/simplemobsai2
SimpleMob AI now enters IDLE state when a client enters a z level
2020-07-25 13:21:08 -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
IndieanaJones
1ceffcefb0 [READY] Swarmer Rework (#51558)
* Move swarmer.dm to the hostile simple mob folder, make changes

* Move swarmer event file to events, make changes

* Update Resource Pricing on Swarmer HUD

* Update traumas.dm

* Update parts.dm to remove deactivated swarmers

* Remove the Swarmer Drone Dispenser

* Remove swarmer.dm from the antagonist file

* Move the swarmer event to the events file

* Add a proper swarmer antagonist file

* Load proper files

* Various Fixes, Implement ATH's Rapid Consumption

* Utilize the Nightmare's Light Level Check on Xeno Spawns For Swarmers, Hopefully Filters Out Bad Spawns

* Update The Pricing In The Descriptions

* Get Rid of That Random Backslash

* Use the Proper Damage Proc for Cyborgs

* Fix the Bug Shiz pointed out

* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>

* Fix the Swarmer Antagonist File

* Fix the traumas issue

* Update traumas.dm

* Update code/modules/events/swarmer.dm

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

* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm

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

* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm

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

* Update code/modules/mob/living/simple_animal/hostile/swarmer.dm

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

* Upload Swarmers Folder

* Remove the swarmer file from the hostile folder

* Update the swarmer megafauna to work with changes

* Load the seperated swarmer files

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Catch-22 Variable

* Update code/modules/events/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Fix all the references in the swarmer megafauna file

* Fix method names in the swarmer mob file

* Fix method names in swarmer_act.dm

* Fix Method Names in swarmer hud file

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer_objs.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Update code/modules/swarmers/swarmer_act.dm

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

* Fix the naming issues to let it compile

* Change the Things Rohsie Wanted Changed

* Change CLRF Back To LF

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-24 02:57:06 -04:00
skoglol
4d53731658 Merge pull request #52377 from Ryll-Ryll/antag
All antag types are now recognized for admin chat
2020-07-24 00:14:07 -04:00
skoglol
1141df98b6 Merge pull request #52419 from zxaber/shell_indwell
Moves AI eye to their shell upon disconnecting
2020-07-23 22:26:26 -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
f93e63f7d6 Merge pull request #52207 from Jared-Fogle/stasis-in-dorms-4
You can now take off clothes while on stasis
2020-07-23 12:02:39 -04:00
skoglol
ec0ef0b44e Merge pull request #52409 from nightred/bug52404
Fixes buckling issue on borgs
2020-07-23 11:48:53 -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
ShizCalev
38edbe0269 Merge pull request #52416 from MrMelbert/testedCode
Fixes cyborg cycling (and a runtime with uneq_active)
2020-07-23 06:40:39 -04:00
Useroth
2b61b2f785 Merge pull request #28 from Skyrat-SS13/upstream-merge-52341
[MIRROR] Removes forcesay on attacked
2020-07-22 14:21:12 +02:00
skoglol
f5cd45f7f7 Removes forcesay on attack (#52341) 2020-07-22 04:30:30 -04:00
tralezab
832f8b8bb5 [READY] Mafia Additional Roles and Generic Randomized Setup (#52083)
* new roles

* Madness rename

* hop judgement override

* hop vote fixed, travis happy

* hop fixed

* Update code/modules/mafia/_defines.dm

Co-authored-by: Fikou <piotrbryla@onet.pl>

* highly experimental random setup system

* hop cannot reveal before any voting is possible, lmao

* this shit actually works lmfao

* removes forced_setup, nightmare detection immune

* whoop

* removes setups!

* OK, finally kind of done with all this minus the incoming reviews

* adds hop's ability to their text, removes old var

* bundle?

* Update tgui.bundle.js

* role fixes (roleblock not working on a few)

* eep

* fuck

* potato's review

* Update tgui.bundle.js

* ffff

* bundle

* rohesie's review

* eureka

* updates doc, removes debug stuff

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-07-21 23:29:53 -04:00
skoglol
7565f1a9b5 Can no longer slimelink from a corpse (#52342) 2020-07-21 19:38:55 +02:00
AnturK
4e1f0c9664 Smoothing cleanup, variables moved, atom movable three Destroy() merged into one (#51878)
* smooth

* derp

* parent call order

* defined

* merge stuff

* tab

* merge conflicts

* call parent first
2020-07-21 19:28:06 +02:00
skoglol
f42a55d976 Merge pull request #52301 from ShizCalev/more-mulebot-fixes
More mulebot fixes
2020-07-21 19:27:45 +02:00
skoglol
dc056ea934 Merge pull request #52305 from ShizCalev/lighteater-fix
Makes the light eater eat even more lights.
2020-07-21 19:24:16 +02:00
skoglol
92f38dc753 Merge pull request #52316 from Couls/givefeedback
Tell the giver when someone takes the item you're offering
2020-07-21 19:22:09 +02:00
skoglol
44c6a265f6 Merge pull request #52331 from Winterous/Medbot_patch
Medbot text changes fixed for real this time.
2020-07-21 14:27:52 +02:00