juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,442 Commits 57 Branches 0 Tags
418cf0b709c0f8a0d6409a60b4c19e1bb85f0dda
Commit Graph

1173 Commits

Author SHA1 Message Date
Topy
b85c902189 Added sink (#14348) 2023-06-30 18:10:47 -04:00
Nemanja
b4fb089e00 Imagine if artifacts fucking killed you (#17746) 2023-06-30 15:25:33 -04:00
Slava0135
aadcc48ddc Better glue (#17381) 2023-06-30 15:07:44 -04:00
Nemanja
8f5282fb89 make rnd console require science access (#17671) 2023-06-29 14:19:19 -04:00
Tom Leys
67df47f553 No atmos stacking (attempt 2) (#16687) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-06-29 22:04:36 +10:00
Nemanja
bc56731583 Orderable chemical crates (#17616) 2023-06-29 20:14:23 +10:00
Nemanja
5212fc5478 No unbuckling while cuffed (#17719) 2023-06-28 23:19:56 -04:00
AJCM-git
e2823d8006 Revert "It's no longer possible to unbuckle if you are handcuffed" (#17717) 
This reverts commit 6d31d50b43.
 2023-06-28 16:54:49 -04:00
DadeKuma
6d31d50b43 It's no longer possible to unbuckle if you are handcuffed (#17698) 
* it's now impossible to unbuckle when cuffed, cuffs must be removed first

* can't unbuckle if any hand is handcuffed

* fixed hand count check

* added popup message
 2023-06-28 13:09:04 -05:00
LankLTE
d0a9cce717 Adds Lead & Zinc, nerfs Licoxide. (#17703) 
* Added Lead & Zinc, Nerfed Licoxide.

* Updated physical descriptions.

* Fixed my stupid dumb error.
 2023-06-28 12:53:56 -05:00
crazybrain23
d75d715d23 ListObjectivesCommand localisation and completion (#17630) 2023-06-28 23:47:46 +10:00
Slava0135
9c976d517e Add space lube tube (#17387) 2023-06-27 22:48:06 -04:00
deltanedas
a3726612ad make it even more obvious extracting is good (#17487) 2023-06-27 22:28:49 -04:00
Arendian
7c26480b5f Turns 90% of vomit into actual vomit (#17697) 
* Changes vomit reagent composition

* Formatting
 2023-06-27 20:08:57 -06:00
Alekshhh
388b3e99fd More Pirate Accenting (#17564) 2023-06-27 20:40:47 -04:00
lzk
3982037d08 Add Eva crate (#16957) 2023-06-27 00:45:29 -04:00
Nemanja
694ba695b0 fix galaxythistle bounty locale (#17594) 2023-06-24 22:08:47 +10:00
Nemanja
489077868c Artifexium (#17604) 2023-06-24 22:00:42 +10:00
crazybrain23
032399c599 Change QM's supervisor to Captain (#17605) 
* QM works for Cap

* Cargo department works for QM
 2023-06-24 00:32:15 -05:00
lzk
6bfccca81b encryption-key-component.ftl locale update (#17557) 2023-06-23 22:23:47 +10:00
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