Commit Graph

5730 Commits

Author SHA1 Message Date
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
SkyratBot
6ead51b46f [MIRROR] Chaplains now enjoy eating the only divine food (#110)
* Chaplains now enjoy eating the only divine food (#52082)

* god please let this work

* Update melon.dm

* Update code/datums/mood_events/generic_positive_events.dm

spelling errors missed.

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

* Update code/modules/hydroponics/grown/melon.dm

grammar matters kids

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

* Update code/modules/hydroponics/grown/melon.dm

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

* Update generic_positive_events.dm

* Update melon.dm

fuckin variable got changed

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

* Chaplains now enjoy eating the only divine food

Co-authored-by: Memedoktor <meme.dokter@gmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-29 01:02:37 +01:00
Azarak
0c06ff6b5d Merge pull request #101 from Skyrat-SS13/upstream-merge-52430
[MIRROR] "Erratas the reporter and corporate lawsets", but without the merge conflict
2020-07-28 05:09:21 +02:00
ATH1909
3fa9b02c4a okay, now this is epic (#52430) 2020-07-27 22:20:29 -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
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
AnturK
f81711fb7d Fixes cinematics for widescreen. (#52464) 2020-07-26 13:48:43 -04:00
Azarak
54d80b961b Merge pull request #74 from Skyrat-SS13/upstream-merge-52448
[MIRROR] Lowers the bar for Disk, Please!
2020-07-26 02:54:06 +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
02295b5ffe Merge pull request #67 from Skyrat-SS13/upstream-merge-52425
[MIRROR] Adds Runechat Subsystem - Deprecates Use of Timers for Runechat
2020-07-26 02:49:00 +02:00
Azarak
e1ae6be670 Merge branch 'master' into upstream-merge-52378 2020-07-26 01:48:16 +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
skoglol
0a90b05437 Merge pull request #52448 from Ryll-Ryll/lowering-the-bar
Lowers the bar for Disk, Please!
2020-07-25 13:35:07 -04:00
Rohesie
e024fbffc3 hard dels (#52399) 2020-07-25 10:08:13 -04:00
Bobbahbrown
942520472f Adds Runechat Subsystem - Deprecates Use of Timers for Runechat (#52425)
* first pass

* one wacky dot

* documentation

* we're the garbage man now

* doc update

* couple of bugs never hurt nobody
2020-07-25 09:57:49 -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
deac53e041 Merge pull request #52378 from Ryll-Ryll/LICK-MY-WOUNDS
You can now contract viruses from licking wounds
2020-07-23 11:39:18 -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
Useroth
29c7533a8b Merge pull request #35 from Skyrat-SS13/upstream-merge-52374
[MIRROR] Quirk waits for client before setting preferences
2020-07-23 15:16:02 +02:00
Useroth
40df423aa3 Merge pull request #31 from Skyrat-SS13/upstream-merge-52370
[MIRROR] We want medical text on quirks
2020-07-23 15:01:30 +02:00
NightRed
852c8022ef Quirk waits for client before setting preferences (#52374)
* moved from timer to on process check

* lets do that better

* bitflag cleanup

* signal is better still

* Update code/datums/traits/_quirk.dm

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

* Update code/datums/traits/_quirk.dm

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

* fixed comment

* Better doc text

* nicer still

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-22 23:46:50 -04:00
NightRed
e3e089baab We want medical text (#52370) 2020-07-22 18:34:55 -04:00
Couls
dc5840dc4e keybind signal support, ported from TGMC (#52219)
* keybind signal support, ported from TGMC

* Thank you linter

* remove unused and extra defines

* move signal defines up and fix emote keybind runtimes

* Apply suggestions

* Update keybinding.dm

* Missed this one in the upstream merge

* Ignore keybindings without names

* back to the OG

* Update living.dm

* Update living.dm

* got it

* trailing newline

* Update code/datums/keybinding/living.dm

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

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-22 16:53:27 -04:00
skoglol
f5cd45f7f7 Removes forcesay on attack (#52341) 2020-07-22 04:30:30 -04:00
skoglol
0d85dc20eb Merge pull request #52304 from Ryll-Ryll/fixing-under-protest
Fixes handi-capable tackling from beyond the grave
2020-07-21 19:25:51 +02:00
skoglol
983b1f2f33 Merge pull request #52369 from nightred/heirloom
Clear family heirloom moods on removal
2020-07-21 19:18:25 +02:00
skoglol
77d73a6518 Merge pull request #52338 from ShizCalev/fixes-coma-runtime
Fixes coma runtime
2020-07-21 17:49:20 +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
Ryll-Ryll
f909ca0663 correct check 2020-07-20 23:25:31 -04:00
ArcaneMusic
911e702540 Adds a simple payment component, photocopiers now cost 5 credits to make copies each. (#51944)
* Take 1, initial mediocity

* Stonks

* I'm working on it don't stale me

* HOOOOOOO adjusts the photocopier, extends component functionality to the medical kiosk, etc etc/

* Fixes that one bug with printers.

* Removes an unused var.

* Makes defines

* I am a champion

* Moves econ defines over... econ defines.

* Forgot the comment.

* How about now?

* Accidently excluded payments from the dme.

* Slight text tweaks, also checkmark.

* updates economy defines.

* Apply suggestions from code review

Review Commits pre-cleanup

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

* Post-Fixes from review.

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-20 22:40:59 -03:00
RaveRadbury
11fda03cc4 Insect phobia (#52261)
* Add insect phobia

applies to moths, flies, and cockroaches

* Adds bee content
2020-07-20 18:27:55 -03:00
zxaber
87a3a7174b Fixes hulk arms breaking when punching non walls (#52250)
* fixes an oversight with hulk recoil

* locating a better solution

* asdf

* condenced
2020-07-20 17:28:10 -03:00
skoglol
8f7bcf424f Runechat emotes (#52212)
* runechat emotes

* rename

* tweaks
2020-07-20 22:03:30 +02:00
Dennok
e54ac594de look_up tweak and look_down verb (#52139)
* look_down

look_down 
persistent  look_up and look_down

* look_down

look_down 
persistent  look_up and look_down

* Now look prefer a hole in front of the astronauts

* up

* up

* up

* up

* Update living.dm

* Update living.dm
2020-07-20 16:12:19 -03:00
nightred
b27331cbb0 Clear Family Heirloom mood on removal 2020-07-20 11:28:52 -05: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
L
00d8f1da66 tweaks 2020-07-19 22:20:09 -03:00
L
9ee2907a68 runechat emotes 2020-07-19 22:11:44 -03:00
ShizCalev
50ee44a045 Fixes coma runtime 2020-07-19 04:41:23 -04: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
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
Ryll Ryll
53d1f1477d Adds hauberoaches, cockroaches wearing spiked helmets (#52161)
* done in under an hour

* sprite
2020-07-18 12:53:45 +02:00
Ryll Ryll
712898d713 webbit to do the incap check 2020-07-18 05:35:32 -04:00
Ryll-Ryll
60e3b6a67f changes buckling to buckled 2020-07-17 22:20:28 -04: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
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
ATH1909
5cce5f87bd Finally adds a quickdraw hotkey for the suit storage slot (#52040) 2020-07-14 20:18:18 -04:00
ShizCalev
ccbd01386e Fixes another pellet cloud runtime (#52202) 2020-07-14 20:12:44 -04:00
EdgeLordExe
7cc4073b93 [READY] Addictions: 3 new drugs to show off a fun feature. (#51930)
* E

* EE

* AAA

* Update code/modules/reagents/chemistry/reagents/drug_reagents.dm

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

* ee

* e

* e

* EE

* Apply suggestions from code review

Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* performance!

* E

* Update code/modules/reagents/chemistry/reagents/drug_reagents.dm

Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* E

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
Co-authored-by: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com>
Co-authored-by: ラッピ from PSO2 <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-07-13 13:20:45 -04:00