izac112
f3e3905b41
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-12-11 20:18:19 +01:00
izac112
87ce13b27c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:17:00 +01:00
izac112
058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
Kashargul and GitHub
2fdde73d3a
Merge branch 'master' into protRig
2024-11-27 23:58:52 +01:00
Kashargul
ba6a5d4038
dmi port
2024-11-13 22:38:36 +01:00
Kashargul
3e5dfe1ddc
.
2024-11-12 21:43:13 +01:00
Kashargul
0fb8005207
chompedit cleanup
2024-11-12 20:55:58 +01:00
Kashargul and GitHub
607614e217
Merge branch 'master' into protRig
2024-11-12 20:35:51 +01:00
ShadowLarkens
d929645c49
Completely merk all traces of the skill system
2024-11-10 00:19:03 -08:00
2c11b12814
Headset Refactor and Selection ( #16568 )
...
* headset refactor and selection
* Update headset.dm
formatting
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/_helpers/global_lists.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
---------
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
2024-11-06 18:49:11 +01:00
Kashargul
0a5742e55b
list helper
2024-11-03 02:30:01 +01:00
Kashargul
2e5e6c36a8
protean rigs, no dmis
2024-11-03 02:07:23 +01:00
ShadowLarkens and GitHub
5470702370
Even more action button updates ( #16510 )
...
* Update action buttons up to tgstation/tgstation/pull/29379
* Update action buttons up to tgstation/tgstation/pull/48669
* Some dead signals and stuff
2024-10-22 21:29:42 +02:00
242fa3a66b
Ports over configuration controller ( #16484 )
...
* Ports over configuration controller
* Fixes
* Manual path fix
* patch (#16490 )
* patch
* .
* SQL Fix
* Post-rebase fix
* Added missing examples
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2024-10-22 19:26:44 +02:00
Kashargul
a2c673ab7a
refactors most spans
2024-10-02 21:10:31 +02:00
Heroman3003 and GitHub
828a405fc4
Merge pull request #16301 from Kashargul/robotMiningIDfix
...
Job rank and radio channel rework
2024-09-16 07:26:11 +10:00
Kashargul
8a3520e2e0
move all factions to defines
2024-09-12 20:17:41 +02:00
Kashargul and GitHub
b1968707c3
slots are saved on load
2024-09-09 22:38:12 +02:00
Kashargul and GitHub
cd9b632436
fix trait loa
2024-09-08 19:43:59 +02:00
Kashargul and GitHub
2fda057252
fix trait loading
2024-09-08 18:29:14 +02:00
ShadowLarkens and GitHub
e9ee57df18
Revert "Revert "/tg/ preference datums part 1: take two""
2024-09-07 23:58:49 -07:00
ShadowLarkens and GitHub
02410abcf3
Revert "/tg/ preference datums part 1: take two"
2024-09-07 23:17:16 -07:00
ShadowLarkens
3eb1849626
Fix NIFs being horrible and overriding prefs with byond savefiles
2024-09-07 14:11:18 -07:00
ShadowLarkens
f9052dbb60
Revert "Merge pull request #16240 from ShadowLarkens/revert"
...
This reverts commit 885171f985 , reversing
changes made to 3e314f8064 .
2024-09-07 14:11:15 -07:00
ShadowLarkens
3c09f52c6a
Revert "/tg/ pref datums (part 1) ( #16219 )"
...
This reverts commit faac97e352 .
2024-08-31 12:04:15 -07:00
ShadowLarkens and GitHub
faac97e352
/tg/ pref datums (part 1) ( #16219 )
...
* TG Prefs (Step 1: JSON savefiles)
* TG Prefs (Step 2: Preference Datum Code)
* TG Prefs (Step 3: Convert /datum/client_preferences)
* TG Prefs (Step 4: Clean up and finishing touches)
* Fix some weird compile errors from the rebase
2024-08-31 07:09:05 +10:00
Kashargul and GitHub
b603127029
properly copy characters after confirmation or fully abandon it ( #16228 )
...
* reload after copy
* properly copy after confirm
2024-08-31 05:30:37 +10:00
izac112
42b345b3cc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-08-28 20:22:38 +02:00
Killian and GitHub
4406e228fa
revert throw notifs ( #16169 )
2024-08-12 05:18:28 +10:00
Killian and GitHub
de3ebb5333
fix charsetup tail layering ( #16166 )
2024-08-12 05:17:47 +10:00
izac112
04de351a1e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-07-17 16:14:16 +02:00
Kashargul and GitHub
ab31632830
even more local defines ( #16033 )
2024-06-12 12:57:31 +10:00
izac112
95279d346e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-515
2024-04-24 23:28:19 +02:00
SatinIsle and GitHub
c2263d59ee
Ports "No Shoes" from RogueStar ( #15893 )
...
* Ports No Shoes from RogueStar
Added the ability to choose to spawn with no shoes in character setup. This was ported from RogueStar: https://github.com/TS-Rogue-Star/Rogue-Star/pull/196
* Small fix
2024-04-02 19:10:11 +10:00
izac112
578e38108f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-25 19:31:25 +01:00
Drathek and GitHub
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
izac112
19e46d19b2
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-17 01:06:24 +01:00
Kashargul and GitHub
c9c281f8d7
accidental resets ( #15767 )
2024-02-16 12:00:56 +01:00
Selis
2fdb69ab5c
Some input updates
2024-02-12 23:33:37 +01:00
Montessquio
5bf6e29acc
Add save export functionality.
2024-02-10 22:15:06 -06:00
Montessquio
163523c9a7
Add pref export boilerplate
2024-02-06 16:55:00 -06:00
izac112
eddb283c11
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-18 03:17:20 +01:00
Selis and GitHub
7ccdbb258f
Revert "Revert "12/10/23 - Map swap update" ( #15593 )" ( #15594 )
...
This reverts commit f00d13da66 .
2023-12-11 00:22:42 +01:00
Selis and GitHub
f00d13da66
Revert "12/10/23 - Map swap update" ( #15593 )
2023-12-10 23:37:45 +01:00
Heroman
67026e62e4
Adds 'default' option for bloodreagents
2023-12-09 14:27:50 +10:00
Heroman3003 and GitHub
aca2ba9ccf
Merge pull request #15521 from KillianKirilenko/kk-mini3
...
Jobfuscate!
2023-12-03 11:06:44 +10:00
Killian
e50cbbe56e
pda ringtone pref
2023-11-30 17:38:26 +00:00
izac112
5052f6f672
Merge branch 'release' of https://github.com/VOREStation/VOREStation ; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac
2023-11-28 16:48:53 +01:00
Killian
1fbd1edf88
jobfuscate, director's cut
2023-11-17 20:36:01 +00:00
Killian
f154c237e3
Merge remote-tracking branch 'upstream/master' into kk-mini3
2023-11-17 11:56:41 +00:00