juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,496 Commits 57 Branches 0 Tags
94a9569d8f91849b92e007de4e94de237e6dfe08
Commit Graph

10496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PJBot
36b19faaa0 Automatic changelog update 2022-05-12 08:25:09 -04:00
Ripmorld
2c90d5458f Added the recipes and tech for several non lethal bullet (#8079) 2022-05-12 22:24:01 +10:00
wrexbe
089e40a061 Convert suicide to ecs (#8091) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 22:05:16 +10:00
metalgearsloth
6903209a31 Show ghosts popups etc through walls (#8077) 
* Show ghosts popups etc through walls

* Stage moment

* crashes
 2022-05-12 21:18:38 +10:00
Emisse
40361ec0ad Fish Cap (#8046) 
* Add files via upload

* Update hats.yml

* Update clothesmate.yml
 2022-05-12 21:15:25 +10:00
ike709
a9c18acd35 Remove misc Startup/Shutdown overrides (#8113) 
Co-authored-by: ike709 <ike709@github.com>
 2022-05-12 21:11:50 +10:00
Emisse
834e29d76a Saltern Small Update 3.2 (#8100) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-12 21:07:38 +10:00
Emisse
50bac7dbf5 Moose Station Component (#8098) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-12 21:07:33 +10:00
Emisse
362f8512a6 Marathon Station Component (#8097) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-12 21:07:27 +10:00
Emisse
0e743074cf Bagel Station Component (#8095) 
* Add files via upload

* Update bagel.yml

* Remove extra fixtures

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-12 21:07:19 +10:00
Emisse
f9e176ce89 Atlas Station Component (#8094) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-12 21:06:59 +10:00
Alex Evgrashin
860db943e1 Reagents localization (#7916) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 21:06:01 +10:00
PJBot
4ef8bfff46 Automatic changelog update 2022-05-12 07:00:07 -04:00
Ripmorld
bd0d53bdd5 Pie transfer reagent on collision (#7802) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 20:59:03 +10:00
PJBot
1720e0a45b Automatic changelog update 2022-05-12 06:54:04 -04:00
Peptide90
a1aba4983a Adds cat ears as rare loot and traitor item (#6939) 
* adds cat ears that give uwu accent

* error

* Updated to 20tc

Web edit yoink

* 21 TC now
 2022-05-12 20:53:01 +10:00
PJBot
dc28587f48 Automatic changelog update 2022-05-12 06:25:51 -04:00
ZeroDayDaemon
b2792cf3ad Salami Lid (#7813) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-05-12 20:24:48 +10:00
Chris V
c6483751bc Cargo telepad machine linking (#7756) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 20:24:24 +10:00
PJBot
06bc4c953f Automatic changelog update 2022-05-12 05:45:20 -04:00
Pieter-Jan Briers
63b9cd0b92 Adds suppermatter (#7633) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 19:44:17 +10:00
Leon Friedrich
c00b459e31 Machine Port Prototypes (#7659) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 18:46:20 +10:00
PJBot
32c2eb7a02 Automatic changelog update 2022-05-12 03:59:30 -04:00
keronshb
e2ac92c3b5 Allows pickuppable animals to resist out of inventory (#7545) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-12 17:58:27 +10:00
PJBot
7a08985994 Automatic changelog update 2022-05-12 03:42:21 -04:00
Peptide90
8cd11dca69 SlowOnDamage for mobs. Removes pulling from some mobs. (#7824) 
* SlowOnDamage for all mobs now not just humans

* removes puller from basesimplemob

* adds pulling back to xeno, pets and some animals
 2022-05-12 17:41:18 +10:00
wrexbe
e4312e08f1 Censor Slimes (#8101) 2022-05-12 17:40:11 +10:00
PJBot
6d37613a0d Automatic changelog update 2022-05-12 02:11:19 -04:00
Jacob Tong
460b0bc212 Make CarpetChapel not collide (#8112) 2022-05-11 23:10:15 -07:00
wrexbe
8215262149 Add external programs to rules (#8108) 2022-05-11 20:34:49 -07:00
Emisse
bb0266c779 Remove the nose off the ghost (#8076) 2022-05-11 20:34:32 -07:00
PJBot
532ee55290 Automatic changelog update 2022-05-11 22:57:05 -04:00
metalgearsloth
e6aeaa2f2f Hugging yourself no longer allowed (#8103) 
!1984.

I want to hug the other person damnit.
 2022-05-12 12:56:02 +10:00
PJBot
12b7bf78b7 Automatic changelog update 2022-05-11 20:25:04 -04:00
Jacob Tong
e6e9f169a0 Collisiongroup tweaks (#8110) 2022-05-12 10:24:00 +10:00
EmoGarbage404
deaecf746e Singlehandedly saved the entire project [praise] (#8109) 
* Delete windowsXP_error.ogg

* Delete windowsXP_shutdown.ogg

* Delete windowsXP_startup.ogg
 2022-05-11 19:01:40 -05:00
PJBot
ff0817a7d7 Automatic changelog update 2022-05-11 19:47:25 -04:00
EmoGarbage404
09425d0137 paintings 1 (#8067) 2022-05-12 09:46:21 +10:00
PJBot
320997bffa Automatic changelog update 2022-05-11 16:49:14 -04:00
wrexbe
9a4892a272 Add listgamemaps command (#8093) 2022-05-11 13:48:29 -07:00
ike709
8b829926dd Improves the smoking experience (#8089) 
Co-authored-by: ike709 <ike709@github.com>
 2022-05-11 13:48:07 -07:00
Ripmorld
4bec937c1f Buffed Dex+ and Stellibinin (#8090) 2022-05-11 13:47:45 -07:00
Chris V
0f63184ac0 Adjust EnteringRange for EntityStorage (#8099) 2022-05-11 13:46:58 -07:00
Kara D
6a09624514 Update submodule 2022-05-11 13:46:04 -07:00
PJBot
a9a3a616e2 Automatic changelog update 2022-05-11 03:18:29 -04:00
Peptide90
3b54566e5b Changs chinese food vending machine (#7754) 
* new chinese food items from paradise

* made soy sauce salty

* new snacks based on the new assets

* chang assets 1

* chang vending machine

* rsi animation and fix

* rsi path fix

* misc changes

* fortune cookie snacks complete with fortunes

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

darn Americans

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-11 00:17:24 -07:00
Moony
e8331b6659 Pull split from rotation due to mapping issues. 2022-05-10 20:11:35 -05:00
Jacob Tong
8c853476fb Rework CollisionGroups (#7656) 
* Replace Mob, Vault, and Small impassable with Mid, High, Low

* Remove CollisionGroup.Underplating

* Remove CollisionGroup.Passable

* Fix constructed APCs not being interactable

* Change firelocks to occlude

* Make pipe inherit from BaseItem

* Clean up pipes

* Remove duplicate physics and fixtures from bucket

* Rework CollisionGroups on all entities

* Add SlipLayer

* Remove fixture from delta

* Fix maps

* Address reviews

* Add SubfloorMask

* Fix glass collisions for flying mobs

* Fix maps

* Update new items

* Fix bagel again

* Fix slug

* Fix maps

* Touchups

* Fix tables blocking high pressure movement

* Update StandingState to allow going under flaps

* Cleanup

* More formatting
 2022-05-10 17:57:20 -07:00
metalgearsloth
6617310ffa Don't play landing sounds in space (#8085) 2022-05-11 09:22:02 +10:00
Moony
cdc474c7f2 fix the fact I sent a bunch of maps to detroit. (#8087) 2022-05-10 15:21:55 -05:00