Commit Graph

2578 Commits

Author SHA1 Message Date
81Denton f247f3722b Adds patriotism to Liberation Station (#38739)
* Adds ancient patriotism to Liberation Station

* I was clapping the whole time this was compiling
2018-06-30 12:04:12 +12:00
oranges a3b4099f0c Merge pull request #38726 from Mickyan/fernet_fix
Fixes a bug with Branca Menta and moves Fernet to contraband
2018-06-27 20:58:34 +12:00
81Denton c7290e6292 Gives honey antibiotic properties (#38728)
* Gives honey antibiotic properties
henk

* 0.6
2018-06-27 04:30:54 +03:00
Irafas 45a0db83d3 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 16:33:28 -04:00
Mickyan 3423fb8ce0 branca menta fix, move fernet to contraband 2018-06-25 18:16:12 +02:00
James 66295cc639 Hardsuit helmets protect eyes from pepperspray 2018-06-24 16:15:37 +01:00
Tlaltecuhtli 24b21b8416 [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 11:51:29 +12:00
AnturK 3c972c41ee Fixes chemnade logging and cleans up the reagent stringify helper 2018-06-19 19:39:30 +02:00
Tlaltecuhtli eaa0b551df 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 13:37:34 -07:00
ShizCalev 6d558b6bcf puts a / at the start of some obj instances (#38545) 2018-06-17 19:10:06 +03:00
Jordan Brown f9af896f6c Merge pull request #38476 from AutomaticFrenzy/patch/sparks
[s] Fix launchpads creating way too many sparks
2018-06-16 16:53:02 -04:00
Dax Dupont 42b65eaa0d 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 13:37:58 -07:00
Armhulen 960837c16b quickie fixies (#38511) 2018-06-16 02:33:29 -04:00
Tad Hardesty 6e021b54b2 [s] Fix launchpads creating way too many sparks 2018-06-13 23:08:54 -07:00
ninjanomnom d483ff3ef0 Regexes
`([^_\.])SendSignal\((.+?)\)` -> `\1SEND_SIGNAL(src, \2)`
`([\.\w]+?)\.SendSignal\((.+?)\)` -> `SEND_SIGNAL(\1, \2)`
2018-06-13 19:19:23 -04:00
cacogen 5c7613c4ff 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 05:34:54 -04:00
AnturK 80d828901b Fixes chem heater trying to heat up empty beakers. (#38434)
* Fixes chem heater trying to heat up empty beakers.

* Typo
2018-06-13 05:24:57 -04:00
Armhulen 82c2bffe9d 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 03:49:44 -04:00
XDTM af50573d85 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 00:44:19 -07:00
Jordan Brown 6d0179f57b Merge pull request #38116 from AutomaticFrenzy/patch/anchored
Refactor machinery to default to being anchored
2018-06-01 12:27:38 -04:00
vuonojenmustaturska c65a99f130 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 11:36:31 +02:00
ShizCalev c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
kevinz000 69c903a057 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 12:35:05 +12:00
Tad Hardesty 2f212e16a3 Remove redundant anchored=TRUE from machines 2018-05-27 19:23:37 -07:00
Grandmother of 50 51fe0bb7e8 Gives effects to drinks Alexander, Between the Sheets, and Menthol (#37700)
Drink effects!
2018-05-26 15:01:34 -07:00
vuonojenmustaturska 4f210f49f5 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 14:36:56 +02:00
kevinz000 8023d94b20 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-23 13:40:03 +12:00
vuonojenmustaturska 1eccbcca18 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 11:38:02 +12:00
pubby 9ca6661140 [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-20 18:44:11 +12:00
Mickyan 018fc78c2e fixes g.blaster, neurotoxin, nuka cola dizzines (#37894) 2018-05-19 13:32:13 +03:00
Iamgoofball c72cb04a80 Removes inherent toxin damage from lipolicide (#37874)
* Removes inherent toxin damage from lipolicide

* Update description of lipolicide
2018-05-18 14:46:57 -07:00
ThePainkiller 703ab07fac 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:19:19 +03:00
81Denton 31353719a2 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-12 16:53:46 -07:00
Tad Hardesty e8304c12ac Merge pull request #37760 from YPOQ/stackfix
Fixed stacks sometimes having the wrong amount if created on another stack
2018-05-10 23:23:51 -07:00
XDTM aa782fffd2 [s] Hallucinations 4.0 (#37423)
No ingame changelog cause these are supposed to fool people.

Changes:

    Hallucinations now pick from a single weighted list, instead of being separated in tiers. The more obvious a hallucinations, the less likely it is to appear.
    Hallucination is now a contantly ticking down variable. 1 hallucination = 2 seconds duration. Hallucinating effects have been rebalanced to fit this.
    Hallucinations have a random cooldown ranging from 10 to 60 seconds. The status will still tick down in the meantime.
    The Sounds hallucinations has been split in three: realistic sounds (likely), weird sounds (rare), and station messages (i.e. the shuttle arrived, blob warning, etc.)(also rare).
    The Bolts hallucination now stops you from bumping doors open. You can still click them to open them.
    Removed the singulo hallucination. It's pretty much impossible to make it realistic enough, and it's too widely known to scare someone. It's an annoyance and a definite tell that you're hallucinating.
    Removed the xeno attack for the same reasons. It was kept in the code to serve as a pseudotemplate for hallucination mobs.
    Removed the fake attacker hallucination. Trying to replicate full attack and defense code as well as managing icon generation with blacklists and all is just not worth it. It would never be realistic enough.
    RDS hallucinations have been either rolled into normal ones or removed (the OOC ones). No reason to keep them separate, aside from throwing off the hallucination odds (which has resulted in complaints about the cult victory warning being too common).
    Added/edited a lot of strings for the text-based hallucinations. I could definitely use a few more for the message hallucination, i got writer's block there.
2018-05-10 09:15:46 +12:00
YPOQ 2b141c3e39 Fixes new stacks getting merged before the stack size is set 2018-05-08 22:20:56 -06:00
deathride58 cdf36c2c6f adds ambient occlusion as a client preference (#37406)
ambient occlusion is a shading technique that simulates how light behaves in the real world, where areas that aren't directly exposed to light tend to receive less lighting. In 3d rendered scenes with ambient occlusion present, this can easily be seen in corners and other crevices in geometry, and can also be visible when two objects are close to one another.

cl deathride58
add: Added ambient occlusion. You can toggle this on or off in the game preferences menu.
/cl
2018-05-08 10:06:44 +12:00
ShizCalev ba1030f803 Makes more messages pronoun sensitive (#37582)
* Makes more messages pronoun sensitive

* Some cleanup

* more pronouns

* rever
2018-05-03 18:45:55 -04:00
Grandmother of 50 56713f1439 Satiates Barhandar's thirst for alcoholic apples (Bikeshed Hard Cider Desc Changes) (#37609)
* Update alcohol_reagents.dm

* removes period
2018-05-02 18:30:23 -04:00
Hyacinth-OR b0b7f2df9a Adds grenadine. (#37598)
* Adds the grenadine sprite to drinks.dmi

* Everything else, woops!

* Sprite tweaks.

* Requested changes!

* hopefully fixes merge conflict issues.

* Removes bad files!

* Messed that one up!

* dupe!

* dupes...
2018-05-02 14:12:37 -04:00
europax 5a78cf1874 Adds 5 new drinks (#37589)
* Added 4 sprites

Added sprites for Alexander, Between the Sheets, Kamikaze and Sidecar.

* Added recipes for 5 drinks

Added recipes for Alexander, Between the Sheets, Kamikaze, Mojito and Sidecar.

* Added 5 drinks

Added Alexander, Between the Sheets, Kamikaze, Mojito and Sidecar.

* Added Creme de Menthe to Mojito

* Changed Creme de Menthe to Menthol in Mojito

* Adds menthol and sake to the dispensers

* Adds menthol to drink reagents

* Removes menthol from drug reagents

* Added the box of menthol

* Adds menthol to the booze-o-mat

* Adds the menthol box sprite
2018-05-01 13:42:05 -05:00
Pigeons 3e27e0562b Adds sake 2018-04-28 22:16:53 -04:00
as334 7d32eba2a1 Re-adds and reworks fusion. (#37384)
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 18:01:39 +12:00
oranges ecd0d8b538 Merge pull request #37476 from AnturK/thisalwaysbuggedme
Uppercases slot defines.
2018-04-28 13:13:56 +12:00
Dax Dupont 52a7ebcbff Refactors and fixes RPEDs (#37380)
* Refactors and fixes RPEDs

* Fixes storage related memes

* beams should probably always play
2018-04-27 21:12:41 +03:00
AnturK 52a99c09d6 Uppercase slot defines 2018-04-27 10:38:32 +02:00
AnturK 4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Armhulen ca273db3f0 Removes SCP_294 (#37326)
* aaah sweet essence

* bye bye sprites

* goodbye machine code

* bye bye blacklist entry

* whoops

* scp gone from runtime

* bye bye ract

* bye bye space ruin folder

* bye bye area
2018-04-26 03:05:41 +12:00
Jordan Brown 405537d7f9 Merge pull request #37365 from DaxDupont/fueltank-logging
Improves fuel tank explosion logging
2018-04-23 10:41:04 -04:00
Fox McCloud 057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00