Commit Graph

2591 Commits

Author SHA1 Message Date
zaracka
047f77762a Increases the probability of cultist deconversion effects (#39213) 2018-07-20 14:55:24 +01:00
AnturK
f0f3c462d8 Fixes pandemic runtime. (#39192) 2018-07-18 17:30:41 +01:00
Fel
1213d701f5 Fermentation Barrels (#38977)
* Adds fermentation barrels.
2018-07-16 16:19:52 +02:00
Time-Green
fabdd28881 Maintenance pills (#39038)
Adds maintenance pills. They are a rare maint loot that holds a random reagent, with exception of a few blacklisted ones. Their name and description are also random
2018-07-12 22:24:48 +01:00
AnturK
8c9ee5df56 Stops extinguishers from reaching absolute zero. (#39063) 2018-07-11 16:01:11 +01:00
Jordan Brown
aa7b055b35 Fix and optimize Dockerfile (#39019)
* Change sound double quotes to single quotes

* Remove broken guitar note bs

* Fix and optimize Dockerfile
2018-07-10 03:43:28 +01:00
XDTM
11fcfc75e3 Corazone actually does something (#38828)
cl XDTM
fix: Corazone now actually stops heart attacks.
/cl
2018-07-08 03:08:39 +01:00
Trevor Serpas
6d395a672f Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 07:01:19 +01:00
81Denton
f773e818f6 Improves cargo shuttle/firefighting foam descs (#38927)
* Improves cargo shuttle/firefighting foam descs

* oof
2018-07-06 15:42:44 +01:00
vuonojenmustaturska
d4bc8e4561 Remove extraneous reagent istype checks, allow carbons (MONKEYS) to get drunk (#38831)
* reaction_mob

* on_mob_add

* on_mob_life

* allow carbons to get drunk
2018-07-02 17:28:10 +01:00
81Denton
9cc0359443 Adds patriotism to Liberation Station (#38739)
* Adds ancient patriotism to Liberation Station

* I was clapping the whole time this was compiling
2018-06-30 01:05:05 +01:00
oranges
27f5d95851 Merge pull request #38726 from Mickyan/fernet_fix
Fixes a bug with Branca Menta and moves Fernet to contraband
2018-06-27 09:59:21 +01:00
81Denton
094c040ab8 Gives honey antibiotic properties (#38728)
* Gives honey antibiotic properties
henk

* 0.6
2018-06-27 02:30:59 +01:00
Irafas
3b154d02c3 Prevents reagents being transferred to a bucket while its worn on a head (#38727)
* Fixed bucket hat bug

Stopped the user from pouring reagents into a bucket while worn as a hat. Does so by changing the bucket to not have a container type until its removed

* Should work

* Works better

* ExcessiveUseOfCobblestone is right, this better

* As per recommendation
2018-06-26 21:34:16 +01:00
Jordan Brown
2f9dff3690 Merge pull request #38699 from Irafas/HardsuitEyeFix
Hardsuit helmets protect eyes from pepperspray
2018-06-25 15:19:13 +01:00
Tlaltecuhtli
3879d7d45c [READY] better contraband crates (#38321)
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-22 00:52:20 +01:00
Jordan Brown
ae171ec9bf Merge pull request #38609 from AnturK/missedthatinreviewwhoops
Fixes chemnade logging and cleans up the reagent stringify helper
2018-06-20 15:26:29 +01:00
Ling
63739f50d5 Merge pull request #1310 from yogstation13/upstream-merge-38510
[MIRROR] Cleans up the chem synths jesus christ what the fuck
2018-06-18 12:39:49 +02:00
Tlaltecuhtli
8a27145150 Advanced foam extinguisers (#38270)
* mining voucher tweak

* will it blend

* d

* s

* ss

* advanced fire extinuishers

* remove trash

* garbage cleaning

* lets see

* t

* whatever

* test if using a var compiles

* adds it to cargo

* adds to atmos + ce

* should fix the sprites

* lowers the volume of the foam tank

* gonna load the icon for this soon

* woops

* foam icon

* ddd

* it works

* boo

* r34ijfirgv5
2018-06-17 21:38:14 +01:00
ShizCalev
771548d36d puts a / at the start of some obj instances (#38545) 2018-06-17 17:11:12 +01:00
Jordan Brown
e2dac49f59 Merge pull request #38476 from AutomaticFrenzy/patch/sparks
[s] Fix launchpads creating way too many sparks
2018-06-16 22:03:24 +01:00
Dax Dupont
0f8a1cde97 Cleans up the chem synths jesus christ what the fuck (#38510)
* Cleans up the chem dispensers jesus christ what the fuck

* Also hey you can set unit amounts now
2018-06-16 21:37:55 +01:00
Armhulen
ebba5a4380 quickie fixies (#38511) 2018-06-16 10:31:27 +01:00
Nich
ee523d7548 Merge pull request #1285 from yogstation13/upstream-merge-38287
[MIRROR] Signal define
2018-06-15 20:42:54 +02:00
Nich
06dcd687cd Revert "Revert "[MIRROR] Virus crates now contain randomly generated viruses instead of single-symptom advance presets"" 2018-06-15 15:27:09 +02:00
Tad Hardesty
10e0fa2560 Merge pull request #38287 from ninjanomnom/signal-define
Use a define to speed up sending signals to datums with no signals
2018-06-15 12:40:41 +01:00
Nich
e811388211 Merge pull request #1252 from yogstation13/upstream-merge-38395
[MIRROR] You can see what other people eat or drink
2018-06-13 13:37:59 +02:00
Ling
bfeae54d63 Revert "[MIRROR] Virus crates now contain randomly generated viruses instead of single-symptom advance presets" 2018-06-13 12:35:06 +02:00
cacogen
7f5705e126 You can see what other people eat or drink (#38395)
* Makes drinking message visible to others

* Makes swallow message visible to other people

* Adds visible messages for eating

* Update snacks.dm

* Update snacks.dm

* Update objs.dm

* Update drinkingglass.dm

* Update pen.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks.dm

* Update condiment.dm

* Update snacks.dm

* Adds a few extra reagents to the borg shaker

* Update drinkingglass.dm

* Update drinkingglass.dm

* removes blood as a borg shaker reagent
2018-06-13 10:35:41 +01:00
AnturK
0ed4664322 Fixes chem heater trying to heat up empty beakers. (#38434)
* Fixes chem heater trying to heat up empty beakers.

* Typo
2018-06-13 10:25:55 +01:00
Ling
70538cca83 Merge pull request #1245 from yogstation13/upstream-merge-38427
[MIRROR] Adds a new drink: Peppermint Patty from Archer!
2018-06-13 10:20:19 +02:00
Armhulen
d7d178342b Adds a new drink: Peppermint Patty from Archer! (#38427)
* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too
2018-06-13 08:50:22 +01:00
XDTM
f65a95d6a8 Virus crates now contain randomly generated viruses instead of single-symptom advance presets (#38412)
* Virus crates now contain randomly generated viruses instead of single-symptom advance presets

* fix

* mapswap
2018-06-13 08:45:05 +01:00
Jordan Brown
f9e709c18c Merge pull request #38116 from AutomaticFrenzy/patch/anchored
Refactor machinery to default to being anchored
2018-06-01 17:28:09 +01:00
vuonojenmustaturska
77410bd84b Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 15:48:10 +02:00
Nich
a4799aa102 Merge pull request #1082 from yogstation13/upstream-merge-38128
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-05-31 12:22:27 +02:00
kevinz000
47bbde3a60 Chemical Specific Heats (#37691)
cl
experimental: Chemistry now has something called specific heat. For the uninitiated, this is the thermal capacity of the reagent, much like how some atmospherics gases have different thermal capacities, making them able to absorb/release more energy per degree of temperature change!
rscadd: Plasma specific heat is 500J/K*unit, everything else is 200
/cl
2018-05-31 11:45:36 +02:00
ShizCalev
39c247d6a9 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-31 05:57:29 +01:00
Grandmother of 50
5dba85d3fb Gives effects to drinks Alexander, Between the Sheets, and Menthol (#37700)
Drink effects!
2018-05-26 23:01:51 +01:00
vuonojenmustaturska
b64e216613 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 13:37:12 +01:00
Dax Dupont
5b274c70d6 Liver fixes (#37175)
* Rebalances lethality and adds a traitcheck

* Moves borg reagent to other_reagents since these shouldn't do damage at all and are hardly toxins

* Lower it more because this is probably gonna hurt a lot real fast

* Naku's suggestion

derp

Thanks cobby

readds this check

almost nerfed cybernetic livers oops

Aaaaaa
2018-05-24 21:35:09 +02:00
Nich
dbbd605a50 Merge branch 'master' into prsfixed 2018-05-24 13:01:20 +02:00
Nich
ec74ea5771 Merge pull request #942 from yogstation13/upstream-merge-37671
[MIRROR] Adds an EMP protection component, allowing ANYTHING to be protected from EMP
2018-05-24 12:48:35 +02:00
Nich
d0ad31fac1 tesla_act refactors and balancing (#37369)
experimental: Tesla damage has been reworked to structures and objects have been worked with a linear scaling.

experimental: All tesla weapons now no longer need to hit a mob to arc lightning; however, they will no longer stun, and only hit each target once.

tesla_zap vars are now a single bitfield.
2018-05-24 12:28:16 +02:00
vuonojenmustaturska
ddd4409133 Adds an EMP protection component, allowing ANYTHING to be protected from EMP (#37671)
The component is initialized with any combination of three flags, EMP_PROTECT_SELF protects against effects that target the object itself, EMP_PROTECT_WIRES protects against wires being messed with similar to the NO_EMP_WIRES_1 flag which this PR removes, EMP_PROTECT_CONTENTS protects against things that are inside the object like organs, internal "non-virtual" power cells and the like

This enables (but doesn't introduce) new mechanics such as adding EMP shielding at runtime to any atom, or taking it away.
2018-05-22 21:35:29 +01:00
pubby
6e145a6ff9 [ready] cargo bounties (#37833)
* Cargo Bounties

* Rebalance and merge exports into bounties.

* Tweak and add bounties.

* Fix spelling errors + tweak mech prices.

* Last minute bugfix

* Add bounty consoles to maps.

* Naksu changes

* save 500 cycles woooooooooooooooooooooooooo

* One last price tweak

* Nerf addy and alien sheets
2018-05-22 18:06:46 +02:00
Mickyan
909d20fef9 fixes g.blaster, neurotoxin, nuka cola dizzines (#37894) 2018-05-19 14:11:50 +01:00
Iamgoofball
c74a7d7acb Removes inherent toxin damage from lipolicide (#37874)
* Removes inherent toxin damage from lipolicide

* Update description of lipolicide
2018-05-18 22:47:02 +01:00
ThePainkiller
a53dc59d0b Adds Fernet, a digestif that reduces your satiety. (#37869)
* Added Fernet and subdrinks

Added sprites for Fernet (bottle), and glasses of pure Fernet, Fernet Cola, Fanciulli and Branca Menta

* Adds Fernet and drinks made out of it

Added Fernet, Fernet Cola, Fanciulli and Branca Menta

* Adds reactions to fernet

* Adds Bottle of Fernet to the list

Spriting by the wonderful NeoExperiences

* Adds Fernet to the Borg's Shaker

They can help you indulge in more hedonism now.

* Adds Fernet to the Booze Dispenser

* Adds Bottle of Fernet to the list

* Updated Fanciulli, Branca Menta

Oops, nearly made two of the drinks not cause the satiety reduction.

* Fixed a missing comma on reagent list

I'm dumb, I forgot this was a list

* Fixed the procs on stamina and hunger

I'm sorry I'm sleepy and retarded to mistake an L for an M

* Changes the recipe of Fanciulli to include Manhattan

They were conflicting, and the description of the glass already says it's just Manhattan with Fernet, so it's consistent.

* Removes glass_icon_state from pure fernet

Cobby said it was pointless since the spritework was lazy
2018-05-17 18:55:07 +01:00
81Denton
c5a1789902 Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers (#37673)
* fixes RTG power, adjusts pipenet, adds debug dispensers

* newline

* missed one

* infinite cell for debug dispenser

* adds debug chem synthesizer, axes dispenser/full/debug

* fixes chem dispenser/fullupgrade

* updates tgui.js and chem synth beaker name

* adds can_synth_debug var and comments
2018-05-13 00:53:31 +01:00