juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,514 Commits 57 Branches 0 Tags
9b99fcbcef2064e7b572787f84021ebcbdbbd9c2
Commit Graph

15514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PJBot
9b99fcbcef Automatic changelog update 2023-04-19 21:24:30 -04:00
metalgearsloth
fc3bc1805c Update submodule to 0.97.1.1 (#15550) 2023-04-19 18:23:26 -07:00
metalgearsloth
122350f19c Salvage expeditions (#12745) 2023-04-20 10:43:13 +10:00
metalgearsloth
486d7c179e Update submodule to 0.97.1.0 (#15547) 2023-04-20 10:42:53 +10:00
DrSmugleaf
82e1c2104a Fix map renderer build (#15543) 2023-04-19 13:25:23 -07:00
PJBot
55d482273c Automatic changelog update 2023-04-19 10:28:45 -04:00
Puro
bb6f8543cd [Clothing] Samurai dogi (#14927) 
* [Clothing] Samurai hakama

syndicate only.

* meta.json update

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>

* hakama desc

the description of the hakama is shortened

* Update theater.yml

* Update coats.yml

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 113dd54a5d0e49a415039f8f03ea1bf87bad04c9.

* dogi

---------

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
 2023-04-19 10:27:39 -04:00
metalgearsloth
e8c7e514c5 Update submodule to 0.97.0.0 (#15535) 2023-04-19 23:52:27 +10:00
Ygg01
71f358a027 Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
Leon Friedrich
9513ea66e4 ECS BatteryComponent (#15337) 2023-04-19 20:10:08 +10:00
DrSmugleaf
e95cd6e412 Remove explosion visuals component references (#15264) 2023-04-19 20:09:22 +10:00
PJBot
52fb725cf3 Automatic changelog update 2023-04-19 06:04:12 -04:00
Nemanja
081b09b0a4 Reduce power of anomaly vessel upgrades (#15520) 2023-04-19 20:03:07 +10:00
metalgearsloth
7102cc7159 Reflect changes (#15071) 2023-04-19 20:02:30 +10:00
Nemanja
31851e5468 [Entity] Brig Timers (#15285) 
* brigtimer

* ok

* TextScreen w timer implementation

* second commit

* working brig timer

* signal timers near completion

* soon done

* removed licenses, fixes noRotation on screens, minor edits

* no message

* no message

* removed my last todos

* removed csproj.rej??

* missed a thing with .yml and tests

* fix tests

* Update base_structureairlocks.yml

* timespan type serialize

* activation turned into comp

* sloth review

* Update timer.yml

* small changes

---------

Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
Co-authored-by: rolfero <45628623+rolfero@users.noreply.github.com>
 2023-04-19 01:47:01 -06:00
PJBot
7fe07fb01d Automatic changelog update 2023-04-19 03:45:01 -04:00
Floofi
0181b1e64d [Entity] Hospital Gown for medical (#15405) 
* Functional hospital gown

* Added gowns to medidrobe
 2023-04-19 01:43:57 -06:00
PJBot
d7c293d301 Automatic changelog update 2023-04-19 03:43:11 -04:00
keronshb
ac87effca0 [Revert] Reverts Ninja (#15516) 
* Revert "[Antag] add space ninja as midround antag (#14069)"

This reverts commit c1cda0dbf8.

* Revert "[Fix] move ninja objectives into NinjaRole (#15490)"

This reverts commit 251f429fb3.
 2023-04-19 01:43:09 -06:00
mhamster
6161f7d5f3 [Entity] Add scientist lab coat (#15455) 
* Hey bro nice coat

+ added scientist lab coat
+ made scientist lab coat obtainable from scidrobe
+ made scientist lab coat obtainable from robodrobe
+ made scientist lab coat obtainable from role joining science departament
+ made scientist lab coat obtainable from science locker
+ made scientist lab coat obtainable from science wardrobe

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

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
 2023-04-19 01:42:05 -06:00
liltenhead
1916e67fd2 [Tweak] Implanter Speed (#15523) 2023-04-19 01:41:09 -06:00
RobbyTheFish
426bb95e1b [Entity] Add Ian's Backpack (#15519) 
* Initial commit

Add Ian's backpack

* Fixed inhand sprites

* Add fill to HoP Locker

Added Ian's 50% probability chance to spawn Ian's backpack in HoP locker
 2023-04-19 01:40:25 -06:00
deltanedas
6ddd8761a9 emag refactor (#15181) 
* limitedcharges stuff from emag

* changes except broken

* fix

* the

* move recharging to server, emag namespace -> charges

* the

* use resolve

* pro

webedit gaming

* the

* the

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-18 22:46:00 -07:00
PJBot
8507bcc8a8 Automatic changelog update 2023-04-19 01:45:40 -04:00
DEATHB4DEFEAT
078963127b add search to marking editors (#15526) 2023-04-18 22:44:37 -07:00
PJBot
3e410bd9e9 Automatic changelog update 2023-04-19 01:42:13 -04:00
Puro
7a5fb7ea67 [Sprite] Stimpack Sprite (#14987) 
* [Sprite] Stimpack Sprite

* updated meta.json
 2023-04-19 01:41:10 -04:00
PJBot
ed4e1d0ad5 Automatic changelog update 2023-04-19 00:37:16 -04:00
Dawid Bla
3d7281540d Makes minibomb actually gib (#15330) 2023-04-19 00:36:12 -04:00
PJBot
f209c702d2 Automatic changelog update 2023-04-18 23:10:26 -04:00
Whisper
1b31da956a Bloodloss drunk status no longer persists after being healthy AND dead bodies will still bleed (#15189) 
* removing drunk scaling with missing blood, drunk will apply until blood restored

* added new drunk function to go with new bloodloss drunk code

* initial tryremovetime code for drunk system. Still need to code it into bloodloss and test.

* initial tryremovetime code for drunk system. Still need to code it into bloodloss and test.

* Drunk status added by low blood level should be removed when healthy

* Everything is working in the dev enviroment. Cleaning up code.

* Dead bodies bleed, do not recover blood, and do not take further bloodloss damage to missing blood

* Last commit
 2023-04-18 23:09:22 -04:00
keronshb
c52db39077 Changelog Fix for syringes (#15517) 2023-04-18 18:17:34 -04:00
PJBot
49058e7b98 Automatic changelog update 2023-04-18 16:50:21 -04:00
EnDecc
3ac9cacc1a [Tweak] adds SolutionRegeneration component to parent sink at 1u per second (#15514) 2023-04-18 14:49:16 -06:00
PJBot
f5e0ddc980 Automatic changelog update 2023-04-18 10:35:58 -04:00
PJBot
6871881a78 Automatic changelog update 2023-04-18 10:34:45 -04:00
deltanedas
24f7b6ffc5 experimental welder fuel regeneration (#15475) 
* solution regeneration system

* experimental welding tool regenerates 1u of fuel every second

* pro

* use a solution

* added -> generated

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-18 10:27:05 -04:00
Whisper
3b1d9c489f Syringe changes. (#14441) 
* Syringe changes

* Fix

* Fix

* Fix

* Trying to rerun the tests because idk how

* revert self heal nerf
 2023-04-18 10:23:54 -04:00
PJBot
3ca51c4d73 Automatic changelog update 2023-04-17 18:48:13 -04:00
SonicHDC
c9f341fcce [Sprite] Brigmed hardsuit sprite stylization (#15461) 
* Add files via upload

* Add files via upload
 2023-04-17 16:47:08 -06:00
PJBot
07dff01ba2 Automatic changelog update 2023-04-17 18:32:43 -04:00
deltanedas
98de245ab4 [Fix] ninja hotfix (#15489) 2023-04-17 16:32:30 -06:00
deltanedas
251f429fb3 [Fix] move ninja objectives into NinjaRole (#15490) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-17 16:32:05 -06:00
Nim
60559ad1c1 [Fix] Gun safe, not a shotgun safe (#15495) 2023-04-17 16:31:40 -06:00
Scribbles0
dd653a4dba [Map] Cluster bridge door access fix (#15497) 2023-04-17 16:31:19 -06:00
deltanedas
98df9c6641 [fix] prevent removing battery from suit (#15491) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-17 16:30:40 -06:00
PJBot
d92d227e48 Automatic changelog update 2023-04-17 18:29:12 -04:00
Kit0vras
07457b72e3 [Fix] ERT Gear Fix (#15488) 2023-04-17 16:28:09 -06:00
PJBot
7401ed40d3 Automatic changelog update 2023-04-17 18:27:34 -04:00
Puro
002f63300a [RND] Research magboots (#15485) 
* [Clothing] Security service magboots

* [RND] Magboots research

* sheesh

* sheesh2

* Update technologies.ftl

* Update technologies.yml

* Update magboots.yml

* Update lathe.yml

* Update security.yml

* qwq
 2023-04-17 16:26:31 -06:00