Commit Graph

1018 Commits

Author SHA1 Message Date
AffectedArc07
04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
variableundefined
6d66f81f93 Merge pull request #13109 from Birdtalon/char-slots
Increases char slots to 30
2020-03-17 15:00:41 -04:00
Fox McCloud
3a08570675 Merge pull request #12616 from SteelSlayer/ai-voice-to-text-pref
Adds a "Hear/Silence AI Voice Announcements" verb to the preferences tab
2020-03-14 16:01:07 -04:00
Fox McCloud
8ce3b1da16 Merge pull request #12932 from AffectedArc07/var/const-to-define
Replaces all var/const with #define
2020-03-14 15:33:44 -04:00
Patrick Meade
54f538307c Panic bunker threshold is configurable (#13080)
* Panic bunker threshold is configurable

* Cleaned up bunker automation logic, added admin control verb

* Changed Set Server Capacity to two toggle verbs; modified logic

* Revert "Changed Set Server Capacity to two toggle verbs; modified logic"

This reverts commit 398a8615a5.

* Revert "Cleaned up bunker automation logic, added admin control verb"

This reverts commit b6a6d49714.
2020-03-12 01:24:16 -06:00
Birdtalon
0894b0246f increases char slots to 30 2020-03-11 23:28:26 +00:00
AffectedArc07
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
Ty-Omaha
428f8aff1d Sort things (#13025) 2020-03-01 13:43:00 -07:00
Fox McCloud
001ffc88c4 Merge pull request #12865 from Arvenius169/RacialLoadoutFix
Racial Loadout Items Pathway Fix
2020-02-24 19:43:25 -05:00
SteelSlayer
762a035208 Merge branch 'master' into ai-voice-to-text-pref 2020-02-14 14:24:55 -06:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Kyep
9dc3a18506 tweaks link message for banned players 2020-01-09 03:56:17 -08:00
Kyep
1504b78ba2 Merge remote-tracking branch 'ParadiseSS13/master' into forum_integration_improvement 2020-01-06 19:28:51 -08:00
Crazy Lemon
488b51bc1d Merge pull request #12887 from Kyep/513
Updates Travis to 513, Makes codebase compile on 513 without warnings
2020-01-06 18:04:38 -07:00
Kyep
2fd66d8510 replaces lentext() with length() 2020-01-06 16:01:20 -08:00
Kyep
f6d332d829 brings paracode more in line with TG 2020-01-05 00:08:09 -08:00
Kyep
7dcb34577b Ports TG/lummox fix to reduce impact of keysend floods 2020-01-05 00:01:08 -08:00
Arvenius169
63c26fbf6f Update loadout_racial.dm 2020-01-02 20:36:14 -05:00
Arvenius169
40118846f4 Update loadout_racial.dm 2020-01-02 19:28:53 -05:00
Arvenius169
be9b931b0f embarassed 2019-12-30 03:24:18 -05:00
Kyep
57412d810f Text clarification 2019-12-22 18:17:15 -08:00
Kyep
a4e6dba738 fixes connection logging to DB not working 2019-12-16 15:55:04 -08:00
Arvenius169
a94916d5f3 Update loadout_racial.dm 2019-12-13 18:44:34 -05:00
Arvenius169
46ea323cf3 Update loadout_racial.dm 2019-12-13 18:40:26 -05:00
Arvenius169
f6c1a388a3 Racial Loadout Items Placement Fix 2019-12-11 15:29:07 -05:00
Kyep
de7b8c52e7 Add link for newly banned people verifying their forum accounts 2019-11-03 01:02:44 -08:00
SteelSlayer
3e797180fc removes if(!holder) check 2019-10-20 11:54:57 -05:00
Kyep
adbe7f1b43 Hide forum link for new players 2019-10-20 02:19:53 -07:00
SteelSlayer
202091090f Gives players an option to hear AI voice announcements as text announcements 2019-10-20 00:34:19 -05:00
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
Darkmight9
d117d72848 Alphabetizes character creation options (#12492) 2019-10-04 19:08:08 -04:00
Ty-Omaha
18bbcc6fa4 silence current midi verb (#12394) 2019-09-24 15:18:14 -07:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Ty-Omaha
fb65835fa4 Removes custom admin event info verbs (#12355) 2019-09-20 18:14:06 -07:00
Kyep
7778c91c45 semi-mirror TG PR 46425 2019-09-11 16:13:35 -07:00
variableundefined
b5860a7bfc Merge pull request #12016 from SomeSortaSquid/karma-fix
Karma purchase infinite loop fix
2019-09-06 19:29:39 -04:00
variableundefined
b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
variableundefined
74a981d8c2 Merge pull request #11895 from MarsM0nd/no_dance
Dance machine preference
2019-08-28 08:46:26 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Fox McCloud
0af85ab71d here we go 2019-08-26 06:07:35 -04:00
Fox McCloud
d0b4c61129 Loadout Updates 2019-08-26 01:36:47 -04:00
Fox McCloud
85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme
2019-08-25 16:51:21 -04:00
SomeSortaSquid
f4813a51c7 Update client procs.dm
I can't explain exactly why, but switch() responsible for choosing karma_purchase() are parts of an infinite loop I couldn't locate.
Return statements break that loop. As far as I can tell, it's not causing any other issues.
2019-08-16 22:29:06 +02:00
AffectedArc07
bdc4bba6ac Add back parallax SQL changes 2019-08-14 17:53:15 -07:00
tayyyyyyy
760009a0cb Fix style 2019-08-13 16:32:31 -07:00
tayyyyyyy
77731d87d2 Fix setting high parallax setting insane instead 2019-08-13 16:32:31 -07:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
variableundefined
c8e0dee631 Merge pull request #11735 from AffectedArc07/panic-bunker
Panic Bunker
2019-08-12 19:34:19 +08:00
Fox McCloud
a15c9fd932 Merge pull request #11865 from Couls/resource_urls
change preload_rsc value to set right before resources are sent
2019-08-11 20:04:22 -04:00