Commit Graph

2554 Commits

Author SHA1 Message Date
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
iksyp
28e98a4d40 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315)
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
2018-04-22 20:20:06 -04:00
Dax Dupont
7e11ec6bbe Improves fuel tank explosion logging 2018-04-22 17:29:23 +02:00
vuonojenmustaturska
3b27a1c35d zoinks 2018-04-14 10:57:26 -05:00
Dax Dupont
3efe335958 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-04-13 20:39:47 +03:00
Dax Dupont
f2846f6f0a Fixes SCP 194 not using the amount variable. 2018-04-13 09:04:25 -05:00
kevinz000
ab993a117a Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 14:46:14 +03:00
Jordan Brown
a80d9a24cc Merge pull request #37000 from tgstation/KorPhaeron-patch-2
Update compile options to make 512 support official
2018-04-11 16:12:27 -04:00
vuonojenmustaturska
8addcd5217 remove 512 version checks 2018-04-11 14:26:22 -05:00
Tad Hardesty
80570931d1 Fix various macro consistency problems (#37092) 2018-04-11 13:20:57 +03:00
Ashe Higgs
7e4da575d5 New drink sprites for grasshopper, stinger, secs (#37004) 2018-04-08 20:27:07 -04:00
vuonojenmustaturska
ece7de4fb2 Admin borg panel (#36990)
* borgpanel

* wip borg upgrades

* some more

* lockdown

* Update borgopanel.ract

* Update borgopanel.ract

* Update borgpanel.dm

* fuggin borg upgrades :DDD

* more compile, less whatever

* meaningless churn

* and we're done

* usr, vtec

* Update borgopanel.ract

* Update borgpanel.dm

* many squid are cool

* reviews

* coerce to client, much nicer this way

* add admin logging

* review stuff
2018-04-08 11:46:27 -04:00
SailorDave
76abfb02b0 Tweaks mixed blood samples to preserve cloneable if the samples are the same (#36961) 2018-04-06 02:54:29 -04:00
Emmett Gaines
49d1e9ee66 Shuttles have additional baseturfs, and other minor baseturf changes (#36388)
cl ninjanomnom
fix: Shuttles have proper baseturfs now.
fix: Mineral walls properly use their baseturfs when destroyed/drilled.
add: A new engineering goggle mode allows you to see the shuttle area you're standing in.
admin: Buildmode works a bit better with baseturfs now and can properly only remove the top layer of turfs when editing. Note that as a result the order you place turfs is important and a wall placed on space means when the wall is removed there will be space underneath.
/cl

This adds an area hook for turfs getting the PlaceOnTop proc called so shuttle areas are able to intercept it and add a special turf used for determining where the bottom of the shuttle is. I'm not too certain on this being the best way to handle it but the alternatives restrict the kind of turfs that are allowed to be on shuttles which I didn't want to do as it was part of the whole intent of the baseturf change to allow any turf type on shuttles.

The alternative to the area hook would require a tool which attaches turfs to a shuttle which is why there's a shuttle area viewing tool in this pr. I considered doing it this way first but decided it was too clunky.

In addition to other changes:

Tiled/Reinforced floors have proper baseturfs now.

A large amount of the remaining ChangeTurf calls were swapped over to various baseturf helpers so, for example, mining doesn't create a lavaland turf if somehow the mineral wall is on plating.

Escape pods, the aux base, and syndicate drop pod have been converted over to shuttle templates as well.

The error when the timid var is set incorrectly has been changed to a stack_trace.

The change turf file has been made all lowercase as per standard.
2018-04-05 11:13:20 +12:00
Jordan Brown
3147e4bb27 Fixes chem macros with trailing ; 2018-04-04 09:05:28 -05:00
XDTM
8548bd88b0 Adds mob biotypes, categories that can be used to only affect certain mob types (#36570)
* Adds mob biotypes, categories that can be used to only affect certain mob types

* good boy travis

* Update syndicate.dm
2018-04-04 11:09:26 +12:00
YPOQ
1226afde9f Fixes mannitol not curing minor brain traumas (#36645)
* Fixes mannitol not curing brain traumas

* Makes has_trauma_type random, adds type arg to cure_trauma_type

* Adds get_traumas_type proc

* Default to /datum/brain_trauma
2018-04-03 12:41:17 +03:00
kevinz000
d804e3af61 GC fixes 1 (#36705) 2018-04-03 08:54:32 +02:00
AnturK
5ad59da350 Prefixes apply_effect flags, fixes unconcious define conflict 2018-03-31 16:31:11 +02:00
Jordan Brown
565a9dcc8c Merge pull request #36770 from ShizCalev/chem-dispenser-fix
Fixes chem dispenser icon desync
2018-03-30 12:26:13 -04:00
Jordan Brown
095b521231 Merge pull request #36803 from ShizCalev/chem-dispenser-exploit-fix
[s] Fixes chem dispenser not actually requiring power
2018-03-30 11:59:19 -04:00
Jordan Brown
db6bf0d8fe Merge pull request #36805 from ShizCalev/chemmaster-power-change-cleanup
Cleans up duplicate chem_master power_change() proc
2018-03-30 11:58:57 -04:00
ShizCalev
603db53fc2 Fixes silicons unable to remotely use chemmaster 2018-03-30 07:34:43 -05:00
ShizCalev
fb15c169a0 Fixes chem dispenser not actually requiring power 2018-03-29 12:45:52 -04:00
ShizCalev
19b323bfad Cleans up duplicate chem_master power_change() proc 2018-03-29 12:42:41 -04:00