Commit Graph
1963 Commits
Author SHA1 Message Date
izac112 aa8016bddd Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2025-01-14 02:20:30 +01:00
35172fd5eb Midweek bugfix release (#16867)
* fix adminjump to area (#16853)

* fix a runtime in the keyloop (#16852)

* fix a runtime in the keyloop

* also fix that

* gloves runtime

* do it proper

* fix stun effect act (#16850)

* fix a runtime and some usr to user (#16849)

* fix a runtimg and some usr to user

* .

* .

* more usr

* fix some bad replaces (#16856)

* fix a lot of map issues (#16857)

* fix a lot of map issues

* fix SM template...

* fix change turf (#16860)

* Fluff item for Beeholddrbeesphb/Evelynn (#16859)

* 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>

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
2025-01-08 16:05:01 +01:00
KillianandGitHub 941bbd54b8 ""antagonism"" cleanup (#16841) 2025-01-06 06:45:20 +10:00
ShadowLarkensandGitHub 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
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
KashargulandGitHub 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
izac112 1acf5fb5b6 Converts from old to new style hrefs 2024-12-28 15:24:09 +01:00
izac112 5a63e93153 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-28 14:43:02 +01:00
izac112 f3e3905b41 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-11 20:18:19 +01:00
ShadowLarkensandGitHub 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
KashargulandGitHub a88c58dde7 Merge branch 'master' into reagentToDefines 2024-12-08 15:41:21 +01:00
KashargulandGitHub 939fcbb488 Merge branch 'master' into reagentToDefines 2024-12-06 21:57:14 +01:00
KillianandGitHub 553675edf5 Merge branch 'master' into kk-spacetraffic 2024-12-06 20:45:06 +00:00
Heroman3003andGitHub 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
izac112 68e5bf9d42 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:21:21 +01:00
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17: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
izac112 a2ad915045 Device and weapon 2024-12-01 00:56:26 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
KashargulandGitHub 56c53e72fe Merge branch 'master' into protRig 2024-11-30 15:00:57 +01:00
Heroman3003andGitHub 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
KashargulandGitHub 07958d0657 Merge branch 'master' into protRig 2024-11-28 15:57:44 +01:00
KashargulandGitHub 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
Heroman3003andGitHub 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
Heroman3003andGitHub 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
KashargulandGitHub 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
KashargulandGitHub 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
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
KillianandGitHub 90497326d6 Merge branch 'master' into kk-rings 2024-11-06 14:58:43 +00:00
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
Kashargul 0a5742e55b list helper 2024-11-03 02:30:01 +01:00
Killian 3ff9ace3b9 Merge remote-tracking branch 'upstream/master' into kk-rings 2024-10-29 01:00:23 +00:00
Killian 4869595855 ring/watch accessory transfer 2024-10-29 00:23:23 +00:00
CaseyandGitHub 8f2a31927a Merge pull request #16528 from SatinIsle/bunny-things
Bunny suits
2024-10-27 12:42:43 -04:00
siliconsandGitHub b36015d52a Adds a second ear slot. (#16513)
* misery

* sigh.

* last piece?

* fix

* Fix

* dna

* forgot commas there

* fix style; also that should work as a key

* fix style
2024-10-27 14:33:11 +01:00
SatinIsle c56d5ab8e1 Bunny suits
Added 6 variations of bunny suits, all recolourable: A white bunny suit, a maid themed bunny suit, a white reverse bunny suit, a maid themed reverse bunny suit and the two reversed bunny suits without leg parts.

Changed the rabbit ears headwear to be recolourable.

Added a bunny tail accessory, recolourable.

Added all of the above to the costume vending machine.
2024-10-27 12:47:22 +00: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
KashargulandGitHub 7be625e0cb some more small things (#16491) 2024-10-18 23:36:19 +02:00
KashargulandGitHub b594520a74 next set of spans (#16434)
* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
2024-10-16 23:37:27 +02:00