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

8315 Commits

Author SHA1 Message Date
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
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
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
Jona-K
2951ea2bee Adjustet MobBaseAncestor class (#30424) 2024-07-28 01:32:26 -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
lzk
e1e2d26969 Fix pancakes stacks (#30270) 
Fix pancakes
 2024-07-28 13:49:06 +10: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
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
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
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
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
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
Golden Can
1149290825 Security Clown Mask (#30249) 
Added Security Clown Mask available from hacked SecDrobes.
 2024-07-27 00:09:23 -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
Moomoobeef
5905767ce7 changed some radio colors to be more distinguishable (#30133) 
* changed some radio colors to be more distinguishable

* changed sec, supply, and engineering in order to provide more accessability to deuteranomaly

* the previous commit made engi and supply hard to distinguish again. so I fixed it
 2024-07-25 23:47:20 -07:00
Cojoke
333bb386d9 Add Identity Blocker to a Couple Things (#30305) 2024-07-25 23:26:04 -06:00
Brandon Hu
4e1fe975ec tweak(StatusIcons): Hide revolutionary icons in the dark. (#30367) 
Wilma? eye harley no er
 2024-07-25 23:25:33 -06:00
Ilya246
d5236d8236 give nukie reinforcements full operative gear (#30173) 
* rebase master

* free fish

* introduce recommended changes

* fix prototypes

* fix protos yet again

* fkhsdjbhehbo;ehb

* rafle
 2024-07-25 16:37:54 -07:00
Plykiya
0a07203121 Lets atmos build gas pipes in walls (#28707) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-25 16:26:06 -07:00
Plykiya
7388b91ef5 Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100) 
* NOW THAT'S A LOT OF FILES

* categorization

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-25 05:24:00 -07:00
timur2011
bcd7a7ad00 Space adder now butcherable, snake drops snake meat (#29629) 2024-07-25 03:52:18 -07:00
lzk
f56e4f6624 Replace some to do with TODO (#30346) 
Replace to do with TODO
 2024-07-25 11:04:03 +03:00
Brandon Hu
50ba20c766 fix(bounties): Make winter counts count as a single warm item. (#30306) 
https://news.stanford.edu/stories/2020/05/veil-darkness-reduces-racial-bias-traffic-stops
 2024-07-24 23:33:22 -06:00
deltanedas
8de6b74e08 fix borg light being on by default (#30342) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-07-24 23:30:17 -06:00
deltanedas
8f6326c3e0 prevent borgs unlocking eachother and robotics console (#27888) 
* prevent borgs from using locks

* e

* bru

* a

* blacklist borgs and robotics console

* frogro

* add IsAllowed to EntityWhitelistSystem

* use IsAllowed

* move thing to new LockingWhitelistSystem

* :trollface:

* review

* use renamed CheckBoth in locking whitelist

* remove unused stuff and add more to doc

* Use target entity instead to remove self check

* Rename to _whitelistSystem

* Add deny lock toggle popup

* Prevent duplicate checks and popups

* Fix wrong entity in popup when toggling another borg

* Make new event

* Update comment to user for new event

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-07-25 13:54:51 +10:00
marbow
b6811d3570 Medical borg add chem glasses (#27843) 
* Update borg_chassis.yml

* Update borg_chassis.yml

* fix

* Removing unnecessary components and adapting changes (#28391) for the syndicate

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-25 13:49:32 +10:00
IProduceWidgets
06d136698c Perma escape crate fills and spawner (#29497) 
* perma escape crate fills and spawner

* also include maints closets because thats easy.

* oopsie daisys

* green glowsticks

* mindshield

* base folder

* mob traps.

* I skill issued a ctrl+F and wrote garabge into yml

* re work syndicate gift crate, remove ability to get syndicate guns randomly.

* Do mob traps differently to hopefully appease tests.

* mindshield probability decrease.

* lower mob chance since I forgor there are crabs in the walls

* Suffixes

* mob chance was definitely too low.

* still too low

* still a bit low

* that feels right.

* too many mk's

* increase hatchet chance since you need a cutting impliment to logs.

* alphabetize
 2024-07-24 20:31:54 -06:00
Ed
50e042011d direct 2024-07-25 00:09:58 +03:00
Ed
08f1aa9fa1 Crew goals update (#355) 
* randomization goals support

* maps update
 2024-07-24 20:52:05 +03:00
Nim
bb20f3a1bc fix Mannequin (#354) 2024-07-24 19:14:18 +03:00
Killerqu00
688a46f903 Move some disabilities traits into a new category (#30102) 
split traits into disabilities and quirks
 2024-07-24 06:50:19 -04:00
Ed
9c84ce9be0 Currency collect goal (#352) 
* simple currency comp

* stack support + weapon cost dnd port

* add collect currency objective conditions

* clean up
 2024-07-24 13:28:27 +03:00
Brandon Hu
343496faf8 tweak(chameleon): Add clown suit to chameleon tech (#29307) 2024-07-24 02:04:20 -07:00
BombasterDS
8b27ef8a78 Fix: Shelfs and Mannequin disassemble (#30313) 
fix shelfs
 2024-07-24 01:57:03 -07:00
Ed
bf93349b73 Female bodies support (#350) 
* port female parts

* boobs support!

* tiefling boobs confirmed

* Update female_shirt.png

* Update female_shirt.png
 2024-07-24 09:11:31 +03:00
mkanke-real
e1f3bdc748 Add spicy rock pizza (#30116) 
* Added all the parts to implement spicy rock pizza

* Added sprites for pizza

* Fixed coma formatting in meta.json for pizzas

* Fix formatting and rebalance reagent quantities in pizza.yml

* Flipped Uranium and Radium values to be the correct ratio

* Updated meta.json file to have credit for sprite
 2024-07-23 16:22:11 -07:00
Ed
8c477a67c1 Update centcomm.yml 2024-07-23 21:50:00 +03:00
Ed
3b5e0003c3 Create centcomm.yml 2024-07-23 21:45:41 +03:00
Ko4ergaPunk
e7aa97645b Change drawdepth of some wall-mounted objects (#30274) 
drawdepth
 2024-07-23 17:41:15 +03:00
Ed
526238bac5 fix 2024-07-23 14:04:13 +03:00
Ed
f348213750 Update arenas.yml 2024-07-23 13:46:57 +03:00
Ed
ed3e896cb8 Update debug.yml 2024-07-23 13:40:19 +03:00
Ed
0190e366a3 maps fix 2024-07-23 13:27:58 +03:00