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

19503 Commits

Author SHA1 Message Date
slarticodefast
502ceb69de Fix puppy ian steal target (#30474) 
fix puppy ian steal target
 2024-07-29 18:22:16 -07:00
PJBot
0bbb099a38 Automatic changelog update 2024-07-30 01:06:33 +00:00
Ian
c5f332ea9f added a defib to the courser (#30471) 2024-07-29 19:05:26 -06:00
Emisse
fcaf04d72b bagel update (#30461) 2024-07-29 12:45:42 -06: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
PJBot
961514dd28 Automatic changelog update 2024-07-29 15:18:01 +00:00
TurboTracker
8595f59b83 Bring kobold ghostrole chance inline with monkey (#30450) 2024-07-29 18:16:54 +03:00
PJBot
16cbd1a36b Automatic changelog update 2024-07-29 12:53:46 +00:00
Moomoobeef
7761f86b99 added wearable lizard plushie (#30400) 2024-07-29 15:52:39 +03:00
end
6114a88628 N2O color change (#30383) 2024-07-29 15:37:31 +03:00
PJBot
7244b9b912 Automatic changelog update 2024-07-29 09:58:10 +00:00
Alzore
3db33d944f Increase the contents of the emergency oxygen and fire lockers (#29230) 
* 201 asphyxiation damage

* A bit less oxygen
 2024-07-29 02:57:04 -07:00
thecopbennet
cf7e680770 turns "nosmoking sign" into "no smoking sign" (#30444) 
add a space

Co-authored-by: thecopbennet <bennetgood@gmail.com>
 2024-07-29 02:31:05 -06:00
PJBot
a9fc5a4b94 Automatic changelog update 2024-07-29 08:30:33 +00:00
Maishul
0e4bc4cefc Candles Crate (#29736) 
* First attempt at adding crate

* Changed loose candles to candle boxes

* Corrected minor typo

* Removed a change to the development preset

* Buffed crate to 2 of each box

* Hopefully removes strange not-change in the repo

* Updated description to be clearer.

---------

Co-authored-by: elee-github <elee2020@yahoo.com>
 2024-07-29 02:29:27 -06:00
PJBot
c586561a9e Automatic changelog update 2024-07-29 06:50:35 +00:00
JIPDawg
0dd22c31d1 Change unused OpenScoreboardWindow to ToggleRoundEndSummaryWindow and bind it to F9 (#30438) 
Change unused OpenScoreboardWindow to ToggleRoundEndSummaryWindow
 2024-07-28 23:49:28 -07:00
Mervill
14a8e94f1e Fix punctuation in anchored / unanchored examine text (#30439) 
fix punctuation in anchored / unachored  examine text
 2024-07-29 08:35:50 +02:00
lzk
c4ef5e4205 Update marathon (#30442) 2024-07-29 00:31:05 -06:00
PJBot
4a13212bc3 Automatic changelog update 2024-07-29 06:20:54 +00:00
lzk
da5918c951 FINALLY FIX APPROVER IN CARGO INVOICE!!! (#29690) 
* OH DEAR LORD I WASTED 2 HOURS ON THIS STUPID SHIT!!!

* change some logic
 2024-07-28 23:19:43 -07:00
lzk
46c8cecbbc Update Marathon (Engineering revamp and small stuff) (#30429) 
* Update Marathon

* Update 2

* Update 3

* Update 5

* Update 5 (actually this time)
 2024-07-28 13:53:23 -06: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
PJBot
ab84eee083 Automatic changelog update 2024-07-28 06:18:12 +00: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
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
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