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

8928 Commits

Author SHA1 Message Date
Ed
4f2eaef6c1 Revert "vladimirs rocks" 
This reverts commit b2c6a193fc.
 2024-10-08 22:37:26 +03:00
Ed
9d7e042ddf Revert "furnace" 
This reverts commit f378e4fb85.
 2024-10-08 22:29:15 +03:00
Ed
f378e4fb85 furnace 2024-10-08 14:04:24 +03:00
Ed
b2c6a193fc vladimirs rocks 2024-10-08 13:56:40 +03:00
Ed
dc6d70b10e iron and copper ore walls + procedural cave update 2024-10-08 13:29:07 +03:00
Ed
3ab1649992 anvil 2024-10-08 13:16:12 +03:00
Ed
d2c5aa74b4 Ritualizm (#474) 
* ritual cucumber setup

* entities requirements

* try graph???

* Revert "try graph???"

This reverts commit c90c6353cb.

* pipyau

* fixes

* yay, it works

* spawn effect

* regex lower message restrictions

* unique speakers support

* apply entity effect ritual

* ritual chalk

* Update SpawnEntity.cs

* ritual stability

* stability event

* add guidebook description to all ritual actions

* Readability added

* Update RequiredResource.cs

* finish describer

* clean up describer

* Update triggers.ftl

* cave ambient loop

* parry sound update

* rituals end start

* magic ambience add

* global sharedization

* Update phases.yml

* daytime requirement

* Update phases.yml

* start ritual

* fixes

* more ambient work

* rritual visualizer

* end ritual

* magic orbs!

* required orbs

* orbs design

* consume orbs

* setup neutral cluster triggers and edges

* listener proxy

* restucture graph

* fix time triggers

* healing cluster

* fixes

* Create CP14RitualTest.cs

* test errors for check test

* YEEEE

* Fuck triggers, its broken now, YAY

* triggers redo

* fix

* fix test

* Update CP14RitualTest.cs

* Update neutral_cluster.yml

* Update CP14RitualSystem.Triggers.cs

* clean up, documentation

* redo triggers again

* and another one

* species sacrifice trigger

* whitelist trigger

* fix

* describer refactor

* fix memory leaking  + hyperlinks

* dd
 2024-10-06 18:04:18 +03:00
Nim
a6532a2801 fix (#480) 2024-10-06 17:12:31 +03:00
Nim
98c921aa94 Zombie and old lamp (#467) 
* zombie

* fix

* spawner fix

* license

* woman parts

* male parts

* 122

* 123

* 124

* HideSpawnMenu

* damn

* requested

* fixxxx

* gooo
 2024-10-04 21:24:17 +03:00
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
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
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
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
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
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
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
lzk
edc83b2fab cleanup and fix dinky star (#32594) 
* cleanup dinky star

* fix

* oh
 2024-10-02 12:53:19 +02: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
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
TakoDragon
542817807d Red circuit floor (#32557) 
* red circuit added

* index colour begone
 2024-10-01 23:35:48 -06: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
slarticodefast
360585276d fix voice mask chameleon menu (#32546) 2024-10-01 21:22:09 -06:00
TakoDragon
23f4bc1d7a Gay Boykissers (#32584) 2024-10-01 23:07:48 +02: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
Jaraten
6c08ca60f3 frame & table (#464) 
* frame & table

* rem superfluous sprite

* merge conflict

* duplicate_ID

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-10-01 16:32:14 +03:00
ScarKy0
ba68fb2ddb Update binary key to use AI icon (#32327) 
* Init

* uplink icon
 2024-10-01 14:03:37 +10:00
Golinth
3b682d4d68 Added Firebots - Real (#32482) 
* Add Firebots

Had to add OnActivateInWorld to the spray system to get the bot to work. Checks for the flammable component and if the onFire boolean is true.

* Make SpraySystem actually use useDelay

got rid of that TODO

* Added firebot speech

Fire detected!
 2024-09-30 20:13:16 -07:00
kosticia
5681db31a9 Changing the thief's objective to stealing ID cards. (#32411) 
* Changed thief ID objection

* Update Resources/Prototypes/Objectives/thief.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-01 00:40:31 +02:00
pofitlo
bad7359aeb Add camera bug (#30250) 
* Add camera bug

* Update camera_bug.png

* fix

* change

* Update Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Catalog/uplink_catalog.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-10-01 00:24:36 +02:00
pofitlo
2f286afd95 Syndicate business card (#32162) 
* add card

* Update Resources/Locale/en-US/paper/syndicate-business-card.ftl

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* fix

* Update Resources/Prototypes/Entities/Objects/Misc/business card.yml

Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com>

* add logo

* swap the "funny 'c'"

* improve logo (a little) and also fight with the funny 'c'

* fix

* oh... i think... mabe i done with this?...

* add

* smaller cards

* fix

* Update synicate_card.png

* fix typo

* fix

* fix

* Update Resources/Prototypes/Entities/Objects/Misc/business_card.yml

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-09-30 22:44:44 +02:00
BramvanZijp
38f59d2038 Swap the advanced tool borg modules omnitool for jaws and a power drill (#32487) 2024-09-30 19:38:22 +02:00
qwerltaz
bc059f0b6d AI can use fire alarm (#32467) 
* ai can use fire alarm

* ai wire
 2024-09-30 11:56:05 +02:00
Ilya246
4aed728207 make conveyor belt assemblies cheaper (#32444) 
cheapening
 2024-09-29 17:18:09 +02:00
Ed
3f94c73bdb Magic update (#473) 
* magic system update

* fix
 2024-09-29 16:44:17 +03:00
ArtisticRoomba
1dc9541aed Fixes HoS's energy shotgun not being marked as restricted contraband (#32521) 
* the 12^21th contraband marking fix

one step closer to release

* sometimes you just make mistakes
 2024-09-29 14:22:57 +02:00
Ed
4cd9e41469 Mist + Lampposts (#472) 
* lamppost

* mist weather

* maps update

* Update weather.yml

* Update meta.json
 2024-09-29 13:07:30 +03:00
Ed
4d9e657f6f Split decal cleaner into Broom + Max Gab papers and hair (#470) 
* add broom

* water fix

* new hair

* paper added

* feather pen

* some unfinished inkwell

* inkstorage

* Update meta.json

* fixes
 2024-09-29 11:02:39 +03:00
Ed
0dc7982109 Footprints + Mop + Force undersky liquid evaporation (#469) 
* all evaporation under sky

* footprints system

* puddle footprints

* split to holder and trailer

* mop added

* mop finish
 2024-09-28 18:09:30 +03:00
Futuristic-OK
a371de16d3 Some new hairstyles! (#31010) 
* Add files via upload

png of hairs

* Update meta.json

hairs meta

* Update human_hair.yml

hairs yml

* Update human-hair.ftl

hairs named

* second try

* fix meta

* Add files via upload

* Add files via upload

fix again

* Add files via upload

again again

* Add files via upload

again again fix again

* Add files via upload

i hate yourself

* Add files via upload

fixxxxx!

* Add files via upload

aaagaaaaiiin

* dd

dddddd

* Add files via upload

fix again

* Add files via upload

ddsdssddssddsdsds

* Update human-hair.ftl

* Update human-hair.ftl

screw this im just going to update it myself
webops time

* Update human_hair.yml

* Update meta.json

* Rename capsdaughter.png to longbow.png

* Rename artist.png to shaped.png

---------

Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
 2024-09-28 16:07:51 +10:00
Ed
dca61c009d 2 new Lobby image, some bugfix (#468) 
* +2 lobby screens

* Update goblin.yml

* workbench recipes remove nesting

* tips update

* Update sewing_table.yml
 2024-09-28 01:29:02 +03:00
deltanedas
7d4ea967e0 remove thief figurine objective (#32413) 
* make figurine objective just 1

* remove the objective entirely

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-09-27 21:04:22 +02:00
LittleNorthStar
bbf84d0346 Feature/grey trenchcoat for detective loadout (#32380) 
* Detective grey coat available in loadout

* Revert "Detective grey coat available in loadout"

This reverts commit 3697e15518b300cbc110872dc92d7905b7ef2605.

* Reapply "Detective grey coat available in loadout"

This reverts commit 8e5f43a035d70a7076ba26d43ed683b135af1d99.

* Hoping I got this right?

* Fixing a oversight

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-09-27 12:03:54 +02:00
Ed
b9e90f50ca nospawn 2024-09-27 10:35:21 +03:00
Ed
1df3ed177b Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream 
# Conflicts:
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
 2024-09-27 10:22:05 +03:00
august-sun
b9b0c10361 Fixed collision for gas and volumetric pumps (#32471) 
Removed BaseMachinePowered from Gas and Volumetric pumps

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
 2024-09-27 15:49:20 +10:00
Ed
c2704165d3 Loadout update (#461) 
* some full species sprite

* floral wreath

* alchemist cloak, loadout restruct

* giant head clothing refactor

* Update entities.ftl

* backpacks loadout! yay

* trinkets

* Update general.yml

* oopsie

* Update general.yml

* fixes

* Delete test-ship.yml
 2024-09-27 00:36:09 +03:00