Heroman3003
edd99b63cf
Merge pull request #16639 from KillianKirilenko/kk-charpod
...
"Maint Lurker" Hole
2024-12-07 05:05:22 +10:00
Killian
01813cd4d0
maint lurker setup
2024-12-04 12:22:40 +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
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
Casey
8f2a31927a
Merge pull request #16528 from SatinIsle/bunny-things
...
Bunny suits
2024-10-27 12:42:43 -04:00
silicons
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
Selis
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
7be625e0cb
some more small things ( #16491 )
2024-10-18 23:36:19 +02:00
Kashargul
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
SatinIsle
7b21a61228
Single language translators ( #16460 )
...
Added a new variant of the handheld translator that only translates a single language into one that you know. These can be taken from character loadout and currently cost 4 points. They can also be found in maintenance randomly.
2024-10-12 16:41:42 +02:00
SatinIsle
0c9eac6408
Disables random hair ( #16451 )
...
Changed character setup to only change your hair on species swapping if the new species is not allowed to use the current hairstyle.
2024-10-12 16:16:34 +02:00
Kashargul
db5b408538
some more and fix filtering
2024-10-05 21:27:23 +02:00
Kashargul
a2c673ab7a
refactors most spans
2024-10-02 21:10:31 +02:00
Kashargul
e0d694e8ac
rid of old span macros
2024-10-01 23:51:48 +02:00
Heroman3003
f045c951a8
Merge pull request #16375 from ShadowLarkens/runechat_color
...
Allow choosing your own runechat color
2024-09-29 18:40:16 +10:00
ShadowLarkens
200981ded9
Allow choosing your own runechat color
2024-09-27 07:33:52 -07:00
Guti
1862c0e11b
Deconf 2: Electric Boogaloo
2024-09-27 13:43:21 +02:00
Heroman3003
f88820729f
Merge pull request #16369 from Kashargul/loadout_fix
...
de-reference save_data lists
2024-09-27 21:13:13 +10:00
Kashargul
924d47c504
fully deref
2024-09-26 18:22:47 +02:00
Kashargul
aa4528b9ca
.
2024-09-26 02:53:20 +02:00
Kashargul
1c5f81efd1
dereference lists
2024-09-26 02:50:45 +02:00
Kashargul
757841c692
.
2024-09-25 01:07:19 +02:00
Kashargul
5ed2cde700
notify the user
2024-09-24 15:23:21 +02:00
Kashargul
c6baa2083f
we load it from a file, that path might no longer exist
2024-09-24 11:48:37 +02:00
Guti
dc7ad02813
Deconf
2024-09-22 15:01:10 +02:00
Heroman3003
2780a44fa1
Merge branch 'master' into shirts
2024-09-22 10:41:43 +10:00
ShadowLarkens
d0bcf33562
Revert "Add plushies to loadout!"
2024-09-21 17:27:54 -07:00
SatinIsle
0672e4f339
Merge remote-tracking branch 'upstream/master' into shirts
2024-09-21 14:49:20 +01:00
Guti
ab9f92904c
Deconflict
2024-09-21 14:42:17 +02:00
