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

26956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
fd3f222e7d Update CP14BiomeSpawnerSystem.cs 2024-07-30 13:21:06 +03:00
Ed
1f587c10b8 Update LICENSE.TXT 2024-07-30 11:48:50 +03:00
Ed
22bb0ae283 Energy pilons WIP (#326) 
* split partial magic system

* add debug sprited pilons

* some energy pilons interactions

* Update CP14MagicEnergySystem.Relay.cs

* spupers (#322)

* spupers

* meta

* aura nodes + aura scanners

* scanner sprites

* maid dress

* reverse pilon logic

* relay delete, code clean up

* delete content

* Update basic.yml

* Update shirt.yml

* Update crystal.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-29 21:01:36 +03:00
Gagarinten-Noverdo
c69cb0320e Biome spawner update. Round seed system (#359) 
* Biome spawner update. Round seed system

* Format fix

* Round seed M I T

* Error to Warning

* Test fix #2

* Test fix #3

* VV

* Del out of body
 2024-07-29 19:16:55 +03:00
Ed
02c5e03ae7 Merge pull request #362 from crystallpunk-14/ed-28-07-2024-upstream 
Upstream sync
 2024-07-28 22:22:55 +03:00
Ed
cc5f27c057 ignore traits 2024-07-28 21:04:45 +03:00
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
 2024-07-28 20:58:48 +03:00
Ed
0d345c33b9 Update dev_map.yml (#361) 
* Update dev_map.yml

* Disable FTL test

* DisableEvacTest
 2024-07-28 20:56:05 +03:00
Ed
9011aab26b Add 3 roles (without gameplay, alas) (#356) 
* add role icons

* add roles prototype

* Update job.yml
 2024-07-28 18:22:50 +03:00
Jaraten
cf6b42d20c Stone-brick wall crushed (#336) 2024-07-28 17:27:24 +03:00
Ed
655b32b720 Magic spells backend (#358) 
* add EntityEffect aability support

* delayed actions

* renaming

* delayed projectile spells

* spawn on self + entityEffect on self spells

* spawn on point spell

* rename

* clean up base species components

* magic alert

* move magic energy to Shared, add manacost to spells

* magic recoil

* improve magic recoil

* verbal aspect

* somatic aspect

* add simple vfx proto and sprites

* add casting VFX

* add TODO
 2024-07-28 17:26:47 +03:00
PJBot
fce5269fc0 Automatic changelog update 2024-07-28 08:33:32 +00:00
Jona-K
2951ea2bee Adjustet MobBaseAncestor class (#30424) 2024-07-28 01:32:26 -07:00
Plykiya
79fa810b9c Update stomach removal and lung removal smite to not use Component.Owner (#29927) 
* Update stomach removal and lung removal smite

* New function makes things simple

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-28 01:25:40 -07:00
PJBot
ab84eee083 Automatic changelog update 2024-07-28 06:18:12 +00:00
Plykiya
1d55a439ff Make NoSlip component networked (#30425) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-27 23:17:06 -07:00
Brandon Hu
4a9bd17a86 tweak(geras): Add a confirmation popup for gera transformation (#29215) 
* tweak(geras): Add a confirmation popup for gera transformation

* remove abstract parent
 2024-07-28 14:13:15 +10:00
PJBot
d9286dd6d9 Automatic changelog update 2024-07-28 03:50:12 +00:00
lzk
e1e2d26969 Fix pancakes stacks (#30270) 
Fix pancakes
 2024-07-28 13:49:06 +10:00
deathride58
3a10ffa030 Makes the labeller automatically label PRs with shader changes (#30316) 
adds shader label to git labeller
 2024-07-28 13:46:22 +10:00
metalgearsloth
404743f073 Fix examine threading issues (#30160) 2024-07-28 13:43:59 +10:00
IProduceWidgets
925d1e3ac8 Prevent gridfill from leaking (#30395) 
dont forget to set the airtights when the tights are aired
 2024-07-28 13:20:29 +10:00
Plykiya
7f9e06501f Update SharedDoorSystem.cs to not use Component.Owner (#29963) 
* Update SharedDoorSystem.cs

* comment

* empty space

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-28 13:18:12 +10:00
PJBot
255b7f3b7a Automatic changelog update 2024-07-28 03:15:24 +00:00
metalgearsloth
093054f7e3 Move vgroid much closer (#29943) 
* Move vgroid much closer

General feedback is map spam + it takes too long to get to. This is somewhat "close" (considering 1/4 of the distance is the vgroid itself) but without a jetpack / shuttle it's going to be an endeavour.

* Decrease max

* Tweaks

* godzilla

* Update Content.Server/Shuttles/Components/GridSpawnComponent.cs
 2024-07-28 13:14:18 +10:00
github-actions[bot]
e3d7c1bd6e Update Credits (#30420) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-07-27 21:36:00 -04:00
PJBot
845fa31419 Automatic changelog update 2024-07-27 23:12:34 +00:00
Spessmann
34a7aa70ce Thief objectives for figurines and stamps ask for less items (#30390) 
Makes thief objective for stealing figures and stamps easier
 2024-07-28 02:11:26 +03:00
Brandon Hu
3283424ba8 tweak(Radiation Suits): Increase damage taken by 1000% (#30392) 
wtf is 0.9% anyways
 2024-07-28 02:10:07 +03:00
Brandon Hu
54e42cc4e5 tweak(NuclearBomb Keg): Give the nuclear bomb keg a hit box (#30415) 
* bleh

* Bugs spread disease :(

* they are reproducing

* no lore
 2024-07-27 21:45:53 +01:00
Flareguy
9bd623a927 Makes security a bit brighter (#30369) 
makes sec more red
 2024-07-27 13:51:10 -06:00
Brandon Hu
d846a621e5 tweak(Core_map_Jobslots): Increase round start chemist slots from 1 to 2 (#30408) 
that is odd
 2024-07-27 13:49:05 -06:00
Brandon Hu
dc1be42b8f tweak(Chemical Dispenser): Give the chemical dispenser a hitbox (#30412) 
weh
 2024-07-27 21:47:38 +03:00
PJBot
6a1efebb6a Automatic changelog update 2024-07-27 15:09:56 +00:00
BombasterDS
de7df2a760 Some plant mutations (#28993) 
* Some new plants mutations

* glasstle inhand

* gapple trico increase ↑

1-10 to 3-16

* replace trico with doc delight
 2024-07-27 18:08:49 +03:00
Errant
f49fc5a89c Do not duplicate Job Greeting on antag selection (#30407) 
Silence MindAddRoles in AntagSelectionSystem
 2024-07-27 07:58:19 -07:00
deltanedas
f67f7034b9 fix ninja not showing in round end (#30405) 
fix ninja not showing in round ned

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-27 05:08:12 -07:00
Chief-Engineer
b66c286ecb Include whitelisting location in baby jail deny message (#30373) 
include whitelist locating in baby jail deny message
 2024-07-27 04:49:02 -05:00
PJBot
9f6e5e8d60 Automatic changelog update 2024-07-27 07:28:28 +00:00
Plykiya
1146f2fefe Fix thieves rule not selecting more than one thief (#30393) 
More thieves

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-27 00:27:21 -07:00
IProduceWidgets
b9090e84f7 Update Evac-Accordia (#30389) 
Update accordia atmos systems
 2024-07-26 23:40:39 -06:00
IProduceWidgets
45a481de47 Oasis updoot (#30388) 
updoot!
 2024-07-26 23:39:43 -06:00
PJBot
5485ae25e0 Automatic changelog update 2024-07-27 04:10:29 +00:00
Golden Can
1149290825 Security Clown Mask (#30249) 
Added Security Clown Mask available from hacked SecDrobes.
 2024-07-27 00:09:23 -04:00
PJBot
d5d8c14ced Automatic changelog update 2024-07-27 01:55:44 +00:00
metalgearsloth
8f250581be Fix VGRoid grid spam (#29946) 
Specifically if a grid splits under the cvar size it doesn't get a label. This also stops stuff like shuttles splitting in half creating new entries for the new grids. Splitting code leaves the largest grid as the existing one so this will always prefer to keep it large (but if there's multiple splits it won't adjust).
 2024-07-27 11:54:38 +10:00
PJBot
e7aa7791b4 Automatic changelog update 2024-07-26 18:49:09 +00:00
themias
7c7f4a9f25 Fix zombie uncuffing (#30321) 
* Fix zombie uncuffing

* PlaceNextTo() and rename vars
 2024-07-26 14:48:03 -04:00
chavonadelal
582e6d2010 Localization of the title of the job (#30353) 2024-07-26 14:47:07 -04:00
Brandon Hu
b1d5436bcd fix(ExtinguisherCabinet): Fix cabinet whitelist to allow fire extinguishers again (#30371) 
ugh

Co-authored-by: Avery Dobbins <avery.dobbins@gmail.com>
 2024-07-26 14:46:40 -04:00