Cameron Lennox
56575082ff
Merge pull request #16891 from KillianKirilenko/kk-loadouts
...
Update & Cleanup Loadouts
2025-01-14 15:36:36 -05:00
Cameron Lennox
39b0b2839f
Merge pull request #16894 from KillianKirilenko/kk-aces
...
ACE Security Outfit
2025-01-14 15:29:36 -05:00
C.L.
3d25ff0b4a
Removes the RS add comments
2025-01-14 15:21:24 -05:00
Killian
9a17931d86
default jacket toggle
2025-01-14 18:57:51 +00:00
Killian
f14fdfb11e
Merge remote-tracking branch 'upstream/master' into kk-loadouts
2025-01-13 21:26:32 +00:00
Killian
27a6b7eed0
clean up _vr files
2025-01-13 21:26:08 +00:00
Killian
95fa27627c
Update loadout_suit.dm
2025-01-13 21:07:20 +00:00
Killian
433aa9a0a3
ace security outfit
2025-01-12 22:07:36 +00:00
Killian
89ad7e1fa6
Update loadout_shoes.dm
2025-01-12 20:50:45 +00:00
Lilly-Lira
3ec79e0665
MemoryCrown
2025-01-12 03:41:09 -05:00
Cameron Lennox
40434b2402
Merge pull request #16875 from KillianKirilenko/kk-setup
...
Clean Up Global Tab
2025-01-11 14:39:53 -05:00
Killian
764a0fca83
gorka suit refactor touchup
...
added black command and grey variants, touched up cuff tones for department colours
2025-01-11 13:23:09 +00:00
Killian
592fc92314
Revert "clean up global tab"
...
This reverts commit 268b2803da
2025-01-10 23:22:58 +00:00
Killian
c270c270dc
Revert "gorka suit refactor"
...
This reverts commit e73ef00ca6
2025-01-10 23:22:26 +00:00
Killian
e73ef00ca6
gorka suit refactor
2025-01-10 23:22:18 +00:00
Killian
268b2803da
clean up global tab
2025-01-09 11:12:18 +00:00
ShadowLarkens
a98ffeaf72
Actually make Evelynn able to spawn their fluff item... z.z ( #16870 )
2025-01-08 20:14:59 +01:00
ShadowLarkens
42b7bd89f0
Fix synth_color not working ( #16866 )
...
* Fix synth_color not working
* Fix spawnpoint pref
* living
* oups
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-01-08 16:03:20 +01:00
Killian
941bbd54b8
""antagonism"" cleanup ( #16841 )
2025-01-06 06:45:20 +10:00
ShadowLarkens
b57023cd11
Convert preferences to /tg/ preferences ( #16449 )
...
* Convert all preferences to /tg/ preferences
* Move obfuscate key/job to game options
* Add abstract_type to each of the new subtypes
* Convert ignored players to tg prefs
* Yet another global category list removed
* Fix error, convert client FPS
* Convert UI_style, UI_alpha, and UI_color to tg prefs
* Clean up a little, convert tooltipstyle
* Convert ambience to tg prefs
* Remove chat_timestamp, tgchat can do this internally and gives localized results
* Convert admin ooc color to pref, merk 01_ui.dm
* Convert uplinklocation to a tg pref
* Fixup byond:// links
* Convert name_is_always_random
* Convert spawnpoint
* v16 savefile migration in prep for converting 03_body.dm
* Convert all colors to tg prefs
* Finish converting ooc notes
2025-01-05 13:39:18 +01:00
Wickedtemp
c7a4f05bbf
Update loadout_fluffitems_vr.dm ( #16829 )
...
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
2025-01-04 03:05:14 +01:00
Kashargul
e6ef8b0f2c
resize limits and designer / dna update ( #16807 )
...
* resize limits and designer / dna update
* .
* genes to mobs
* .
* Update designer.dm
* Update designer.dm
* species cleanup
2025-01-01 18:23:20 +10:00
ShadowLarkens
5a47c9b8a1
Check for 516 byond:// hrefs ( #16359 )
...
* Add a lint to check for hrefs that don't start with byond://
* Regex convert href links
* Regex convert _src_ as well
* Clean up the last few
* Missed a few
2024-12-11 08:33:17 +10:00
Kashargul
a88c58dde7
Merge branch 'master' into reagentToDefines
2024-12-08 15:41:21 +01:00
Kashargul
939fcbb488
Merge branch 'master' into reagentToDefines
2024-12-06 21:57:14 +01:00
Killian
553675edf5
Merge branch 'master' into kk-spacetraffic
2024-12-06 20:45:06 +00:00
Heroman3003
edd99b63cf
Merge pull request #16639 from KillianKirilenko/kk-charpod
...
"Maint Lurker" Hole
2024-12-07 05:05:22 +10:00
Kashargul
80edcd2c3d
Converts gas, mat and reagent strings to defines
2024-12-06 17:26:00 +01:00
Killian
01813cd4d0
maint lurker setup
2024-12-04 12:22:40 +00:00
Killian
e9aafd2826
Merge remote-tracking branch 'upstream/master' into kk-spacetraffic
2024-12-02 06:08:55 +00:00
Killian
9d3a7986d8
traffic update
...
more khi cleanup
2024-12-01 18:37:08 +00:00
Kashargul
56c53e72fe
Merge branch 'master' into protRig
2024-11-30 15:00:57 +01:00
Heroman3003
a15578d8fd
Merge pull request #16597 from Kashargul/miscGripper
...
up ports misc gripper, gargoyle, petrification, some message fixes
2024-11-30 14:41:36 +10:00
Kashargul
07958d0657
Merge branch 'master' into protRig
2024-11-28 15:57:44 +01:00
Kashargul
2fdde73d3a
Merge branch 'master' into protRig
2024-11-27 23:58:52 +01:00
Kashargul
938ab8af7c
Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects
2024-11-27 23:53:06 +01:00
Heroman3003
8d70180e87
Merge pull request #16588 from ShadowLarkens/merk_skills
...
Completely merk all traces of the skill system
2024-11-28 05:34:18 +10:00
Killian
c80b0df3d4
recolourable fingerless gloves parity
2024-11-23 22:45:20 +00:00
Heroman3003
ed09e84a67
Merge pull request #16599 from SatinIsle/millie-tarot
...
Fluff item
2024-11-17 20:55:47 +10:00
SatinIsle
24e798346f
Another approved fluff item
2024-11-17 10:40:04 +00:00
Kashargul
1f7926eeef
missing string section
2024-11-13 12:30:07 +01:00
Kashargul
32c9f971bc
tgui usr to ui.user
2024-11-13 00:49:17 +01:00
Kashargul
607614e217
Merge branch 'master' into protRig
2024-11-12 20:35:51 +01:00
SatinIsle
642b9d481e
Fluff item [not approved yet]
...
Do not merge yet, this application has not yet been approved, I will update the commit if/when it is.
2024-11-12 19:08:40 +00:00
Killian
361effe064
bracelet refactor
2024-11-10 15:11:05 +00:00
ShadowLarkens
d929645c49
Completely merk all traces of the skill system
2024-11-10 00:19:03 -08:00
Killian
e6eb45f910
Merge remote-tracking branch 'upstream/master' into kk-rings
2024-11-08 10:50:04 +00:00
Killian
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
Killian
90497326d6
Merge branch 'master' into kk-rings
2024-11-06 14:58:43 +00:00
Kashargul
4879a52633
Server maint subsystem ( #16518 )
...
* upports server maint subsystem
* fix runtime in admin z narrate
* .
* sorts them verbs
* .
* .
* Update code/controllers/subsystems/statpanel.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/controllers/subsystems/server_maint.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
---------
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
2024-11-04 11:44:44 +01:00
