Commit Graph

29057 Commits

Author SHA1 Message Date
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
AnturK
36699cc1ef Fixes crab meat reagents. (#46394) 2019-09-08 01:04:26 -04:00
skoglol
c56f5937e2 Buffs stamcrit (#46323)
* Buffs stamcrit

* Now drops you deeper instead.

* Prevents stacking if high.
2019-09-07 23:45:45 -04:00
oranges
46f4b5867d Merge pull request #46384 from AutomaticFrenzy/patch/ie8-line-height
Fix goonchat line-height setting in IE8
2019-09-08 15:41:10 +12:00
ATH1909
91ae448fc7 Update medicine_reagents.dm (#46365) 2019-09-07 20:25:44 -04:00
MacBlaze1
3021c27f35 Resubmmited alternate PR for Pepperspray rework, Fucked up my repo (#46342)
* Fuck Git pushing and Fuck Git pulling

PR machine broke, had to resubmit

* Update food_reagents.dm

* Major fixes and error fixes for nemvar

* fixed a missing type path part

* expanded scope of protection while increasing protection needed

* spacing error

* adds new variable, pepperproof to check for immunity to pepperspray

* adds another protection variable EYESPEPPERPROOF

* Revert "adds another protection variable EYESPEPPERPROOF"

This reverts commit b9f3682f7c47a157008d565620f8cdcffece145a.

* fixes and reverts to better and easier time

* small formatting fixes

* null checking

* Update living_defense.dm
2019-09-07 20:21:12 -04:00
wesoda25
d429a7616a War on Stuns Ch 8: Fuck Flashbangs (#46221)
* BURAB

* asd

* sowwy

* Update flashbang.dm

* Update code/game/objects/items/grenades/flashbang.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2019-09-07 16:22:41 -04:00
nemvar
84bee81790 Unscrambles melee_attack_chain 2019-09-07 16:12:01 +02:00
Tlaltecuhtli
11024a6c74 Fix loading into the custom vending machine (#46351) 2019-09-06 21:32:32 -07:00
Rob Bailey
8eaf3f63b1 Fix some jumpsuit sprites (#46350)
- Fixes an issue where random jumpsuits were sometimes rolling an invalid 
  jumpsuit.
- Fixes generic red suits having an invalid icon.
2019-09-06 21:30:52 -07:00
carlarctg
4e906278ae Syndicate combat defib buffed, has unique sprites (#46115)
Combat defibrillator has halved recharge time. This allows it to both 
stun people more quickly, and actually be able to cause a heart attack 
with harm intent during the stun.

It also has unique, mediocre sprites by Me. Syndicate duffel bag 
sprites altered slightly so the little med/ammo icon is tilted.

I randomly found out combat defibs could actually be used offensively 
while testing things, but they were both a tad slow to recharge and had 
what was practically an undocumented feature that I've never seen 
anyone use. This PR points out that they can be used in combat, and 
buffs them appropriately so a nuclear operative could reasonably use 
it, at the cost of sacrificing their belt slot and their offhand.
2019-09-06 21:10:33 -07:00
Tad Hardesty
c0b5cd3430 Fix defaults, clamp to minimums 2019-09-06 21:02:45 -07:00
Tad Hardesty
0c311392f5 Fix goonchat line-height setting in IE8 2019-09-06 20:57:24 -07:00
Mickyan
e028edc836 Bombproof photo album contents (#46359)
Makes album contents not be damaged by being at the epicenter of an 
explosion. It's annoying for persistent albums and I don't see the harm 
in it since it's fluff content.
2019-09-06 20:21:04 -07:00
81Denton
3547ba9da1 Add killer tomato logging (#46330) 2019-09-06 19:58:02 -07:00
bgobandit
b93888c1bf Prevent wizards from rod-forming in the den (#46267)
No more rod form in the wizard's den. This applies whether you are a 
wizard or whether you somehow ended up in the den and are not a wizard, 
which I don't know how that would happen, but if you did.
2019-09-06 19:55:58 -07:00
ShizCalev
a0b8baf827 Fix typo in Discord linking process (#46353) 2019-09-06 19:53:26 -07:00
cacogen
6062cc28bb Fixes chameleon ID card job overlays not showing up after sele… (#46329) 2019-09-06 16:37:21 -07:00
nemvar
1ead3e8ae7 Fixes morph movement and replaces magic numbers. (#46358)
* fixes morph speed shizz

* fixes morph movement
2019-09-06 16:23:28 -07:00
oranges
402dbc781d Merge pull request #46370 from ShizCalev/crab-rangoon-fix
Fixes crab rangoon sprite
2019-09-07 09:36:07 +12:00
ShizCalev
c618206307 Fixes crab rangoon sprite 2019-09-06 15:58:11 -04:00
Qustinnus
2d53f8539c jumping into abandoned crates no longers causes them to go boom (#46314)
* no more

* fixed
2019-09-06 04:03:56 -07:00
Dingo-Dongler
cb31d23f49 Fixes self-sustaining rainbow slime extracts, blue slime extracts' foam activation and refactors foam code into a helper proc (#46259)
* Fixing self sustaining rainbow extracts and fixing foam creation of blue slime extracts

* Refactoring foams to be in a helper function. Resin foam remains untouched

* Improving refactor of create_foam

* Putting helper proc in vent clog event

* create_foam takes a foam type again

* minor type passing change
2019-09-06 08:54:42 +02:00
cacogen
1f010e7144 Selectively randomisable characters (#46108)
* Selectively randomisable characters

* it's a list now

* this doesn't work

* it's totally fucking fucked mate big time

* it works

* so sick of this goddamn pull request and yes i know this is a retarded way to do this it didn't work the other way

* anturk forestalls the inevitable suicide

'associative lists are more performant'

* final changes anturk requested

'remove all the "in randomise" and it's ready'
2019-09-06 08:50:12 +02:00