Commit Graph

2256 Commits

Author SHA1 Message Date
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
Kashargul
8e652ec967 forward resize to temporary forms 2024-11-25 02:06:04 +01:00
Kashargul
28333a1195 size guard area sanity 2024-11-15 15:03:54 +01:00
Kashargul
c063be65bc missing ooc escspe section 2024-11-13 12:23:39 +01:00
Kashargul
32c9f971bc tgui usr to ui.user 2024-11-13 00:49:17 +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
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
Kashargul
8d02f877a4 Belly import upport (#16454)
* Belly import upport

* .
2024-10-27 15:46:02 +01: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
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
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
ShadowLarkens
bcc107c7cd Ports tgstation/tgstation/pull/15673 (#16495)
* Ports tgstation/tgstation/pull/15673

* Add a small delay to icon updating to cover up SSoverlays

* Fix actions on robot modules
2024-10-20 17:12:24 +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
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
ShadowLarkens
66ef0c42d1 Dark-mode color-coded mechanical vore preferences tab (#16444) 2024-10-12 14:15:25 +02:00
ShadowLarkens
190f5d7ae9 Add digested prey count belly format text (#16455) 2024-10-12 14:12:58 +02:00
Heroman3003
ab0f06a827 Merge pull request #16427 from Kashargul/bellystrings
fix missing %
2024-10-06 08:54:24 +10:00
Kashargul
db5b408538 some more and fix filtering 2024-10-05 21:27:23 +02:00
Kashargul
793365fb1e fix missing % 2024-10-05 00:42:40 +02:00
ShadowLarkens
4b5e7d0745 Centralize vore message parsing and add a bunch of word replacements
Add all of the new % replacements to a help menu
2024-10-04 13:37:42 -07:00
Kashargul
1648896bed . 2024-10-04 18:58:07 +02:00
Kashargul
8e6c39e29b . 2024-10-04 12:39:28 +02:00
Kashargul
e06d79ddba . 2024-10-04 12:38:33 +02:00
Kashargul
960f3c6ba6 . 2024-10-04 12:37:50 +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
Guti
1862c0e11b Deconf 2: Electric Boogaloo 2024-09-27 13:43:21 +02:00
Heroman3003
bd46c837e4 Merge pull request #16363 from SatinIsle/How-churny-am-i
Print your own healthbar as prey
2024-09-27 21:05:27 +10:00
Heroman3003
4cc8e4691c Merge pull request #16345 from Kashargul/afkcheck
those should have a key... else no player chars
2024-09-27 21:02:10 +10:00
SatinIsle
81e20f6f38 Very minor change to wording to make it clear the prey is in your belly 2024-09-25 20:28:57 +01:00
SatinIsle
ef183bcb9f Print your own healthbar as prey
Added the functionality to print your own healthbar from "Print Prey Healthbars" when you yourself are the prey.
2024-09-25 15:57:04 +01:00
Guti
dc7ad02813 Deconf 2024-09-22 15:01:10 +02:00
Heroman3003
0ce5f9ef63 Merge pull request #16326 from ShadowLarkens/scanlock
Allow printing whitelisted bodies, but resleeve lock them by force
2024-09-22 16:27:32 +10:00
Kashargul
33672859f9 those should have a key... else no player chars 2024-09-22 08:22:18 +02:00
Guti
ab9f92904c Deconflict 2024-09-21 14:42:17 +02:00
ShadowLarkens
2adbacac3d Add progress bar to grower pod examine 2024-09-19 17:17:12 -07:00
ShadowLarkens
c13354640a Allow harm-intent disabling AI holograms 2024-09-18 18:42:40 -07:00
Guti
f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
ShadowLarkens
3444395d5e Swizzle some prefs around with the new meaning of resleeve lock 2024-09-18 00:40:10 -07:00
Kashargul
4ba7beeb9c up to field medic 2024-09-12 21:20:47 +02:00
Kashargul
10dc8510b3 up to engineer 2024-09-12 02:01:36 +02:00
Kashargul
0425a4e396 up to officer 2024-09-12 00:00:11 +02:00