Commit Graph

5217 Commits

Author SHA1 Message Date
spookydonut
49eab491b4 Gamer skill (#49618)
* gaming.dm added

* initial changes

* gamer god trait

* finalization after testing

* spellcheck + flavortext

* phone gamer support

* incorporates review suggestions

* tiny flavor change in pwr game desc

* more trait-related touchups and minor fluff

* adds and removes ?s where needed

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:06:33 +08:00
Qustinnus
4b2a8aebe5 [READY] Meat material & material datum turf support (#49402)
* temp

* meatwalls

* more

* adds sheetifier

* fix

* two

* mat texture + 4dplanner admin (#21)

* mat texture + 4dplanner admin

* keep together trait

* counter instead of trait

* finalizations

* woops

* fixes

* oopsie

* only set starting keep_together if necessary (#24)

* keep together as trait again

* remove false comment

* doc for TRAIT_KEEP_TOGETHER

* remove needless scoping

Co-authored-by: 4dplanner <3combined@gmail.com>
2020-03-04 23:18:08 +08:00
nightred
15452cac44 [READY] Two Handed Component (#49422)
About The Pull Request

For an item to be two handed just add this handy component.

All existing two handed items have been converted to use this component.
Why It's Good For The Game

It has components and signals, and now you can make items two handed so simply.

/obj/item/shockpaddles/ComponentInitialize()
	. = ..()
	AddComponent(/datum/component/two_handed)
2020-03-04 11:26:01 +13:00
tralezab
be1291c232 fixies! (#49534) 2020-03-03 18:18:16 +08:00
necromanceranne
746fb273d1 autodocs hurt my simple catbrain 2020-03-03 05:57:21 +11:00
necromanceranne
1b8b80b0a8 gonna be on the safe side with that brute mod after all 2020-03-03 05:27:15 +11:00
necromanceranne
1ca314feee someone convinced me to keep deflection for now. 2020-03-02 16:49:01 +11:00
necromanceranne
916f04440b oh god I hope mr. orange man isn't angy 2020-03-02 15:58:12 +11:00
necromanceranne
0425bc2c9e oh wait they do stack nutso 2020-03-02 13:57:33 +11:00
necromanceranne
bf2ab26d2e I think the fishmen are no longer pillermen 2020-03-02 13:47:47 +11:00
skoglol
24de591c87 Merge pull request #49636 from Ryll-Ryll/let-there-be-tape
Puts basic sticky tape in autolathe, makes pointy and super sticky tape the BEPIS major reward
2020-03-01 15:22:35 +01:00
skoglol
2f1ebf83e5 Merge pull request #49524 from necromanceranne/let-sleeping-carp-lie
Sleeping Carp: Scaled Skin Edition
2020-03-01 01:07:33 +01:00
necromanceranne
ec382c638f I think this fixed it? 2020-03-01 10:34:46 +11:00
Ryll-Ryll
b02b2e4e6e fixes harmless embeds doing jostle messages 2020-02-29 06:29:45 -05:00
nightred
70a3925567 fever and shivers change body temp normal 2020-02-27 20:22:05 -06:00
AnturK
a2ff959950 Batch of runtime fixes. (#49568)
* Fixes secret sauce recipe paper.

* Fixes say runtime

* Fixes modular computer on holodeck runtime

* Fixes bee runtime

* Fixes grav holopara runtime

* Fixes olfaction runtime

* Fixes zombie runtime.

* Cleanup
2020-02-26 20:47:31 +08:00
skoglol
2220049fc2 Fixes blindfolds not properly counting as being blind (#49541)
* Fixes blindfolds not properly counting as being blind

* Call the proper proc
2020-02-25 19:15:33 +01:00
nemvar
e13eec92a3 Renames status to sanity (#49553)
* Renames status to sanity

* Update code/datums/components/mood.dm
2020-02-25 19:15:04 +01:00
necromanceranne
24f087c9cf Merge branch 'master' into let-sleeping-carp-lie 2020-02-26 02:55:05 +11:00
Time-Green
e114d67d02 kills all reac bugs with the power shame (#49504) 2020-02-25 16:16:22 +01:00
Time-Green
ea124455ac Fixes gastrolisis runtime (#49516)
* fixes gastrolisis runtime

* fuck
2020-02-25 16:09:32 +01:00
Time-Green
0cac6d4e20 adds snail achievement to genetics (#49515) 2020-02-25 16:07:42 +01:00
ArcaneMusic
94f27c7b25 [READY]Arconomy: Sales Taggers, split profits on barcoded, sold items! (#49111)
* Startwork

* "Arcane: Everything works up until the export datum bullshit"

* I got up to "Split Profit" in "sell object"

* This is when I switched over to components and it STILL doesn't work

* alright stopwork for the 'night'

* So this is the version that crashes

* One step further in my descent to madness.

* Alright, this should be working (Minus maybe profit_split)

* Alright splitting up custom sales splits is broken right now.

* Profit split works now.

* Alright what the hell is going on here.

* Revert "Alright what the hell is going on here."

This reverts commit 6cb3b6eb56ea45ede3496bbe219ca18302c806e2.

* Oh wait, I can do commit messages through VSC?

* Adds a quick little box with all the shipping supplies you'll ever want, unwrapping signal

* Added shipping box to all maps and the service/cargo lathes.

* Fuck you mapmerge hook you ain't shit

* Alright, yet another take of making it get rid of the pricetag

* [3:43 PM] oranges: anturk is smart (This is true)

* Tested, cleaned up component procs,  and limits signals sent a bit.

* Whoops

* Other comments from Ninja over discord

* Left in a comment line.

* Fixes the issue with ind. barcodes, adds examine.

* Well thank GOD the children wern't there to see it

* Adds a do_after to prevent accidents.

* Fixes merge conflicts

* Fixes merge conflict. Twice in one day.

* Fixes merge conflict.

* one tiny bit of documentation

* Travis play nice.
2020-02-25 20:42:01 +08:00
fluffe9911
5eea39977d [READY TO BE MERGED] King Goat Achievements, bugfixes, and minor tweaks (#49159)
* king goat memes

* I cant grammar

* newline

* the arena is no longer pressurised

* How into grammar

* I am embarrassed I did not notice this

* no hotel vacations in the arena

* better goat hoof sprite curticy of stephen

* new goat gun sprite

* might as well

* grammar

* no more king goat plushies in toy crates

* Update code/modules/mob/living/simple_animal/hostile/megafauna/king_of_goats.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* done

* based and redpilled

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2020-02-24 20:47:42 -05:00
spookydonut
cea5360e4b Updates codedocs with links (#49497)
About The Pull Request

Updating the best written documentation with the new linking feature.
2020-02-25 08:17:45 +13:00
necromanceranne
a3a8a91cc8 I tested block in a few spares and it was too easy to just sit behind it and tank if they had a baton 2020-02-24 22:32:30 +11:00
necromanceranne
fd3d5f1fc0 should be respecting targeting/sanity stuff no more dropkicking them in the chest 2020-02-24 22:25:58 +11:00
spookydonut
1a9ddbee5f Merge pull request #48959 from Ryll-Ryll/embeddead
Refactors embedding, adds harmless embeds, sticky tape, admin buttons to make everything embeddable
2020-02-24 15:43:36 +08:00
ShizCalev
0228bc2fbe Call the proper proc 2020-02-24 01:31:38 -05:00
ShizCalev
df81c5be4a Fixes blindfolds not properly counting as being blind 2020-02-24 01:10:34 -05:00
Ryll-Ryll
6d379bf62b fixes a few bugs 2020-02-24 01:09:36 -05:00
necromanceranne
044f065a68 bullet swatting 2020-02-24 12:23:10 +11:00
Ryll-Ryll
33d2628c34 spacing and correcting comments 2020-02-23 07:03:01 -05:00
necromanceranne
dc3a5b33cb Some additional adjustments 2020-02-23 22:50:50 +11:00
Ryll-Ryll
7e384752e6 moves topic, cleans code, adds sticky tape to maint loot 2020-02-23 06:50:18 -05:00
necromanceranne
fd810e30f2 Merge branch 'master' into let-sleeping-carp-lie 2020-02-23 22:16:56 +11:00
necromanceranne
1dcf24306c current work 2020-02-23 22:01:37 +11:00
Unit2E
488cf996b9 headset uplink code is weird and this fixes a null 2020-02-23 03:17:15 +01:00
Ryll-Ryll
0ecd64c74d e 2020-02-22 04:27:17 -05:00
necromanceranne
3c06b9140d still not finished 2020-02-22 20:06:51 +11:00
necromanceranne
e6388ec433 eh not so keen on this after all even if it did work 2020-02-22 19:55:25 +11:00
Ryll-Ryll
cb3b82bdc1 lets you update embedding behavior, also makes red pens faster 2020-02-22 02:15:19 -05:00
Unit2E
230d343686 Adds owner of uplink to logs. 2020-02-22 05:19:57 +01:00
Unit2E
b73fddfb28 adds logging for uplink horribly. 2020-02-22 04:04:27 +01:00
necromanceranne
5e6425ecaf aaah 2020-02-21 19:23:52 +11:00
Mickyan
cebc8d428e Merge branch 'master' of https://github.com/tgstation/tgstation into chewing_gum 2020-02-20 16:09:01 +01:00
Bobbahbrown
476399a346 the span of these changes is immense (#49432) 2020-02-20 13:48:13 +01:00
spookydonut
6401ba5708 Merge pull request #49421 from ShizCalev/define-cleanup
Cleans up redundant math defines
2020-02-20 19:32:36 +08:00
AffectedArc07
0315245729 Adds in discord auto-roling (#49374)
About The Pull Request

When a user successfully links their BYOND accounts and discord accounts, they will now be automatically roled, based on config settings.

NOTE: This does not update pre-linked accounts, but I can write an external bot to do that if needed

RUST-G has also been updated in this PR, to be inline with this PR over at RUST-G tgstation/rust-g#23

Why It's Good For The Game

People with linked accounts can now be given a specific role in the discord, which is good for verification.
Changelog

🆑 AffectedArc07
add: Linking your discord and BYOND accounts will now give you a role in the discord
/🆑
2020-02-20 22:37:14 +13:00
necromanceranne
188e9167cc few more changes 2020-02-19 23:35:25 +11:00