Commit Graph

13506 Commits

Author SHA1 Message Date
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
SkyratBot
2afc8586e6 Add check timer sources debug command (#108)
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-07-28 19:10:17 +01: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
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
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
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
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
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
skoglol
d259623def Merge pull request #52308 from ShizCalev/Hyperkinetic-Dampener-Field-fix
Fixes Hyperkinetic Dampener Field runtime
2020-07-21 19:19:58 +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
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
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
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
ShizCalev
08f5e30011 Fixes Hyperkinetic Dampener Field runtime 2020-07-18 02:18:21 -04: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
skoglol
f87ed89865 Merge pull request #52263 from ShizCalev/jetpack-fix
Fixes runtime caused by a mob's client disconnecting while jetpacking around
2020-07-17 11:02:58 +02:00
Ryll-Ryll
1f31064c3e Merge remote-tracking branch 'tgstation/master' into who-named-this-damned-proc 2020-07-16 21:43:14 -04: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
ShizCalev
254536072e [s] sanity checks vv_edit_var() values (#52255)
cl ShizCalev
fix: Added some sanity checking for varedit values.
/cl
* sanity checks vv_edit_var() values

* this should be an or

* one more fix
2020-07-16 10:20:41 +12:00