juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,358 Commits 57 Branches 0 Tags
113778471cd1f4e4d4eb13b8d232c49b0c447239
Commit Graph

5552 Commits

Author SHA1 Message Date
chromiumboy
c853f0bfb7 Artifact containers can safely store radioactive objects (version 2) (#19652) 
* Artifact containers suppress the radioactive of artifacts inside them

* Updated to reflect changes to RobustToolbox

* Made necessary changes after updating RT

* Removed test code

* Made requested change

* Updated due to changes to RobustToolbox

* Renamed function

* Updated to accommodate changes to RobustToolbox

* Actually resolve merge conflict?

* Removed unnecessary change

* Made requested changes

* retrigger checks

* Retrigger checks

---------

Co-authored-by: root <root@DESKTOP-HJPF29C>
 2023-09-11 15:58:25 -04:00
lzk
5ca34e5578 crayon.yml cleaning (#20029) 2023-09-11 15:52:54 -04:00
metalgearsloth
a75745491d Make some more machines snapCardinals (#19781) 2023-09-11 22:56:53 +10:00
DrSmugleaf
a272cd4439 Remove manual localization from action entity prototypes (#20023) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-09-11 22:34:41 +10:00
metalgearsloth
d5bd1c6f86 Predict StorageComponent (#19682) 2023-09-11 21:20:46 +10:00
drteaspoon420
a7ac4a83c4 Changed produce spills into dynamic from hardcoded. (#19980) 2023-09-11 01:16:26 -07:00
metalgearsloth
28bf3a6240 Remove SharedEye (but content) (#19481) 2023-09-11 16:15:23 +10:00
Kara
64a29f0d8a InAir tweaks & chasm fixes (#19707) 2023-09-11 16:03:16 +10:00
Morb
2a143c873c SSD Indicator (#19701) 2023-09-11 15:52:56 +10:00
Vasilis
1a7d3d945e Nerf paramed PDA scanning speed and buff all others to be the same (#19983) 
* Match scantime with peramed for cmo

* Nerf, the webedit

* All pda times are same now uwu
 2023-09-10 16:01:05 -07:00
deltanedas
6953070d40 ninja bombing target whitelist warp point (#19977) 
* ninja bombing target whitelist

* :trollface:

* add bombing targets to saltern

* oops remove jordans

* remove aspid js too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:04:00 -06:00
deltanedas
24810d916b ninja 2 electric boogaloo (#15534) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 16:20:27 +10:00
Flareguy
8d69f7f2eb Cobwebs (#19623) 
* adds cobwebs

* like legit the most awesomest thing ever
 2023-09-09 23:37:56 -04:00
deltanedas
5dbf79f7da ian crafting (#19821) 2023-09-09 23:04:32 -04:00
deltanedas
152a1d1e75 Make monkeys better (#19407) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-10 12:51:51 +10:00
DrSmugleaf
09bce85f19 Fix actions not being usable, ordering, and containers (#19964) 2023-09-09 16:14:17 -07:00
JoeHammad1844
dc254a1308 Fingerless gloves in SecDrobe (#19932) 
* Fingerless gloves in sec drobe

* oopsies

* Add files via upload
 2023-09-09 12:59:03 -06:00
lzk
e1d54e360f ways to get a plush moth (#19843) 
* to arcades

* plushie toys crate

* hampter in arcade
 2023-09-09 12:58:42 -06:00
csqrb
e773d8c09f Increase crayon charges from 5 to 15 (#19922) 2023-09-09 10:45:38 -08:00
lzk
79b9ec8675 Update paper.yml (#19943) 2023-09-09 12:45:14 -06:00
deltanedas
2c72032c30 Buff gauze (#19909) 2023-09-09 10:32:00 -08:00
Vasilis
16943ff857 Aghost have syndicate access (#19948) 2023-09-10 03:58:37 +10:00
Vasilis
d637ad0e21 no more (#19949) 2023-09-09 11:29:31 -04:00
SonicHDC
6e0466fb25 Bench and fixes (#19748) 
* Bench Proto

* Bench sprites

* Update meta.json

* Grammatic fixes

* Update meta.json

* Add files via upload

* Delete Resources/Textures/Structures/Furniture/chairs.rsi/steel-bench-overlay.png

* Meta

* Spaces

Final changes in git web

* Directions fix

Bar and stool fixes

* Final proto fixes

* Physics

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-09-09 08:56:10 -04:00
DrSmugleaf
66fd8de531 Add missing tile migration for glass alt > alt (#19940) 2023-09-09 01:37:12 -06:00
Emisse
ca289d4f0b Revert "Semi revert glass tile resprite (#19266)" (#19931) 
This reverts commit 38f921f831.
 2023-09-09 00:33:22 -06:00
Nairod
25569e2f87 Mime Wall Nerf (#19925) 2023-09-09 15:40:11 +10:00
DrSmugleaf
c71f97e3a2 Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
lzk
85de6ffcf4 Sort jobs in map prototypes (#19910) 
* Update aspid.yml

* Update barratry.yml

* Update cluster.yml

* Update kettle.yml

* Update saltern.yml

* Update origin.yml
 2023-09-08 13:43:19 -06:00
potato1234_x
5945c20fdc no more f toast (#19905) 2023-09-07 23:37:52 -07:00
deltanedas
64f2efbb55 move advanced laser gun into t3 lasers tech (#19875) 
* move advanced laser gun into t2 lasers tech

* t3 and troll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-07 19:25:04 -07:00
Kevin Zheng
442cc7f659 Switch security techfab to produce magazines (#19769) 
* Switch security techfab to produce magazines

* Add back ammo boxes
 2023-09-07 19:16:19 -07:00
deltanedas
db2a4478b0 show non-sheet material units in lathe (#19896) 
* locale for material units

* use material units in lathe ui

* give units to non-sheet materials

* :trollface:

* use volume properly

* :trollface:

* review

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-07 22:11:10 -04:00
Doru991
1c6d723515 Syndie airlocks (#19264) 
* Add regular syndie access level

* Localize that

* Syndie airlock textures

* Yaml work

* guh

* Real

* Eated a word

* Just one more commit

* The game didn't complain about that one

* Make agent id have working agent access

* Change color scheme and palette

* Glass too because why not

* Nukie agent ID workaround
 2023-09-07 19:19:56 -04:00
deltanedas
7e77720f01 Scale radiation intensity with stack size (#19869) 2023-09-07 13:59:08 -08:00
liltenhead
005e89c352 Increase hardhat light radius (#19867) 2023-09-07 10:38:57 -08:00
Vasilis
2446c6a37b Hypo can inject solutions back into beakers (#19877) 
* Inject to beakers

* Stop fighting in my pr

* Review
 2023-09-07 09:49:02 -07:00
Velcroboy
1de23dc4d0 Adds Ganja Brownies (#19222) 2023-09-06 21:21:14 -04:00
Jackal298
b3420f2fbf Refinement of inventory of Disсond Dena (#19514) 2023-09-06 21:15:02 -04:00
lzk
08d0c78a25 grooog (#19870) 2023-09-06 20:32:23 -04:00
EnDecc
f8eefc0725 Craftable steel secure crate (#19881) 
* recipe

* i cast retest spell
 2023-09-06 17:25:25 -07:00
potato1234_x
38f921f831 Semi revert glass tile resprite (#19266) 2023-09-06 14:41:53 -07:00
metalgearsloth
b25862365e Revert click damage mod (#19860) 
Maybe swings should be default and we make the animation not shit and the prediction slightly better.
 2023-09-06 03:30:23 -05:00
lzk
8437038fd4 Adjust red glow stick glow duration (#19857) 2023-09-05 12:16:54 -08:00
deltanedas
6d5c310b36 Make constructed hydro trays start empty (#19620) 2023-09-05 12:15:06 -08:00
daerSeebaer
048c7f8e04 Add atmos door to spray painter (#19852) 2023-09-05 09:46:30 -08:00
EnDecc
9c8e86e252 The Quartermaster Hardsuit (#19738) 
* added Quartermaster hardsuit, and cargo order for it

* always some pocket lint

* DNM comments to relevant spots

* renames

* more renames, also pirate crate because gold luxury something something

* plus one id
 2023-09-04 20:42:09 -07:00
DrSmugleaf
0527d2e719 Fix barriers not working (#19774) 2023-09-04 15:33:40 -07:00
Fromoriss
b50e5651a1 Add moth plushie (#19828) 
* Add moth plushie

Moth plushie. It's cute, don't mind, merge it.

* Update toys.yml
 2023-09-04 13:18:03 -07:00
Doru991
c6869c89d0 Add plant phalanximine, fix slippery fruits (#19820) 2023-09-04 12:11:40 -08:00