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

26962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PJBot
c729079408 Automatic changelog update 2024-08-13 13:37:52 +00:00
slarticodefast
6a462221ff Add keybinds for rotating and flipping objects (#30540) 
* add keybinds for rotating and flipping objects

* no popup for verbs
 2024-08-13 23:36:41 +10:00
pigeonpeas
7153e43946 Fixes the grey mantle (#30971) 
add the thing i missed
 2024-08-13 22:13:50 +10:00
PJBot
79315c2531 Automatic changelog update 2024-08-13 11:09:46 +00:00
Ubaser
135d52406a Add capfruit, a gatfruit mutation. (#30850) 
* add base

* add fake suffix and flavor fix

* address some reviews

* parent it

* fix test fail

* add FoodSequence support and address small review
 2024-08-13 13:08:40 +02:00
PJBot
0998645077 Automatic changelog update 2024-08-13 10:55:06 +00:00
Ed
cc180e54e6 Sliceable doAfter (#30824) 
* init

* wtf git
 2024-08-13 13:53:59 +03:00
PJBot
bf7c32737b Automatic changelog update 2024-08-13 09:21:19 +00:00
pigeonpeas
329a0a875b Grey mantle in winterdrobe (#29774) 
* add the mantle

* fix a few things

* fix merge conflict stuff, remove from winterdrobe and lathe.

* Add mantle to loadouts (20 hour requirement)
 2024-08-13 19:20:12 +10:00
PJBot
d49d78cebf Automatic changelog update 2024-08-12 23:26:37 +00:00
nikthechampiongr
dcc11873f9 Fix permission check for whitelists in player panel (#30948) 2024-08-12 18:25:31 -05:00
PJBot
ab1613315d Automatic changelog update 2024-08-12 23:22:00 +00:00
LeoSantich
c9366b818c Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratva… (#30954) 
Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratvar, per issue #30719.
 2024-08-13 09:20:53 +10:00
Cojoke
0c1cfe8f18 Fix Reagent Fire Stacks (#30766) 
* Fix Reagent Fire Stacks

* Comments on code

* little nicer wording?
 2024-08-12 10:48:39 -04:00
Token
d4c0155d66 Fix DoDrop to DropNextTo in container cases (#30911) 
* Fix DoDrop to DropNextTo in container cases
DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method

* codestyle change
 2024-08-12 10:18:26 -04:00
Chief-Engineer
691e37c0db Update space law for contraband upate (#30937) 
* update space law

* missed a thing
 2024-08-12 04:58:20 -05:00
Ubaser
c02aeebdf1 Add conducting gloves to the maintenance loot table (#30904) 
* add

* lower weight
 2024-08-12 03:06:55 -06:00
Plykiya
883dc998e6 First Review Pass Contraband Fixes (#30930) 
* First pass contra fix

* bam

* More

* Security crates are now marked as security restricted

* Syndicate raid suit is contra

* damn I forgot gatfruit
 2024-08-12 02:17:26 -06:00
Ubaser
7e17063b86 Removes variant cube migration (#30934) 
add
 2024-08-12 02:16:59 -06:00
PJBot
ca75d5a3e3 Automatic changelog update 2024-08-12 07:15:52 +00:00
Ubaser
c6209cc725 Make mantles loadout only. (#30929) 
* remove cloaks and mantles from dresser

* remove mantles from lathe

* add role timer loadout thing

* add back cloak dresser

* fix test fail

* potentially fix test fail (?)
 2024-08-12 01:14:45 -06:00
Ubaser
d220249902 Hotfix #30291 (#30932) 
* add

* Revert "add"

This reverts commit 2b4ae87c4fbdd80d224ab19a655c9c547fcc43fd.

* add
 2024-08-12 17:04:21 +10:00
PJBot
463a5299db Automatic changelog update 2024-08-12 06:22:03 +00:00
DieselMohawk
6759d6a614 Sec Vest & Helmet Resprite (Attempt 2) (#30291) 
* Sec Vest & Helmet Resprite

* Made Helmet side sprites better

* Vest Alterations In Line With Feedback

* Feedback Based Alterations PT.2 (How did I miss that?)

* Alterations in line with Art Director Feedback
 2024-08-12 16:20:56 +10:00
PJBot
9f550002d1 Automatic changelog update 2024-08-12 03:58:57 +00:00
Kara
485caa4553 Contraband marking & examining (#28688) 
* System & loc strings

* pass over syndie contraband

* fixes

* grand theft pass

* contrabandexamine -> contraband

* examine text generation update

* all composition parents necessary

* bring back minor contra so it has a less confusing message

* minor

* weapon pass

* jumpsuit pass

* feet pass

* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH

* head

* AUUUUGH

* ear

* belt

* back

* fix

* bro

* rename for more clarity

* do da review

* add cvar for contraband examine

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-08-11 23:57:49 -04:00
Mervill
9f180e4f62 Don't show the Meteor Swarm announcement to players in the lobby. (#30922) 2024-08-12 12:13:28 +10:00
Nemanja
a0a1421da4 give trash a reusable entity table (#30921) 2024-08-12 12:07:39 +10:00
PJBot
15812d2a08 Automatic changelog update 2024-08-12 01:50:16 +00:00
Alzore
bcd7085a3e Add diamond mining drills, buff regular mining drills (#30814) 
* why do I have to change so much just to add drills

* diamon
 2024-08-12 11:49:09 +10:00
Brandon Hu
dea9a637fb chore(grammar): correct some mistakes (#30916) 2024-08-12 08:25:45 +10:00
PJBot
86f4346c05 Automatic changelog update 2024-08-11 22:13:37 +00:00
Plykiya
c688da00a0 Add execution component to all energy sword weapons (#30909) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-08-12 08:12:31 +10:00
Zachary Yona
7aaac2c179 Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit (#30918) 
* Fixes inhand hardsuit cross color from https://github.com/space-wizards/space-station-14/issues/26516#issue-2213917971

* Fixed HoS Turtle not covering all butt pixels

---------

Co-authored-by: Zachary Yona <magicalusf@gmail.com>
 2024-08-12 07:45:28 +10:00
Brandon Hu
aa15a9a839 chrore(ageRequirement): fix grammar. atleast -> at least (#30914) 2024-08-11 22:28:07 +02:00
Brandon Hu
46f631fa11 tweak(AgeRequirement): Make the requiredAge more sensible (#30913) 2024-08-11 21:47:26 +03:00
Killerqu00
65521696c8 Remove rest of Geras files (#30912) 
remove remaining geras stuff
 2024-08-11 14:01:00 -04:00
mhamster
e26e662023 Small json files fixes (#30907) 
Small json fixes

Resources/Textures/Interface/Default/meta.json: trailing comma
Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json
Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas
 2024-08-11 23:26:45 +10:00
Ubaser
58fd50c369 fix a capitalisation mistake (#30908) 
ad
 2024-08-11 22:51:19 +10:00
PJBot
6ec6a28aeb Automatic changelog update 2024-08-11 10:27:43 +00:00
Moomoobeef
28efd76e82 adds a throngler plushie, and adds it to the grand lotto (#29978) 
* adds a throngler plushie, and adds it to the grand lotto

* this was supposed to be in the initial commit but I apparently forgot to save so anyway here it is

* make throngler plushie more rare

how about I split the difference:
original throngler: 0.0001
other plushies: 0.01
thongler plushie: 0.0005

* removed inheritied soundhit
 2024-08-11 20:26:37 +10:00
Brandon Hu
31c5d3555e fix(Commands): Improve Localization of commands. Standardize some behaviors. (#30362) 
* I should be studying for school but that is sofucking boring, I will pass my class no matter, however getting an A might be a challenge. My gpa is important but is the tourture for 1 point of GPA worth it? The american government says yes but they are responsible for the majority of all genocides that have ever been conducted since the dawn of man

* ugh

* ugh
 2024-08-11 19:46:57 +10:00
PJBot
e0f292921f Automatic changelog update 2024-08-11 09:24:20 +00:00
slarticodefast
bd5d415575 Make the sentient plant mutation non-copyable to other plantholders (#29133) 
make the sentient plant mutation not propagate by clipping, using the seed extractor or cryoxadone
 2024-08-11 19:23:14 +10:00
osjarw
456410239e Reorder priorities in MeleeCombatCompound (#30066) 
Reordered MeleeCombatCompound to improve unpulling
 2024-08-11 19:22:46 +10:00
PJBot
8c4e5c5848 Automatic changelog update 2024-08-11 09:20:06 +00:00
Token
ad71d8cb2f Pax now refresh instead of stacking pacified forever (#30778) 
Pax refreshes instead of stacking pacified forever
 2024-08-11 19:19:00 +10:00
Plykiya
b6d04f884c EntityTables for sec belts and webbing (#30900) 
* EntityTables for sec belts and webbing

* update name

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-08-11 19:16:46 +10:00
PJBot
93c9d49f9b Automatic changelog update 2024-08-11 09:16:34 +00:00
lzk
f93fe05f4c Make RCD ui activateable only in hand (#30861) 2024-08-11 19:15:28 +10:00