Commit Graph

6066 Commits

Author SHA1 Message Date
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
Urumasi
6e7801550b Moves reagent fill code and adds caps to plastic water bottles (#46878)
* Adds caps to plastic bottles

* Non-crafted water bottles now spawned closed

* Added warning message for closed bottles, fixed minor bug

* meme

* Makes the warning only show up when doing valid actions with the bottle

* Clumsy people now have a chance to lose the cap

* Fix small bottle's cap when fallen over, bottles now turn upright when opened on the floor

* Add a minor positive moodlet on bottle flip

* Adds a relic lavaland water bottle that always lands upright

* Moves container fill overlay to reagent_containers, changes glass/beaker/waterbottle to glass/waterbottle

* Make actions with closed cap early return

* Minor code cleanup
2019-10-09 12:05:52 -04: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
3daea05e2a remove duplicate definition of /obj/screen/alert/status_effect/regenerative_core's name var 2019-10-08 22:47:38 +01:00
William Wallace
061b2558ea remove duplicate definition of /datum/mutation/human/shock's locked var 2019-10-08 22:44:47 +01:00
William Wallace
8d658d1d90 remove duplicate definition of /datum/mutation/human/hulk's locked var 2019-10-08 22:43:38 +01:00
William Wallace
53ed029490 remove duplicate /datum/component/storage/concrete/pockets definition 2019-10-08 22:38:57 +01:00
William Wallace
b06f2cec11 remove duplicate /datum/map_template/shuttle/cargo/box definition 2019-10-08 22:33:16 +01:00
William Wallace
6c3278e712 merge duplicate /datum/map_template/shuttle/cargo definitions 2019-10-08 22:28:33 +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
Rob Bailey
b4c34c8b58 Tabling Rework (#46383)
* nutable

* more damage

* halved time

* louder + slightly different sound

* head slam + nerfed table damage

* martial art breaks table + headsmash damages table

* stamina boost to headsmash

* functional table crushing
2019-10-06 19:26:12 -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
ATH1909
9e6950888d Advanced virus infection vector changes (#46730)
* Update advance.dm

* Update cough.dm

* Update cough.dm

* Update sneeze.dm

* Update disease_abilities.dm

* Update genetics.dm

* Update advance.dm

* Update sneeze.dm

* Update sneeze.dm

* Update cough.dm

* Update genetics.dm

* Update genetics.dm
2019-10-06 13:35:27 -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
Tony
404a7da996 Fix a couple typos (#46880) 2019-10-05 13:12:08 -07: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
81Denton
98cafaaed2 Adds antag datum to transformed morphs (#46864) 2019-10-04 14:23:52 -04:00
Qustinnus
61bf8d7cd3 Fixes the roulette wheel (#46853)
* fixes roulette

* woops

* gotem
2019-10-04 14:22:33 -04:00
ATH1909
4d795b8fb4 Update genetics.dm (#46748) 2019-10-03 02:19:33 -07:00
nemvar
daffaefb71 Switches out the three billion args of electrocute act for flags (#46564)
* Switches out the three billion args of electrocute act for flags

* Adds autodoc to electrocute flags, sets the boolean I removed and tries to fix the ed209 file

* tries to fix ed209 again

* Fixes 209 hopefully

* Finally fixes that darn file

* one final one to fix the diff

* Or i guess i'll just do it myself
2019-10-02 23:14:19 +02:00
AnturK
b9e84d8946 Makes digital camo hide you from ai huds (#46814) 2019-10-02 12:19:36 +02:00
Urumasi
a6052138a9 Tweaks the iscatperson() helper to be in line with other helpers (#46771)
* Fixed iscatperson() helper

* Renamed iscatperson() to isfelind()

* Fixed bug after working on out of date branch

* Fix spelling mistake
2019-10-01 09:34:41 +02:00
ATH1909
484728b311 ATHATH touches disease code (and symptom code too, but that's normal) (#46774)
* Update symptoms.dm

* Update oxygen.dm

* Update heal.dm

* Update oxygen.dm

* Update heal.dm

* Update heal.dm

* Update symptoms.dm

* Update advance.dm

* Update advance.dm

* Update advance.dm

* Update symptoms.dm

* Update disease_abilities.dm

* Update advance.dm

* Update disease_abilities.dm
2019-10-01 09:03:21 +02:00
Names Are Hard
057be7fdf2 Adds phobias as roundstart quirks (#46524)
* Phobia as quirk

* Changed value

* Valueless again

* Moved to neutral

* Actually gives trauma roundstart
2019-09-27 00:26:51 -07:00
moo
894a6e6ed7 Cobbduceus 1.2/X; Sanguibital is replaced with Helbital, A C2… (#46426)
* bye

* reaction

* totally a feature

* b

* dark purple

* haha don't worry im just going to not test num 2 define haha

* comment

* > static'ing a list that is 1 in a million

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

* amp healing

* thing to bin
2019-09-25 18:47:32 -07: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
210ba5c571 Adds linting for equipped() pickup() dropped() (#46614)
* lint some inventory procs

* lineends

* f

*  line end

* lineend

* fuck

* changes per review
2019-09-25 02:31:29 -07:00
Rob Bailey
7d7a1e72d9 Gun sound revamp (#46689)
* shitload of new sounds

* dme fix

* file fixes

* more file fixes

* more file fixes

* volume tweaks + better pistol sounds

* more new sounds + no through walls suppressed

* better suppressed

* more work

* pistol handling sounds

* small tweaks
2019-09-24 18:01:27 -04:00
kingofkosmos
9a91a408e1 Personal combat messages (#46388)
* Makes all combat involved visible_messages in species.dm ignore user and adds a new to_chat-message for user alone.

* Adds personal combat messages to martial arts.

* Adds personal combat messages to most things, like monkeys, aliens, humanoids and silicons.

* Fixed message to bite src, not self

* Fixed message to attack src, not self

* Changes wording on miss-messages.

* Adds audible messages to visible_messages. Also adds few missing to_chats.
2019-09-24 17:46:47 -04: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
ATH1909
b155ac49b8 Fixes the narcolepsy symptom (#46684)
* Update narcolepsy.dm

* Update confusion.dm
2019-09-24 08:23:55 -04: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
William Wallace
ed9f8a265b Revert "Give blood brothers traitor HUD (#45295)" (#46562)
This reverts commit c914d556c1.
2019-09-20 15:12:05 -07:00
Surrealaser
2c50f842ba Medborg Crew Monitor Upgrade (#46598)
* Medborg Crew Monitor Upgrade

Adds the crew monitor to medborg upgrades.

Why This is Good for the Game: The important second part of the crew pinpointer; as a result, medborgs no longer have to glue themselves to fixed crew monitor consoles in order to do the paramedicine job they excel at, which is boring and lame.

* Update

Revised per request so that the crew monitor upgrade is integrated with the pin pointer.

* Debug removal

* Verb removal
2019-09-20 10:00:12 -04:00
Qustinnus
20397d59f1 [READY] Roulette wheels (#46418)
* Basic roulette interface

* at least it compiles

* roulette

* fixes jackpot sound

* beacon

* epic

* push

* Update code/game/machinery/roulette_machine.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* sprites and more audio

* color

* Woops

* epic

* wires

* sprite

* Nya mergies pwease OwO (#17)

* Moves style to .styl

* test

* Fixed

* da real shiet

* fix

* fix

* fixes

* woops

* assets

* stop github stop

* fix

* static

* nya (#18)
2019-09-20 12:21:49 +02:00
ATH1909
eaa00b8744 Reworks the DAS symptom (#46347)
* Update genetics.dm

* Update dna.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update dna.dm

* Update genetics.dm

* Update genetics.dm

* Update dna.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update genetics.dm

* Update dna.dm

* Update genetics.dm

* Update code/datums/diseases/advance/symptoms/genetics.dm

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

* Update genetics.dm

* Update genetics.dm

* Update dna.dm
2019-09-20 09:59:54 +02:00
Mike Long
582c7923a7 Sleeping is now improved if you have a bedsheet. Sleeping also now helps recover stamina regardless of injury level. (#46550) 2019-09-18 12:11:33 -04: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
ShizCalev
6aab8e1be6 Removes references to removed miracle ruin (#46565) 2019-09-17 16:02:54 -04:00