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

4845 Commits

Author SHA1 Message Date
lzk
3f946bb1e5 secure windoor id standartization (#17531) 
* Update windoor.yml

* comit
 2023-06-21 12:44:17 -06:00
lzk
cd949bcb2b some more netsync: false removing (#17472) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-06-22 01:00:53 +10:00
Chief-Engineer
f14f09cc90 remove armor from uniforms (#17523) 2023-06-22 00:30:31 +10:00
Alekshhh
c1a971f3a6 dorf (#17475) 2023-06-20 14:30:56 -06:00
Sailor
4c43e20af3 Vend contraband/emag inventory expansion (#17503) 
* Vend contraband/emag inventory expansion, do a 2-year TODO

* Map checks failed real
 2023-06-20 14:30:27 -06:00
CrigCrag
b795479245 buff atmos firesuits, nerf atmos hardsuits (#17507) 
* buff firesuits in suits.yml

* Update hardsuits.yml to nerf atmos hardsuit heat resistance
 2023-06-20 14:29:13 -06:00
MisterMecky
ec71f1bc8e update stimpack desc (#17496) 2023-06-20 05:45:42 -05:00
Nemanja
a01f26d3a6 fix lathe syncing and tweak ui (#17489) 2023-06-20 00:39:35 -06:00
deltanedas
763f6048f2 make taser require silver (#17477) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-20 00:39:20 -06:00
Vordenburg
34e03a07f2 Improve HandLabeler and AgentID UI (#16902) 2023-06-20 00:52:03 -04:00
metalgearsloth
55690f688e Remove cat ear guaranteed spawns (#17488) 2023-06-20 13:53:26 +10:00
metalgearsloth
d4c87155f8 Nerf stims (#17485) 2023-06-19 19:23:10 -07:00
Jackal298
3cb919fe77 Small addition to mercenary items (#17464) 
* Small addition to mercenary items

try number three

* Bot

* Bot fix
 2023-06-19 11:38:57 -06:00
lzk
3d98319069 Add more windoors (#17471) 2023-06-19 11:29:44 -06:00
lzk
bf8fa41ecd comit (#17462) 2023-06-19 02:36:29 -06:00
Nemanja
ea767b742b Buff ores, add quartz (#17453) 2023-06-18 22:03:41 -06:00
lzk
acf102ba0d add suffix for rigged gloves (#17287) 
* Update gloves.yml

* Update Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

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

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
 2023-06-18 19:14:28 -06:00
deltanedas
21b583a68c add pkas back to salv vendor (#17446) 
* add pka back to salv lockers

* troller ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-18 18:53:01 -06:00
Flareguy
0e238dabc9 Adds the SWAT Helmet (#17384) 
* adds swat helmet

* joever

* epic > rare

* A
 2023-06-18 17:38:55 -06:00
Nemanja
580c57926f Remove security techfab board from expedition loot (#17448) 2023-06-18 17:37:34 -06:00
Nemanja
b8fb9aaabd Make BOH require less uranium (#17449) 2023-06-18 17:37:16 -06:00
Nim
9797a0d42e ert and death squad gas mask (#17444) 2023-06-18 17:14:31 -06:00
Pieter-Jan Briers
c8930106b6 CE belt in locker again, CE doesn't spawn with it. (#17445) 
Better way to do #17430

Yes I know this means the CE spawns with a regular filled toolbelt they'll just throw away at round start. Oh well.
 2023-06-18 17:13:53 -06:00
Vordenburg
7ea7e3f49d Set marker drawdepth to Overdoors (#17438) 2023-06-18 16:38:27 -06:00
Nemanja
8411739e00 Fix secfab being able to print protolathe items (#17443) 2023-06-18 16:35:19 -06:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
Chase Maguire
8cd6067d49 Changing default fuel consumption for weldable components, and increasing non-default instances by two units of fuel (#17350) 2023-06-18 15:56:09 -06:00
Chief-Engineer
7c432b09e1 update command role requirements (#17366) 
* update role requirements

* add 6 hr overall requirement for mime

I keep seeing mimes that don't know the controls, specifically how to use other chat channels, like emoting.

* fix wrong prototype

* split to part 2

* fix engi belts

this is a pain
 2023-06-18 15:53:05 -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
Vordenburg
8a943fb374 Make suit storage units anchored, heavier, thicker (#17433) 2023-06-18 12:25:01 -06:00
Leon Friedrich
b03d9a90ab Add support for client-side replays (#17168) 2023-06-19 03:23:31 +10:00
Nemanja
1646f4c405 Remove spare CE belt (#17430) 2023-06-18 12:06:09 -05:00
Nemanja
0d0bef455e artifact resprite (#17417) 2023-06-19 01:02:27 +10:00
Nemanja
0b5ccf3395 Artifact Fragments (#17420) 2023-06-19 00:56:45 +10:00
Alekshhh
291ae0bcd2 Dwarf Accent Expansion (#17411) 2023-06-18 02:12:09 -07:00
Nemanja
ac9d6c94a0 Add bananium ore to expedition loot (#17421) 2023-06-18 17:11:29 +10:00
Chief-Engineer
f6d658d40b remove zombie bundle from nukie uplink (#17418) 2023-06-18 13:23:42 +10:00
lzk
b075912b12 slimes.yml cleaning (#17406) 
* Update slimes.yml

* Update slimes.yml
 2023-06-17 20:32:48 -06: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
Sir Winters
6e924ea568 Pill Renames, add Cryo Bottle and Derma Pill, Burn kit Update (#17414) 
Co-authored-by: Owai-Seek <>
 2023-06-17 14:47:56 -05:00
Sigil
70248638e3 Fixed armour for biosuits and winter coats. (#17402) 
Co-authored-by: Sigil <noreply>
 2023-06-17 03:55:15 -06:00
metalgearsloth
b67209cb24 Revert "Door opening tweaks" (#17395) 2023-06-17 12:09:49 +10: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
Artjom
cae037d8a8 Zooming for everyone with keyboard keys (#16605) 2023-06-17 09:22:21 +10:00
brainfood1183
9bdaca579e ClownHardsuit Fix (#17386) 
* ClownHardsuit Fix

* fix for monkey template
 2023-06-16 12:45:28 -06:00
deltanedas
41fae6e9cd expedition air mod (#17369) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-16 15:25:25 +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