Commit Graph

14969 Commits

Author SHA1 Message Date
loginsandylogout
2bd4aa98ed y 2018-03-22 13:10:23 -05:00
deathride58
476d4ff075 Merge pull request #6053 from Citadel-Station-13/upstream-merge-36539
[MIRROR] Removes toolarm prefix from toolarm surgery tools.
2018-03-21 21:45:09 +00:00
deathride58
def113531c Merge pull request #6052 from Citadel-Station-13/upstream-merge-36565
[MIRROR] Being happy no longer makes you obese.
2018-03-21 21:44:49 +00:00
CitadelStationBot
665754992d Removes toolarm prefix from toolarm surgery tools. 2018-03-21 16:14:35 -05:00
Tlaltecuhtli
3fab4a3b41 fixes #36538 (#36539)
Removes toolarm prefix from toolarm surgery tools.
2018-03-21 16:14:35 -05:00
CitadelStationBot
848ec04d38 [MIRROR] Sets the default preload_rsc to 2 (#6051)
* Sets the default preload_rsc to 2 (#36556)

This was supposed to be 1 or 2 (2 preloads uploaded resources) in the repo and set to 0 in [`server_side_modifications.dm`](https://tgstation13.org/parsed-logs/basil/server_side_modifications.dm) but i messed that up when i switched it from a test merging pr to something mergable.

* Sets the default preload_rsc to 2
2018-03-21 15:55:47 -05:00
CitadelStationBot
b45d732a7d Being happy no longer makes you obese. 2018-03-21 15:35:33 -05:00
Qustinnus
79911d330a Being happy no longer makes you obese. (#36565)
* D O U B L E N E G A T I V E

* jesus
2018-03-21 15:35:33 -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
deathride58
c14b00ad80 Merge pull request #6033 from Poojawa/bluespace-bags-are-a-mistake
Fixes occupied bluespace bodybags from being put in the analyzer
2018-03-21 19:31:05 +00:00
deathride58
06ca6cfc9d Merge pull request #6040 from Citadel-Station-13/upstream-merge-36537
[MIRROR] Adds lights to the bridge on Omega
2018-03-21 19:30:15 +00:00
deathride58
0a331a26ee Merge pull request #5994 from Poojawa/beepboop
Adds IPCs refractors preferences
2018-03-21 19:20:43 +00:00
CitadelStationBot
4403ccf908 [MIRROR] Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#6038)
* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#36549)

* Add Fringe Weaver, Sugar Rush, Crevice Spike from Va-11 Hall-A

* Rebalance crevice spike damage

* Crevice Spike cleanup and sugar-y Sugar Rush

* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A
2018-03-21 14:00:54 -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
CitadelStationBot
99487a6bbb [MIRROR] April Fools Day replaces the overflow role with Clowns (#6041)
* April Fools Day replaces the overflow role with Clowns (#36533)

* Refactors overflow job assignment

* Fixes job selection

* April Fools Day replaces the overflow role with Clowns
2018-03-21 12:57:30 -05:00
CitadelStationBot
4ad2b2975a [MIRROR] Fixes some more trauma bugs (#6039)
* Fixes some more trauma bugs (#36487)

* fixes some more trauma bugs

* Update brain_trauma.dm

* Update brain_item.dm

* Fixes some more trauma bugs
2018-03-21 12:50:22 -05:00
CitadelStationBot
962311ff0d [MIRROR] Preload vox sounds when preload_rsc is disabled (#6042)
* Merge pull request #36557 from MrStonedOne/patch-498

Preload vox sounds when preload_rsc is disabled

* Preload vox sounds when preload_rsc is disabled
2018-03-21 12:49:48 -05:00
LetterJay
5433b320bf Merge pull request #6036 from Citadel-Station-13/cloak
Donator cloak
2018-03-21 07:59:07 -05:00
CitadelStationBot
d95d734b14 Adds lights to the bridge on Omega 2018-03-21 01:04:05 -05:00
ShizCalev
b569465705 Adds lights to the bridge on Omega (#36537) 2018-03-21 01:04:05 -05:00
LetterJay
613d54ad4e Update __donator.dm 2018-03-21 00:36:40 -05:00
LetterJay
8797bdace1 donator cloak thing, going to bed 2018-03-21 00:29:11 -05:00
Poojawa
8377bdf9a8 fixes some screen issues 2018-03-20 23:53:55 -05:00
Poojawa
f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
Poojawa
b80e7cded9 fixes #5996 2018-03-20 19:18:33 -05:00
Michiyamenotehifunana
61fde978e1 Tennis Balls! (and donator stuff) (#5962)
* Donator rainbow stuff and balls!

* Updates code and adds izzy's donator thing

* Adds right click memes!
2018-03-20 19:11:34 -05:00
Poojawa
2bb09bef5f Adds additional screen 'faces', allows switching of screens in game
also puts jelly people in with the jelly people file.
2018-03-20 13:53:52 -05:00
deathride58
0d4e7f73f4 Merge pull request #6031 from Citadel-Station-13/upstream-merge-36466
[MIRROR] Unit test to make sure all subsystems which initialize call parent
2018-03-20 15:56:27 +00:00
deathride58
3aca9ea2af Merge pull request #6030 from Citadel-Station-13/upstream-merge-36523
[MIRROR] Fix N2 filter in deep storage ruin
2018-03-20 15:54:29 +00:00
Poojawa
af82e1109f slight tweaks, revert job controller changes, penor layering tweaked 2018-03-20 10:41:36 -05:00
deathride58
9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime
Hopefully crushes some runtimes
2018-03-20 15:26:43 +00:00
deathride58
3a5fbcf15e Update _unit_tests.dm 2018-03-20 11:11:41 -04:00
LetterJay
15109ad50a Merge pull request #6029 from Citadel-Station-13/LetterJay-shockcollar
Fixes autolathes not building shockcollars
2018-03-20 10:10:36 -05:00
LetterJay
089c2e70b2 fixes runtime in donator
fixes runtime in donator
2018-03-20 09:34:22 -05:00
Emmett Gaines
0832bb62c3 Unit test to make sure all subsystems which initialize call parent 2018-03-20 08:02:17 -05:00
CitadelStationBot
0c38958d95 Fix N2 filter in deep storage ruin 2018-03-20 07:53:55 -05:00
Tad Hardesty
47850573b0 Fix N2 filter in deep storage ruin (#36523) 2018-03-20 07:53:55 -05:00
LetterJay
e01a0d521d Update shockcollar.dm 2018-03-19 23:44:13 -05:00
CitadelStationBot
6cd994d342 [MIRROR] Colour fix (#6024)
* Colour fix

* Update ai_laws.dm
2018-03-19 22:18:28 -05: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
CitadelStationBot
7b3b1f65ec [MIRROR] Adds two new intermediate beaker types to chemistry (#6018)
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
2018-03-19 22:17:05 -05:00
CitadelStationBot
7c8c8f3a0a [MIRROR] Engie goggles in Meson mode now respect light levels (#6028)
* Engie goggles in Meson mode now respect light levels (#36504)

* Engie goggles in Meson mode now respect light levels

Meson glasses show the surrounding terrain, but darken areas beyond line of sight and that are not lit. Engineer goggles set to Meson mode currently show all terrain at max brightness. As a result, it can be hard to even know an area is unlit until objects (or mobs) suddenly start popping in one tile away.

This change makes the Engineer goggles respect light levels like Meson glasses do.

An image for visual aid;
https://i.imgur.com/KdYmkZb.png
Left shows the current Engineer goggles. Right shows the current Meson glasses, and how the Engineer goggles will look with this change.

* Update engine_goggles.dm

* Engie goggles in Meson mode now respect light levels
2018-03-19 21:44:30 -05:00
CitadelStationBot
0016b323f6 [MIRROR] Lowers damage cap on breaking hacked apcs (#6026)
* lowers damage cap on breaking apcs (#36520)

* Lowers damage cap on breaking hacked apcs
2018-03-19 21:44:19 -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
Poojawa
088f3fda5d Gives a prompt for people to see who is replying to an mhelp (#5963) 2018-03-19 21:27:41 -05:00
CitadelStationBot
36ba7312c7 Re-recorded the piano instrument to sound better! (hopefully) (#6027) 2018-03-19 21:27:17 -05:00
CitadelStationBot
980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000)
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
2018-03-19 21:25:01 -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
9338d18a28 [MIRROR] Techweb fixes (#6023)
* Techweb fixes (#36513)

* Techweb fixes

* board

* robo

* Techweb fixes
2018-03-19 21:18:35 -05:00