Commit Graph

27441 Commits

Author SHA1 Message Date
Vile Beggar
18802ff4e2 Tweaks lights to spark less (#42696)
* makes lights spark less

* applies cobby's suggestions from review

Co-Authored-By: VileBeggar <edmir995@gmail.com>
2019-02-08 16:32:38 -05:00
tralezab
43ecae6fa2 sleeping carp now deflects projectiles in random directions (#42647)
* bad ass shit

* durr

* nice

Co-Authored-By: tralezab <40974010+tralezab@users.noreply.github.com>
2019-02-08 11:56:25 -05:00
subject217
7a2d4cd7ef Removes the stamina version of .45 ammo (#42692)
* webbit reddit

* commits for each file

damn i hate web edits

* magazine

one of these is going to conflict with the guns pr why am i doing this at 2 am

* yeet

* does it compile

probably not
2019-02-08 11:55:48 -05:00
tralezab
46e3894bb2 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-02-08 11:26:41 -05:00
gy1ta23
b547cc9bfb Fixes immersion ruining clothesmate line (#42684)
* Update clothesmate.dm

* Update code/modules/vending/clothesmate.dm

Co-Authored-By: gy1ta23 <44277885+gy1ta23@users.noreply.github.com>
2019-02-07 15:00:55 -05:00
Vile Beggar
d13420801b Properly adds a Janitor ERT (#42659)
* does the thing

* adds the regen thing to the sprayer

* adds a quite important addition to a comment

* capitalizes janitorial response

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

* adds cobby's process suggestion
2019-02-06 15:56:31 -05:00
tralezab
bc6dec202c fixes barnyard only being able to curse humans (#42603)
* fixes barnyard fun

* i think this works?

* Update code/modules/spells/spell_types/barnyard.dm

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

* the fix we were all waiting for...
2019-02-06 13:18:43 -05:00
ShizCalev
92d94c2342 Corrects damp rag reagent logging (#42682) 2019-02-06 22:35:42 +13:00
KomradeSpectre
0ceeee4d0c Port vendor icon display instead of color from Yogs (#42653)
Port of yogstation13/Yogstation-TG#2549
which is a port of Citadel-Station-13/Citadel-Station-13#7442
which is a port of OracleStation/OracleStation#50

This port visualizes items in all machines handled by _vending.dm, allowing a
person to see what they're buying before buying it. This is very useful for
clothing vendors for example, and much better than the previous system that had
vending machines choose from three colors randomly.

Credits to:
  * AndrewMontagne (Oracle, original implementation)
  * FlattestGuitar (Citadel)
  * nichlas0010 (Yogstation)
2019-02-05 20:20:38 -08:00
ShizCalev
c56869fe0a Fix incorrect var passed to admin makeAI AIize (#42677)
Second param is for the client.
2019-02-05 17:56:35 -08:00
granpawalton
a1ff7750a1 you can nolonger turn toasters into a fridge using a screwdriver (#42670) 2019-02-05 19:59:19 -05:00
Tlaltecuhtli
9f2124dd3e fixes inconsistency in syndicate simple mobs (#42657)
🆑
fix: some syndicate operatives simple mobs no longer have an invisible shield
/🆑

they visually only have 1 knife, while their subtypes have a shield  kevin put the var in the wrong place
2019-02-05 14:16:47 -05:00
Kierany9
753fa182bd Trauma gain formula fix/tweak (#42619)
* bad math

* cyberboss
2019-02-05 14:06:12 -05:00
Whoneedspacee
cf88603129 [READY] Fixes megafauna deathgasp and hierophants death animation (#42613)
* fixes death sounds not being played on delondeath creatures

increases volume of death sounds

fixes hierophants achievement granting problem in another way and re-adds its death animation

adds a force grant achievement option for megafauna (maybe used in the future for only granting achievements to the most damaging person whom knows)

* true true false true
2019-02-05 14:04:55 -05:00
wesoda25
0761441250 Nitrous Oxide (Reagent) Anemiates (anemiates??) Blood faster (#42557)
* changes how nitrous oxide causes you to lose blood

* increases loss of blood volume
2019-02-05 13:37:55 -05:00
wesoda25
26a5db4389 Makes Ephedrine a less Viable Combat Drug (#42553)
* fuck you

* bumps up chance to drop items

* lowers the chance a bit

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

Co-Authored-By: wesoda25 <37246588+wesoda25@users.noreply.github.com>

* cobby suggestion
2019-02-05 13:35:15 -05:00
wesoda25
1cadfc9580 Branches Syndicate Bundle into A and B Categories, adds Mr Freeze Bundle (#42662)
* Update uplink_items.dm

* update item names

* does all that stuff

* whoop forgot a comma

* adds geladi and cryo to mutation injector list

* adds mr freeze, i think

* maybe this will work?

* defines geladikinesis and cryo

* possibly fixes what was wrong

* ohhhhhhhhhhhhhhhhhh im an idiot

* one last thing

* mr freeze gets temp gun

* 20 TC

* Update uplink_kits.dm

* maybe?

* name change

* Update uplink_items.dm

* temp gun didn't have a firing pin
2019-02-05 21:49:21 +11:00
Qustinnus
7142f5ab76 You can no longer rattle bones at the speed of light (#42661)
https://www.reddit.com/r/SS13/comments/ams83q/rattle_me_bones_warning_loud/
2019-02-04 16:36:28 -08:00
Rob Bailey
ecf9e538ed Gun (Hot)Fixes (#42666)
Fixes my broken bullshit.
2019-02-05 09:32:52 +13:00
Michael Ashfield
918bd7f450 Adds flyswatter to beekeeper suit storage (#42658)
* Adds flyswatter to keeper suit storage

Lets beekeepers store their flyswatter in their suit

* Added more botanist items

Added normal botanist items that fit into their apron.
2019-02-04 14:50:18 -05:00
4dplanner
9b1ff3f4c3 Rebalances perfluorodecalin (#42528)
* Reduces toxin damage and increases metabolisation rate of
perfluorodecalin

* Adjusts to 0.3 toxloss, no brute + burn healing

* Boosts metabolisation rate back up to original
2019-02-04 11:42:01 -05:00
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