Commit Graph

27400 Commits

Author SHA1 Message Date
ShizCalev
39c3ceff7e Fixes petting mood stacking 2019-02-02 17:16:15 -05:00
Anonmare
675547832d Updates malf fire alarm hack desc (#42635) 2019-02-02 16:59:01 -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
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
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
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
Jordie
dc4933012a Merge pull request #42464 from BuffEngineering/forth-times-the-yeah
Adds welding hardhats
2019-01-30 22:35:53 +11:00
Jordie
90cf55d65b Merge pull request #42579 from Hathkar/patch-1
Nicotine Nerf
2019-01-30 21:54:31 +11: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
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
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
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
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
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
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
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
fluffe9911
d78bb9152b Adds the golem Time-Green was too communistic to add (#42475)
* capitalism is the true way

* better sound clip

* there we go

* fixes mine and time-greens copy pasta

* adds the soviet golem to the human file

* capatalist golems now bleed money

* makes it so both capatlist and soviet golems can now use guns

* hec

* makes the song the U.S.A Anthem to please the copyright gods and removes money bleeding cause im to lazy to do a refactor right now

* Update code/modules/mob/living/carbon/human/species_types/golems.dm

Co-Authored-By: fluffe9911 <dablank02@hotmail.com>

* re

* better sound clip
2019-01-25 15:38:07 -05:00
4dplanner
87ba21090c Megafauna cannot teleport (#42479)
Megafauna cannot teleport
2019-01-25 10:17:54 -05:00
as334
3e3fc41182 [READY]Atmos: Things Other Than Bombs Edition (#42194)
Due to the difficulty of interacting with the more complicated atmos content, the only things that toxin scientists and atmospheric technicians tend to focus on is bombs. The goal here is to give them some more productive things to do that encourage them to branch out beyond Tritium production and bomb rushing. Singlecaps, single tank bombs made with oxygen and tritium are also a recent balance concern that this hopefully addresses by adding a thermal energy requirement, which hopefully should make singlecaps either impossible or at least more difficult to construct, but leave normal bombs more or less intact. Also adds some ways for other gases in the mix to influence the BZ production reaction.

I'm looking for feedback on the specific number for values for how many points reactions give. I did my best to figure out some reasonable amounts via math, but I don't know that much about how techwebs are balanced.

cl as334
add: Tritium now needs to be an environment with a sizable thermal mass for full efficiency combustion.
add: Advanced Gas reactions now produce research points.
add: A gas canister with Pluoxium, Noblium, Stimulum, Miasma or BZ inside now produces points when sold via cargo.
/cl
2019-01-25 14:58:59 +13:00
YoYoBatty
a3015ac893 Bodypart received damage is run through armor check in certain situations (#42462)
* Refactors the way bodypart damage is applied

* Update bodyparts.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update damage_procs.dm

* Update bodyparts.dm

* Update damage_procs.dm

* Update carbon.dm

* Update twohanded.dm

* Update damage_procs.dm
2019-01-24 16:11:52 -05:00
Razharas
b8550d57ee [Ready] Added animations to cryo/sleepers opening/closing (#42289)
* Added animations to cryo/sleepers opening/closing

Also changed a bit of internal handling of icons of cryo
Images -> mutable appearances
No more updating icons every click on anything in the ui

* Back to images

* Actually fixes images

* Use of flick and animation sprites

Changed the way animations are done to use flick proc instead of animate
proc
Changed the way animations of cryo cells are organazed in a dmi, now
separate icon_state for opening and closing

* Support for resprites of the cryo subtypes

Support for resprites of the cryo subtypes
2019-01-24 14:47:10 -05:00
Kierany9
8113154a22 The PR that fixed Assimilation (#42156)
lots of commits
2019-01-24 12:14:08 -05:00
PKPenguin321
90b5da0355 Fixes ling notes copying on absorb (#42471)
* fixes ling notes copying

* addresses review
2019-01-25 03:33:53 +11:00
Erik
517128a53f Adds a proper TRAIT_RADIMMUNE check to the portable scanner and cloner. (#42489)
* ok

hi

* Add TRAIT_RADIMMUNE check to the portable gene scanner and to cloning

* Add TRAIT_RADIMMUNE check to the portable gene scanner and to cloning

* Implemented Suggestions.

* "No Sir, im not a synth, check my DNA!"

* You got it Boss

* Remove a useless Return

Co-Authored-By: Gousaid67 <gousaid67@gmail.com>

* Add a comment, also rerun checks
2019-01-25 03:33:16 +11:00
Time-Green
5621143421 Gibbing transfers reagents to meat (#42492)
* adds reagent from mob to meat

* actually makes reagents transfer on gibbing

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>
2019-01-25 02:50:56 +11:00
Jordie
ad19c17660 Merge pull request #42490 from tgstation/Cyberboss-patch-1
Removes copypasta from synth code
2019-01-25 02:42:57 +11:00
81Denton
21fd1b2cea Ports wheelchairs from Hippiestation (#42401)
* Ports wheelchairs from Hippiestation

* Apply suggestions from code review

Thanks Cyberboss!

Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>

* Removes unneccessary vars+attackby(), uses obj_destruction()

* Uses overlay SS and moved()

* removes redundant else, GetComponent(), moves has_buckled_mobs() to Destroy(), etc.

* Apply suggestions from code review

Co-Authored-By: 81Denton <32391752+81Denton@users.noreply.github.com>

* Removes unneeded has_buckled_mobs()
2019-01-24 09:25:23 -05:00
Time-Green
9861efde71 Cryokinesis and Geladikinesis mutations (#42453)
* Adds cryokinesis and renames the cold resistence file to space adaptation

* adds cryokinesis

* fixes icon conflict

is there actually a proper way to fix them thats not copying master and reimplimenting your own sprites?

* fixes a typo and lowers instability of cryokines by 5

* Apply suggestions from code review

Co-Authored-By: Time-Green <timkoster1@hotmail.com>

* maybe reverts line ending?

* unfucks flags?

* probably unfucks line endings

i swear to fucking god why does it even do this. i never even touched the file and reverting it to master doesnt do anything. fuck you git
2019-01-23 15:20:56 -05:00
Jordan Brown
fe474bc0ab Merge pull request #42478 from WarJenkins/gasbag-no-smell
Plasmamen don't have to shower anymore
2019-01-23 12:23:15 -05:00
Dangerous dingidy doo
4df7d82680 Trash bounty (#42467)
* Tresh

* yes the janitors need more then 1 piece of trash.

* a

a

* b

b

* that's why travis got triggered

* Maybye like this?

* minor spelling error of centcom

* Fixed it hopefully now.

* done my man ExcessiveUseOfCobblestone
2019-01-23 12:23:07 -05:00
Jordan Brown
fd3f3636eb Removes copypasta from synth code 2019-01-23 09:01:43 -05:00
Menshin
9dabcbbb04 Fixes for projectiles bugs (#42463)
* Bandaid fixes for bugs with reflectors projectiles and plasma cutters

* * Fixed bouncing piercing projectiles on qdel
* Fixed projectiles reflection not working
* Fixed heavy beam pulses not penetrating
* Changed numerous projectiles procs to use the new BULLET_ACT_* format

* Final conversions to new BULLET_ACT_* format
2019-01-23 21:00:11 +13:00
Vile Beggar
421ed22471 cl Vile Beggar
tweak: Plasmamen have no need for regular showering anymore.
/cl

why: there's no reason for plasmamen to be semlly, they're just skeletons after all, are they not?
2019-01-22 18:55:46 +01:00
4dplanner
ea4234cd81 legion cores remove CC instead of adminhealing [READY] (#42378)
* legion cores remove CC

* legion -> regenerative

* lore

* Icons

fixes last reference to legion core in status

* Automatic creation of classes is possibly the worst feature of all time

* Moves remove_CC

* Review changes
2019-01-22 11:57:53 -05:00