cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-02 13:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,617 Commits 55 Branches 0 Tags
f76737dc0472ac901b245453b3d96c2ab8ec687a
Commit Graph

441 Commits

Author SHA1 Message Date
Poojawa
99e57fb221 various citadel tweaks/fixes 
remeber to add //citadel edit to base code changes because we're still a downstream and hard syncs are still a thing
 2018-09-17 03:26:05 -05:00
Poojawa
62813d4392 Fixes Preference related issues 
Also fixes headpatting & tail checks in general
 2018-09-14 03:06:21 -05:00
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Poojawa
1975c74efb Fixes Cit_toggles by sanitizing it with less autism 
how the fuck did it never go from toggles -> cit_toggles I haven't a
clue
 2018-08-31 03:11:41 -05:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
deathride58
586b27d489 adds antag ooc (#7477) 2018-08-23 00:25:27 -07:00
deathride58
e902fa8b79 Clarifies the text in the panic bunker bounce message (#7454) 2018-08-16 13:02:48 -07:00
kevinz000
6353b26822 Update client_procs.dm 2018-08-03 19:26:41 -07:00
kevinz000
03843f1b20 Update asset_cache.dm 2018-07-26 00:43:52 -07:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
Jordan Brown
1c41c36489 Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd 
Fix the MOTD having too many newlines
 2018-06-25 09:18:27 -05:00
Jordan Brown
11dc633021 Merge pull request #38692 from Jordie0608/blacklistedmakesitsoundlikethebuilddidsomethingbadwhichitdidbadbuildnaughtybuild 
Blacklisted buggy build 1428
 2018-06-24 09:16:39 -05:00
deathride58
bf378cdc36 prevents the vast majority of IC in LOOC cases 2018-06-17 04:49:19 -04:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58
8dc3d5f70a Update suicide.dm 2018-06-09 00:47:48 -04:00
oranges
de68aa9571 Individual Logs now follow the client around automatically (#37790) 
The logging is now stored in the persistent client/player_details datum,
that will survive an entire round

The existing mob log is retained and a new admin verb is added to access
it. It will only show logs for the mob in question, across all players
who possibly spent time in that mob

A new log type is added that tracks the mobs the player changes across
into and the times they occured, to better help admins manage complex
situations, this also appears in the mob log as a record of the players
who entered/exited control of the mob
 2018-06-06 04:10:20 -05:00
deathride58
963ad5dce9 Merge pull request #6983 from Citadel-Station-13/upstream-merge-38238 
[MIRROR] Fixes pda style loading
 2018-06-05 21:23:53 +00:00
deathride58
2b02092639 Update preferences.dm 2018-06-05 17:03:55 -04:00
Jordie
d8113dfc99 Fixes datediff not returning (#38215) 2018-06-03 09:04:16 -05:00
Ling
49bd6e24fb Fixes pda style loading 2018-06-03 09:02:42 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
Jordan Brown
d4b8d3e540 Merge pull request #37963 from AutomaticFrenzy/patch/finally 
Unredden the input bar when the viewport is clicked
 2018-05-25 21:25:13 -05:00
deathride58
fd4e6b880a Merge pull request #6830 from Citadel-Station-13/upstream-merge-37943 
[MIRROR] Fix mindswap forcibly enabling ambient occlusion
 2018-05-22 02:27:55 +00:00
deathride58
1e7839342f Merge pull request #6832 from Citadel-Station-13/upstream-merge-37944 
[MIRROR] Remove second copy of jQuery used only by IRV polls
 2018-05-22 02:27:21 +00:00
Jordan Brown
96106ff2e8 Adds OOC verb to show the last round end report you've viewed (#37900) 
You can now view your last round end report window with the "Your last round" verb in the OOC tab

stores the HTML in a data dir
 2018-05-21 16:48:08 -05:00
Jordan Brown
ec14a7c7ef Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery 
Remove second copy of jQuery used only by IRV polls
 2018-05-21 16:33:42 -05:00
Jordan Brown
1766134062 Merge pull request #37943 from AutomaticFrenzy/patch/mind-over-matter 
Fix mindswap forcibly enabling ambient occlusion
 2018-05-21 16:31:21 -05:00
ShizCalev
49bf67ed1d Updates BYOND links to use HTTPS (#37918) 
* Updates BYOND links to use HTTPS

* revert

* if -> If
 2018-05-20 15:31:28 -05:00
ShizCalev
abc57b0e53 Capitalized Current Quirks (#37877) 2018-05-17 20:54:23 -05:00
Kyle Spier-Swenson
085066d555 Client topics only check for deleted objects when an object was actually passed (#37866) 2018-05-17 10:15:12 -05:00
LetterJay
08fab3adaa Update client_procs.dm 2018-05-15 10:25:58 -05:00
LetterJay
24b6ee5a6c should make life simpler 2018-05-15 10:05:56 -05:00
LetterJay
7c3c270e2a Merge branch 'master' into upstream-merge-37749 2018-05-15 00:50:13 -05:00
LetterJay
0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
 2018-05-15 00:47:59 -05:00
oranges
ef7be078b5 Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2 
Send jquery asset when initializing tooltips
 2018-05-14 16:51:20 -05:00
LetterJay
21bc6c48ef Update preferences.dm 2018-05-14 09:53:00 -05:00
LetterJay
e990ac3ef7 Update preferences.dm 2018-05-13 22:06:35 -05:00
Jordan Brown
2424ee0539 Quirk limit now only applies to positive quirks 2018-05-13 08:55:02 -05:00
LetterJay
80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
deathride58
fcc078af35 Update preferences.dm 2018-05-10 23:46:41 -04:00
Tad Hardesty
111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
deathride58
bc6fbeb9fe Adds (fake) ambient occlusion as a client preference 2018-05-07 22:08:08 -05:00
LetterJay
5d18d53566 Merge pull request #6673 from Citadel-Station-13/kevinz000-patch-2 
Allows anyone to reboot on OOM situations
 2018-05-07 09:20:59 -05:00
kevinz000
79d0a12884 Allows anyone to reboot on OOM situations 2018-05-07 03:07:09 -07:00
Tad Hardesty
af5e898dab Fix the top menus in the skin not working 2018-05-06 16:37:31 -05:00
oranges
e0412f6325 Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code 2018-05-06 16:37:13 -05:00