Commit Graph

29080 Commits

Author SHA1 Message Date
ATH1909
21909e2733 Makes borg buckling conflict less with inventory searching (#46364)
About The Pull Request

This PR finally splits up the ways that borgs are supposed to initiate inventory checks of a mobs and initiate attempts to buckle mobs to themselves (formerly, they would both happen upon click+dragging a mob onto yourself as a borg). Now a borg will only try to buckle a mob to themself if they ARE NOT on harm intent when they finish click+dragging said mob onto themself, and will only try to check a mob's inventory if they ARE on harm intent when they finish click+dragging said mob onto themself. An outsider can still buckle someone (even themself) to a borg who's on harm intent; the borg just can't do it themself.
Why It's Good For The Game

This issue is incredibly annoying to deal with as a borg (especially if you're in an area or situation where *spinning someone off of you could be risky), and I'm really surprised that it's taken this long for this control conflict to be fixed.
Changelog

cl ATHATH
tweak: If a cyborg click+drags someone onto themself, they will only try to buckle that person to themself if they (the cyborg) ARE NOT on harm intent. Attempts made by non-cyborgs to buckle themselves to cyborgs by click+dragging themselves onto said cyborgs should be unaffected by this change, even if those cyborgs are on harm intent.
tweak: If a cyborg click+drags someone onto themself, they will only attempt to check that person's inventory if they (the cyborg) ARE on harm intent.
/cl
2019-09-16 16:36:13 +12:00
Fikou
a439c6ac37 makes the ed209 a child of securitrons instead of a horrifying copypaste (#46230)
About The Pull Request

does what says on title, becomes a securitron that can shoot people
removes ed209 cell because it doesnt do anything why does it even exist
fixes ed209 crafting using dragnets
sadly, removes lasertag mode from ed209, but ive never seen anyone use it and it made everything a lot more confusing
eds now shoot you even if youre lying down because i guess that you could rest before to avoid getting shot but im not 100% sure
Why It's Good For The Game

fixes tons of horrifying copypaste
also fixes some minor things
Changelog

cl
del: Lasertag EDs have been removed
code: EDs are now not a horrifying mess of copypasted securitron code
balance: EDs now still shoot you if you're lying down
tweak: you no longer need a battery to make an ed209
fix: fixes ed209 crafting using dragnets instead of disablers
/cl
2019-09-16 16:33:19 +12:00
Mickyan
e9116fcace Moves drunk healing to quirk process (#46507)
* drunk coding

* removes redundant check
2019-09-15 19:00:11 -04:00
cacogen
755b649da5 Highlander event tries to drop items, heals and uncuffs (#46490)
* highlander event uncuffs participants when equipping them

* highlander tries to drop items instead of deleting, heals participants

healing also uncuffs them

* excessive use of integers

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-09-15 18:04:59 -04:00
oranges
ba157add71 Merge pull request #46502 from nemvar/patch-108
Fixes infinite loop
2019-09-15 20:53:37 +12:00
Fox McCloud
2c9b467903 Fixes Tendrils Spawning Inside Ruins (#46455) 2019-09-15 00:35:55 -07:00
nightred
dc23d15170 Blindness removes your ability to see colours (#46475)
* Blindness removes colours so you can only see if an object is near, not the fine points on it.

* Fixed up the monochromatic trait to persist when removing blindness

* Removed added trait and created new colour filter for blindness

* Blankspace Removal

* removed the src before the proc as it was not needed
2019-09-15 00:34:21 -07:00
skoglol
280741a839 Point blank execution shots now hit head (#46421)
* Point blank execution shots now hit head.

* Update code/modules/projectiles/gun.dm

Co-Authored-By: nemvar <47324920+nemvar@users.noreply.github.com>
2019-09-15 00:33:01 -07:00
ShizCalev
172e8d1dd7 Evidence bag self-containing fix (#46450) 2019-09-15 00:30:00 -07:00
variableundefined
900483ba44 Remove redundant structure/chair/wood/normal typepath (#46443) 2019-09-15 00:29:23 -07:00
cacogen
6403b55b97 Makes admin OOC the same size as player OOC again (#46458) 2019-09-15 00:27:54 -07:00
spookydonut
00fa882721 Changes some typed loops to typeless loops (#46444)
* typeless loops

* new_player

* eol
2019-09-15 00:26:55 -07:00
Nichlas Pihl
39d3cce714 Fixes a runtime (#46432) 2019-09-14 23:58:08 -07:00
skoglol
ee7306b4ea Projectile effects no longer ignore armor. (#46419) 2019-09-14 23:57:37 -07:00
kingofkosmos
8358169b8e New 'hear' span class (#46369)
* Reverts italics-span back to no color.

* Cleans up many extra spaces and indents.

* Adds 'hear' span class.

* Replaces all 'italics' used in heard messages with 'hear'.
2019-09-14 23:56:34 -07:00
skoglol
f4e7baa899 Adrenals reworked (#46211)
* Repurposes the adrenal implant.

* reverts adrenals back to 8tc

* updated uplink description, reduced oxy slightly.

* nanites in line, more description fix, stunresist back in.

* Pre testing.

* Final ling touches, removed stamcrit stun.

* Removes jitter, screen shake on metab end.

* woops.

* removes toxin damage.
2019-09-14 22:11:56 -07:00
4dplanner
8279aca3dd liver fix (#46488) 2019-09-14 19:48:32 -04:00
Unknown
df76d0dbb2 slip 2019-09-14 22:56:28 +02:00
Qustinnus
9812834054 Adds knight armour to the game that can be made from any material (#46301)
* Adds knight armour

* fixes armor

* nerfs & fixes

* adds ruin

* done

* bug

* oh im a buddy

* rad

* ok nem

* fix sprite

* fixes

* tgm

* epic

* re-adds icons

* fixes list

* ok ninja

* fixes

* fixed

* woops
2019-09-14 15:32:29 -04:00
Dingo-Dongler
319df6f554 Makes nanites be passed down when jellypeople and slimes split (#46283)
* Makes nanites be passed down when jellypeople and slimes split

* Trying to change how nanite splitting works, currently this is broken and disallows splitting of slimes and jellypeople

* Still doesn't work, jellypeople code fails at the L1 check

* Nanites now pass on properly, but sync needs a rework. Get component might be the right way to do it after all

* preparing for revert

* Reverting, I think

* I don't know how revert works, making activation copy over as well

* Removing an unneccesary proccall
2019-09-14 14:26:36 -04:00
nemvar
2a8e76ffd5 Fixes infinite loop 2019-09-14 16:24:04 +02:00
AnturK
c6d0ce940f Fixes return to lobby issue with soulstone. (#46431)
* Fixes return to lobby issue. This code is still awful.

* Mm
2019-09-14 01:08:44 -07:00
Rob Bailey
a6aa03b90b client vars autodoc (#46446)
About The Pull Request

Autodocs client vars
2019-09-14 20:02:26 +12:00
oranges
8c3fa4400a Merge pull request #46441 from py01/repeatingsurgery
Failed surgery steps automatically retry
2019-09-14 17:39:33 +12:00
Fikou
259ebdcc5d makes bonespear a child of spear and MAKES THE DAMAGE MORE CONSISTENT (#46467)
* who did this

* boner

* a

* a

* hhhhhhhhhhhhhhhhhhhhh

* a

* a

* Update recipes.dm

* hhhh
2019-09-13 18:36:10 -04:00
Mickyan
4f95643e40 Adds an improved first aid kit for medical staff (#46393)
About The Pull Request

CMO and MDs start with a first aid kit with slightly increased capacity and basic surgery tools
Why It's Good For The Game

Doctors need tools for doctoring in the new medical landscape, also makes the starting medkit a bit more worth holding onto
Changelog

cl
add: Medical staff now spawns with a first aid kit with increased capacity and basic surgery tools
/cl
2019-09-14 09:37:20 +12:00
ATH1909
44648abb45 Removes some references to /datum/reagent/colorful_reagent/powder's old name that Akrilla forgot about (#46338)
* Update other_reagents.dm

* Update other_reagents.dm

* Update other_reagents.dm

* Update other_reagents.dm
2019-09-13 14:21:22 -04:00
ATH1909
d4bd86c914 Removes the haloperidol chem from omega weed (EDIT: and makes some other alterations) (#46355)
* Update cannabis.dm

* Update cannabis.dm

* Update citrus.dm

* Update cannabis.dm
2019-09-13 14:18:05 -04:00
Rob Bailey
d633bcb039 equip sounds (#46387)
* equip sounds

* small tweaks

* single quote filepaths
2019-09-11 15:37:42 -04:00
Arkatos1
fb4bd33021 Lightning botl fix (#46436) 2019-09-11 10:09:51 -04:00
py01
3472469e81 surgeries automatically retry if fumbled 2019-09-10 20:30:42 -07:00
cacogen
abced6018e All font size spans scale (#46414) 2019-09-10 16:36:30 -07:00
AnturK
70dc8f9dfc Makes reagent transfer logging easier to read. (#46406)
* Makes reagent logging easier to read.

* Makes it work correctly for empty external list
2019-09-10 16:00:37 -07:00
AdamElTablawy
21dd8ab861 buffs ling adrenalin somewhat (#46242)
* buffs ling adrenallin

* Update medicine_reagents.dm
2019-09-10 15:37:26 -07:00
moo
6b18b2b80d Update healing.dm (#46319) 2019-09-10 15:33:05 -07:00
GuyonBroadway
a5e24c0205 Makes chocolate less of an instant taser and more of a poison. (#46366)
* Less puke, more DIE

* Sickness messages and better probs.
2019-09-10 16:27:43 -04:00
kevinz000
6c50583b34 Fixes VV renaming (#46410)
* vv fix

* forgot the define
2019-09-10 20:13:09 +02:00
Rodey125
051ec9ffe4 Adds AttackingTarget() to ranged holoparasite (#46412)
* Adds AttackingTarget() to ranged holoparasite

* removes some shitty code
2019-09-10 11:58:09 -04:00
ATH1909
a3944dcde0 Halves the cooldown time between mutations for sentient diseases (#46399)
* Update medicine_reagents.dm

* Update medicine_reagents.dm

* undoes an accidental change to master

* Update disease_mob.dm
2019-09-10 11:57:48 -04:00
Akrilla
3c9bf0c5e1 Removes flashbang protection from helmets (#46215) 2019-09-10 03:11:51 -07:00
Mickyan
f2c80d5bec Inhands for photo albums (#46404)
* inhands, grammar fix

* that's not how books work
2019-09-09 22:13:03 -04:00
moo
eb4894f668 Medbot-Bros Fixes / Adds Trait Callbacks (#46341)
* Update medbot.dm

* romance of the three medbots

* no longer requires unique ID

* Revert "no longer requires unique ID"

This reverts commit 3349140f3779f8e694e14d1c2a170ff5d3105a56.

* sometimes i can code ok

* Update medbot.dm

* duh

* Update unsorted.dm

* Update unsorted.dm
2019-09-09 17:30:22 -07:00
MacBlaze1
4d12d4dfc7 edited costs of diamond to be gold and silver (#46385) 2019-09-09 18:01:34 -04:00
Twaticus
1bc5d5c239 snacks cake blackbArry cake coco cake slice coco cake (#46390) 2019-09-09 17:14:36 -04:00
nemvar
ab4f8bb903 Changeling Alt click Fix (#46403) 2019-09-09 13:02:42 -04:00
oranges
d646640e12 Merge pull request #46391 from nemvar/mekeeakkackkhain
Unscrambles melee_attack_chain
2019-09-09 18:49:54 +12:00
moo
591b51297d Cobbduceus 1.1/X, Base(d) Healers (THIS KILLS TACTICAL KILLING AND CLONING???) (#46219)
About The Pull Request
Buffs C2 Healing

I should have leaned to more healing initially, especially since they're damaging. Goal here is to make them more enticing.
Dilutes Starting Meds / Borg Hydro Microdosing

Perhaps this was the biggest issue in that your DEFAULTS carried way too much of the chem specifically designed for lower dosages so people were getting smacked with needless damage consistently.

You can still make your own "pure" samples I guess, but I think you'll like the current values.

Borgs can now switch between 5u/2u with altclick.
Adds a C3 Diluent Specifically for Minor Brute/Burn

Wouldn't make much sense to dilute it with air! Granibitaluri is a new C3 that slowly tops off your damage by order of brute then burn. The catch is you must be at 10 damage or less for the healing to apply. ODs at 50.

This is the reagent all C2s are diluted with regardless of what they heal (meaning brute/burn chems will heal a tad better but only when you're about healed anyways).
Why It's Good For The Game

Buffed C2s to make them more viable as contenders to some of the more oddity avenues you guys were using.

Dilutes C2s to make the roundstart items viable on their own without chemistry (or at least a chem master). Same with Borg Microdosing option.

Added the C3 since it was suggested by zxaber to have a form of healing more minor damage without going through the lengths of surgery.

Sorry in advance silicon players, the solutions are still pure in your hypo!
Changelog

cl Anarcho-Capitalistabital-by
add: In General, Buffs healing thoroughput of C2s. You can stop paying your cloners overtime now!
tweak: The roundstart C2 methods are now diluted with a new reagent, Granibitaluri.
tweak: The borghypo now can switch to "microdosing", which is 2u transfer via AltClick
add: Granibitaluri is a C3 (no downside!!!) that tops off your brute THEN burn damage if they are at or below 10 damage.
/cl

Thank you guys for being so patient and providing constructive feedback! G-g-g-good thing coders "play" haha!
2019-09-09 11:00:35 +12:00
Trilbyspaceclone
b8208fac37 [Ready] More cakes and pies, as well as resprites a few others (#46196)
About The Pull Request

Adds in more tarts - pies
Mime Tart, Lava Coco flow Tart, berry tart
Adds in a few more cakes
Vanilla cake - real this time
Clown cake - Honk!
New book only get able via Dinner-o-mat that teaches you how to makes these
Why It's Good For The Game

More colorful foods and crafting as well as using the locked crafting system - Maybe better looking cakes
2019-09-09 10:59:28 +12:00
moo
235939d98b Plasma now "boils" at 50C, Reagent effects can now trigger on Temp Change (#46361)
About The Pull Request

Elevates issues brought up in #46100 & #45020 into a feature by having it only do such based on temperature. Also fixes an exploit where you could make on-demand fire traps by heating plasma prior to splashing, or simply heat it up to avoid having to use reactions and/or pyrotechnics in grenades.

If the temperature is 50C or above, plasma will "boil" aka become gaseous and spread as it would had you previously harm intent.

Consequently, this adds the framework for having special effects depending on the temperature of the reagent.

Minorly, Cryostasis beakers now will not have chem temperature shifts (forever chilly)
Why It's Good For The Game

Fixes 2 issues without snowflaking react_obj or beakers or anything to compensate for plasma, while still keeping syringes and the like using react_obj

Also makes it consistent if you're into immersion and stuff.
Changelog

cl
add: Plasma now "boils" at 50C. This means you will need to heat the liquid form up to make it into a gas (previously you could just splash it)
tweak: containers that halt reactions (IE cryostasis beakers) will keep reagents at a set temperature.
fix: Plasma will no longer summon gas whenever transferring via syringe. AKA you can now do xenobio again.
fix: Plasma can no longer be cheesed grenade-style by heating the beaker. It will now require reaction/pyrotechnics.
code: Reagents now have the framework to perform different effects on temperature change.
/cl
2019-09-09 10:58:51 +12:00
Qustinnus
8599d84d1d The science department now gets a mood bonus for petting borgs. (#46296)
* adds mood event for petting borgs

* oranges suggestions

* indented too far

* woops

* ok unit test chill out
2019-09-08 03:34:02 -07:00