Kashargul
939fcbb488
Merge branch 'master' into reagentToDefines
2024-12-06 21:57:14 +01: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
Kashargul
56c53e72fe
Merge branch 'master' into protRig
2024-11-30 15:00:57 +01:00
Heroman3003
f5f707030c
Merge pull request #16506 from Darlantanis/RecordSaving
...
Ports in-round record updating
2024-11-30 14:42:17 +10: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
Heroman3003
10de4fc09f
Merge pull request #16511 from VOREStation/verb-subsystem
...
Verb manager subsystem & Speech controller
2024-11-28 14:43:53 +10: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
fa5a178010
Merge pull request #16515 from ShadowLarkens/zas
...
Some ZAS tweaks and minor optimizations
2024-11-28 05:34:47 +10: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
Nadyr
38192e5616
Rename record_updator.dm to record_updater.dm
2024-11-20 18:22:03 -05:00
SatinIsle
479e60f995
Fixed advanced who too
2024-11-17 20:52:35 +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
ba6a5d4038
dmi port
2024-11-13 22:38:36 +01: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
3e5dfe1ddc
.
2024-11-12 21:43:13 +01:00
Kashargul
0fb8005207
chompedit cleanup
2024-11-12 20:55:58 +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
a1576977cc
Robot upgrades ( #16481 )
...
* initial
* variable cell durability and hp increase on upgrades
* cell hp
* cell influences components
* set defaults for most
* value tgui
* .
* .
* .
* fix copy typoes
* also this
* .
* sanity that
* .
2024-11-04 21:12:31 +01: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
Kashargul
2e5e6c36a8
protean rigs, no dmis
2024-11-03 02:07:23 +01:00
ShadowLarkens
bcab66a291
BYOND 516 Compatibility ( #16344 )
...
* 516 compatibility
* Add a pref to turn on dev tools (not admin locked)
* tgui say
* max is 6 rows
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2024-10-31 19:18:26 +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
ItsSelis
e376c37825
Verb manager subsystem
2024-10-26 14:03:17 +02:00
ShadowLarkens
dc3fd79427
The final action buttons PR ( #16514 )
...
* Make action button target datum
* Initial working action palette
* Action related refactors
* tgstation/tgstation/pull/71339
2024-10-26 13:20:54 +02:00
ShadowLarkens
2bb91dcf59
Murder some old disabled admin verbs
2024-10-23 05:49:51 -07:00
ShadowLarkens
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
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
Nadyr
843559859b
Ports in-round record updates
2024-10-21 22:18:56 -04:00
Kashargul
7be625e0cb
some more small things ( #16491 )
2024-10-18 23:36:19 +02:00
Kashargul
edf912d4a6
add missing triggered and some mirror fixes ( #16489 )
...
* add missing triggered
* fix that
* fix borg panel stats
* .
* fix that
* fix that
* those are fine
* holder status
* prommi
* less usr
* eh check that later
* hardsuit usage
* .
* .
* .
* .
2024-10-18 00:39:56 +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
ShadowLarkens
c07027136e
Port tg statpanel ( #16463 )
...
* Port tg statpanel
* Add verb descriptions using the title attribute
* Fix a dreamchecker error
* Remove chomp edits
* Add mentor tickets to ticket panel
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2024-10-16 19:39:06 +02:00
