Commit Graph

27420 Commits

Author SHA1 Message Date
Menshin 8d11af1748 * Fix a runtime on mecha syringe gun hitting that prevented reagent transfer (#42642)
* Reverted some hastily (and wrongly) made changes to prehit() procs
2019-02-04 22:06:15 +13:00
Qustinnus 215802f67e Fixes some Golem issues and fixes the name of a durathread item #42587
cl Floyd / Qustinnus
tweak: Bonechill now actually chills you
tweak: Bonechill lasts 2 seconds longer
tweak: RESIST_COLD is checked before bonechill is applied
fix: Changes makeshift vests' name to durathread vest
fix: Cardboard golem can now reproduce himself.
fix: The durathread golem now needs cloth instead of strands
/cl
2019-02-04 21:56:52 +13:00
subject217 fcad1805bc [Ready] brittle plasma bones (#42561)
cl the epic purple skeleton in the sky
balance: Plasmamen now take 1.5x brute damage.
/cl
2019-02-04 10:49:27 +13:00
Tlaltecuhtli 3e99cc4119 [READY] reworked neurotoxin (#42507)
cl
balance: neurotoxin doesnt insta stun but gives you limb paralysis overtime and heart attacks if it stays in for too long and it is also alcholic
/cl
2019-02-04 10:32:31 +13:00
Rob Bailey 69e217d8d9 [READY] I got guns (#41804)
cl actioninja\memager
refactor: Ballistic guns have been almost entirely reworked from a backend side. This primarily focused on moving as much as possible into the base ballistic gun and turning as many other guns into essentially varedits as possible.
add: Guns can now be racked. This is the default action unless the magazine is empty.
add: Guns now can have the magazine removed by clicking on them with an open hand while they are in hand.
tweak: Suppressors are now removed by alt clicking instead of clicking with an open hand
add: Guns now have various bolt types that all function a bit differently. Open bolts cannot have a bullet chambered with no mag, locking bolts lock back after running out of ammo, etc.
add: All ballistic gun sounds are controlled by variables instead of hardcoded usages.
tweak: The l6 LMG has a reworked control scheme. alt + click to open and close the cover, open hand to remove mag, place mag in by slapping them together, default action is rack.
tweak: Functionality that used to be snowflake code such as tactical reloads has been moved to the base gun, and can be toggled by variables.
refactor: All shotguns are now properly subpaths of the shotgun type. They still work the same.
imagedel: Gun sprites have been almost entirely overhauled to use overlays instead of states. This collapsed the L6 sprite from 20 sprites to 9 sprites to give an example.
soundadd: Remixed versions of the shotgun and base gun firesound
soundadd: New rifle firesound for l6 and moist nugget, new SMG fire sound, new sniper fire sound.
soundadd: Lots of new weapon operation sounds such as racking and bolts and the like.
imageadd: New sprites for the Riot Shotgun, Combat Shotgun, c20r, Deagle, m90, double barrel shotgun and 1911 by Memager.
imageadd: All gun sprites that were pointing to the left have been flipped to point to the right.
balance: Shotguns now can be pumped faster.
balance: Bulldog can now be tac reloaded
balance: Sawn off shotguns now have an accuracy penalty and recoil
/cl
2019-02-04 10:27:01 +13:00
Militaires cecf676684 [Ready] Outputs datum (#41535)
Idea and instructions by @Razharas, many thanks.

This PR only implements the framework required to catalog as well as play the sounds. Their to_chat text, and icons (if any) are not included, are to be pushed in a separate PR.

This PR does not remove the old playsound_local system, it is kept for the sake of not necessitating a direct changeover of every single playsound in the code, which will surely cause a lot of merge conflicts. It does however, replace bike horns' and toy nukes' means of playback to this datum, purely as proof of concept.

Playsound_local may remain in the code to support playback of admin-uploaded sounds that do not have an inherent datum. Playsound will likely be renamed to something else in the next PR to reflect its new, more universal function. We will see.

New process for adding sounds:

    Create a new datum/outputs subtype.
    If you wish, write down some supporting text; this gives further meaning to the sound.
    Add multiple sounds to the sounds list, and weight them as you wish. (New)
    Add a sound icon if you wish, it defaults to a generic sound circle anyways though.
    playsound(/datum/outputs/new_subtype, receiver), and it will deliver, icon, sound, and text to the receiver.

Maintaining implication is that from now on playsound should only be processing datum/outputs

This pr intends to gut to_chats that are added alongside playsounds in the code.
This pr eliminates the need to initialize sounds in a list so that you can weight them or have the game play them randomly from the list.

Sound Rings
Currently, only mobs with the audiolocation var may view them. Sound icons have an alpha that depends on the volume of the sound, louder sounds create a more opaque image

Sound rings are completely modular and may be changed to any image.

In addition to renaming playsound to reflect its new function. I intend to give blind people sound icons at the cost of their small view, but that is for another PR.

cl Basilman
refactor: refactored how sounds are stored and played
add: Added sound rings and supporting text
/cl
2019-02-04 10:25:48 +13:00
Tad Hardesty 3b3eb4b88e [s] Fixes petting mood stacking (#42650)
* Fixes petting mood stacking

* fixed pronouns
2019-02-03 12:32:07 -08:00
ShizCalev 2ea88b7515 Fix fire alarms not updating icons when emagged/malf hacked (#42649) 2019-02-03 12:31:23 -08:00
oranges 2b9c04c6ec Merge pull request #42562 from Jordie0608/idontrememberwhythecidcolumnisavarcharsoimnotsureifthatshouldbechangedornot
Banning panel fixes
2019-02-03 22:36:23 +13:00
oranges cd05d64bcf Species types sources refactor (#42523)
There is now a bitflag that controls all the ways a species can be
selected from the different methods of changing species, xeno spawn,
pride mirror, magic mirror etc.

The soviet and capitalist golems are no longer selectable from the pride
or magic mirrors (just the badmin one)

interesting thing I found, androids and synths (including military
synth) are acheivable via xeno extracts!
2019-02-03 20:33:11 +11:00
Suicidalpickles a798f33602 Flagellant Robes Changes (#42611)
* flagellant robes nerf

* changes speed again
2019-02-03 19:28:01 +11:00
Jordie 4c6d81a377 Merge pull request #42625 from BuffEngineering/smoking-fix
Fixes addiction moodlets
2019-02-03 19:00:43 +11:00
py01 b44beb52b5 Blood magic tooltip alterations (#42623)
* Tooltip text changes

* typos

* Update blood_magic.dm

* Update blood_magic.dm

* Update blood_magic.dm

* Update blood_magic.dm

* Update blood_magic.dm
2019-02-03 18:53:04 +11:00
KomradeSpectre fba959a3f0 Adds an inhand for package wrapped parcels. (#42639)
* Adds an inhand for package wrapped parcels.

* Moves the package inhand sprite code to the proper location.

* Removes a redundancy with the small package in-hand code.
2019-02-03 17:37:19 +11:00
Jordie 8517024e31 Merge pull request #42636 from as334/pluoxtweak
BZ Tweaks
2019-02-03 16:46:34 +11:00
ShizCalev f09b0e7b44 fixed pronouns 2019-02-02 19:16:59 -05:00
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
as334 8f2cc10405 Pluoxium balance and bug fix 2019-02-01 15:27:02 -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
Name 983997c81c Fixes other thing I noticed 2019-01-31 19:09:45 -05:00
Name 6eb07a41db Fixes it 2019-01-31 18:04:28 -05: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
Jordie0608 1ed5dc7b95 fixes for non-ckey ban messages and dropping admins on server bans 2019-01-28 22:04:28 +11: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