18228 Commits

Author SHA1 Message Date
PJBot
f5364f9ffa Automatic changelog update 2024-03-12 02:39:45 +00:00
Ubaser
c2d52e4540 Space damage now causes heat along with blunt (#25770)
* add

* heat not burn?
2024-03-12 13:38:39 +11:00
PJBot
cd43f32a3d Automatic changelog update 2024-03-11 23:06:32 +00:00
SlamBamActionman
6d1f07a375 Add "Juice that makes you Weh" to moths eating Lizard plushies (#26003)
Weh
2024-03-12 02:05:25 +03:00
Emisse
52b2724a14 marathon update (#26016) 2024-03-11 16:10:16 -06:00
PJBot
c6a8da76e9 Automatic changelog update 2024-03-11 22:00:27 +00:00
Cinkafox
fdee5c808a - tweak: Youbka update (#75)
* - fix: animation log shit

* - tweak: skirt funny think
2024-03-11 21:00:33 +03:00
Baptr0b0t
7bdfd4cfc0 FIX Criminal SecHud icon Rsi path BUG (#26001)
FIX BUG
2024-03-11 10:45:30 -04:00
d6aa8ac5be Merge remote-tracking branch 'upstream/master' into huistream 2024-03-11 11:21:24 +03:00
Cinkafox
95054e072a Fixes (#73)
* - fix: Genitals sprite shit and meow for tajaran

* - add: fart sound if kicked from server

* - tweak: vulpies and tajaran now for donaters!!!

* - fix: Fart on exit

* - add: roleplay think

* - fix: database shit and loc

* - add: ears for slime

* - fix: LOC interaction fix

* - add: height setting

* - fix: height for felinids

* - fix: nigga fix

* - fix: no bitches on captain

* - fix: interaction panel animation shit
2024-03-11 11:13:33 +03:00
PJBot
79604608ad Automatic changelog update 2024-03-11 06:57:08 +00:00
pigeonpeas
5364bd4af0 New salvage expedition ambience. (#25983)
adds the stuff!!

adds the OGG file, makes it play in game, and adds the attributions.
2024-03-11 17:56:01 +11:00
deltanedas
88f8da465b buff cargo hydroponics crate (#25878)
buff hydroponics crate

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-10 23:52:22 -05:00
PJBot
d6d58cf224 Automatic changelog update 2024-03-11 03:34:14 +00:00
LankLTE
88d424e877 Return Detective to Security (#25986)
* Revert "detective patch (#24739)"

This reverts commit 8ef69ff2e1.

* Revert "Detectives gain independency (#23114)"

This reverts commit 807f5facbb.
2024-03-11 14:33:08 +11:00
PJBot
1885ad32e0 Automatic changelog update 2024-03-11 03:13:57 +00:00
Arendian
60b9d89e4d Criminal record hud icons (#25192)
* Security hud shows icon based on criminal record status

* Criminal status now linked to name instead of identity

* parole loc

* Test fix

* review changes

* Check station records instead of storing names on criminal record consoles.

* cleanup

* more cleanup

* review changes

* change outdated comments

* rename

* review changes

* remove event subscription

* replaced event with trycomp

* default value
2024-03-11 14:12:52 +11:00
PJBot
244e91d8eb Automatic changelog update 2024-03-11 03:02:38 +00:00
Errant
84a07315dd Species info in Guidebook and at chargen (#25844)
* guidebook pages defined

* species info button in character profile editor

* if current species has no guidebook page then open the parent page

* skrek

* destroying evidence of secret vox plot

* icon size adjustment, no icon if guidebook page for species does not exist

* finished pages

* additional info

* weh
2024-03-10 20:01:32 -07:00
PJBot
8de4b4196e Automatic changelog update 2024-03-11 02:12:51 +00:00
github-actions[bot]
37ece88d09 Update Credits (#25953)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-03-11 12:57:39 +11:00
Ed
d3d9898d2a Recolor detective stamp (#25945)
* Add files via upload

* Update rubber_stamp.yml
2024-03-11 12:57:20 +11:00
PJBot
f556816a0d Automatic changelog update 2024-03-11 01:56:25 +00:00
RavmorganButOnCocaine
8878280b17 Automatic changelog update 2024-03-10 23:08:40 +00:00
ThereDrD0
3f005b158b Ремув попапа сна (#146)
* remove: remove ZZZ popup

* fix: client popup for target doll
2024-03-11 02:07:37 +03:00
RavmorganButOnCocaine
2c0ce46898 Automatic changelog update 2024-03-10 23:03:51 +00:00
ThereDrD0
f6b1999443 add: less roles inventory, more lockers and dressers inventory (#180) 2024-03-11 02:02:48 +03:00
ThereDrD0
eb792d0b24 Пополнение вендоматов (#179)
* Куча говна в вендоры (#371)

* Куча говна в вендоры

* fix

* Ноу пробел

* Еще 2 емаг прикола

* Минус хуйня

* Правки контрабанды

* Блять это пиздец

* Коммент фикс

* Фикс яиц

* Фикс 2

fucking fuck

* fix: fix useless tags
2024-03-11 02:02:31 +03:00
PJBot
29efea42e0 Automatic changelog update 2024-03-10 17:08:30 +00:00
PJBot
e4a4f00626 Automatic changelog update 2024-03-10 15:42:48 +00:00
PJBot
e3180aec03 Automatic changelog update 2024-03-09 11:44:25 +00:00
Nemanja
f3f4616c49 Add a toggle for colorblind friendly progress bar colors (#25318)
* Add a toggle for progress bar colors

* yeah this thing

* PJB review

* optimization
2024-03-09 12:43:19 +01:00
PJBot
3f32fa804c Automatic changelog update 2024-03-09 10:20:09 +00:00
Plykiya
5cb48c922f Syringes that spawn with content start in inject mode (#25881)
* Remove unnecessary datafield names, syringes with stuff in them start in inject mode

* No trash tag

* Remove ViewVariables since DataField has them implicitly

* Revert "No trash tag"

This reverts commit 2c42172653d2cc70d58bd5bedf61a880b939bf20.

* Get rid of tags entirely for PrefilledSyringes

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-03-09 11:19:03 +01:00
MODERN
6e38b992cf CargoConsoleMenu localization (#25931)
- every category of type "cargoProduct" was edited to "cargoproduct-category-name-{categoryName}"
- file "cargoproduct-categories.ftl" was added to english localization to localize categories of cargoProduct
- CargoConsoleMenu.xaml.cs got tweaks which prevent issues with strings comparisons
2024-03-09 17:56:39 +11:00
PJBot
1a1bdec6c1 Automatic changelog update 2024-03-09 01:46:00 +00:00
nikthechampiongr
dbc27b57c8 Remove unecessary easy pry prototypes (#25893)
* Remove unecessary prototypes

* Put unecessary prototypes in migration.yml
2024-03-09 12:45:35 +11:00
he1acdvv
806c0d162f New Nukie Song (#25765)
made a new nukie song lel.
2024-03-09 12:44:54 +11:00
Ko4ergaPunk
2a5be69898 Fix chromite chasm sprite (#25819)
* fix

* Remove stripes

* empty
2024-03-09 02:48:03 +03:00
RavmorganButOnCocaine
932e4ce866 Automatic changelog update 2024-03-08 16:51:05 +00:00
Remuchi
36c40bafd7 remove: убран акшен Кричать 2024-03-08 23:06:46 +07:00
Remuchi
ae812dde8f add: переводы размеров предметов 2024-03-08 23:01:35 +07:00
Remuchi
dc64a19475 fix: перевод вкуса пива 2024-03-08 22:58:30 +07:00
Remuchi
52a24a4f74 add: только люди на ролях ЦК 2024-03-08 22:56:00 +07:00
Remuchi
be72cebea7 add: уменьшен размер портсигара до 2x2 2024-03-08 22:55:46 +07:00
Remuchi
f41b64e508 tweak: исправлены размеры оставшихся материалов 2024-03-08 22:55:36 +07:00
Remuchi
d423a9d188 add: больше нельзя вставлять импланты в боргов 2024-03-08 22:55:18 +07:00
Remuchi
acc636dad3 add: космоочиститель снова убирает ресунки 2024-03-08 22:55:02 +07:00
Remuchi
40ae63b75f add: сканер растений теперь суется в пояс ботаника 2024-03-08 22:54:42 +07:00
RavmorganButOnCocaine
7ca4fdb65f Automatic changelog update 2024-03-08 15:36:15 +00:00