Commit Graph

6066 Commits

Author SHA1 Message Date
Ryll Ryll
f9963454db Adds tackling (VIDEO INSIDE) (#49476)
* huthtuthuthuthtuhtuthuthuthuthtuthuthuthtuthut

* documents and expands, adds new glove types

* Adds slamming into tables and neatens up throwingdatum handling (+stuff)

* bit less squishy

* adds sprites, offbrands, swaps most combat insuls for tacklers

* adds dolphin and rocket gloves to BEPIS

* changes dna to traits, buffs tackling

* same as last commit but moreso

* updates docs, nerfs stuns

* vending machines, better docs

* window tackles for good measure

* gets window splats working

* polish off

* LAST DAY OF SCHOOL
2020-03-06 11:17:52 +08:00
moo
72b7a266b3 Adds Religious Sects and Basic Technophile Sect for Proof of Concept (#49434)
* このコミットの中が未来です

* Adds Rites

* 💻

* remove bible global

* last minute code changes 😏

* review brah

* waaa_fb

* 

Review stuff, Doc stuff, You can now coax a user to the platform for !!FUN!!

* Update code/modules/religion/religion_sects.dm

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-06 11:11:52 +08:00
Bawhoppen
7bb27cf55e getting closer to being ready 2020-03-05 18:09:21 -06:00
tralezab
211f219995 woop 2020-03-05 15:03:00 -08:00
tralezab
a7259a7d7a words before damage 2020-03-05 15:01:26 -08:00
nightred
e2f03055a9 oh lets not make a loop that was bad 2020-03-05 12:25:38 -06:00
nightred
944fe34d80 telekinesis checks for held object 2020-03-05 12:22:55 -06:00
Emmett Gaines
718074ce55 Build SpacemanDMM from source (#49712)
* Build SpacemanDMM from source

* oops

* Fix new unreachables/dumb code

* ooops cache conflict

* bugfix

* oops

* lint

* ninjanomnom held me down and forced me to delete this
2020-03-05 11:54:04 -05:00
Emmett Gaines
33458640dc Add lints for "new" override prevention feature (#49672)
* Add lints for "new" override prevention feature

* bEsPoKe

* i'm an idiot

* arg index
2020-03-05 10:22:19 -05:00
nightred
5f0cf09967 Off hand item drop fix 2020-03-05 08:56:06 -06:00
spookydonut
50058b9a1f Adds the label component; Small tweaks to the hand labeler (#49700)
* Adds the label component

* switches to using RegisterWithParent / UnregisterFromParent

* Adds docs. Change Destroy() to qdel(src)
2020-03-05 21:33:29 +08:00
spookydonut
29fe3a0b76 a couple more genetics perks: martyrdom and HARS, locks chem spike behind crafting only (#49062)
* getting somewhere

* cleanup one

* cleanup two

* supermatter immunity > HADS

* more fluff

* proper return, compile

* lint

* lint 2 electric boogaloo

* cobby happy

* HADS

* some more changes

* i don't know why this file went rogue

* final fixes, small name change, difficulty up (polish!)

* skog help

* EUREKAAAAAAAAAAAAAAAAAAA

* chelp

* reverts some regenerate limbs changes as they are no longer needed, fully integrates attach limb power

* minor fuck before the big fuck

* the big fuck ALMOST DONE, FINISHING TOUCHES NEEDED

* the big fuck finale

* teenie fuck ;)

* line endings

Co-authored-by: spookydonut <github@spooksoftware.com>
2020-03-05 20:49:24 +08:00
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
Bawhoppen
1f82ec544e Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-03-04 20:02:26 -06: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
Bawhoppen
d0c5d63116 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-03-02 19:30:48 -06: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
kevinz000
350b9b7a29 Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two 2020-03-01 06:50:37 -07:00
Bawhoppen
527ab502a3 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners
# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
2020-03-01 03:30:17 -06:00
Bawhoppen
11dfb9c376 addresses some concerns 2020-03-01 02:31:12 -06: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
Bawhoppen
fd5f209863 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners 2020-02-27 17:12:47 -06:00
EgorDinamit
0c0eb90c2a Merge branch 'master' of git://github.com/tgstation/tgstation 2020-02-27 22:40:42 +04: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