Commit Graph

46042 Commits

Author SHA1 Message Date
Nirnael 2509decbc9 Fix tourettes function overload (#42592) 2019-02-01 12:25:35 -05:00
Hathkar 76e17b18c6 Nerfs Speed Potion (#42447)
* Capped slowdown to 1 for applying speed potion to vehicles.

* Update xenobiology.dm

Modified the movement delay to match the config on the servers.

* Update xenobiology.dm

Adjusted back to 1.0

* Update xenobiology.dm

* Update xenobiology.dm

Speed potions applied to vehicles now make them 15% faster than a normal running person, unless that vehicle was already faster than a running person.

* Update xenobiology.dm

Now with correct numbers.

* Update xenobiology.dm

Updated to pull from the config's vehicle speed.

* Update code/modules/research/xenobiology/xenobiology.dm

Co-Authored-By: Hathkar <30916002+Hathkar@users.noreply.github.com>

* Update code/modules/research/xenobiology/xenobiology.dm

Co-Authored-By: Hathkar <30916002+Hathkar@users.noreply.github.com>
2019-02-01 11:47:13 -05:00
Jack Edge 5f3be2a50a Merge branch 'master' into seperate-job-files 2019-02-01 08:37:19 +00:00
tralezab c967f674ad fixes borg wheelchair sanic speed (plus the whip) (#42602)
* SKRRRRRRRRRRRRRRRRRRRRRRRRRT

* VRRRRRRRRRRRRRRRRROOOOOOOOOOOOO

* rrrrrrrrrrrrrrrrrrrrrrrrrrrrr    RRRRRRRRRRRRRRRRR (checks on whip removed)

* Apply suggestions from code review

elegant changes

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

* thbahtegegarf

* whoops

* ebhfbfaaetbfheabhehaetjyr
2019-01-31 16:56:05 -05:00
Jordan Brown 5491bbd884 Merge pull request #42600 from actioninja/MYBONES
Make bone hurting juice less shit
2019-01-31 10:57:26 -05:00
4dplanner f37a7dc8f8 Unremoves cloning (#42609)
* Unremoves cloning

* Fixes indentation

* Removes 0
2019-01-31 08:47:47 -05:00
oranges 61f7ee1357 Revert "adds handholding"
This reverts commit 106937961c.
2019-01-31 07:05:04 +00:00
oranges f6f2f09867 Merge remote-tracking branch 'nervere/patch-1' into upstreamasterunsafe 2019-01-31 07:04:51 +00:00
coiax 2ed34af9c0 Adds Paraplegic quirk (#42503)
🆑
add: Adds the Paraplegic quirk for -3 points. You start with unhealable leg paralysis
(persists through cloning), and have a wheelchair to move around the station.
/🆑

This is really popular for some reason.

This required a surprising amount of small code tweaks for it to "feel"
right in edge cases like being a job that had items in their hands or
joining on the arrivals shuttle.

Justification for -3 points: You move REALLY slowly, in a game that's
about generally running from security/the guy with the esword. And if
you die and get cloned and don't have your chair, you move even slower.
2019-01-30 12:08:54 -05:00
coiax e65e50e8d9 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-01-30 11:36:20 -05:00
Jordan Brown 84a1b0cd6c Merge pull request #42586 from 4dplanner/antimagic
Antimagic works again
2019-01-30 11:33:48 -05:00
nichlas0010 3ec4eb619f [s] disables the Middle Mouse Button exploit (#42594)
* disables the MMB exploit

* Adds a config option to set a minimum build, with the recommended minimum build for 512 users being 1421

* readds the post-block detection, and changes MMB -> Middle Mouse Button

* Makes it the standard, I guess

Co-Authored-By: nichlas0010 <nichlas00100@gmail.com>

* Update client_procs.dm
2019-01-30 11:07:45 -05:00
py01 d6ff345460 Blood magic fixes (#42469)
* Replaces magic numbers with defines in blood magic code. Fixes twisted construction damaging on fail.

* Reclarifies blood rite option selection.

* Update blood_magic.dm
2019-01-30 10:06:40 -05:00
actioninja 894062efb5 less shit 2019-01-30 04:59:54 -08:00
tralezab 1733858ba8 [Ready] Happiness drug overdose has special mood icons, badass syndies get sunglasses on their moodlet, creeps get heart eyes (#42502)
* mood_event.dm

* runaway - kanye west

* didn't take forever debugging how nice

* fixes and sanity

* moods are fun
2019-01-30 22:44:54 +11:00
Jordie dc4933012a Merge pull request #42464 from BuffEngineering/forth-times-the-yeah
Adds welding hardhats
2019-01-30 22:35:53 +11:00
Jordie 3aa1c0396e Merge pull request #42585 from ShizCalev/hardsuit-contamination-fix
Fixes suit storage units not clearing out radiation for built-in hardsuit helmets and jetpacks.
2019-01-30 22:00:07 +11:00
Jordie 90cf55d65b Merge pull request #42579 from Hathkar/patch-1
Nicotine Nerf
2019-01-30 21:54:31 +11:00
monster860 5fdfcbd1a2 Prevent admins from setting the "bounds" var (#42534) 2019-01-29 23:39:48 -08:00
pubby 2d37bde715 Drop "universal" from the suppressor name. (#42574)
It's incompatible with lots of guns so the name is misleading.
2019-01-29 23:34:15 -08:00
Nirnael 812adf7cc0 Fix another dirty boy null pointer (#42591) 2019-01-29 23:32:08 -08:00
py01 1102ee8037 Add sound effect to bola throw hit (#42575) 2019-01-29 23:15:12 -08:00
Erik 9699ff0db0 You can no longer open podsafes in blue/green with alt click. (#42571) 2019-01-30 01:35:17 -05:00
nervere 106937961c adds handholding 2019-01-29 21:04:31 -05:00
ShizCalev 97fb5adee6 Fixes suit storage units not clearing out radiation 2019-01-29 20:03:03 -05:00
4dplanner 7ad8fa48c6 ?. 2019-01-29 18:34:48 +00:00
Rob Bailey 08afd120f4 [Ready] Smoker and Junkie Quirks (#42477)
* drug quirks

* more work on junkie trait

* more druggie work

* work pls

* make the junkie trait actually fucking work and not runtime

* fix the smoker quirk

* fix capitlization on the reagent containers

* refactored

* less shitcode

* fix errors

* add meth and crank since it's 0.5u

* fix dupe chem + fix addictions list being loaded with null

* relapse mechanic

* have addiction applied on spawn again

* remember to compile kids

* some logic error corrections

* fix another logic error resulting in relapses never triggering

* fix the logic error that I thought I fixed to begin with but accidentally made worse

* I really have the fucking dumb right now.

* reset the addiction when it's readded

* better syntax for list addition

Co-Authored-By: actioninja <actioninja@gmail.com>

* suggested changes

* better new syntax

Co-Authored-By: actioninja <actioninja@gmail.com>

* turf var

* correct syntax error

* renamed vars

* announce proc instead of hacky logic

* clearer logic refactor

* increment operator

Co-Authored-By: actioninja <actioninja@gmail.com>

* make it actually compile

* no null patrol

* fix accessory spawning

* fix runtime from the reagent list being full of instances apparently

* buff pill contents so they actually satisfy addiction

* adds cigars to the smoker spawn pool

* I think this is what cyber means?
2019-01-29 10:11:13 -05:00
Jordan Brown 5f887403be Merge pull request #42563 from Time-Green/oopsie-woopsie
Makes snow tiles not kill everything
2019-01-29 09:54:45 -05:00
4dplanner 7a707d3c8f ! 2019-01-29 13:11:04 +00:00
Jordie 37d1055705 Merge pull request #42552 from Kierany9/bugfix
Assimilation radar bugfix
2019-01-29 23:49:31 +11:00
Jordie 8019c76bd5 Merge pull request #42560 from ShizCalev/cleanbot
Cleanbot now cleans up salt and plant smudges
2019-01-29 23:40:45 +11:00
4dplanner 89ded4fc4d Antimagic works again 2019-01-29 12:40:02 +00:00
Hathkar ad01090438 Nicotine Nerf
Reduced stun reduction from -20 to -5. -20 is equal to adrenals and ephedrine.
2019-01-28 22:39:30 -05:00
zxaber 96190eef88 Allows mechas to turn in strafe mode if the user holds Alt (#42516)
* Update mecha.dm

* Actually I should use do this like everyone else

* Edited the Strafe button mouse-over text

Now says "Toggle Strafing. Disabled when walk intent is set (or Alt is held)."

* It's less fucky now

* Re-changed mouse-over text

* Request by ShizCalev

Looks good to me

Co-Authored-By: zxaber <37497534+zxaber@users.noreply.github.com>
2019-01-28 21:57:52 -05:00
4dplanner 3104cd0382 Adamantine armor sets flags_inv correctly (#42564) 2019-01-28 18:36:22 -05:00
Name 004792ba05 Rebase due to mime trickery
Cuts something that should be there


hardens pp


largens pp further


maximiezes pp 


fixes code


Auto stash before merge of "forth-times-the-yeah" and "BuffEngineering/forth-times-the-yeah"
Adds Initialize()


First Draft

Mostly works
Removes redundant code, adds other colors, adds to CE locker


oops forgot to


hardens pp


maximiezes pp 


Adds Initialize()


Auto stash before merge of "forth-times-the-yeah" and "BuffEngineering/forth-times-the-yeah"
oops forgot to


Attempts to balance the hardhat, adds to EngiDrobe


Removes unnecessary code and sprite, adds necessary sprite


How can commas be real if our eyes aren't real


Fixes bad slash


Fixes runtime


Optimizes code after runtime fix


Removes redundant code


Fixes 3/4


*scream


Makes visor coverage consistent with new sprites


Actually fixes the issue


samus? its an honor


Makes requested changes


Doesn't delete welding hardhat sprites
2019-01-28 16:28:40 -05:00
Time-Green 442bfdeca5 changes geladikinetic creation to geladikinesis
honestly its a mouthfull
2019-01-28 15:13:32 +01:00
Time-Green 52b19df321 makes snow tiles not fucking kill 2019-01-28 15:10:58 +01:00
pireamaineach 1b670a9c36 Mime-related tweaks. (#42508)
* Mime-related Tweaks

Improves upon the standard beret sprite, aswell as the rest.
Changes the sprite of the french beret to the classic maroon colour, matching the mime's suspenders.
Remove's the mime's pocket protector as it's either rarely used do to the lipstick being nearly useless to mimes, since they spawn with a mask or alternatively, removed.

* Removes the standard beret from the standard costume crate.
2019-01-28 03:14:47 -05:00
Yenwodyah bafcb1816e Fixed grinder interaction with empty beaker (#42513) 2019-01-28 03:11:26 -05:00
Vile Beggar c98d9d054b Properly adds a drill sergeant hat to the warden's locker (#42533)
* does the thing - please work

* adds it to the locker

* remove var/datum

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* Update code/modules/clothing/head/jobs.dm

adds space

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds denton's review suggestion

it's a webedit but i tested it and it worked

* makes it a bit less annoying

* grammar fix
2019-01-28 03:10:57 -05:00
kevinz000 5d4143f923 Emergency projectile fix #42544
Okay, oranges was right and I'm stupid.
Stops the server from crashing from a beam rifle, jesus.
2019-01-28 20:22:32 +13:00
ShizCalev 35670e8832 Cleanbot now cleans up salt and plant smudges 2019-01-28 01:16:46 -05:00
leon2550 23fc38af7e Increase drop chance for Crusher trophies (#42481)
it takes way too long to get a crusher trophy as is, and it kinda makes crushers pointless. so i increased the drop chance to about 1 in 4 instead of 1 in 20. also, first PR, yay.
2019-01-27 21:10:10 -05:00
wesoda25 604a059eaf Mime Foods/Drinks Now Silence the Mime (#42499)
Mime stuff silences the mime now
cl
tweak: The nothing, silencer, and blank paper beverages now apply a mute on the mime for their duration (and a bit after).
cl

If you want to heal as a mime, you should not be allowed to speak. By extension things such as mime burgers will have this effect given the fact that they have nothing inside them (the reagent).
2019-01-28 09:11:21 +13:00
kierany9 74da8a2382 owch 2019-01-27 20:16:20 +01:00
Jack Edge 9740ebb7ad Jobs code is in seperate files
🆑 coiax
code: Jobe code has been moved into seperate files. There should be no
change in behaviour.
/🆑

Every time I've ever gone into job code, this has annoyed me so much.
Some jobs have seperate files, some do not. So I put them in seperate
files, which I thought was a simple job. I removed some comments in the
process.

But it turns out the display order on the job preference screen was
literally determined by the ordering of the datums in the source files.
So I needed to add a way to order it. Now you can reorder the jobs by
changing the values of the defines.
2019-01-26 20:54:13 +00:00
Kyle Spier-Swenson fbcb1b924f [s]Advance proc call no longer allows you to call world/datum procs as global procs (#42529)
* [s]Advance proc call no longer allows you to call world/datum procs as static procs

* Update debug.dm
2019-01-26 15:22:43 -05:00
Erik 0344b98df1 The spraycan now works on walls again. (#42519)
* Graffitis from the Spraycan now works on walls.

* Graffitis can be Sprayed on walls again.

* add a comment, rerun checks
2019-01-26 12:57:49 -05:00
4dplanner 1fb33ec33d Removes the mute aspect of perfluorodecalin (#42501)
cl
balance: perfluorodecalin no longer mutes
balance: it also heals brute and burn 3x faster (a new rate of 0.25 of each a second)
balance: it also causes toxin buildup over time
/cl
2019-01-26 12:22:21 +13:00