Commit Graph

1815 Commits

Author SHA1 Message Date
LetterJay
71af2a9bc5 Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477
[MIRROR] Science goggles detect grenade reagents
2018-03-31 06:17:37 -05:00
LetterJay
d509014cd3 Merge pull request #6151 from Citadel-Station-13/upstream-merge-36655
[MIRROR] Fixes hot potato coloration
2018-03-31 06:17:22 -05:00
LetterJay
9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617
[MIRROR] Improves some logging legibility
2018-03-31 06:17:11 -05:00
yorii
130337797d Science goggles detect grenade reagents (#36477)
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
2018-03-28 12:18:18 -05:00
kevinz000
8c98e4769c Fixes hot potato coloration (#36655)
* Fixes hot potato coloration

* wupps
2018-03-28 12:17:45 -05:00
vuonojenmustaturska
adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-28 12:17:32 -05:00
Ashe Higgs
8ec16df2e4 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 12:15:06 -05:00
deathride58
be9ae841b6 Merge pull request #6123 from Citadel-Station-13/upstream-merge-36716
[MIRROR] Adds singular_name to BS crystals
2018-03-27 17:48:51 +00:00
deathride58
ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398
[MIRROR] [READY]pathfinding circuitry upgrade
2018-03-27 17:47:11 +00:00
deathride58
15472805ba Merge pull request #6055 from Poojawa/cmo-hypo-objective
Removes the old hypospray from CMO closet, updates tator objective
2018-03-27 17:41:44 +00:00
Jordan Brown
35f0fe9676 Merge pull request #36716 from 81Denton/bscrystalname
Adds singular_name to BS crystals
2018-03-26 14:21:36 -05:00
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
CitadelStationBot
de697be536 [MIRROR] Fix unwrenching and placing directional signs (#6106)
* Fix unwrenching and placing directional signs

* Merge pull request #36677 from AutomaticFrenzy/patch/sign-backings

Fix unwrenching and placing directional signs
2018-03-26 04:30:33 -05:00
CitadelStationBot
9f5682fa35 [MIRROR] New torch sprites, fixed missing inhands (#6099)
* New torch sprites, fixed missing inhands

* missing sprites
2018-03-26 04:27:30 -05:00
CitadelStationBot
bb1aaf01e7 [MIRROR] Plastic flaps are now airtight (#6098)
* Plastic flaps are now airtight (#36659)

* flaps

* fucking flaps, how do they work?

* Plastic flaps are now airtight
2018-03-26 04:20:12 -05:00
CitadelStationBot
bd3d76b8d3 [MIRROR] Modularises vending machines (#6050)
* Modularises vending machines

* Update vending_items.dm
2018-03-22 06:10:17 -05:00
Poojawa
e52e52fa5d Removes the old hypospray from CMO closet, updates tator objective 2018-03-21 20:37:29 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00
CitadelStationBot
2fbdfd1856 [MIRROR] Atmos unary devices can now be analyzed (#6037)
* 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

* Atmos unary devices can now be analyzed
2018-03-21 12:58:24 -05:00
deathride58
9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime
Hopefully crushes some runtimes
2018-03-20 15:26:43 +00:00
CitadelStationBot
9f182d89ed [MIRROR] Distinguishes law types by colour (#6022)
* Distinguishes law types by colour

* merge conflict
2018-03-19 22:17:24 -05:00
Poojawa
8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
CitadelStationBot
dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [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.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
2018-03-19 21:33:18 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
CitadelStationBot
b74454bf5c [MIRROR] Tweaks to ERT creation (#6021)
* inquisition ert tweak (#36511)

* Tweaks to ERT creation
2018-03-19 21:18:02 -05:00
CitadelStationBot
c8004a088e [MIRROR] Crayons and spraycans can no longer infinitely draw large graffiti (#6001)
* 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.

* Crayons and spraycans can no longer infinitely draw large graffiti
2018-03-19 21:16:00 -05:00
Poojawa
d6e7dcdf37 Merge branch 'master' into digileg-runtime 2018-03-17 20:16:21 -05:00
Poojawa
c8365e6be7 Hunts down some runtimes
cleans up some dogborg sleeper code too
2018-03-17 19:38:03 -05:00
deathride58
082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459
[MIRROR] Clown Ops
2018-03-17 23:58:15 +00:00
deathride58
f74aa475c1 Merge pull request #5988 from Citadel-Station-13/upstream-merge-36449
[MIRROR] Chem dispenser upgrade
2018-03-17 23:55:32 +00:00
deathride58
79db79f630 Merge pull request #5987 from Citadel-Station-13/upstream-merge-36437
[MIRROR] Tesla coils and grounding rods actually shock buckled mobs.
2018-03-17 23:54:50 +00:00
deathride58
fa62612298 Merge pull request #5980 from Citadel-Station-13/upstream-merge-36438
[MIRROR] Fixes ghost portal teleportation
2018-03-17 23:53:10 +00:00
deathride58
b8d6bc53cf Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432
[MIRROR] Fixes brain damage json runtime
2018-03-17 23:50:10 +00:00
deathride58
c00c135ed4 Merge pull request #5969 from Citadel-Station-13/upstream-merge-36371
[MIRROR] Fixes false wall layering
2018-03-17 23:47:47 +00:00
deathride58
fc59e7d42f Merge pull request #5968 from Citadel-Station-13/upstream-merge-36079
[MIRROR] [S] Fixes tables being bluespace magnets
2018-03-17 23:47:29 +00:00
vuonojenmustaturska
aceed22b76 Chem dispenser upgrade 2018-03-17 10:10:20 -05:00
RandomMarine
c1e897b298 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 08:49:38 -05:00
kevinz000
2dcaf50d07 Fixes ghost portal teleportation (#36438)
* Forced teleportation by portals

* Update portals.dm
2018-03-17 08:22:46 -05:00
oranges
9ea4bd45c2 Merge pull request #36432 from ShizCalev/braindamageeventruntime
Fixes brain damage json runtime
2018-03-17 07:54:04 -05:00
oranges
9f561a6a65 Merge pull request #36371 from ShizCalev/false-wall-layer-fix
Fixes false wall layering
2018-03-17 07:53:28 -05:00
oranges
dd55ad6f88 Merge pull request #36079 from deathride58/nerfstheskylarlinemanexperience
[S] Fixes tables being bluespace magnets
2018-03-17 07:53:20 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
Cruix
b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
Poojawa
ae2541f0fb Fixes missing href on borg sleepers (#5930)
* Fixes missing href

* Update dogborg_sleeper.dm
2018-03-15 04:44:03 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
LetterJay
3e95574d1e Merge pull request #5941 from Citadel-Station-13/upstream-merge-36346
[MIRROR] Makes touching (8)balls take less time
2018-03-14 10:42:13 -05:00
Dax Dupont
f132f6d703 Makes touching (8)balls take less time (#36346)
* Makes touching (8)balls take less time

* Lower it more because holy shit
2018-03-13 23:04:39 -05:00
kevinz000
0e4f0c0211 Exploit 2018-03-13 23:04:15 -05:00
CitadelStationBot
b24f4a7f1f [MIRROR] Allows medical sprays to be stored in medical belts and smartfridges (#5925)
* Medical sprays can now be added to medical belts and smartfridges (#36313)

* Allows medical sprays to be stored in medical belts and smartfridges
2018-03-12 13:12:18 -05:00
CitadelStationBot
c91006c27f [MIRROR] Create ERT refactor (#5924)
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
2018-03-12 07:30:03 -05:00