juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,328 Commits 57 Branches 0 Tags
ed065e8a3dbecb688b8aef1c1d597794de1503ef
Commit Graph

15825 Commits

Author SHA1 Message Date
FungiFellow
6260e4b35b Improvised shell crafting recipe (#25545) 
* Changed Projectile Sprite to Shard

* Removed Notes on Recipe

* Made Recipe

* Added a space

* Update improvised.yml

* Update shotgun.yml

* Removed Note

* Reduced needed matches from 8->6

* Update improvised_shotgun_shell.yml

* Matchbox fix didn't work

* Reduced glass needed from 5-4

* Added backspace

* Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-03-13 10:52:32 +11:00
PJBot
b0c65a03d5 Automatic changelog update 2024-03-12 18:48:36 +00:00
UnicornOnLSD
76db710a1c new haircut alternative (brought back old one) (#25935) 
added crew cut 2 wew
 2024-03-12 14:47:29 -04:00
PJBot
44224a3df0 Automatic changelog update 2024-03-12 18:45:15 +00:00
Mr. 27
ad99564b3e kobolds no longer die at 40 hp (#25984) 
* me

* change
 2024-03-12 14:43:21 -04:00
Alice "Arimah" Heurlin
ffd52b24ff Remove random Cyrillic characters from locale files (#26043) 2024-03-12 16:58:04 +01:00
PJBot
afc04a463e Automatic changelog update 2024-03-12 12:58:41 +00:00
PJBot
c8fce85a3f Automatic changelog update 2024-03-12 10:58:11 +00:00
Ubaser
dc0e4ada62 Update Core (#25927) 
* add

* invalid
 2024-03-12 02:56:44 -06:00
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
Baptr0b0t
7bdfd4cfc0 FIX Criminal SecHud icon Rsi path BUG (#26001) 
FIX BUG
 2024-03-11 10:45:30 -04: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
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
PJBot
3c82e00aae Automatic changelog update 2024-03-08 07:51:40 +00:00
MACMAN2003
24fd1a93ff Fix air not existing in corner window tiles (#25926) 
let there be air

air time
 2024-03-08 18:50:34 +11:00
Emisse
463817056e infiltrator update (#25923) 2024-03-07 17:52:49 -07:00
AlexUm & XGabriel08X
7af183ec72 Barber scissors in uplink and chameleon bundle. (#25920) 
scissors

uplink catalog localization and just catalog update, with adding scissors to the chameleon set
 2024-03-07 17:55:24 -06:00
PJBot
dd79536442 Automatic changelog update 2024-03-07 23:54:42 +00:00
Ed
faed7a3746 Remove Hamlet, Smile and Pun Pun from Thief objective (#25921) 
* Update thief.yml

* Update stealTargetGroups.yml

* Update objectiveGroups.yml

* Update pets.yml
 2024-03-07 17:53:36 -06:00
PJBot
937238fa67 Automatic changelog update 2024-03-07 21:03:55 +00:00
Admiral-Obvious-001
0000f1b899 Buff zombie resists (#25876) 
* Buff zombie resists

Tweaks zombies to be tankier but still have a similar damage grouping for a specific weakness

* Removed unnecessary values of 1
 2024-03-07 16:02:49 -05:00
NakataRin
77f969af0e Green alert shuttle time change (#25906) 
green alert shuttle time change
 2024-03-07 16:01:52 -05:00
PJBot
15a431bdda Automatic changelog update 2024-03-07 20:51:16 +00:00