Commit Graph

107 Commits

Author SHA1 Message Date
Chubbygummibear
4cf04e9dad Ports TG's eye contact: social anxiety harder, get caught staring at your obsession target, and new quirk Shifty Eyes (#14258)
* eyeeyeseyes

* updated
2022-06-04 16:05:57 +01:00
tattax
c278cf30cf moves atom/target in do_after() forward (#14161)
* wowzers

* s2

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>

* s3

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>

Co-authored-by: Maxim Nikitin <mnmaxim@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-05-30 21:25:59 +01:00
LatteKat
9c8572a3be fixes some lint warnings (#13773)
* fix lint

* argh
2022-04-21 14:13:50 +01:00
SapphicOverload
fad8cbfd63 Makes mindbreaker toxin actually work against reality dissociation syndrome (#13674)
* Makes reality dissociation syndrome a brain trauma

also makes mindbreaker toxin not cause hallucinations if you have it

* Update toxin_reagents.dm
2022-04-17 03:44:29 +01:00
Notamaniac
1ae2907a0a Ports split personality commune (#13048) 2022-01-12 17:46:12 +00:00
HugeBalloonGodGamer
ad02bba9b9 Make ineloquent quirk less strict and more variable (#12574) 2021-11-14 17:51:01 +00:00
Redmoogle
1074be5011 Cleans up some do_after calls (#12417)
* Replaces do_after delays with defines instead of deciseconds

* Fixes Text
2021-10-09 01:18:35 -04:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Theos
26191754f1 Ports wounds from TG (#11955)
* piss

* second set of files

* theos feels pain and dies

* code works lmao

* other stuff

* YES YES YES

* Update zombies.dm

* egg

* whoops

* bubblegum alt attacks won't wound

* bone hurting juice hurts bones

* something's fucky wucky

* humans are no longer blue space babes but projectile damage is still wack

* IT WORKS???????

* other stuff

* turns out im big brain and already handled that should be testable live now

* WHOOPS

* medical pens not in stupid area

* fix regen mesh icons

* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit

* should help

* mapping problem

* fix monkies shitting out blood all the time

* going to remove examine_more being stupid

* this is stupid i think it works though

* Empty commit, more bad code

* this probably fdixes something

* buckshot buffed back to where it should be

* woundings

* missed this one

* fix gamebreaking bug

* turns out damaging ANYTHING causes suit sensors to break whoops

* stuff up to limb disable refactor

* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades

* Update burn_dressing.dm

* wtf

* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less

* burn debriding uses the scalpel rather than the hemostat

* debriding for patch/treat no longer causes wounds

* Give syndicate medical cyborg a bonesetter

* like 5 more prs ported

* fixes burn ointment and mesh application not having a progress bar

* gamemode zombies get easydismember and easily wounded

* managed to screw up self cautery this fixes it

* carbons can't use check self for injuries but humans can

* honey gives +2 sanitization to burns

* re-add this if sensors get fixed

* should fix a runtime I made on accident when trying to make examine more less jank

* last 2 prs and some holdup fixes since these touched on that

* set target = src so the progress par shows up i think

* Update mutations.dm

* fixes twohanded reuqired weapons by reverting some change I don't understand

* fixes blood sprites

* actually properly fixes the thing

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-11 13:19:11 +01:00
Kaithyl
a950852ee7 Adds new quirk that gives an unremovable version of Expressive Aphasia. (#11956)
Also edited Expressive Aphasia brain trauma to give more leeway to words with 4 letters or less.

Quirk name, trait values and text are essentially placeholders and should be adjusted to fit mechanical balancing/lore.
2021-08-14 13:21:03 +01:00
ynot01
1829449bf6 a couple mrat changes (#11951) 2021-08-07 11:46:29 +01:00
TheGamerdk
cbb6dbff36 Update mrat.dm (#11894) 2021-07-29 23:10:49 -04:00
ynot01
3acf2a391c mrat (#11876)
* initial commit

* fixes a whole buncha things

* changes proc to verb

* fixes a bunch of other things

TESTED AND WORKING

* humans only

* more things see desc

adjusted verb name & other things referencing the rat, let the rat pseudo-point, made the rat squeak whenever it talks, added a check for if someone already has an mrat

* mcolor

* radial appearance options, more adjustments
2021-07-24 12:43:02 +01:00
adamsong
45e9fdcce8 Fixed ghosts always hearing imaginary friends (#11646) 2021-07-01 10:33:48 +01:00
Jamie D
0ceb3a8eff Revert "Sound Environments - Adds reverb and echos to rooms (#11106)" (#11441)
This reverts commit 7e98769cf0.
2021-05-01 18:10:41 +01:00
swissloaf
7e98769cf0 Sound Environments - Adds reverb and echos to rooms (#11106)
* Updates header.html

fuck

* asd

* nice

* Echo

* Update sound.dm

* Update Space_Station_13_areas.dm

Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-04-25 11:11:44 +01:00
Theos
01ce433f46 fix obsessed not tracking cloned people (#11122) 2021-03-16 09:23:11 -04:00
Theos
2028916840 Changes how the push for actually using anesthetics works so it's more intuitive (#10949)
* merge upstream

* reworks how anestheticless surgery damage is dealth

* WE FORGOT THE CHEESE GROMMIT

* borgs don't have to deal with this since they are special snowflakes

* add ikmmunity for abductors

* Update surgery_step.dm

* Update surgery_step.dm

* reduction > modify since chems may be added that increase chances of screwups

* Update surgery_step.dm

* Update surgery_step.dm

* analgesia case

* tenacity case

* Update surgery_step.dm

* Update healing.dm

* Update healing_surgeries.dm

* Update remove_embedded_object.dm

* Update plastic_surgery.dm
2021-02-13 16:18:45 +00:00
Theos
c9a6bc9ed6 fix bluespace prophecy working on cc (#10907)
* fix bluespace prophecy working on cc

* Update special.dm
2021-01-23 11:46:18 +00:00
Jamie D
b80a77572d Fixes Runechat runtimes and Adds Singing And fixes lots of other runtimes (#10325)
* E

* More runtimes

* Fucking i(n)dent I swear
2020-11-05 20:25:37 +00:00
Jamie D
e9c958fb11 Revert "Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler"" (#10254)
* Revert "Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)" (#10252)"

This reverts commit c936816e14.

* FIXES NO BUTTON PRESS BS
2020-10-29 22:15:01 +00:00
Jamie D
c936816e14 Revert "TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)" (#10252)
This reverts commit 38f3174826.
2020-10-29 19:54:16 +00:00
Jamie D
38f3174826 TG performance tweaks - oh-god-please-kill-me-edition ASYNC / SLEEP BAD / Profiler (#10207)
* Im sleepy

* Reee

* oopsie Linter go brrrr

* Update code/datums/components/storage/concrete/bag_of_holding.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>

* Update code/controllers/subsystem/air.dm

Co-authored-by: Nichlas Pihl <nichlas00100@gmail.com>
2020-10-29 19:28:57 +00:00
Redmoogle
a200e8af1a Silenence MGamer (#9816) 2020-10-17 12:21:51 +01:00
TheGamerdk
e056d9a1f1 Ports Runescape Chat bubbles from TG-station (#8293)
* Working

* 512

* Hacky AF 512 workaround, revert if 513 update

* 512 fix

* Update layers.dm

* PLANE GO CRASH

* Revert "512"

This reverts commit 024f7adfe3.

* Revert "512 fix"

This reverts commit 0efdc42688.

* Revert "Hacky AF 512 workaround, revert if 513 update"

This reverts commit 569987d66f.

* f

* -f

* Revert "-f"

This reverts commit aadad7b75d.

* Revert "f"

This reverts commit 0e4368ecee.

* reverts darkness

Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
2020-05-02 09:38:36 -04:00
alexkar598
2333d64f09 Adds support for 513(and unicode), additionally drops supports for 512 in the process and updates dreamchecker(turdis) and casually fixes about 90 bugs in the codebase (#8324)
* Cherry picks the unicode part 2 PR from TG

* Things

* drop 512 support

* TAN --> tan

* Manually does the things that was in renamed files

* CLAMP --> clamp

* ismovableatom -> ismovable

* bugfixes, tg is bad

* Ports sanitize_name

* Bumps checks

* Fixes new linter errors (#48126)

About The Pull Request

This fixes the errors raised by the new feature I'm adding to the linter: SpaceManiac/SpacemanDMM#119

* Update SpacemanDMM suite to 1.2 (#48785)

* Update SpacemanDMM suite to 1.2

* Fix new lint errors

* Removes unreachable code (#48143)

About The Pull Request

As detected by SpaceManiac/SpacemanDMM#123

* casually fixes 50 bugs

* stoopid evil dreamchecker

* stoopid evil dreamchecker

* stoopid evil dreamchecker

* almost the same thing

* Makes all UIs UTF-8

* Fixes bugs

* Fixes runtimes, some related to 513, some not

* Fixes agent ids

Co-authored-by: MrPerson <spamtaffic@gmail.com>
Co-authored-by: alexkar598 <>
Co-authored-by: spookydonut <github@spooksoftware.com>
2020-05-02 00:43:42 -04:00
Nichlas Pihl
3d4e6dccb6 More tgui-next (#7383)
* Tgui-next pandemic (#48074)

* pandemic

* rebuild

* flatten object

* use the correct var derp

* lint fixes + rebuild

* Rebuild tgui

* Tgui-next pandemic (#48074)

* pandemic

* rebuild

* flatten object

* use the correct var derp

* lint fixes + rebuild

* Rebuild tgui

* tgui-next portable atmos (#48081)

* portable atmos stuff

* better titlecase handling

* Rebuild tgui

* Update tgui dependencies, improve window dragging (#48213)

* Update tgui dependencies

* Rework window drag and vectors

* Refactors language holder (#48106)

* Language holder refactor

* Ironed out bugs, testing

* adds sourced language, blocking list. more useful helpers.

* Replaced old usage

* Adresses requests

* Autodoc attempt #1

* Fixed monkeyize (again)

* Travis happy

* Language menu updated

* Final pass

* durrrr (#48329)

* Refactors language holder (#48106)

* Language holder refactor

* Ironed out bugs, testing

* adds sourced language, blocking list. more useful helpers.

* Replaced old usage

* Adresses requests

* Autodoc attempt #1

* Fixed monkeyize (again)

* Travis happy

* Language menu updated

* Final pass

* lol

* lol2

* lol

Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2020-01-02 16:03:14 +01:00
alexkar598
89db3cd18b Fixes #6775 2019-10-11 18:02:47 -04:00
Nichlas Pihl
fdc28d1993 Update imaginary_friend.dm 2019-08-17 19:23:26 +02:00
vuonojenmustaturska
48fc27a463 Replaces hear_intercept with signals, refactors MOVABLE_HEAR, touches up nanites and to_chat (#44391)
hear_intercept is removed in favor of having the things that care register for the COMSIG_MOVABLE_HEAR signal instead.

The signal has been changed to be like the speech one with an args list.

Nanite datums no longer register for the hearing signal just in case, only the voice sensor nanite program does.

Dead code has been removed from to_chat, the savefile/sound checks being just-in-case boilerplate checks made during the conversion to to_chat, the replacetexts sidestepping a byond bug that was fixed in 512.1420.
2019-07-15 17:27:21 +02:00
ShizCalev
a782f7996c Merge pull request #44663 from XDTM/CtrlAlertMind
Hypnosis and Abductor mind control now have alerts
2019-06-20 23:13:12 +01:00
Ling
af5963d681 Merge pull request #5938 from yogstation13/upstream-merge-44591
[MIRROR] Makes beepsky smash less real
2019-06-20 14:08:15 +02:00
Ling
035b2999d8 fix conflict 2019-06-20 13:50:58 +02:00
yogstation13-bot
50f60740fd Fixes obsessed not respecting player preferences 2019-06-18 21:27:18 +01:00
yogstation13-bot
95e43cbc23 Makes beepsky smash less real 2019-06-18 17:05:08 +01:00
fluffe9911
bd22041d92 Merge branch 'master' into upstream-merge-44320 2019-06-13 14:32:14 -04:00
Joe Schmoe
c2a442a926 New brain trauma: expressive aphasia 2019-06-12 23:37:22 +02:00
fluffe9911
5542f7d1a4 ok 2019-06-11 19:45:29 -04:00
yogstation13-bot
2b0890dc82 [MIRROR] Fixes autophobia. (the fear of oneself) (#5805) 2019-06-11 07:24:32 -05:00
Joe Schmoe
a4bd03cab5 Gets rid of the GetComponent macros 2019-06-08 22:21:00 +02:00
yogstation13-bot
db2a973fb8 [READY] Cleans up saycode by removing random hook stubs and using a signal where relevant 2019-06-06 07:33:20 +01:00
Gary Lafortune
c64fdcd6d4 REGEX REPLACE! /([\w\.]+)\.has_trait\(/ -> /HAS_TRAIT(\1, / 2019-06-01 20:55:36 -05:00
Gary Lafortune
68d6a815a9 REGEX REPLACE! /([\w\.]+)\.remove_trait\(/ -> /REMOVE_TRAIT(\1, / 2019-06-01 20:54:11 -05:00
Gary Lafortune
108ffdd4d2 REGEX REPLACE! /([\w\.]+)\.add_trait\(/ -> /ADD_TRAIT(\1, / 2019-06-01 20:52:22 -05:00
yogstation13-bot
c51d3d6e79 [MIRROR] Adds "Never for this round" to a few more ghost rolls. (#5632)
* Merge pull request #44197 from kriskog/spamspamspam
2019-06-01 18:47:41 -05:00
Tlaltecuhtli
824291bd4e [ready] beepsky smash change (#43228)
* 1

* 2

* 3

* temp

* r

* rogue space

* e

* e

Co-Authored-By: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>

* restarts appveyor
2019-03-25 17:03:22 +01:00
tralezab
852ad6c92f [READY] dilutes the staff of chaos pool with some more bolts (#42719)
* staves

* projectiles

* sapped event

* last of the staves (need to sprite and get sounds)

* last of the projectiles

* Squash is a single-use plant in Plants vs. Zombies and returns as a premium plant in Plants vs. Zombies 2.

* removes staff of cooperation, adds fly magic status effect

* a couple things with flight + tweaks

* removes old bolts/staves, finishes and adds parts of the new set

* fixes

* fetching + flying fixes, added chill and wipe

* and done

* cobblestone's review
2019-03-14 12:35:17 +01:00
tralezab
0f69bc4a8e Creep fluff completely rewritten (#42675)
* hang in there!

* Apply suggestions from code review - rewrite P1

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>

* most creep > obsessed - rewrite P2

* removes creep_inlove, last edit to greet
2019-03-14 12:25:32 +01:00
yogstation13-bot
484b933123 [MIRROR] Hypnosis code improvements (#4591)
Hypnosis code improvements involving how it does the regex
2019-02-26 16:47:56 -06:00
coiax
6f836a9e2b Traumas are copied when a person is cloned (#41852)
* Traumas are copied when a person is cloned

🆑 coiax
add: When a person is cloned, any mental traumas are cloned as well.
/🆑

If the cloner is going to recreate your delicate personality, it's going
to have to recreate anything wrong with your brain as well. After all,
where does one greytider's legitimate fear of security end, and another
one's irrational fear begin?

Essentially, traumas could be easily gotten rid of by cloning, or death
would rob a person of a rare positive trauma. Now you're stuck with them
until you get rid of them.

* Suggested changes
2019-02-01 12:00:17 +01:00