Commit Graph

2522 Commits

Author SHA1 Message Date
Ryll Ryll 1a8078eabe Fixes clothes repair for real (#52379)
* fixes clothing fixing

* per roh

* durr
2020-07-25 05:56:49 -03:00
Ryll Ryll 46dd89b07a [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 23:19:30 -03:00
skoglol fa73ae9116 Removes forcesay on attack (#52341) 2020-07-22 05:29:41 -03:00
ShizCalev 4b6500fb67 Makes all anchored changes use setAnchored(), COMSIG_MOVABLE_SETANCHORED now only sent if an AM's anchored var has changed for more reliable usage. (#52254)
* Converts everything to use setAnchored() + other fixes

* Fixed singulo debug

* singulo again

* forgot to move the vv_edit proc

* caught that this time :)

* changes

* Update code/game/atoms_movable.dm

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

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-21 02:20:26 -03:00
ArcaneMusic c69cb714f2 You can now store mice in your chef's hat. (#52253)
* Is that a mouse in your chef's hat.

* yeah that sounds about right

* Sure thing boss.
2020-07-18 14:37:29 -04: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
ShizCalev bbca1ece3a Readds the welding visor toggle button to plasmamen helmets (#52189) 2020-07-14 20:16:23 -04:00
Jordan Brown 749dace788 Fixes warning (#52201) 2020-07-14 20:13:08 -04:00
LemonInTheDark dbdb2d33fe Merge conflict begone 2020-07-12 17:37:14 -07:00
ShizCalev 14c15d970d Fixes warning 2020-07-12 20:02:19 -04:00
skoglol a489164005 Merge pull request #52165 from Tlaltecuhtli/caps
monkey caps drop on the floor if no ghosts got polled
2020-07-12 22:43:03 +02:00
skoglol 6dcda573c4 Merge pull request #52155 from tralezab/blargety-missing-sprites
Monkey mind mag helmets's sprites don't break on updating their icon_state
2020-07-12 11:42:40 +02:00
skoglol c0c43380b1 Merge pull request #52150 from ShizCalev/monkey-mind-magnification-helmet-fix
Fixes qdel loop for monkey sentience helmets
2020-07-12 11:36:54 +02:00
Fikou 59cbfcd0da fixes bounty hutnignh ate sprite note towkfderking (#52133) 2020-07-12 03:12:16 +10:00
Tlaltecuhtli bff043de1d 1 2020-07-11 17:55:51 +02:00
tralezab 7d4b643583 shiv's review 2020-07-11 00:22:13 -07:00
tralezab 91d5f5de3c keep the lights on 2020-07-10 15:09:51 -07:00
tralezab f0ba7154ea eek ook 2020-07-10 15:04:39 -07:00
ShizCalev 2ffd725d86 Fixes qdel loop for monkey sentience helmets 2020-07-10 15:26:49 -04:00
tralezab caa6f771fe [READY] Adds monkey sentience caps! (#51621)
* monkey mind caps!

* sprites 1/2 + polish checklist

* athath suggestions

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

* weird, this file says it was changed i wonder what that is

* review (conflict fixes next)

* conflicts + all the colors of hats

* remove

* done

* k

* done, but must readd sprites

* sprotes back

* Update helmet.dm

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2020-07-10 10:36:55 +02:00
LemonInTheDark f59207ec83 Converts rad_flags to flags_1, holy shit why 2020-07-09 00:20:46 -07:00
Jared-Fogle 418bd80a6b Remove healing skill (#52005)
* Remove healing skill

* Remove dissection from tech web
2020-07-07 10:10:12 -04:00
LemonInTheDark e807cf1208 Makes rads glow, buffs rad goggles (#51879)
* Adds a healthy green glow to contaminated objects

* Improves rad goggles, increases the range, improves the brightness, and raises the text above the mob layer

* God damnnit jared

* filters are sane now

* lowers max alpha, and starting alpha
2020-07-05 18:53:34 -04: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
ShizCalev 411dea9542 Merge pull request #51659 from TaG2e/master
Fixes more missing sprites and adds invisible icon
2020-07-01 11:58:17 -04:00
TaG2e 5276005acb Reverts, changes, and fixes to sawoff and energy weapons' icons 2020-06-28 17:34:41 -05:00
WarlockD 431cf8390e Spacesuit battery charge shows up in stat panel (#51835)
* Added suit battery to stat panel

* Fix the icon gauge
2020-06-25 17:47:31 -04:00
Jordan Brown b64c9093b2 Merge pull request #51784 from ShizCalev/skill-cape
Chameleon tie stolen valor fix
2020-06-24 10:34:18 -04:00
Jordan Brown c89d7b188d Fix Docker Build (#51781)
* Change BYOND version to 513.1526

* Remove BSQL from docker image

* Add a docker publish action

* Add a docker test action

* Cleanup runtime icons

* Cleanup runtime sounds

* Correct docker workflow names

* Add Dockerfile as an appveyor cache dependency

* Fix build issues

* Copy all dlls

* No need for .dlls in docker

* Minor cleanups
2020-06-22 16:49:07 +02:00
ShizCalev 8420872c10 Neck slot stolen valor fix 2020-06-21 22:12:53 -04:00
TaG2e 8f72395637 Fixes more item icons, conflicts, and default hidden to false 2020-06-20 19:00:36 -05:00
ShizCalev 268edde07c Fixes clothing repair not working, adds better pronoun handling (#51689)
* Fixes clothing repair not working

* Moth fixed

* message fix

* more grammar stuff

* better text handling for multiple articles
2020-06-18 15:46:53 -03:00
nemvar b87f65d95e Converts ALL typepaths to lowercase (#51642)
* Case of lower

* More changes

* Ruins the nice 420 diff, brainfart when doing the second batch of conversions

* More changes

* Next batch. I think

* Converts even more paths

* Restarts bots

* Capital Free Zone

* Come on travis, do something

* Renames areas

* Bots, please stop dying

* Updates CONTRIBUTING.md and updates a few paths I missed.

* APC recgarftzfvas
/obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2020-06-17 20:47:57 -03:00
Mickyan e3d5fb1bbf fixes wigs again (#51632) 2020-06-16 14:22:00 -04:00
Jordan Brown ade117d5ec Merge pull request #51656 from ShizCalev/fixes-engineering-goggles-overlay-colors
fixes engineering goggles glasses overlay colors
2020-06-16 14:20:36 -04:00
ShizCalev c164d9922f Fixes a few duplicate articles in examines (#51631)
* Fixes heavily fried foods naming issues

* a few more
2020-06-15 15:10:35 -04:00
Kaffe-work 8e5980802b Add wound armor values to wizard hat (#51644)
Fixes consistency issues between hat and robe
2020-06-15 10:34:26 -04:00
TaG2e b9ec327c17 Fixes more missing sprites and adds invisible icon 2020-06-15 01:56:12 -05:00
ShizCalev de6e3546d3 fixes engineering goggles glasses overlay colors 2020-06-15 00:53:11 -04:00
AnturK 2d1f38e100 Cleans up sensors nonsense (#51623)
* Cleans up sensor mess

* Makes refresh button work on lists in vv
2020-06-14 19:01:04 +02:00
ShizCalev 1ff3945b30 Fixes more belt missing texture crap (#51597)
* Fixes more belt missing texture crap

* #51010 progress

* tank fixes

* typo

* Removed dead/duplicated code

* cleanup

* don't need the - meme anymore with build_worn_icon

* icon fix

* commentary

* yelling at future coders

* more condensedd
2020-06-13 14:16:52 -04:00
Ryll Ryll 0f6496a55c [READY] Adds Medical Wounds: Bamboo Bones and the Skin of Your Teeth (#50558)
About The Pull Request

This PR adds medical wounds, new forms of injuries that people can suffer that cause debilitation and complications, and often require more than what can be found in a medkit to treat. But let's be honest, big complicated walls of text about medical changes make people's eyes glaze over easily- so I created a handy infograph to explain the basics!

Also there's a full guide here!

dreamseeker_2020-04-18_20-42-19.png

The infograph may not be fully up to date with the specifics of the PR's status, but it'll be updated along with major changes so people have something to use as a crash course for familiarizing themselves with how wounds function. I also have another infograph with all 9 of the possible initial wounds coming, and will be up soon. You can also find the longform design doc here with more info on the broad details, including descriptions of treatments: hackmd whee
What this does

There's a lot to cover, but here's the bullet points of the main features and changes:

    Getting lots of damage on a limb can result in wounds, with more damage causing worse wounds. These can range from dislocated joints and minor cuts to compound fractures and fourth degree burns, and can affect you in different ways depending on what bodypart they're applied to (namely with broken bones).
    You can damage individual bodyparts on clothing (only jumpsuits for now) through the use of lasers and sharp weapons. Bodyparts that reach max damage are considered "shredded" and will not apply any protection for that zone until it is repaired with cloth. If all zones are disabled, the entire piece of clothing is shredded and unwearable until repaired with 3 cloth. Jumpsuits give a small amount of wound protection, and since sharp weapons and lasers generally get extra wound bonuses against bare flesh, even a plain jumpsuit provides decent protection from a few laser shots or scalpel stabs.
    Lasers gain a powerful niche versus unarmored/lightly armored carbons! As noted above, lasers can shred clothing and burn away zones of jumpsuits in 2 shots each, after which the target's bare flesh is exposed (barring other clothing), and lasers excel at dealing burn wounds against uncovered skin. Think big, nasty charring!
    Bleeding is now totally limb based, and gauze is as well. Bleeding is also 95% cut wound based, meaning sharp weapons make you bleed rather than just having 40+ brute on a limb.
    The more wounds and damage you get on a bodypart, the easier it'll be to gain more severe wounds. Wounds are arranged from Moderate, to Severe, to Critical in increasing severity, and you'll generally have to suffer the lesser ones before getting the worse ones.

dreamseeker_2020-05-15_03-15-59.png
Above: Someone having an incredibly bad day from bloodloss

dreamseeker_2020-05-04_22-29-29.png
Above: Scars from healed wounds

ShareX_2020-05-15_06-55-20.png
Above: Actual combat involving someone's head getting cracked

Here's a quick, if non-exhaustive, list of things I have left to do before I consider it feature complete

Finish adding treatments for each wound type/severity (mostly surgeries/triage for critical wounds)
Add second winds for bad injuries to give the victim a chance to get away
Flesh out severe & critical injuries in general
Find sprites for the bonesetter, bone gel, and anything else that might be needed
Add the medical items for treating the less severe wounds to the station
Polish code and remove any redundancies I left behind

    Quick balance pass to make sure nothing is horribly abuseable

Why It's Good For The Game

Adds a flexible new system for representing damage on carbons with injuries that can be treated in different ways. Moderate wounds from getting toolboxed or sliced with a scalpel can usually be treated by a buddy or even by yourself with the right tools, but getting flayed with a fireaxe or a laser gun emptied into your bare skin may require extra attention or even surgery in bad cases! Also makes laser guns cooler and more like 40k lasguns that can flash fry people (cool!)

This should also make spessmen more resilient and harder to kill outright, while still adding consequences and complications to getting hurt. Wounds aren't immediately fatal, but they can do things like slow down interactions, deal damage over time through infections, and generally make you more fragile until fixed. They can also give you a "second wind" on being applied that gives you a small adrenaline boost (or whatever) to help disengage and escape immediate danger.
Changelog

🆑 Ryll/Shaps
add: Introduces medical wounds, new injuries that can happen to fleshy carbons when they sustain lots of damage on a bodypart. There's quite a lot of change here, but you can read the guide at: https://tgstation13.org/wiki/Guide_to_wounds and an extended changelog is available here: https://hackmd.io/l_FI9b3tSqa_woDadewJXA
add: Introduces scars and temporal scarring! Healing a wound leaves a scar behind that can be seen by examining someone twice rapidly, and if Temporal Scarring is enabled in character prefs, surviving a round with scars will save them to be granted at roundstart another round! Let your body tell stories!
tweak: Bleeding is now fully bodypart-focused, and 95% of bleeding comes from cut wounds from sharp weapons. Gauze is applied on a limb-by-limb basis, and helps staunch bloodflow rather than totally stop it. Notably, you no longer bleed just from having 40+ brute damage on a limb.
del: Organic bodyparts are no longer disabled at maximum damage, but are easier to cause wounds to
add: O2 medkits in emergency lockers have been replaced with new emergency medkits with basic tools for diagnosing and treating wounds and basic damage
tweak: Herapin now rapidly increases bleeding on all open cuts, rather than causing bleeding by itself. The more cuts on the target, the more it will affect them.
tweak: Neckgrab table slams now hit the targeted limb rather than just the head, with a large chance to dislocate or break a bone
tweak: Sharp weapons and burning weapons can now shred zones on jumpsuits, disabling protection on that limb. Damaged clothes can be repaired with cloth.
tweak: Slaughter demons now deal less raw damage, but gain the ability to cause cut wounds, which becomes more powerful with each attack on a humanoid but resets when bloodcrawling.
/🆑
2020-06-12 23:47:33 +12:00
AnturK 22e619dcf1 Fixes sensors runtime. (#51445) 2020-06-05 18:44:52 +08:00
Fikou 6245b51884 atmos jumpsuits now have the same protections as engi jumpsuit (#51243)
* fix (maybe)

* atmos jumpsuits now have the same protections as engi jumpsuit

* gosh i hate plasmem

* hhhnnn

* fuck
2020-06-03 09:58:41 -04:00
Rohesie b73e2c4b0e Adds a knockedout trait, begins refactoring mobility 2.0 (#51348)
* ko

* change request
2020-06-02 00:14:49 +02:00
TemporalOroboros 2438ef86fe Firesuits and Radsuits fit the big tanks now (#51395)
Changed the allowed suit storage items for firesuits and radsuits to allow any internals tank.
2020-06-01 03:13:46 +02:00
Fikou 5c88d587b4 removes king goat (#51366)
* Revert "Remodels king goat ruin (#50813)"

This reverts commit 26ffe3d539.

* numba 1

* bye

* bye 2

* bye 3

* fuck bitches get money

* hey this was actually a good change

* goat sounds

* fuck

* h

* waaaaaaaaagh
2020-05-31 17:38:07 +02:00
MacBlaze1 d8e49fa3b3 Update clothing.dm (#51337) 2020-05-31 02:02:49 +08:00
MrDoomBringer 3546417d7f Improves player retention by leveraging existing assets to incentivize higher average playetime (#51297)
* im a player ok that means i play

* FINE

* you win this time, shaps

* makes floyd happy

* Update code/__DEFINES/misc.dm

* i was just playing cyberboss dont be mad at me

* changes one character in a comment
2020-05-27 18:29:42 -04:00
MacBlaze1 666e1e2653 Fixing crew monitor suit sensors (#51268)
* first steps

* Update _under.dm

* time for bug testing

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* more fixes and implementation

* Update crew.dm

* Update clothing.dm

* more bug fixing

* Update crew.dm

* debugging

* Update clothing.dm

* Update clothing.dm

* Update clothing.dm

* added stuff to nanites

* goddamn nanites

* nanite cleanup

* Update crew.dm

* Update crew.dm
2020-05-27 15:54:37 +08:00