Commit Graph

275 Commits

Author SHA1 Message Date
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
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
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
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58
aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070
[MIRROR] Beacons are no longer radios
2018-03-09 18:41:05 +00:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070)
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
2018-03-07 14:43:25 -06:00
Poojawa
95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710)
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
2018-03-05 12:34:01 -06:00
CitadelStationBot
2c5b8a586b [MIRROR] Operating computers now display required surgery chems (#5701)
* Operating computers now display required surgery chems

* Rebuilds tgui
2018-02-27 05:05:02 -06:00
LetterJay
6ce5985f9f Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775
[MIRROR] [READY]Randomized Station Time + Night Shifts
2018-02-24 00:24:47 -06:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
deathride58
f072def90e Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673
[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.
2018-02-17 20:44:57 +00:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668
[MIRROR] Quote the armor lists
2018-02-17 19:29:50 +00:00
Leo
a5650cccc4 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals. 2018-02-16 12:18:21 -06:00
deathride58
a3180b0173 Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431
[MIRROR] html_interface removal and crew monitoring console refactor.
2018-02-16 14:27:26 +00:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58
91a2c04f0d Update law.dm 2018-02-15 20:27:36 -05:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
AnturK
10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
vuonojenmustaturska
d44ccdb009 Merge pull request #35575 from ShizCalev/communications-console-runtime
Fixes communications console runtime
2018-02-13 10:29:47 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Jordan Brown
3674d38a99 Merge pull request #35493 from DaxDupont/cloner
Fixed cloning pod status not updating when autocloning.
2018-02-10 11:09:52 -06:00
deathride58
21d5781e37 Update arcade.dm 2018-02-07 14:05:34 -05:00
ShiggyDiggyDo
991922b323 Toy Daggers! 2018-02-07 02:31:58 -06:00
deathride58
3a79a17399 Merge pull request #5325 from Citadel-Station-13/upstream-merge-35316
[MIRROR] Fixes comm message list for non-unique messages.
2018-02-06 02:44:29 +00:00
Leo
f574bea5d1 Merge pull request #35316 from AnturK/commfix
Fixes comm message list for non-unique messages.
2018-02-05 14:37:50 -06:00
vuonojenmustaturska
903ab00096 Merge pull request #35299 from ShiggyDiggyDo/arcadegrammar
fixes small grammar issue on arcades
2018-02-05 09:11:51 -06:00
CitadelStationBot
b16d2148e4 [MIRROR] Steampunk Watches! (#5293)
* Steampunk Watches! (#35187)

* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!

* Steampunk Watches!
2018-02-05 01:31:16 -06:00
CitadelStationBot
0d01cb1f56 [MIRROR] Adds a log out button to record screen of the security records and allows you to print photos that are on file (#5298)
* Adds a log out button to record screen of the security records and also allows you to print photos (#35160)

* Adds a log out button to record screen of the security records and allows you to print photos that are on file
2018-02-05 00:54:22 -06:00
CitadelStationBot
e95269398c [MIRROR] Fixes sending cross station messages during wait period. (#5311)
* Merge pull request #35286 from DaxDupont/commsfix

Fixes sending cross station messages during wait period.

* Fixes sending cross station messages during wait period.
2018-02-05 00:49:03 -06:00
CitadelStationBot
684c98d2e2 [MIRROR] Cloner checks if occupant is human rather than just carbon (#5227)
* Cloner checks if occupant is human rather than just carbon (#35077)

* Makes cloner sure its human

* Revert "Makes cloner sure its human"

This reverts commit 2591f2a7cd74cc83d9afcbac5df59bfea20962df.

* travis fix maybe

* Cloner checks if occupant is human rather than just carbon
2018-02-04 22:07:42 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
ShizCalev
cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
oranges
4dac26d2da Merge pull request #34765 from ShizCalev/apc-controller-runtime
Fixes APC controller runtime
2018-01-23 01:42:43 -06:00
Ashe Higgs
c9224a3185 allows servants to cancel warps more intuitively by clicking on the button again (#34504)
* lets you cancel cc warps

* runtimestation
2018-01-19 09:57:57 -06:00
coiax
497e6bb13f Various deadchat messages are more informative and consistent (#34326)
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
2018-01-15 02:56:10 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
deathride58
62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310
[MIRROR] Removes some hrefs from logging
2018-01-12 17:48:13 +00:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090
[MIRROR] Replace hardcoded z-level numbers with a trait system
2018-01-12 17:41:28 +00:00
JJRcop
ed6ec3d63a Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
deathride58
57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
2018-01-08 04:15:47 +00:00