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

1253 Commits

Author SHA1 Message Date
Nemanja
476f7800c8 22 New Cargo Bounties (#17582) 2023-06-23 14:31:53 +10:00
Alekshhh
26e5249028 Dwarf Accent Fix (#17561) 2023-06-22 14:48:38 -05:00
Nemanja
7ab5127286 Cargo Bounties (#17344) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-22 21:49:33 +10:00
Nim
4ed11ca73b Energy Shield (#16996) 
* energy shield

* description edits

* shields protect

* small correction

* say no to asteroid bees

* fix

* BlockModifier

* fix

* tweak

* tweak

* ops

* fix

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 55be82fe537490367e0afaf86365b0e274e6597e.

* formatting
 2023-06-22 00:08:58 -04:00
Alekshhh
c1a971f3a6 dorf (#17475) 2023-06-20 14:30:56 -06:00
MisterMecky
ec71f1bc8e update stimpack desc (#17496) 2023-06-20 05:45:42 -05:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
FacePluslll
422a84e029 Adds Double bladed Esword (#17227) 
* Changed Energy Sword system to allow Wieldable eswords

Needed to add conditions to allow the wielding system to handle the esword if the component existed in the entity. The normal eswords work just fine still.

* Adds sprites for double bladed esword

* added double bladed esword to yml

* Add double bladed esword to uplink catalog

* fixed sprites on right handed wielding

* decresed speed a little and added a wielding time

* Reduced damage

* Damage change

* Balence change

* edited attack speed and heavy windup

* fixed readability issue and removed unwanted brackets

* reflectProp to .75

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* wieldTime to 0

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* litDisarmMalus to .7

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* changed heat and slash damage to 9 and structural damage to 20

* changed uplink desc

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
 2023-06-18 15:35:23 -04:00
ShadowCommander
dd7032a860 Mind ECS (#16826) 2023-06-19 04:33:19 +10:00
Alekshhh
291ae0bcd2 Dwarf Accent Expansion (#17411) 2023-06-18 02:12:09 -07:00
Nails+Tape
bb45db7151 cargo guidebook (#17342) 
* adds a guidebook entry explaining playable species

* adds a cargo guidebook entry

* Update guides.ftl

* Update shiftandcrew.yml

* Update ss14.yml

* Delete Species.xml

* Update Resources/ServerInfo/Guidebook/Cargo.xml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Cargo.xml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Cargo.xml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Cargo.xml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Cargo.xml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Cargo.xml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Cargo.xml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/ServerInfo/Guidebook/Cargo.xml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: OttoMaticode <124523848+OttoMaticode@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-06-17 20:31:49 -06:00
Slava0135
8ed4dcf0fb shield values examine (#17245) 2023-06-17 12:07:58 +10:00
deltanedas
a3c37edd69 use parts crates for rewards, show rewards in ui (#17374) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-17 12:00:54 +10:00
Nemanja
eb114677ad move hamtr to civilian services tech (#17393) 2023-06-17 11:59:53 +10:00
deltanedas
b9f24b2681 expedition rewards (#16972) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-06-16 15:19:02 +10:00
metalgearsloth
f7e4a69b65 Move PKA to a tech (#17043) 2023-06-16 13:56:59 +10:00
Nairod
bec641515d Color Coded Anchor Examine Text (#17363) 2023-06-16 12:46:38 +10:00
end
a27bd8d6b2 In game guide books (#17304) 2023-06-15 13:36:15 +10:00
Ahion
de63c5230b More user friendly crew monitor UI (#17328) 2023-06-15 13:29:52 +10:00
Nemanja
fa23d57fd8 Remove cloning tech, add bluespace chemistry tech (#17345) 2023-06-14 21:11:11 -06:00
brainfood1183
4322faf5c9 Behonker and Clown Spider (ready for merge) (#16678) 2023-06-15 12:47:36 +10:00
OctoRocket
780d52514f [Add] Adds pirate accent trait (#17258) 2023-06-14 20:17:39 -06:00
Dynexust
35c838c1cf Added a new cryogenics chemical - Doxarubixadone! (#16568) 2023-06-15 11:26:27 +10:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
deltanedas
b82885af38 make salvage magnets upgradable with capacitors (#16763) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-13 16:37:53 +10:00
deltanedas
7cbf08ea9e logic gate momentary pulse, switch status port (#17198) 
* logic gate momentary is now pulse

* switch status, minor refactor

* filescope namespace

* switch

* fix ci probably

* add auto linking for edge detector and logic gate

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-12 15:43:59 -07:00
Veritius
d0b42aebeb Add the White Gilgamesh (#16378) 2023-06-12 03:09:41 +10:00
deltanedas
662c83a8a2 artifact extract tweaks (#17164) 
* make extract button green, rename Destroy internally to Extract

* 5

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-09 04:44:25 -06:00
OctoRocket
ecef573af5 [Tweak] Default to Traitor instead of Extended when possible (#16386) 2023-06-08 17:16:18 +10:00
brainfood1183
cd7d4be188 HAMTR mech (hamster mech) (needs review) (#16393) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-08 16:33:35 +10:00
TemporalOroboros
d71b6c84e5 Converts the particle accelerator over to ECS + misc (#17075) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-08 16:25:59 +10:00
deltanedas
07d2430840 logic gate stuff (#16943) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-07 16:48:42 -07:00
deltanedas
6acfe53e5f add breakers to power batteries (#16903) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-07 12:43:54 -07:00
Kit0vras
9adf737854 Reagent "Fat" and reactions for soapification and meatification (#16058) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-07 23:04:36 +10:00
Nemanja
d9e38d3b6f fix missing cogchamp effect text (#17159) 2023-06-07 19:52:24 +10:00
Nemanja
409462df7f defib tweaks (#17167) 2023-06-06 15:08:34 -06:00
Leon Friedrich
923f8f617a Fix observer command & button (#17151) 2023-06-06 11:01:38 +10:00
Sir Winters
a1b0f10e5c Chem/Medicine/Botanical Book Entries (#17145) 
Co-authored-by: Owai-Seek <>
 2023-06-05 17:45:45 -05:00
Nemanja
85c2c5091e Bartender guide (#17143) 
* Bartender guidebook

* grammar error :Death:
 2023-06-05 17:44:43 -05:00
Leon Friedrich
2ef95a3225 Replay client (#15001) 2023-06-05 14:44:09 +10:00
Sir Winters
09d16964c4 Chef Guidebook (#17120) 
Co-authored-by: Owai-Seek <>
Co-authored-by: Moony <moony@hellomouse.net>
 2023-06-04 16:34:29 -05:00
Sir Winters
704a6e8f70 Medical Doctor guidebook. (#16769) 
* Medical Doctor guide.

* small wording update and cauterization

* Minor adjustments, move Cloning and Cryo out of MD

* Update Cryo Text + Guidehelp Tags

* Update Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml

---------

Co-authored-by: Owai-Seek <>
Co-authored-by: Moony <moony@hellomouse.net>
 2023-06-04 16:06:42 -05:00
Nemanja
b9fb66f005 Chem guidebook (#17123) 
* im good at atomizing. welcome to half-finished chem guides.

* wagh

* e

* save work

* aa

* woweee UI

* finishing the last of it

* don't actually update the engine :(

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2023-06-04 15:45:02 -05:00
Sailor
7252b9e1e9 Origin update (#17119) 
* Origin update

* Update psychologist desc loc

* I👉😏👈, Eva X🆒️😎, humbly😶 submit😐 , a 🍷toast🍞, to Nikolas😮Alexander🇷🇺, for ✔successfully✔managing 🆓️ to pirate🏴 Warcraft 3👹, so 🙄 that 😏 he 😐👉♂️ may ♉ play 💻Defense🛡️of The⚔Ancients🏛. 👏👏👏Congratulations 👏👏👏, Nik😎🥛. Enjoy 😍 your 😮👊 dota 📀.
 2023-06-04 14:11:15 -06:00
deltanedas
d36b93a4d7 add records console to aghost (#17091) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-04 21:32:03 +10:00
deltanedas
5906ec24f2 dungeon carp and dragon (#17040) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-04 21:06:13 +10:00
Pieter-Jan Briers
ee784ac17c Use THE() for SecretStash (#17049) 2023-06-03 12:10:07 -07:00
brainfood1183
c99585c94f Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
Pieter-Jan Briers
4be515b8e2 Storage bugfixes. (#17011) 2023-06-02 11:13:56 +10:00
Pieter-Jan Briers
9931a6b2f2 New bql_select command. (#17007) 
Shows BQL results in a client window. Allows TP and VV to the entities.
 2023-05-31 17:29:31 -05:00