Commit Graph

10993 Commits

Author SHA1 Message Date
kevinz000
e6cbeac2b2 Fixes blueprints exploit (#36625)
* Fixes blueprints exploit

* redundent qdeleted
2018-03-29 11:35:26 +02:00
RandomMarine
46b89cce88 Fixes plasma window fire armor 2018-03-28 13:38:58 -05:00
Ashe Higgs
bd42041c9c Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
2018-03-28 16:14:08 +03:00
John Ginnane
c3627c2741 Adds guillotine (#36540)
* Add guillotine to the game

Can be found in BoxStation's courtroom. Also added some sounds to the clap emote, which is used during execution

* Made requested changes

* minor typo

* Updated code

* Added crafting recipe and removed from map
2018-03-28 10:41:03 +13:00
vuonojenmustaturska
9fb62af5c7 Merge pull request #36731 from fludd12/this-took-too-long-to-fix
Fixes Rainbow Extracts
2018-03-27 23:21:49 +03:00
vuonojenmustaturska
a6c9a2280f Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-27 20:56:39 +03:00
kevinz000
810e5315da Fixes hot potato coloration (#36655)
* Fixes hot potato coloration

* wupps
2018-03-27 20:53:06 +03:00
Armhulen
5ed2a56ced Refactors Spell and Martial Art Books to use Action Granters! (#36442)
* HE'S DONE IT

LETS GOOOOOOOOOOOOOOOH

* floyd. floyd. he's the floyd. floyd dude yeah yeah yeah yeah FLOYD

* fireball remarks, the other spells.

* YOU MEAN THE CHAOS FLOYDS

* what is a floyd, but a miserable pile of moodlets

* flflflflfoooaooayoyydd FLOYOYODDD DFFRRURURMPPFF

* FLOYDING LIGHTS LIGHTS LIGHTS LIGHTSSS

* GORGE YOUR MOODLETS, EMBRACE YOUR FLOYD

* no more floydposting, i removed the old spellbooks

* aaaaaaaaaaaaaaaaaaah ALL of the remarks added my fucking god

* 10 days to sunday travis.

* last minute fixes

* 1 fix

* 2 fix

* red fix

* martial granters

* MAMA MIA
2018-03-27 20:51:14 +03:00
yorii
3810624cdf Science goggles detect grenade reagents (#36477)
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
2018-03-27 17:05:23 +03:00
vuonojenmustaturska
bc8958cc14 Merge pull request #36541 from XDTM/NOTTHEBEES
Swarming component! Beware of bees
2018-03-27 17:04:09 +03:00
fludd12
5baa1e87e4 Removes an errant comment. 2018-03-26 16:30:40 -04:00
Jordan Brown
77a5507332 Merge pull request #36716 from 81Denton/bscrystalname
Adds singular_name to BS crystals
2018-03-26 15:21:03 -04:00
arsserpentarium
92fe820f3d [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 19:01:34 +03:00
fludd12
daaee7d89c Let's not make it prime several times. That would be bad. 2018-03-26 00:38:18 -04:00
fludd12
663320f2d6 Fixes Rainbow Extracts 2018-03-26 00:32:34 -04:00
Denton
e49d064d3c adds singular_name to BS crystal 2018-03-25 18:40:38 +02:00
Jordan Brown
36d059674d Merge pull request #36677 from AutomaticFrenzy/patch/sign-backings
Fix unwrenching and placing directional signs
2018-03-25 10:06:36 -04:00
81Denton
83c4bde9ec Plastic flaps are now airtight (#36659)
* flaps

* fucking flaps, how do they work?
2018-03-24 22:01:31 -05:00
Lexorion
9589fe43a1 gives the torch new sprites, fixes missing lines in flashlight.dm 2018-03-24 22:01:03 -05:00
Tad Hardesty
8b87d70920 Fix sign backing items rotating when pulled 2018-03-23 21:37:39 -07:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Qustinnus
f79de1ec9b Adjusts the behavior of Mood on sanity (#36640)
cl Floyd / Qustinnus
balance: Changes rate of sanity drain and caps it depending on mood
/cl
Kor gave me permission to work on mood during the freeze so I could stop the fuckload of people that ping me 5 times with insults.

If you are only slightly sad, you wont go insane, but go to a cap, to go insane you /need/ to be in a bad mood at the same time, or you will go back to sane really fast. Also sanity drain rates lowered.

Also if there's bugs/issues with mood just make an issue on the issue trackers, I dont need you pinging me at 4AM to tell me how I'm horrid at things. It'll just make me get a headache. I'm making PRs in good faith, not to annoy the playerbase. The same respect in return would be appreciated.

If mood doesn't work out after this the Headmins will turn off the config, and I'll look into either rebalancing it or repurposing it.
2018-03-23 18:51:09 +13:00
Tad Hardesty
69de4fea25 Allow entering frequencies in human-readable form (#36615) 2018-03-22 22:56:05 -04:00
ShizCalev
79b59c5471 Improves some logging legibility 2018-03-21 23:37:00 -04:00
John Ginnane
3e1db725c1 Modularises vending machines (#36508)
* Modularises vending machines

Each machine now has its own file, which includes it's refill cannister for easy maintenance

* Moved and renamed vending file
2018-03-21 16:33:39 -04:00
fludd12
97534f2ac3 [Ready] Slime Crossbreeding! (Part 1 of 2!) (#35986)
* Slime Crossbreeding!

* Shifts a few things around.

* Prismatic extracts!

* Self-sustaining extracts!

* Consuming extracts!

* Recurring extracts!

* Whups!

* Regenerative extracts!

* Stabilized (unfinished)

* More stabilized!

* This took more effort than it should have.

* Industrial extracts!

* Icons!

* Colors the crosses.

* Bugfixes galore!

* Burning extracts!

* Sounds!

* Starts on burning extracts.

* Charged extracts!

* Minor adjustments to the adamantine shield.

* Fixes map! Ready!

* Fixes problem children, changes consuming extracts

* I'm an idiot.

* Fixes playsounds, unnecessary srcs.

* Removes a gross text2path

* Resolves a conflict

* More AnturK fixes.

* Fixes two other things, too.

* Burning black extracts use shapeshifting now.

* Love Potion now mostly RP in use, aligns user factions.

* Iterative discovery of status effects.
2018-03-21 21:04:26 +01:00
cyclowns
97aeab66c4 Atmos unary devices can now be analyzed (#36485)
tweak: Unary devices can now be analyzed using gas scanners. This means stuff like vents, scrubbers, cryo tubes, or heaters/freezers.


fixes #36448

this means stuff like cryo, vents, scrubbers, heat exchangers, heaters/freezers, injectors, those big pressure tanks etc. can now be analyzed by gas analyzers/PDA gas scanners
2018-03-21 16:21:40 +13:00
Jordie
9c1731e75b Distinguishes law types by colour (#36463)
* distinguishes law types by colour

* hacked laws now separate from ionic

* fix and less src.

* moves hacked laws above ion

* also the ai fixer

* also missed order in stating laws

* Less garish blue
2018-03-19 20:31:51 -04:00
vuonojenmustaturska
0714b6a4da inquisition ert tweak (#36511) 2018-03-19 20:25:55 -04:00
vuonojenmustaturska
287ee756e8 Adds two new intermediate beaker types to chemistry (#36484)
* a commit

* rebase

* 180
2018-03-19 20:22:32 -04:00
XDTM
415e977509 Swarming component! Beware of bees 2018-03-19 23:36:38 +01:00
Ian Turk
fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05:00
SailorDave
7f1c8ef88b Crayons and spraycans can no longer infinitely draw large graffiti (#36412)
🆑 SailorDave
fix: Crayons and spraycans can no longer draw an unlimited amount of large graffiti regardless of uses left.
/🆑

Fixes https://github.com/tgstation/tgstation/issues/35833

The check_empty() at the top of the afterattack() was only checking if the can was empty, not if the amount of charges left was less than the spray amount. This is fixed.
2018-03-19 08:07:28 +01:00
Qustinnus
4911991f70 [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)
cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.
2018-03-18 19:48:50 +13:00
vuonojenmustaturska
fa365a5917 Chem dispenser upgrade (#36449)
* Initial commit for chem dispenser update

* ties macro granularity to manipulator level

* rebase
2018-03-17 16:09:23 +01:00
RandomMarine
093cfdfe45 Tesla coils and grounding rods actually shock buckled mobs. (#36437)
* coils and grounding rods shock buckled things

* general tesla buckle shock proc
2018-03-17 15:48:56 +02:00
kevinz000
a3599d14b8 Fixes ghost portal teleportation (#36438)
* Forced teleportation by portals

* Update portals.dm
2018-03-17 15:21:14 +02:00
Cruix
7639492389 Added clown ops game mode, and several clown weapons. (#36459) 2018-03-17 02:40:53 -04:00
kevinz000
fe5fdec776 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 11:26:09 +13:00
oranges
76576e384a Merge pull request #36079 from deathride58/nerfstheskylarlinemanexperience
[S] Fixes tables being bluespace magnets
2018-03-17 11:25:29 +13:00
oranges
2b07ea6f23 Merge pull request #36371 from ShizCalev/false-wall-layer-fix
Fixes false wall layering
2018-03-17 11:23:47 +13:00
oranges
c7d42c49b9 Merge pull request #36432 from ShizCalev/braindamageeventruntime
Fixes brain damage json runtime
2018-03-17 11:18:41 +13:00
ShizCalev
2211eb0bc1 Fixes brain damage json runtime 2018-03-15 00:05:17 -04:00
cacogen
5e0428c2c8 Makes transit tubes take half as long to secure/unsecure (#36345)
* Makes transit tubes take half as long to secure

Takes ages to build anything meaningful when each pipe takes four seconds to fasten to the floor.

* Halves time to deattach transit tubes

Should be just as easy to get rid of as they are to build

* Update transit_tube.dm

* Update transit_tube_construction.dm
2018-03-13 23:04:21 -06:00
kevinz000
4c1284c9d7 Exploit 2018-03-13 20:44:59 -05:00
Dax Dupont
59adf22116 Makes touching (8)balls take less time (#36346)
* Makes touching (8)balls take less time

* Lower it more because holy shit
2018-03-13 20:44:00 -05:00
deathride58
6b0978b704 Merge remote-tracking branch 'refs/remotes/tgstation/master' into nerfstheskylarlinemanexperience
# Conflicts:
#	code/game/objects/structures/tables_racks.dm
2018-03-13 15:49:25 -04:00
ShizCalev
e7e8ac00da Fixes false wall layering 2018-03-12 16:43:35 -04:00
Polyphynx
abcf7361e0 Medical sprays can now be added to medical belts and smartfridges (#36313) 2018-03-12 11:49:35 -04:00
vuonojenmustaturska
6aabcac079 Create ERT refactor (#36321)
cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl
2018-03-12 23:48:09 +13:00