Commit Graph
14937 Commits
Author SHA1 Message Date
CitadelStationBotandPoojawa 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
LetterJayandGitHub 5433b320bf Merge pull request #6036 from Citadel-Station-13/cloak
Donator cloak
2018-03-21 07:59:07 -05:00
LetterJayandGitHub 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
MichiyamenotehifunanaandPoojawa 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime
Hopefully crushes some runtimes
2018-03-20 15:26:43 +00:00
deathride58andGitHub 3a5fbcf15e Update _unit_tests.dm 2018-03-20 11:11:41 -04:00
LetterJayandGitHub 15109ad50a Merge pull request #6029 from Citadel-Station-13/LetterJay-shockcollar
Fixes autolathes not building shockcollars
2018-03-20 10:10:36 -05:00
LetterJayandGitHub 089c2e70b2 fixes runtime in donator
fixes runtime in donator
2018-03-20 09:34:22 -05:00
Emmett GainesandCitadelStationBot 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 HardestyandCitadelStationBot 47850573b0 Fix N2 filter in deep storage ruin (#36523) 2018-03-20 07:53:55 -05:00
LetterJayandGitHub e01a0d521d Update shockcollar.dm 2018-03-19 23:44:13 -05:00
CitadelStationBotandPoojawa 6cd994d342 [MIRROR] Colour fix (#6024)
* Colour fix

* Update ai_laws.dm
2018-03-19 22:18:28 -05:00
CitadelStationBotandPoojawa 9f182d89ed [MIRROR] Distinguishes law types by colour (#6022)
* Distinguishes law types by colour

* merge conflict
2018-03-19 22:17:24 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
PoojawaandGitHub 8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
CitadelStationBotandPoojawa 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
PoojawaandGitHub 088f3fda5d Gives a prompt for people to see who is replying to an mhelp (#5963) 2018-03-19 21:27:41 -05:00
CitadelStationBotandPoojawa 36ba7312c7 Re-recorded the piano instrument to sound better! (hopefully) (#6027) 2018-03-19 21:27:17 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 9338d18a28 [MIRROR] Techweb fixes (#6023)
* Techweb fixes (#36513)

* Techweb fixes

* board

* robo

* Techweb fixes
2018-03-19 21:18:35 -05:00
CitadelStationBotandPoojawa b74454bf5c [MIRROR] Tweaks to ERT creation (#6021)
* inquisition ert tweak (#36511)

* Tweaks to ERT creation
2018-03-19 21:18:02 -05:00
CitadelStationBotandPoojawa fcbc76a7a9 [MIRROR] Pacifists can now use mech drills on closets containing living beings (#6020)
* Pacifists can now use mech drills on closets containing living beings

* Removes no longer needed Mecha code relating to Pacifist use of drills. Also alters variables to be more consistent. (#36494)
2018-03-19 21:16:44 -05:00
CitadelStationBotandPoojawa 889ff6fa08 [MIRROR] circuit diagnostic status icon changes (#6019)
* circuit diagnostic status icon changes

* circuit diagnostic status icon changes (#36218)

* circuit diagnostic hud revisit

warning icon replaced with red versions of prefered icons, new icons added to the AR interface

* did this fix it?

* ok how about now

put all the new icons at the end of the file instead of at different places inside
2018-03-19 21:16:26 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa df15bbe0f0 [MIRROR] New & Fixed AI VOX Sound Files (#6003)
* New & Fixed AI VOX Sound Files

* Update vox_sounds.dm
2018-03-19 21:15:34 -05:00
CitadelStationBotandPoojawa 1d6d8b454c [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017)
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE

* FUCK (#36483)

F A L S E
semicolon be gone
2018-03-19 21:12:46 -05:00
CitadelStationBotandPoojawa 0c1fc7ff61 [MIRROR] Gives warning message to holodeck mobs that gain sentience via sentience potions. (#6016)
* Adds warning message to holodeck mobs that are made sentient. (#36472)

* Gives warning message to holodeck mobs that gain sentience via sentience potions.
2018-03-19 21:12:21 -05:00
CitadelStationBotandPoojawa 51a7f39176 [MIRROR] Updates rhumba beat to be more different from GBS (#6015)
* Updates rhumba beat to be more different from GBS

* Updates rhumba beat to be more different from GBS (#36439)

* Update rhumba_beat.dm

* clarifying comment
2018-03-19 21:11:54 -05:00
CitadelStationBotandPoojawa 009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
CitadelStationBotandPoojawa 6aaef3b010 [MIRROR] Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs] (#6013)
* Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs]

* RND techwebs: Mineral access (#36387)
2018-03-19 21:08:54 -05:00
CitadelStationBotandPoojawa fd63838558 [MIRROR] Circuits constants chips now keep their data on save/load (#6012)
* Circuits constants chips now keep their data on save/load

* Fixes constants chips (#36315)
2018-03-19 21:08:24 -05:00
CitadelStationBotandPoojawa dac99faf65 [MIRROR] Brain Damage Trait (#6011)
* Brain Damage Trait

* Brain Damage Trait (#36235)

* OK FINE GOD.

* balance??
2018-03-19 21:07:57 -05:00
CitadelStationBotandPoojawa e6cee90e4c [MIRROR] Adds missing space to lobby music toggle (#6010)
* Adds missing space to lobby music toggle

* Adds missing space to lobby music toggle (#36517)
2018-03-19 21:07:36 -05:00
CitadelStationBotandPoojawa 777a4473d8 [MIRROR] Fixes roundend report runtmining if no traitor had a uplink. (#6009)
* Fixes roundend report runtmining if no traitor had a uplink.

* Merge pull request #36461 from AnturK/broken-uplink-log

Fixes roundend report runtmining if no traitor had a uplink.
2018-03-19 21:07:18 -05:00
CitadelStationBotandPoojawa 26e1aec9d8 [MIRROR] Massively slows Spaceacillin metabolism (#6005)
* Massively slows Spaceacillin metabolism

* Update medicine_reagents.dm
2018-03-19 21:06:56 -05:00
CitadelStationBotandPoojawa 1fd5de5bfe [MIRROR] Fixes stacks and material containers, fixes wet floors (#6008)
* Fixes stacks and material containers, fixes wet floors (#36497)

* Fixes stacks and material containers, fixes wet floors
2018-03-19 21:06:33 -05:00
CitadelStationBotandPoojawa c17da68be6 [MIRROR] Removes completely unnecessary block of code in reactions.dm (#6007)
* Removes completely unnecessary block of code in reactions.dm

* removes block of code (#36474)
2018-03-19 21:06:01 -05:00
LetterJayandGitHub 4f07c9f856 Merge pull request #5995 from Citadel-Station-13/donator
sabre and sheath
2018-03-18 22:03:11 -05:00
LetterJay 6ee530b30a die 2018-03-18 20:16:50 -05:00
LetterJayandGitHub 9e072fe328 Update __donator.dm 2018-03-18 19:28:51 -05:00
LetterJay 46733bca65 type path 2018-03-18 16:54:43 -05:00
LetterJay f55ad18f69 fk 2018-03-18 15:54:43 -05:00
LetterJay e163a889fb i hate this shit 2018-03-18 15:53:20 -05:00