Commit Graph

9281 Commits

Author SHA1 Message Date
SkyratBot
2bd47ab6e2 [MIRROR] snowballs deal stamina damage now instead of brute (#208)
* these are snowballs, not rocks (#52631)

* snowballs deal stamina damage now instead of brute

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2020-08-05 10:16:43 +02:00
SkyratBot
c64bc0005f [MIRROR] Food trays drop their contents when deleted or destroyed. (#207)
* Food trays drop their contents when deleted or destroyed. (#52667)

* Food trays drop their contents when deleted or destroyed.

* Moves the traycheck up to the storage level.

* Food trays drop their contents when deleted or destroyed.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-08-05 10:16:15 +02:00
SkyratBot
5fd8cb072e [MIRROR] Color standardization, vars moved, and signals (#194)
* Color standardization, vars moved, and signals (#52574)

    Defined all the existing light_color values.
    Moved their definitions to colors.dm
    Made white the default color. It was so already, but that was very obscured.
    Moved the atom light-related variables to the atom definition.
    Wrapped changes to variables such as light_color into procs that report the event through signals.
    Moved the light_on variable to the atom level, also adding a signal for its changing, to represent toggling lights.
    Cleaned up a little bit of code in where new variables were defined before redefinitions.

This is all atomization to reduce changes in #52413
None of this affect gameplay at all, it's all code cleaning and refactoring.

There's more colors to standardize, a search for color = will find lots of targets, and I see little need to have both the LIGHT_COLOR and COLOR patterns, but I don't want to make this PR bigger than it already is.

* Color standardization, vars moved, and signals

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-08-04 12:20:31 +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
1780fae23e [MIRROR] Makes several icon/outfit tweaks/fixes to bounty hunters. (#184)
* Makes several icon and outfit tweaks/fixes to bounty hunters. (#52668)

* Makes several icon/outfit tweaks/fixes to bounty hunters.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-08-03 16:36:52 +02:00
Gandalf
081694871d Merge pull request #160 from Skyrat-SS13/upstream-merge-52605
[MIRROR] Fixes invisible bepis boards
2020-08-02 00:01:35 +01:00
Gandalf
683cbd1137 Merge pull request #156 from Skyrat-SS13/upstream-merge-52585
[MIRROR] Returns hot ice to "sane" plasma output
2020-08-02 00:00:33 +01:00
ShizCalev
e07dce2f3d Fixes invisible bepis boards (#52605) 2020-08-01 06:40:46 -04:00
LemonInTheDark
f5026c776f all my homies love ice (#52585) 2020-08-01 05:46:47 -04:00
ShizCalev
52afb7d200 Cleans up paicard and aicard code (#52575)
* Cleans up paicard and aicard code

* fix

* more fixes
2020-08-01 05:45:33 -04:00
SkyratBot
5e92c6f05b [MIRROR] Fixers for telekinesis and the defibrillator interactions (#149)
* Fixers for telekinesis and the defibrillator interactions (#52571)

* tk and the defib

* fixed range check

* extra check that is not needed

* only show ear damage on threshold pass

* wrong branch am bad

* is living check

* Fixers for telekinesis and the defibrillator interactions

Co-authored-by: NightRed <nightred@gmail.com>
2020-07-31 14:06:48 +02:00
SkyratBot
284f2de8a1 [MIRROR] Cleans up some unused procs and makes is_blocked_turf a turf proc. (#136)
* Cleans up some unused procs and makes is_blocked_turf a turf proc. (#52482)

* Cleans up some unused procs and makes is_blocked_turf a turf proc.

* Update code/game/turfs/turf.dm

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

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

* Cleans up some unused procs and makes is_blocked_turf a turf proc.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-31 00:30:27 +02:00
Gandalf
c963acda00 Merge pull request #126 from Skyrat-SS13/upstream-merge-52544
[MIRROR] Fix check_completion()
2020-07-30 00:37:32 +01: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
ad687de510 Merge pull request #120 from Skyrat-SS13/upstream-merge-52314
[MIRROR] Simple skill/skillchip framework
2020-07-30 00:31:04 +01:00
SkyratBot
eeba02ce61 [MIRROR] Fixes the SM sliver tongs sprite being nulled after picking up the sliver (#116)
* Merge pull request #52576 from TheVekter/sm-tongs-icon-fix

Fixes the SM sliver tongs sprite being nulled after picking up the sliver

* Fixes the SM sliver tongs sprite being nulled after picking up the sliver

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
2020-07-30 00:29:40 +01:00
Dennok
21d0713e92 Fix check_completion() (#52544)
check_completion() now check all parts
2020-07-29 09:10:17 -04: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
Azarak
92e23edef1 Merge pull request #99 from Skyrat-SS13/upstream-merge-52512
[MIRROR] Fixes lollipop embedding, emagged mediborg pops can now embed
2020-07-28 05:08:24 +02:00
Ryll Ryll
fb95f0a87f Fixes lollipop embedding, emagged mediborg pops can now embed (#52512)
* ohhh lolly lolly

* fix blood
2020-07-27 22:05:51 -04:00
Ryll Ryll
a1691ac7e7 Tones down embedded damage, especially for spears (#52518)
* nerfs embeds, spears a bit

* fixes comment
2020-07-27 22:01:37 -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
TemporalOroboros
1ca448ae1f Replaces some zero-delay timers with INVOKE_ASYNC (#52434)
* INVOKE_ASYNC

Replaces a zero-delay timer with INVOKE_ASYNC

* More timers

Switches out some more zero-delay timers for `INVOKE_ASYNC`

* lib_codex_gigas

One last switch
2020-07-26 22:10:38 -04:00
Azarak
68ba7fc498 Merge pull request #89 from Skyrat-SS13/upstream-merge-52473
[MIRROR] Supermatter slivers thrown by bombs / mass drivers will now consume a mob if they're hit by it.
2020-07-26 22:38:45 +02:00
ShizCalev
8cf2bd4a80 Supermatter slivers thrown by bombs / mass drivers will now consume a mob if hit by it. (#52473) 2020-07-26 13:47:34 -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
Azarak
29796d045c Merge pull request #72 from Skyrat-SS13/upstream-merge-52429
[MIRROR] Adds a balloon meant to simulate the arrest hud
2020-07-26 02:52:24 +02:00
Azarak
3ebc4bde5e Merge pull request #68 from Skyrat-SS13/upstream-merge-52399
[MIRROR] Fixes wires and extinguisher hard dels
2020-07-26 02:49:44 +02:00
Azarak
12377e062e Merge pull request #63 from Skyrat-SS13/upstream-merge-52390
[MIRROR] Adds an metric ton of belt sprites and suit sprites for worn objects.
2020-07-26 02:44:39 +02:00
Azarak
660d896f79 Merge pull request #61 from Skyrat-SS13/upstream-merge-52420
[MIRROR] Paper cash stacks visually with it's value.
2020-07-26 02:01:58 +02:00
Azarak
f16d142837 Merge pull request #48 from Skyrat-SS13/upstream-merge-52274
[MIRROR] B.E.P.I.S. Version 2.0: Cargo Trimming
2020-07-26 01:58:39 +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
9d5c527e9b Merge pull request #53 from Skyrat-SS13/upstream-merge-51786
[MIRROR] [READY] Wounds part 2: Piercing wounds, dismemberment changes, housekeeping
2020-07-26 01:12:23 +02:00
skoglol
70a97b4319 Merge pull request #52429 from lordpidey/add/fake_arrest_balloon
Adds a balloon meant to simulate the arrest hud
2020-07-25 13:26:39 -04:00
Rohesie
e024fbffc3 hard dels (#52399) 2020-07-25 10:08:13 -04:00
ArcaneMusic
aade6fcdd3 Adds an metric ton of belt sprites and suit sprites for worn objects. (#52390)
* Plant Belt sprites are fixed, Engy Sprites too

* I did belt sprites until my eyes started hurting
2020-07-25 01:59:31 -04:00
ShizCalev
f6c1d29a10 Merge pull request #52420 from ArcaneMusic/PaperCash
Paper cash stacks visually with it's value.
2020-07-24 20:57:48 -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
NightRed
7039a0b175 golden cooldown (#52410) 2020-07-23 22:18:59 -04:00
skoglol
cdd1dfa09b Merge pull request #52274 from ArcaneMusic/bepisv3
B.E.P.I.S. Version 2.0: Cargo Trimming
2020-07-23 12:00:25 -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
f5cd45f7f7 Removes forcesay on attack (#52341) 2020-07-22 04:30:30 -04: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
Mickyan
9bd9672153 Removed spraycan ability to paint any object (#52186)
* begone

* dont need this
2020-07-20 16:33:47 -03:00
skoglol
fab6a70587 Fixes arrhytmic knife (#52322) 2020-07-20 14:37:29 -04:00
ShizCalev
8fdb09fcfe Defibbing THICKMATERIAL fix (#52291) 2020-07-19 17:21:58 +02:00
ArcaneMusic
72b7c738af Arconomy 1.0: Final Stage Capitalism (#52007)
* Part 1: Arcane is challeneged to rewrite all of economy at 4am on a wednesday, accepts

* Miasma? DUNKED
Bounties? CHUNKED
Hotel? TRIVAGO

* End of day... 2? 3? lockdown has ruined me

* Day 3. I cannot unto bogdanoff. Send help.

* So far so good.

* Day 4, in the ghost house. I've resprited a beloved machine with soul in it. There is a chance, I am losing my mind. Sometimes I hear the words, "When is economy done, arcane", and I look over my shoulder, and oranges isn't there, because he lives in New Zeland. Probably.

* We'll throw the technodes and mapchanges in too.

* Okay lets keep this a friendly debug item then

* yeah on second thought lets not make a precision testing instrument on a 50% success ratio.

* Newscaster updates.

* TGUI Rebuild 1 start counting fokes

* Runtime BEGONE FROM ME, fckn typepaths

* Cleans up autodocs, and other areas

* Updates tgui because I feel nothing anymore

* Recompiling tgui for that green check

* dunks the whole mint out of the code, get that hothead outta here.

* Green checkmark daily update.

* Should be decent from here.

* Resolves machine_design conflict

* Rebuilds TGUI again for the epic pogs

* Sweeping changes 2: See additional changelog

* Haunting insurance plus changes the define comment.

* Rounded vending prices, made bounties appear on examine, polish

* Atmos tanks now specify their mole requirements.

* TGUI 4.0 Updated.

* ACTUALLY updates to TGUI 4.0 standards.

* ThE bUiLd DiFfErS fRoM oUrS

* Ah, I didn't see the testmerge get re-upped.

* TGUI Rebuild.

* Shuffles some security-assistant bounties around
2020-07-19 13:44:25 +02:00
LemonInTheDark
d3f9b70c0f Adds a message modification packet to saycode to allow for unordered parsing of operator chars, like ;, #, :, or % (#51790) 2020-07-18 18:18:23 +02:00
Timberpoes
a24d6f5adb Exosuit Fabricator tgui Total Conversion - An Ode to Roboticists (#52073)
* First draft

* tgui interface bluescreen guards

* Preparing for cyborg module sub-categories

* The rest of the owl

* Stop duplicate say messgaes

* Implement interface handling for obstructed exits

* Pocket lint

* Documentation and misc. code cleanup

* Implement searching in interface

* tgui pocket lint and build

* Coding style consistency and changes. Rebuild tgui.

* Update default bitflags

* Address potential edge case bluescreen.

* orange man good

* Remove emag_act with obsolete functionality

* Standardise variable naming conventions

* tgui 4.0 update

* tgui 4.0 update

* Port a couple of usability improvements from concept branch.

* Fix new ui_act input.

* Actually fix new ui_act input

* Port some small improvements from concept branch.

* Rebuild tgui

* Made department of redundancy department redundant.

* Rebuild tgui.
2020-07-18 19:09:24 +03:00