juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,788 Commits 57 Branches 0 Tags
373c368b94de808ff8da1f9956b489daecee64d8
Commit Graph

16167 Commits

Author SHA1 Message Date
PJBot
e0db71ee32 Automatic changelog update 2023-09-24 15:57:13 -04:00
Tunguso4ka
ee54022832 Ash Walker`s spear and uniform (#20292) 
* bones, gladiators, milk, spear and tears

* :trollface: my copy/paste python script did the funny

* forgor

* fixed

* mat.yml fixed

* bones

* bone armor

* gladiator uniform now in clothesmate like ss13

* bone armor craft

* pieces

* i was dumb in the past, now im dumb too

* that was dumb...

* fixing stuff

* i hate git

* Revert "i hate git"

This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.

* Revert "fixing stuff"

This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.

* this will work?

* i fucking merged it
 2023-09-24 15:57:10 -04:00
Slava0135
74901b0cb1 remove hot potato from uplink (#20474) 2023-09-24 22:56:06 +03:00
PJBot
52afe73ae9 Automatic changelog update 2023-09-24 15:55:42 -04:00
PixelTK
ec05e229ba new arachnid marking (#20347) 2023-09-24 15:54:38 -04:00
PJBot
a9ec34a416 Automatic changelog update 2023-09-24 15:51:45 -04:00
PJBot
47c107c431 Automatic changelog update 2023-09-24 15:48:46 -04:00
PJBot
9e1bf43242 Automatic changelog update 2023-09-24 15:47:20 -04:00
drteaspoon420
1a67c5583a Solutions on thrown spears/shot arrows (#20416) 
* Solutions on thrown spears/shot arrows

Spears inject their solution on thrown hit.
Arrows now have 5u solution storage that is injected when it hits target.

* Whoops, wrong arrow.

Instead of base arrow, I accidentally modified the 'regular arrow'

* spear and arrow solution graphics

Spears and arrows now show what they are doped with when they are on ground. (just like beakers)
 2023-09-24 15:46:16 -04:00
Nemanja
d225bd39fa basic station event commands (#20371) 
* basic station event commands

* ouagh
 2023-09-24 12:46:35 -05:00
PJBot
2be28908f7 Automatic changelog update 2023-09-24 13:21:08 -04:00
deltanedas
e0950d21fd mouse cant open doors (#20470) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-24 08:59:27 -07:00
Morb
17f45d7faf Exterminate tab in seeds prototype No C# (#20464) 2023-09-24 05:42:44 -07:00
Leon Friedrich
4774368f2a Fix "spawn" spellbook (#20447) 2023-09-24 12:38:22 +10:00
PJBot
6feb66ad42 Automatic changelog update 2023-09-23 16:01:17 -04:00
Repo
16b70ca8f6 Fix declaration of war (#20399) 2023-09-23 12:00:12 -08:00
PJBot
e512f532d0 Automatic changelog update 2023-09-23 15:16:09 -04:00
deltanedas
f747bfe5fc Add navmap beacon to armed nukes (#20394) 2023-09-23 11:15:05 -08:00
deltanedas
815846ee7f butcherable gloves + glove cleanup (#20036) 
* butcherable gloves + glove cleanup

* insulative fingerless merc

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-23 11:28:06 -07:00
PJBot
d5d9b043b8 Automatic changelog update 2023-09-23 12:34:43 -04:00
PJBot
52d3d13f47 Automatic changelog update 2023-09-23 09:15:10 -04:00
PrPleGoo
1a13884961 Task/food hud (#19312) 
* security HUD now shows a job icon on entities with a body

* thirst goggles

* set starting hud gear

* fix build

* remove from starting gear

* remove

* replace

* fix thirst and hunger icons

* update icons

* space

* space

* ]

* ]

* fix build

* fix comments

* fix

* spacing

* field

* move more namespaces

* use AutoGenerateComponentState

* comments

* fix build

* not all fields

* comments

* unpaused

* fix Dirty warning

---------

Co-authored-by: Slava0135 <super.novalskiy_0135@inbox.ru>
 2023-09-23 16:14:06 +03:00
Leon Friedrich
684b334806 Action container rejig (#20260) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-09-23 18:49:39 +10:00
PJBot
c80c90ed65 Automatic changelog update 2023-09-23 04:26:03 -04:00
Nemanja
86d22a7cb6 skeleton fixes (#20373) 2023-09-23 18:24:58 +10:00
TsjipTsjip
5bb381dd4b Add chef closet to aspid (#20423) 2023-09-23 18:15:35 +10:00
daerSeebaer
42104bb56a Add SMES and substation names (#20414) 2023-09-22 23:13:09 -08:00
Kara
b8b4e918e2 Mouse rotator system (#19267) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-09-23 15:45:13 +10:00
PJBot
69bcd69715 Automatic changelog update 2023-09-23 01:40:51 -04:00
deltanedas
b7cff81587 Openable refactor (#19750) 2023-09-22 22:10:04 -04:00
DrSmugleaf
71ab660885 Add role bans tab to the bans admin window (#20388) 2023-09-22 14:08:28 -07:00
PJBot
8299fcbb65 Automatic changelog update 2023-09-22 16:02:46 -04:00
Waylon Cude
9cbcf67b1a Metabolism fixes (#20402) 
* In-progress commit for fixing metabolism system

* Commit with all debugging in there

In case I have to revert or something

* Cleanup debug commands
 2023-09-22 15:01:42 -05:00
Nemanja
f16ff3a2d9 Rat King Milsim + Buffs (#20190) 
* rat king update

* rummaging

* buuuuunnnnncccchhh of shit

* the last of it

* make rat servants not ghost roles

* pissma buff and cooldown
 2023-09-22 15:01:05 -05:00
PJBot
eebf2c0039 Automatic changelog update 2023-09-22 15:58:09 -04:00
HerCoyote23
393b50d008 ninja suit damage resistance nerf (#20413) 2023-09-22 14:53:56 -05:00
PJBot
d2a3cf8a8c Automatic changelog update 2023-09-22 15:53:35 -04:00
Vasilis
e5162d4151 Guidebook can POP OUT YAYYYY (#20268) 
* Let them eat cake

* Reviews

* Change amoled theme to gray

* Ok nevermind im big smart
 2023-09-22 14:52:30 -05:00
PJBot
b765cb7b85 Automatic changelog update 2023-09-22 05:46:26 -04:00
Kara
f8d194b117 Bows & arrows (#19771) 2023-09-22 02:45:21 -07:00
SolidusSnek
1ba1ab6d61 Fix WizDen rules grammar (#20320) 
* Update Rules.txt

* Update Rules.txt
 2023-09-21 21:19:48 -05:00
Warentan
aa1c908038 Update atmos and AME guidebook (#20379) 2023-09-21 14:07:36 -08:00
deltanedas
37c5020a71 move ninja objectives code into generic antag system (#20186) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-21 07:33:18 -07:00
PJBot
8629a3ab9e Automatic changelog update 2023-09-21 09:22:48 -04:00
Jezithyr
31b2c9f830 Refactoring body system to use containers and general body cleanup (#20202) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-21 17:23:02 +10:00
Repo
b98e099af0 Fix syndicate bomb uplink time limit (#20380) 2023-09-20 17:05:04 -08:00
PJBot
f0df598bf5 Automatic changelog update 2023-09-20 21:00:03 -04:00
Waylon Cude
a8018dd575 Tweak mixed drink ratios (#20301) 
The drinks in SS14 were made quite boozy, usually there should be more
mixer than alcohol in a drink. This commit tweaks all the standard
alcohol + mixer drinks to have twice the amount of mixer vs alcohol
 2023-09-20 16:58:56 -08:00
PJBot
f8306911bc Automatic changelog update 2023-09-20 15:41:45 -04:00
ike709
3ee729f3fd Adds a search bar to vending machines (#20326) 
* Adds a search bar to vending machines

* fix indentation

* whitespace again

---------

Co-authored-by: ike709 <ike709@github.com>
 2023-09-20 15:40:41 -04:00