Commit Graph

1025 Commits

Author SHA1 Message Date
Qustinnus
0d46e6c441 You can no longer slip on fireman-carried clowns (#47000)
* trips

* yikes

* im braindead
2019-10-13 16:43:40 +13:00
kingofkosmos
280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
Rob Bailey
e1683f674f Merge pull request #46978 from willox/duplicate-variable-stuff
removed a bunch of duplicate member variable definitions and entirely duplicated types
2019-10-12 03:44:15 -07:00
William Wallace
4f8b437069 'frozen' food crafting category now works (#46970)
* ice crafting category now works

* un-murder rainbow snowcone
2019-10-11 15:46:45 -04:00
Fhaxaris
c2efff7919 Fixes my horrible mistake (#47001)
speed merge dis
2019-10-10 18:23:00 -04:00
nemvar
c38a7a3bb5 Removes a bunch of var/ in procs (#46946)
* Removes a bunch of /var in procs

* reset this

* Why wasn't this already?
2019-10-10 04:20:27 -07:00
Rob Bailey
f50eb4e3d4 neckslice logging (#46987) 2019-10-09 11:10:22 -04:00
Emmett Gaines
e6be7a1bda Cleans up dejavu component (#46935)
* cleans up dejavu component

* makes dejavu clean up properly
2019-10-09 01:50:16 -07:00
Fhaxaris
acf733db23 Adds throat slicing (#46838)
* Adds throat slicing

* Max cut time for low force objects doubled

* Adds emotes, limits to one slice at a time, fixes messages. Hopefully has no bugs
2019-10-09 01:41:36 -07:00
William Wallace
53ed029490 remove duplicate /datum/component/storage/concrete/pockets definition 2019-10-08 22:38:57 +01:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
Qustinnus
d7475b774a Fixes beauty runtimes and accidental value changes (#46945)
* fix

* fixes beauty

* epic

* fixes to typos

* unepic

* Update code/datums/components/beauty.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/datums/components/beauty.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-10-08 09:14:29 -04:00
Mickyan
a4385c7c64 sanity hud (#46805) 2019-10-07 15:54:18 -04:00
nemvar
a148cae769 Kills obj/item/projectile in favour of obj/projectile (#46692)
* Kills obj/item/projectile in favour of obj/projectile

* Resolves conflicts properly

* fixes that one map

* it lives
2019-10-06 13:37:24 -04:00
XDTM
3f00eadada Display fixes, removes cloud sync stuff 2019-10-06 13:09:26 +02:00
XDTM
105cb4304e Merge branch 'master' of https://github.com/tgstation/tgstation into ThisRULES 2019-10-06 12:13:27 +02:00
Qustinnus
26a95ac867 Re-adds room beauty without the negative moodlets (#46848)
* re-add

* epic

* fix

* epic
2019-10-05 22:47:49 -04:00
Fikou
05f0c2c1f3 adds the GRILL (#46844)
* a

* GRILL GANG

* sipp

* sip

* seep

* grug

* FSAIUGANOHNHOE

* bru

* a

* finish him

* compilies ^w^

* WOOO

* holy crap

* woo

* a

* h

* woo

* woo

* woo

* awoo

* aa

* aw shet

* heck you floyd

* at ath

* awo

* we like compiling code

* awo

* coal mat

* awoo

* aasdga

* a

* nice

* awoo

* awwoooooooooooooooooooooooo

* awoo

* spaceport bars

* grill gang

* aw

* awooo

* yee

* aw

* flod

* awoo

* awoo

* yesyesyyes

* a

* awoo

* holy sht

* h

* awoo

* awo

* aaaaaaaaa

* awoooooooooo

* awoo

* aw man

* honk

* well boys we did it

* oh mama mia

* ok cobby flushed

* awoo

* removes fun

* yeep

* i just said something

* vruh obama

* ye

* awoo

* awooooooo
2019-10-05 13:40:40 -04:00
Qustinnus
81c3d92129 Adds pick-up, drop and throw sounds for items. (#46677)
* finishes up

* adds sound volumes

* woops

* forgot to ctrl + s

* cloth

* smh

* done
2019-10-04 18:53:09 -04:00
Emmett Gaines
22564a3eaf Moves documentation from the component readme to doc comments (#46544)
Also improves some wording and structure
We never remembered to update the readme anyway
2019-09-25 18:43:43 -07:00
Firecage
69a0c5b15c Bike horns, golden horns, rubber ducks, and air horns no longe… (#46690)
* Bike horns no longer squeaks when crossed in Zero-G.

* Flying over bikehorns no longer squeaks them.

* Replaces the has_gravity() check.
2019-09-25 17:08:29 -07:00
spookydonut
8b339f7f94 creamed component (#46496)
* creamed component

* creamed no

* make use of unused sprites

* applies to all living

* params

* changes from review
2019-09-24 17:17:33 +02:00
bgare89
d89aba95d5 Fixes #46440 (#46661)
Also transfers old spears damage to new explosive spear. (Fixes plasma spears.)
2019-09-23 14:06:35 -07:00
nemvar
dc783795db Renames is_hot and is_sharp to get_temperature and get_sharpness (#46680) 2019-09-23 14:02:59 -07:00
nemvar
27dbe6cf0c Fixes proximity checks (#46652)
* Fixes proximity

* shock hand no longer calls parent

* actually lets just let it do what it does.
2019-09-22 03:03:45 -07:00
Time-Green
7aff176c9c Fixes floating point errors in plumbing (#46448)
* fixes floating point error and get_chem_id

* Fixes excessive floating point errors in plumbing

* unfucko wokie my disgusting attempt at conflict solving
2019-09-21 18:46:37 +02:00
nemvar
8cfe0f6467 Slightly improves visible and audible messages. (#46499)
* Doubtful improvement

* Switches out all the magic numbers with defines

* Thanks travis for finally finding a real error

* properly resolves some left over conflict
2019-09-18 12:52:18 +02:00
Fikou
730d96ad06 bunch of datum mats stuff mostly related to coins (#46289)
adamantine and mythril are now datum mats (mythril still admin only), adamantine has 1.5 strength buff to whatever is made out of it, mythril adds rpg loot elements to whatever is made out of it
you can now put plastic, adamantine and mythril in the autolathe and coin mint
you can now put titanium in coin mint
switches a bunch of stuff in cargo exports, including mythril and plastic being worth cash money
coin code has been changed to datum mats, the custom sprites have been lost except for antag token
2019-09-17 10:50:32 -04:00
oranges
b48ce19e54 Initial pass of documentation on components (#46493) 2019-09-16 16:44:25 +12:00
Fikou
a439c6ac37 makes the ed209 a child of securitrons instead of a horrifying copypaste (#46230)
About The Pull Request

does what says on title, becomes a securitron that can shoot people
removes ed209 cell because it doesnt do anything why does it even exist
fixes ed209 crafting using dragnets
sadly, removes lasertag mode from ed209, but ive never seen anyone use it and it made everything a lot more confusing
eds now shoot you even if youre lying down because i guess that you could rest before to avoid getting shot but im not 100% sure
Why It's Good For The Game

fixes tons of horrifying copypaste
also fixes some minor things
Changelog

cl
del: Lasertag EDs have been removed
code: EDs are now not a horrifying mess of copypasted securitron code
balance: EDs now still shoot you if you're lying down
tweak: you no longer need a battery to make an ed209
fix: fixes ed209 crafting using dragnets instead of disablers
/cl
2019-09-16 16:33:19 +12:00
Unknown
df76d0dbb2 slip 2019-09-14 22:56:28 +02:00
Qustinnus
9812834054 Adds knight armour to the game that can be made from any material (#46301)
* Adds knight armour

* fixes armor

* nerfs & fixes

* adds ruin

* done

* bug

* oh im a buddy

* rad

* ok nem

* fix sprite

* fixes

* tgm

* epic

* re-adds icons

* fixes list

* ok ninja

* fixes

* fixed

* woops
2019-09-14 15:32:29 -04:00
Fikou
259ebdcc5d makes bonespear a child of spear and MAKES THE DAMAGE MORE CONSISTENT (#46467)
* who did this

* boner

* a

* a

* hhhhhhhhhhhhhhhhhhhhh

* a

* a

* Update recipes.dm

* hhhh
2019-09-13 18:36:10 -04:00
Krysonism
747b73a824 October comes early! Revolutionary art and bust. (#46163)
* Marx bust + rev art component

* Fixies

* -f
2019-09-12 12:43:05 +02:00
nemvar
56899a5976 Applies arglist memes to mood events. Also fixes some bugs (#46325)
Renames mood_event.dm to _mood_event.dm so it's at the top of the folder. Very cool.

You can now apply an almost infinite amount of extra parameters to mood events. This is currently only used for one thing but could easily be expanded.

The owner of the mood_event is now the parent of the mood component and not the component itself. The typing of the variable and the way it is used in that one place suggests that this was intended behaviour. This fixes a bug where cats weren't wagging their tail when getting tabled.

mood_event's now null their owner on Destroy.
2019-09-09 10:05:12 -04:00
Unknown
2ef1435af8 fixes it with real testing 2019-09-08 18:22:44 +02:00
Qustinnus
8599d84d1d The science department now gets a mood bonus for petting borgs. (#46296)
* adds mood event for petting borgs

* oranges suggestions

* indented too far

* woops

* ok unit test chill out
2019-09-08 03:34:02 -07:00
Time-Green
d81e1fab5c Plumbing Splitter, reaction chamber, destroyer and pill press (#46149)
* chemical splitters

* adds the pill press

also removes a debug variable from the splitter used for getting the perfect ui size

* chem disposer

* half a reaction chamber

i forgot to fucking merge upstream so I cant do anything without making ungodly conflicts

* wip

* more work on the reaction chamber

* fixes big brain maths

* removes one / because travis is throwing a shitfit
2019-09-02 23:52:29 -07:00
bgobandit
c606522bec Non-tagger graffiti counts as bad art (and other art adjustments.) (#46248)
About The Pull Request

    Non-taggers' graffiti counts as bad art. Taggers' graffiti counts as good art, not great art.
    Makes the art defines global defines and removes some magic numbers.
    Re-orders the switch statement for art to go ascending instead of descending, because otherwise if something is at BAD_ART it will register as good instead, if it's at GOOD_ART it will register as great, etc., which defeats the purpose of having defines.

Why It's Good For The Game

The tagger component: Because there isn't really much bad art in the game ,and graffiti is as obvious a candidate as any, and gives the janitor an actual excuse to remove it besides being a dick. If you don't want the potential for a bad moodlet, don't examine the art. You have to go out of your way to do so anyway.

Very slightly nerfing tagger graffiti: Because "what a thought-provoking piece of art" is kind of much for graffiti.

The other component: Because there's no point in having defines if people are just going to put magic numbers everywhere anyway. (I left the impressiveness numbers for statues, etc. alone, because those can take damage, dropping their quality. But if something can't take damage, just use the define.)
Changelog

cl
tweak: Graffiti by a non-tagger counts as bad art.
/cl
2019-09-02 09:17:41 +12:00
TheChosenEvilOne
2d93a013d6 Motorized wheelchairs (#45737)
* Motorized wheelchairs

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* bruh

* woah

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Upped the power usage to 100.
With 15000 power cell you can move 600 turfs with tier 4.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Assign the variables directly instead of temp var.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Motorized throwing machine.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>

* Motorized reviews.

Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
2019-09-01 02:02:40 -07:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
kingofkosmos
df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
nemvar
91c146a00e Crafting can now pull stuff from your pockets and also put it into your hands. (#46045)
That's pretty cool right?
2019-08-24 01:08:58 -07:00
Rob Bailey
d18925fb41 Merge pull request #46084 from AnturK/runtime_β
Fixes boh dumping runtime
2019-08-23 16:31:24 -07:00
nemvar
66f17ecd57 Fixes thermite on reinforced walls. (#46089) 2019-08-23 16:30:26 -07:00
AnturK
a6232420de Fixes boh dumping runtime 2019-08-22 14:12:04 +02:00
nemvar
1d866977ba Changes thermite (#46020)
* Nerfs thermite

* Adjusts those numbers.

* Reinforced walls now need 50 units.
2019-08-21 10:19:02 -04:00
Rob Bailey
024932eaee Merge pull request #46008 from nicbn/quiet-quiet-now-you-are-on-the-doorstep
Walking now makes no footstep sound, and xeno footsteps are louder
2019-08-21 01:17:52 -07:00
nemvar
1ec07b1508 Fixes that pesky dumping issue (#46025) 2019-08-21 01:08:36 -07:00
PKPenguin321
898f544414 [Ready] Adds a Shrink Ray (#45387)
About The Pull Request

    It adds a shrink ray that has 5 shots, can be recharged, has unique (coder)sprites, and has a cool sound
    Shoot a thing with the shrink ray to make it small. Anything can be shrunk except floors
    Shrunken things grow back after a couple seconds, might adjust this
    Small things will not block vision and can be walked over (this includes walls)
    Small people won't fit into their clothes and will drop all their stuff (or rather, their stuff will drop off of them). They also can't move very fast, and take 2x damage while shrunk.
    Preview video here

Why It's Good For The Game

It's really goddamn cool
Changelog

cl PKPenguin321, Fury McFlurry
add: A shrink ray for abductors that they can buy at their console for 2 experiment points. Anything can be shrunken, and shrunken things can be walked over/seen past (for example, you can shrink a wall and then walk around it). If a human is shrunk, they will drop all of their belongings, move slower, and take 2x damage.
imageadd: Shrink ray sprites by Fury McFlurry. Thank you!
/cl

I intend to add it as a thing abductors can purchase but am putting it up now for code review and if anybody has any other ideas on good thematically fitting places to put it.
2019-08-21 11:50:38 +12:00