Commit Graph

222 Commits

Author SHA1 Message Date
1fbff5f83b23d39d38b1dfcb4cac8d9b
3118516012 Merge branch 'master' into upstream-merge-39511 2018-08-05 19:48:35 +02:00
oranges
3d9c7aa25b Makes asay brighter orange (#39552) 2018-08-05 11:03:07 +01:00
oranges
cb9da96686 All adminsay now uses the adminobserver colour (#39511)
This makes it more distinguishable for admins
2018-08-04 22:48:42 +02:00
Ling
de83254b10 Fixes the fix 2018-04-29 15:50:26 +02:00
Ling
11da470131 Adds more input keys and changes hotkeys help 2018-04-29 15:19:21 +02:00
Ling
79ce22540c makes the input bar bigger 2018-04-28 21:29:09 +02:00
Ling
ce39f7ef6b Port yog tickets 2018-04-24 19:53:29 +02:00
vuonojenmustaturska
086cb42cda Update interface.dm 2018-03-28 19:38:00 +01:00
Qustinnus
5140cff38c [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] (#35475)
Floyd / Qustinnus (Sprites by Ausops, Some moodlets by Ike709)

add: Adds mood, which can be found by clicking on the face icon on your screen.
add: Adds various moodlets which affect your mood. Try eating your favourite food, playing an arcade game, reading a book, or petting a doggo to increase your moo. Also be sure to take care of your hunger on a regular basis, like always.
add: Adds config option to disable/enable mood.
add: Indoor area's now have a beauty var defined by the amount of cleanables in them, (We can later expand this to something like rimworld, where structures could make rooms more beautiful). These also affect mood. (Janitor now has gameplay purpose besides slipping and removing useless decals)
remove: Removes hunger slowdown, replacing it with slowdown by being depressed
imageadd: Icons for mood states and depression states


What this PR is

This PR adds a system that allows player to gain and lose moodlets based on events occuring to, and around them. These events then give the player a mood value based on what it is. For example a hug could give you +1 mood, while being stabbed in the eye with a screwdriver can give -5 mood. All these moodlets together determine the mood of your character which currently affects the following things:

    Movement speed - If you are very sad you move slower. Replacing movement slow from hunger. (hunger now instead affects mood)
    Screen blur - If you are sad you gain an overlay that slightly blurs the screen, increasing in severity as you get sadder.
    Interaction / do after speed - If you are sad or happy your interaction speed with things such as handcuffs is changed. with a 25% longer time if you are sad, or 10% shorter time if you are extremely happy.
    Hunger rate - You gain hunger slower if you are very happy.
2018-03-08 14:15:57 +13:00
uraniummeltdown
49516c97de changes chatbar font-size to be smaller
adds auto-OOC and Me buttons, makes all buttons look more button-like by making them not flat
2018-02-22 16:46:24 +05:00
AnturK
619b273ed3 html_interface removal and crew monitoring console refactor. (#35431)
Quick changes list:

    html_interface gone
    unused card interface gone
    minimap gone from crew console(subsystem not disabled in case something else wants to use it)
    ui_host() now takes user parameter
    Some assets moved around.

Fixes #22124
2018-02-16 09:31:21 +13:00
Jordan Brown
17673e639c Adds client version to ingame reporting 2018-01-29 09:50:41 -05:00
Jordan Brown
e25f34da76 Makes report issue handle null round IDs and server names (#34124)
* Makes report issue handle null round IDs and server names

* What Leo said

* Add missing bracket

* Parenthesis intensify
2018-01-17 09:28:00 +13:00
tortellinitony
2fcdcafced Makes a hotkey for asay 2018-01-08 17:55:18 -05:00
XDTM
71f6ee67be [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)
* Adds abductor Mind Interface Devices, and a gland HUD

* .
2017-12-18 20:30:20 -06:00
Emmett Gaines
278d25fdfd Quick access hotkeys for backpack and belt (#33501)
* quick access hotkeys for backpack and belt

* fix for mousetrap bombs

* adds help text
2017-12-16 23:17:39 -05:00
ShizCalev
d79d92e1ae Standardizes deconversion message (#33547)
* Standardizes deconversion message

* More cleanup

* Reverted tooltips

* Standardized all flavour_texts

* Cleaned up redundant classes
2017-12-17 12:49:42 +13:00
MoreRobustThanYou
d3aacc2a54 [READY] Monkey mode overhaul (#32916)
* Monkey mode overhaul

* Fix some runtimes

* Clean up code a bit

* Woops!

* WOOPS #2

* Fix stuff.

* Antag datum!

* Fixes

* Fix a runtime

* Fix leaders not being monkeyfied

* ...

* Logging

* Monkey major/minor victory

* Ventcrawling, etc etc

* REEEE

* Forgot a "user".

* handle ninjanomnom's review

* .
2017-12-16 13:34:51 +13:00
AnturK
cd3643fe60 Fixes canceling on rule/report/forum buttons (#33509)
* Fixes report issue cancel

* Other buttons to while i'm at it.
2017-12-14 04:41:28 -05:00
Dax Dupont
80ec17243e Makes sillicon chat more visible (#33222)
Made it green on black

Forgot to remove it at the bold thingy
2017-12-06 07:20:06 -05:00
ninjanomnom
7b7b67edd8 In-code key handling system 2017-11-30 07:40:27 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
deathride58
4589e9c2bd Lets you press Ctrl+H (or just H in hotkey mode) to stop pulling (#31848) 2017-10-19 07:40:30 -02:00
Jordan Brown
d55bd40f91 Issues created with the report issue button will contain the round ID (#30998)
* Issues created with the report issue button will contain the round ID

* Update interface.dm

* More url encoding

* URL ENCODE THE PLANET!

* Server name

* Fix trevis

* Too many god damn fucking brackets here
2017-10-04 12:27:57 +13:00
Jordan Brown
4178c209f1 Configuration datum refactor (#30763)
* Configuration datum refactor

* More WIP

* New easier on the eyes format

* More WIP

* Finished config.txt

* Fucktons more WIP

* The end of conversion draws near...

* Add all this shit

* Done converting entries finally

* Hunting down compile errors

* More WIP

* MORE CONVERSIONS

* More WIP

* More WIP

* Oh shit only 90 errors this time!

* IT COMPILES!!!

* Fixes world start runtimes
2017-09-29 15:36:51 +13:00
Pirmais
6ac3ac4376 Fixes the wiki button 2017-08-15 12:20:21 +03:00
Kyle Spier-Swenson
f2cf4c2f5c [ready]Makes bIcon better (#29690)
Goonchat will use the asset cache, you now have to specify who to send the icons too.

Goonchat will now load icons in the background, displaying them once they load. this prevents the message from being delayed while the icons are sent.

Icons that aren't preloaded using the asset cache system will not render on ie8 clients. This is because of a ie8 bug that prevents changes on runtime created images from rendering.
2017-08-14 10:40:50 +12:00
MoreRobustThanYou
95e19b85a5 Update interface.dm 2017-08-10 11:35:03 -04:00
MoreRobustThanYou
57c7d7a579 The wiki button now asks what page you want to be taken to
ported from paradise
2017-08-09 13:47:13 -04:00
Jordan Brown
ef96559701 Removes cortical borers 2017-06-26 11:21:08 -04:00
Leo
9d45a6db23 Merge pull request #28670 from MrStonedOne/fixcidrandomizer
Makes oldchat show while goonchat loads, sends preload messages there.
2017-06-22 21:49:41 -03:00
Ashe Higgs
cbdcd08691 Malf AI module refactor and small additions (#28334)
* Refactors malf AI modules to modern standards

* Updates the goonchat stylesheet

* Moves air and fire alarm overrides

* squash commits!

* Fixes some things

* Review, fixes

* does the thing!

* Requested changes
2017-06-21 15:35:03 -04:00
MrStonedOne
7a13937fc7 Makes oldchat show while goonchat loads, sends preload messages there. 2017-06-21 00:51:28 -07:00
Kyle Spier-Swenson
31e41d9f21 Proper fix for icon scaling preferences (#28475) 2017-06-15 22:57:41 -03:00
Jordan Brown
f4ffde7a09 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-06-08 12:54:27 -04:00
Jordan Brown
b6538c50e2 Fixes, css, removes changefont 2017-06-08 12:52:25 -04:00
Jordan Brown
5bbbd26739 Merge branch 'master' into goonchatv3 2017-06-07 20:06:46 -04:00
Jordan Brown
3073d0dc8c Fixes datum verbs 2017-06-07 16:08:52 -04:00
Jordan Brown
e6bfb7f449 Refactors datum verbs to be general (#28109) 2017-06-06 22:21:26 -03:00
Cyberboss
ffbdc49188 Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3 2017-05-08 09:23:55 -04:00
Joan Lung
ca815ef61f Merge pull request #23201 from MrStonedOne/clientimprovements
[READY]DATUM VERBS AND TOP MENUS!
2017-05-07 18:07:35 -04:00
MrStonedOne
a6f423d7cd Fix defaults
I was going to make this an arg but it being a variable made more sense.
2017-05-06 16:02:24 -07:00
MrStonedOne
33efcb78c4 Does the cyberboss 2017-05-05 20:19:18 -07:00
Cyberboss
bcfeebb060 Merge branch 'master' into goonchatv3 2017-05-05 19:18:25 -04:00
Jack Edge
be7b49422e Adamantine golem leadership
🆑 coiax
add: Adamantine golems have special vocal cords that allow them to send
one-way messages to all golems, due to fragments of resonating
adamantine in their heads. Both of these are organs, and can be removed
and put in other species.
add: You can use adamantine vocal cords by prefixing your message with
":x".
del: Xenobiology is no longer capable of making golem runes with plasma.
Instead, inject iron into the adamantine slime core to get an incomplete
golem shell, then complete it with 10 sheets of a suitable material.
/🆑

Adamantine Golems are the starting Free Golem spawns, and they are
previously just as ordinary as Iron Golems, which are strictly worse
than a variety of other golem materials. This gives them limited one way
telepathy, to act as leaders and communicate to the other golems.

They're vocal cords because it's a suitable fit for the vocal cord code,
and recieving it is organ based because more organs are always fun.

Making "leadership" slave golems is somewhat of a contradiction, and
they're also somewhat easy to spam. This requires xenobio to at least
have some spare materials lying around (remember, you can use metal and
glass or plasteel).
2017-05-05 18:08:40 +01:00
MrStonedOne
1ff6a090d4 DATUM VERBS AND MENUS! 2017-05-04 01:54:20 -07:00
Lzimann
53677a7f7f Fixes conflicts 2017-04-28 08:37:13 -03:00
Leo
e803369fd9 Merge pull request #26634 from Core0verload/tochat_master_race
Changes some << to to_chat
2017-04-28 08:14:09 -03:00
c0
ee049b38de Changes some << to to_chat 2017-04-27 04:20:26 +03:00
MrStonedOne
ca9bbaa333 Fixes changelog assets
It now uses the asset cache, so opening the changelog more then once does not re-send the assets.
Added the scales.png asset
2017-04-26 13:35:36 -07:00