juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,710 Commits 57 Branches 0 Tags
21ea4290a5cc72ec6e7ebf7e285cde0423347eb2
Commit Graph

28710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nim
21ea4290a5 Paintings (#479) 
* oppa

* fix

* Update Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-10-04 21:18:01 +03:00
Ed
c55241355e Update wild.yml 2024-10-04 19:48:18 +03:00
Ed
35baaacbce Blue amanita flower, mana potions! (#478) 
* merge bloodgrass and red flowers

* delete sprites

* add blue amanita sprites

* restruct alchemy reactions folders

* mana heal and damage reagent

* add gatherable to worldgen

* fixes

* Update sewing_table.yml

* Update Alchemy.xml

* Update Alchemy.xml

* Update migration.yml
 2024-10-04 19:19:13 +03:00
Ed
41cf2b22ff Merge pull request #477 from crystallpunk-14/ed-03-10-2024-upstream 
Ed 03 10 2024 upstream
 2024-10-03 17:47:23 +03:00
Ed
ab1e071fdf Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
 2024-10-03 17:34:08 +03:00
PJBot
1c41d3381f Automatic changelog update 2024-10-03 14:02:07 +00:00
eoineoineoin
a8982b88af Allow users to drag-reorder action bar (#32552) 
* Avoid rebuilding all buttons on action state change

Allows for drag events to continue when actions change

* Remove excess action buttons

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
 2024-10-03 16:01:01 +02:00
PJBot
568fb235fa Automatic changelog update 2024-10-03 10:33:16 +00:00
Vasilis
bc76cd876f Remove sentience from clean and medi bot (#32383) 
There is no point in these silicon being sentient, they have basically zero role play potential and are not meant to be controlled by players. The janibot can be played somewhat but at that point we have janitor borgs which are way better at this. You can only clean floors and even then it does a terrible job at doing that and only that. A player playing as a janibot will get bored quickly. No amount of RP will save you.

A player taking over a mediborg just makes it useless as you cant inject anymore. And again, medical borg. There's no point in adding the feature. It's too much work then its worth when we have borgs.

They don't have ghost role info for a reason. They are not meant to be played.
 2024-10-03 03:32:10 -07:00
PJBot
3e85d28e9d Automatic changelog update 2024-10-03 10:03:05 +00:00
ArtisticRoomba
c68e5a667c Various item contraband fixes (#32614) 
* fixes current contraband issues: xray cannon, hos's trench coats, stinger grenades

* yet another contraband addition
 2024-10-03 12:01:58 +02:00
SpaceCat
b603233480 change sound (#476) 2024-10-03 09:28:50 +03:00
PJBot
052d7c4d2e Automatic changelog update 2024-10-03 00:13:04 +00:00
Pieter-Jan Briers
2d644095e3 Fix borg hands showing up in stripping menu (#32606) 
* Fix borg hands showing up in stripping menu

Borgs can't drop their items anyways, and the amount of hands borgs have causes the UI to just bug out.

* Add more checks
 2024-10-03 02:11:56 +02:00
PJBot
440742f8f7 Automatic changelog update 2024-10-02 13:53:20 +00:00
Pieter-Jan Briers
719f78956b Disable bioluminescence plant mutations because it breaks the engine (#32561) 
No fun allowed

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-02 15:52:14 +02:00
Flareguy
4ad4fd42b1 Steel tile variantization fix (#32596) 
steel tile variantization fix
 2024-10-02 14:14:44 +02:00
PJBot
58c8a07d2c Automatic changelog update 2024-10-02 12:01:37 +00:00
FluffMe
8961dd35a5 Fix accidental erase of paper contents by spamming save action (#32598) 
Fix spammable paper save issue
 2024-10-02 14:00:31 +02:00
PJBot
9b4df5b452 Automatic changelog update 2024-10-02 11:45:17 +00:00
deltanedas
8b14e2534d fix instigator not existing (#32597) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-10-02 13:44:11 +02:00
lzk
c55e311c7e Cleanup pins.yml (#32593) 
* Cleanup pins.yml

* oh my

* forgor
 2024-10-02 13:23:32 +02:00
PJBot
612732fb84 Automatic changelog update 2024-10-02 10:54:25 +00:00
lzk
edc83b2fab cleanup and fix dinky star (#32594) 
* cleanup dinky star

* fix

* oh
 2024-10-02 12:53:19 +02:00
PJBot
7b39d146d3 Automatic changelog update 2024-10-02 09:38:55 +00:00
Toly65
ea3b14faac Bandaid fix to entityeffects on plant trays (#32576) 
prevented the bioluminescent and slippery effects from being applied to the plant (and thus the plant tray)
 2024-10-02 11:37:49 +02:00
PJBot
5a229e7a2b Automatic changelog update 2024-10-02 06:19:03 +00:00
ArchRBX
dd12ac1f8a MedTek Cartridge (#32450) 
* initial commit

* adds cartridge to cmo's locker

* tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too

* fixes ert medic pda not having it preinstalled

* adds attribution

* removes redundant dependencies

* fix agent pda

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
 2024-10-01 23:17:57 -07:00
PJBot
c4c786f08d Automatic changelog update 2024-10-02 05:36:54 +00:00
TakoDragon
542817807d Red circuit floor (#32557) 
* red circuit added

* index colour begone
 2024-10-01 23:35:48 -06:00
PJBot
b364894228 Automatic changelog update 2024-10-02 05:34:42 +00:00
TakoDragon
936917cd05 Hydroponics doors (#32575) 
* spriting done

* yml hydro updates

* Named wrong thing and forgot it inherets
 2024-10-01 23:33:35 -06:00
Preston Smith
2df61e4e71 Added LV cables to Marathon SMES room (#32574) 
Added LV cables to SMES room, powering light and computers.
 2024-10-01 23:30:58 -06:00
PJBot
95f20f13dc Automatic changelog update 2024-10-02 05:28:07 +00:00
Plykiya
2a07e4666a Fix quick-swap stacks of items (#32560) 
* remove picking up stack on quick swap

* better
 2024-10-02 15:27:01 +10:00
PJBot
cfc723e3f8 Automatic changelog update 2024-10-02 05:01:54 +00:00
metalgearsloth
4ca2a2bb8f Fix sensors blocking doors (#32591) 2024-10-01 23:00:48 -06:00
PJBot
b050e8332e Automatic changelog update 2024-10-02 03:23:15 +00:00
slarticodefast
360585276d fix voice mask chameleon menu (#32546) 2024-10-01 21:22:09 -06:00
PJBot
c0d8d58629 Automatic changelog update 2024-10-02 02:57:55 +00:00
Zylofan
42a1e02261 Seismic charge now craftable (#32459) 
* when tryInsertBlueprint is called it now also calls UpdateMaterialWhitelist on the ent so that it can accept new materials if needed.

* Changed the previous commit to now just have sharedMaterialStorageSystem subscribe to TechnologyDatabaseModifiedEvent which will call  UpdateMaterialWhitelist.

* Empty-Commit
 2024-10-01 20:56:49 -06:00
Scribbles0
20aa14e4f7 Cog update (#32585) 
* ai core upgrades

* fix distro color
 2024-10-01 19:45:54 -06:00
github-actions[bot]
8833cf624a Update Credits (#32516) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-10-02 01:29:00 +02:00
Zylofan
ec8b7b238a fixed it so blue bandana head and mask sprite is not reversed on vox (#32569) 2024-10-01 23:55:56 +02:00
PJBot
24f2d4c317 Automatic changelog update 2024-10-01 21:45:55 +00:00
TakoDragon
f3fe5af240 Reinforced walls sprite see throu top (#32578) 
fixed a gap
 2024-10-01 23:44:47 +02:00
PJBot
bfb2f60090 Automatic changelog update 2024-10-01 21:08:56 +00:00
TakoDragon
23f4bc1d7a Gay Boykissers (#32584) 2024-10-01 23:07:48 +02:00
PJBot
d82c666e80 Automatic changelog update 2024-10-01 15:15:06 +00:00
BramvanZijp
f79de12509 Prevent borgs from being able to be briefly toggled off. (#32485) 
* Prevent borgs from being able to be briefly toggled off.

* Use the pre-existing component instead of making an unneccesary duplicate.
 2024-10-02 01:13:59 +10:00