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

29142 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nemanja
c4c4a934af fix lathe screen animations (#30479) 2024-07-30 14:03:46 +10:00
PJBot
fc65acc7a0 Automatic changelog update 2024-07-30 03:05:23 +00:00
themias
92210ff51b Fix ACC wire light not appearing (#30453) 2024-07-29 23:04:17 -04:00
PJBot
16ec6443f6 Automatic changelog update 2024-07-30 02:49:34 +00:00
Cojoke
ad81c30dcb Lets Hamlet Dance (#30478) 
Allow Ghost Roles that have NPC to turn on Combat Mode
 2024-07-29 19:48:28 -07:00
osjarw
669cc55ba4 Allow the creation of recursive HTNs (#30138) 
Allow recursive HTNs
 2024-07-30 12:18:53 +10:00
PJBot
cc3d6441be Automatic changelog update 2024-07-30 02:18:33 +00:00
Plykiya
031eb9606c Make magic mirror do-after longer, add popups to notify the target (#30366) 
* Make magic mirror do-after longer, add popups to notify the target

* Turns out I do have access to the user

* More detailed popups

* Helmets protecc

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-30 12:17:27 +10:00
PJBot
3104215ced Automatic changelog update 2024-07-30 02:15:17 +00:00
nikthechampiongr
2f42e1d18e Vanquish inaccurate docs (#30449) 2024-07-30 12:14:34 +10:00
TheKittehJesus
18370c3d1c Four cooking recipes changed to use liquid egg instead of whole egg, and 5u of milk added to cake batter (#30262) 
* Changed four cooking recipes to use egg fluid instead of whole eggs, see issue #30123

* Added 5u of milk to cake batter due to it becoming a subset of brownie recipe and occurring in beaker
 2024-07-29 22:14:11 -04:00
PJBot
ca8ee5fb77 Automatic changelog update 2024-07-30 01:50:11 +00:00
themias
85e36266fa Add envelopes (#30298) 
* Add envelopes

* oops

* Remove unused loc string

* comments and fixes
 2024-07-29 21:49:05 -04:00
PJBot
b16de9bb35 Automatic changelog update 2024-07-30 01:23:23 +00:00
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
Mervill
83a56cc74a Objects that only have a basic description won't have extra line in examine text (#30472) 
objects that only have a basic description won't have extra line in examine text
 2024-07-29 17:57:46 -07: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
Mervill
ec19f9f4a9 Make the powered examine text fully client predicted (#30441) 
* Make the powered examine text fully client predicted

* switch to using the Entity<T> API for the examine event
 2024-07-29 00:28:17 -07: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
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