Commit Graph

3701 Commits

Author SHA1 Message Date
ShizCalev
3fb4f54770 Fixes display cases going invisible when you put shit into them (#52275)
* Fixes display cases going invisible when you put shit into them

* finished
2020-07-23 07:08:32 -04:00
skoglol
f5cd45f7f7 Removes forcesay on attack (#52341) 2020-07-22 04:30:30 -04:00
skoglol
83fde6527a Merge pull request #52294 from Donkie/reinf-wall-plasteel-fix
Added chat warning if you try to finish a reinforced girder with regular metal
2020-07-21 19:29:15 +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
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
Daniel Hultgren
792516a521 Added chat warning about using regular metal on a reinforced girder 2020-07-17 18:14:29 +02:00
Daniel Hultgren
78d8c697c6 Converted a if block to properly use else-if 2020-07-17 17:54:55 +02:00
Aleksej Komarov
0cf00a2645 tgui 4.0 (#52085)
* tgui 4.0 hyper squash

* Upgrade dependencies
2020-07-16 20:13:04 +02:00
L
84c44bc03c defined 2020-07-16 11:14:46 -03:00
skoglol
ed9a3ce516 Merge pull request #52241 from ShizCalev/false-wall-fix
Fixes sheets of glass / other materials that don't have a valid false wall type being consumed without doing anything when you try to construct a false wall with them
2020-07-16 08:52:56 +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
Jared-Fogle
ee5b005007 Add tests for outfits, fixes families outfits, Syndicate Ship Captain, and armored bounty hunters (#52210)
* Add tests for outfits, fixes families outfits and Syndicate Ship Captain

* Switch out captain uniform from tacticool to combat

* Consistent styling

* My weakness is I'm a pedant

* Check left and right pockets, and fix armored bounty hunter
2020-07-14 20:06:11 -04:00
ShizCalev
aa847113c5 Fixes using sheets of glass / other materials that don't have a valid false wall type consuming your sheets without doing anything when you click on a displaced girder 2020-07-14 15:53:03 -04:00
skoglol
496d4772ec Merge pull request #52179 from ArcaneMusic/fixeroni2
Makes vend-a-trays usable by bartenders, adds them to a technode.
2020-07-13 10:46:02 +02:00
LemonInTheDark
dbdb2d33fe Merge conflict begone 2020-07-12 17:37:14 -07:00
skoglol
a21edadf52 Merge pull request #52011 from ATH1909/patch-46
You can now actually sacrifice people who are strapped to sacrificial altars.
2020-07-12 13:30:17 +02:00
skoglol
06c5a7afdf Merge pull request #51854 from MrDoomBringer/supplyprettypod
Please check out this EPIC OFFICIAL PR TRAILER before reading (very important)
https://youtu.be/4RckVdx20oQ
the video is kinda autistic

dont forget to upvote
About The Pull Request

All sprites and epic meme videos made with love by yours truly
Except for the 2 missile sprites. Those were taken and modified from NSV13 who in turn ported them from TGMC
nupod_all_decals

Anyways, this adds:
New pod, reverse-pod, and target indicator sprites
Pod-ground collision effects (impact craters basically)
Cool looking vapor trails a la the half-life 2 headcrab shells

And also:
Fixes seethrough pods not actually working
Makes reverse-mode a bit more predictable
Has some minor code improvements with how supplypod-reverse-mode works
2020-07-12 13:24:37 +02:00
skoglol
5cb2316c5d Merge pull request #52068 from MrMelbert/railings
Fixes railings
2020-07-12 12:40:03 +02:00
skoglol
742b696f11 Merge pull request #52149 from ShizCalev/headpike-fix
Fixes mapspawned headpikes
2020-07-12 11:35:48 +02:00
ArcaneMusic
b26deb6707 Makes vend-a-trays usable by bartenders, adds them to a technode. 2020-07-12 01:44:40 -04:00
Dennok
c033e736ef Catwalk block uplifting from below. Base for similar Z move blocking things. (#52141)
* BLOCK_Z_FALL separate

Separate BLOCK_Z_FALL flag to BLOCK_Z_OUT_DOWN, BLOCK_Z_OUT_UP, BLOCK_Z_IN_DOWN, BLOCK_Z_IN_UP

* Propertly Z blocking for catwalk

Catwalk block z falling and uplifting from below

* Walkable lattice

Now lattice can support spaceman

* Replace BLOCK_Z_FALL flag

* Update _open.dm

* Update openspace.dm

* Update ladders.dm

* Update away_props.dm
2020-07-11 20:19:32 -03:00
AnturK
f4af5ed28c Makes CanReach default to blocking. (#52115) 2020-07-12 04:25:27 +10:00
ShizCalev
ef6fc627a6 Fixes mapspawned headpikes 2020-07-10 15:25:11 -04:00
LemonInTheDark
f59207ec83 Converts rad_flags to flags_1, holy shit why 2020-07-09 00:20:46 -07:00
ShizCalev
cc83c3598b Merge pull request #51919 from tralezab/branched-from-upstream-master
Painting frames are no longer ERRORs
2020-07-07 10:32:34 -04:00
MrMelbert
1e4ce1e4be lol 2020-07-07 01:52:24 -05:00
MrDoomBringer
719d3a1f45 first pass
WIP overlays


icon upd8


more


need to figure out whats going on with extractionpods


compile


the icon update


more!!


why are skillcapes broken


boat lmao


seethrough fix


Second drive-by


Code cleanup and improvements

Specifically surrounding contractor pods and reverse mode working properly
accidently left in an extra dmi whups


do the impossible see the invisible


new effect booster pack


MFW MRW Linter fail
2020-07-06 23:44:02 -04:00
ArcaneMusic
eee922ee7f Updates vend-a-trays to have a unique UI, improves accessibility. (#51931)
* Initial commit, updates trays into 2020

* Adds vend-a-trays as a service machine, without it being a machine.

* Replaced the mapped vend-a-trays with service unique versions.

* "YoUr BuIlD DiFfErS fRoM mAsTeR"

* Removes {}s from img, workin on the other part

* All my homies recompile on merge conflict

* Fixes end of line because honestly there must be no god on this green earth

* hopefully this isn't too excessive.

* How's this?

* Applies Anturk's Confirm suggestion.

* Shipped, workshopped with style a bit

* Alright that's probably enough fiddling for now

* Rebuilds.
2020-07-06 11:37:06 +03:00
ATH1909
0f7f57a0e9 ooga chaka ooga ooga ooga chaka 2020-07-04 05:20:22 -05:00
Rohesie
fc3a93323b lattice (#51880) 2020-07-04 05:03:59 +02:00
Jared-Fogle
a91066c3e4 Support fireman carrying people onto morgue trays and other bucklable objects (stasis beds, operating tables, chairs) (#51539)
* You can now fireman carry people onto trays

* Support putting fireman carried people to buckle

* Reverse conditions

* Only attach to bucklables if adjacent, and forcably move to the turf so you don't just drop them
2020-07-02 19:25:15 -04:00
WarlockD
a8f9415104 General washing fixes (#51904)
* Intaial Washing fixes

* Got to watch those copypasta

* Update atoms.dm

* Some day I will learn how to read

* Don't update at 5am kids
2020-07-02 13:17:29 +08:00
FloranOtten
0380aacbc7 Adds the Ice Hermit! (#51503)
* Adds hermit ruin

* adds the actual ghost role part

* is this the issue

* okay is THIS it

* Update icemoon_underground_hermit.dmm

* requested changes
2020-06-29 16:16:45 -03:00
tralezab
76e6562e8a E 2020-06-29 11:15:39 -07:00
AnturK
378cc1a8da Fixes painting dupes (#51868)
* Fixes painting dupes

* Actually let's only do it when it matters.
2020-06-28 14:19:45 -04:00
AnturK
a6c22323d7 Fixes name santization in few places. (#51837)
* Fixes name santization in few places.

* Update code/__HELPERS/text.dm

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-06-25 17:48:54 -04:00
spookydonut
88d1d36aef Removes some var/const that should be defines (#51461)
* Removes some var/const that should be defines

* change requests

* change requests
2020-06-25 03:00:09 -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
TemporalOroboros
e78d82592f Refactors reagent exposure code (#51396)
* Refactors reagent exposure code

Removes istype clutter. Renames a few procs

* == TRUE

Adjusts COMPONENT_NO_EXPOSE_REAGENTS bitflag offset.

TODO: Remove comment

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

* == TRUE

Adjusts COMONENT_NO_EXPOSE REAGENTS bitflag offset.

Removes comment

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-06-21 20:03:19 -03:00
LemonInTheDark
e5547a8f5c Supermatter variable documentation, cleanup, bugfixes. (#51345)
* Makes the supermatter file smaller.

AHAHAHAHHAHA YOU FOOL YOU HAVE FALLEN FOR MY TRAP CARD

* stable build maybe? sm cleanup begins

* The old ones knew

* lemme atomize actually

* I know how to spell ok? OK?

* braindamage

* That'll do it

* That do it?

* There we go

* Wow I should test things

* test?

* I hope that clears it

* Should fix the formatting trouble

* isolates the opening proc

* Lowercase and fixes messed up proccall
2020-06-19 18:48:06 -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
WarlockD
1d0cc0c715 Papers Please! Now with Markup...again! (#51534)
* Initial update

* tgui ofcourse

* Small fixes

* More lint fix

* Updated to support signatures and adding to paper

* Sign and adding to paper work, need to tune it a bit though

* Ok, signatures and adding work, still working on stamps

* Stamps now, fix rotate and cleanup tommow

* Alrighty!  Lets try for some testing!

* Stupid travis

* annnd the bundle

* Minor fixes

* DONE.  Still have some code cleanup, but all the major features work now

* Requested changes cleaned up formating

* Dammmn you bundle!

* Fixed the preview issue

* Updated bundle

* Ok, some more fixes and clean up

* Ugh damn you tgui bundle

* Update tgui.bundle.js
2020-06-17 11:55:58 -04:00
Fikou
83eac9cc38 some ctf changes (#51595)
* some ctf changes

* oops

* Revert "oops"

This reverts commit 0817cbf4ed516c29159b5c1802e54a61612c6be1.

* fuck

* penis
2020-06-14 00:10:27 -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
ShizCalev
1059a64a98 I before E, except after C. (#51543) 2020-06-10 23:23:50 +02:00
Ryll Ryll
6bf874839a Adds new body type pref (#51058)
* tgdb

* tgdb

* Auto stash before cherry pick of "balance changes, enables burn surgery, various body improvements"

* moves unnecessary list out of client

* describes a var

* corrects
2020-05-29 14:25:01 -03:00
nemvar
6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
spessman-007
ab84042f94 [READY] Improve spelling (#51134)
* Improve spelling

* Spell isn't, ain't, shouldn't, hasn't, wasn't correctly

Co-authored-by: NewSta <spessman-007@users.noreply.github.com>
2020-05-25 02:13:37 +08:00
LemonInTheDark
1614501d23 Datum view and some other things (#51208)
* Datumizes all uses of change_view

* Cleanup and helper procs

* tweaks values to match the format, hint hint, (value - 0.5) works just fine

* And there's the rest

* woop, braindamage

* and one more

* fuck you menu file

* woops

* we should apply that

* fixes tooltip drift, thank you goon coders

* you can shake but you can't zoom
2020-05-25 01:53:51 +08:00
spessman-007
5ae305ec9f Resolve issues with incorrect usage of a/an (#51095)
Co-authored-by: NewSta <spessman-007@users.noreply.github.com>
2020-05-25 01:34:34 +08:00