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

4631 Commits

Author SHA1 Message Date
Jackal298
f8d404d783 Mercenary Items (#16665) 
* Mercenary Items

Adding Mercenary Items

* Fix

* icon jumpsuit fix

* Bot

* bot fix
 2023-05-22 15:57:15 -06:00
Tom Leys
db81e59013 NanoTrasen might send Gifts to the station via Cargo (#16556) 
* Rebase Cargo Gifts

* Remove Chaos values from gifts (for now)

* Translate CargoGifts, rename fields

* Fix gift errors, detect missing products

* Fix order Id, some crate IDs

* Fix get Station. Gifts for Sec, Med, Fire, spacing

* Minimum players for various gifts

# Conflicts:
#	Resources/Prototypes/GameRules/cargo_gifts.yml
 2023-05-22 15:55:27 -06:00
Sir Winters
9568216c7b Adds a Janitorial Guidebook (#16667) 
* Janitor Guidebook

* Added blurb for recycling.

---------

Co-authored-by: Owai-Seek <>
 2023-05-22 15:50:14 -06:00
Vordenburg
7ebe16dd3d Fix snares (#16699) 
The alert for snares will appear again. Previously it was being updated
on the snare itself and not the player.

It is no longer possible to infinitely ensnare someone; the maximum
number is dependent on the target's legs.

Only one snare at a time will be removed now.

Clarified the wording and logic around CanMoveBreakout. It was
inconsistent.

Made multiple snares impose cumulative speed penalties.

It is no longer possible to remove bolas while moving.
 2023-05-22 15:49:37 -06:00
Vordenburg
cb93572c72 Let holobarriers be climbable with alt. action (#16700) 
Fix a typo, too.
 2023-05-22 15:49:24 -06:00
themias
035de023f8 Fix egg and tomato puddles (#16707) 
* Fix egg and tomato puddles

* fix tests
 2023-05-22 15:48:37 -06:00
metalgearsloth
20faa3169e Revert "Add AKMS into t-uplink" (#16690) 2023-05-22 23:18:17 +10:00
AjexRose
2ecbc7beeb Salvage Guide (#16680) 2023-05-22 14:01:24 +10:00
Leon Friedrich
7a35b1f08e Add missing WirePanel components (#16676) 2023-05-22 13:45:36 +10:00
MisterMecky
0e337fb646 add solution visuals for watertank, fueltank etc. (#16653) 2023-05-21 18:27:51 -06:00
deltanedas
44cb94257f give handheld radio its own channel (#16673) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-05-21 18:16:46 -06:00
TaralGit
57dfb82117 Shivs, spears and guns (#16654) 
* weapons

* craft

* crafting but working this time. hopefully

* spear crafting fix

* graph id fix

---------

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2023-05-21 18:14:42 -06:00
metalgearsloth
2a8324fe50 Nerf boots of blinding speed (#16649) 
Over 10m/s speed and blindfold doesn't even work.
 2023-05-21 18:06:07 -06:00
OctoRocket
735de00fef [entity] add flanel clothing (#16671) 2023-05-21 18:05:35 -06:00
Jackal298
89a74b92cb Winterdrobe emag (#16672) 2023-05-21 17:55:00 -06:00
Nemanja
252f0be372 Telepad revival (#16664) 2023-05-21 20:09:31 +10:00
metalgearsloth
8edfedfba5 Fix some announcements code (#16585) 2023-05-21 20:06:05 +10:00
EEASAS
d09475d45a Add AKMS into t-uplink (#16544) 2023-05-21 13:15:52 +10:00
Kara
44657522f0 Puddle drink fixes (#16661) 2023-05-21 13:05:22 +10:00
deltanedas
04bf87f5a1 bible is a book (#16660) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-05-20 18:52:48 -06:00
OctoRocket
25f2573b12 [Add] Adds winterdrobe (#16652) 
* winterdrobe added

* changed timings

* more coats

* fix typo

* add bomber jacket to the winterdrobe

* remove winterdrobe items from clothesmate

* restock box added
 2023-05-20 18:52:23 -06:00
Slava0135
e554958be6 Add space glue tube (#16600) 2023-05-20 12:42:38 +10:00
OctoRocket
5f035f0444 [Add] Adds more scarfs! (#16631) 2023-05-20 11:15:32 +10:00
Nemanja
848de7c5bd Bag of holding recipe nerf (#16637) 2023-05-20 10:59:06 +10:00
deltanedas
426686fa6e make BaseStationNanotrasen abstract (#16634) 2023-05-19 18:06:51 -05:00
Moony
e92a8fedab Refactor stations to properly use entity prototypes. (stationsv3) (#16570) 
* Update StationSpawningSystem.cs

Web-edit to allow feeding in an existing entity.

* Update StationSpawningSystem.cs

value type moment

* Update StationSpawningSystem.cs

* Oh goddamnit this is a refactor now.

* awawawa

* aaaaaaaaaaa

* ee

* forgot records.

* no records? no records.

* What's in a name?

* Sloth forcing me to do the refactor properly smh.

* e

* optional evac in test.

* tests pls work

* awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2023-05-19 15:45:09 -05:00
metalgearsloth
d6adf9880d Nerf emitsoundoncollide (#16602) 2023-05-20 02:04:26 +10:00
deltanedas
373435c006 reinforcement plays parp1 (#16604) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-05-20 01:59:47 +10:00
deltanedas
04b2dab4e9 Revert no device stacking (#16608) 2023-05-20 00:39:37 +10:00
metalgearsloth
36cd2046a8 Fix tethergun (#16612) 2023-05-20 00:31:15 +10:00
KEEYNy
caa4da31f3 Death squad changes (#16173) 2023-05-19 04:21:36 -06:00
Tom Leys
ccd503f8bb Cannot stack binary and trinary Atmos pumps and devices. 5x Filter rate boost (#16331) 
* Cannot stack binary and trinary Atmos pumps and devices

- Filters now have a 5x max volume to compensate for no more stacking
- Add flipped versions of mixers and filters to the list of constructables

* Oi! No anchoring unstackables together!

* Use EntityLookupSystem in Unstackable and Window lookup

- Use static method for AnyUnstackableTiles
 2023-05-19 02:59:20 -06:00
Tom Leys
f6a302363a Several power infrastructure items are more shocking (#16584) 2023-05-19 02:21:14 -06:00
20kdc
ea64b86331 Remove plural BaseTurfs as a thing in favour of BaseTurf (#16560) 2023-05-19 17:10:56 +10:00
metalgearsloth
4efb41aa58 Adds force-gun (#16561) 2023-05-19 17:10:31 +10:00
lzk228
deb3c03712 Advanced Tools Technology (#16497) 
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-05-19 17:07:59 +10:00
GoodWheatley
e9e37e65df Monkeys are now very rarely ghost roles (#16363) 
* Monkeys are no longer ghost roles

* Clumsy is back + monkeys only have a chance to be sentient

* Update Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-05-19 17:00:27 +10:00
20kdc
af1d77ed74 Completely remove every last reference to underplating. (#16559) 2023-05-19 16:58:49 +10:00
Emisse
ba1db5a11c Remove among us noise from game (#16589) 
* Delete emergency_meeting.ogg

* Update reinforcement_teleporter.yml

* Update attributions.yml

* Update troll.yml

* Update mecha_equipment.yml
 2023-05-18 23:44:23 -06:00
metalgearsloth
f079ed01da Remove zombie from secret (#16588) 2023-05-19 15:03:09 +10:00
metalgearsloth
829e05822f Remove zombies preset (#16583) 
Needs more time in the oven.
 2023-05-18 22:11:36 -06:00
OctoRocket
f87d60efb0 [Tweak] Change antifreeze taste (#16578) 2023-05-19 12:21:57 +10:00
Nemanja
11da00778c make vending machines destructible (#16574) 2023-05-19 09:48:14 +10:00
TemporalOroboros
ed1b9bde83 Resolves RadiationCollectorVisualizer is Obsolete (#13905) 2023-05-18 14:03:30 -04:00
TemporalOroboros
f43683e3b9 Resolves StorageVisualizer is Obsolete (#13910) 2023-05-18 14:03:20 -04:00
Kit0vras
fe95908710 Corpses of roles (#15477) 2023-05-18 12:33:46 -04:00
TemporalOroboros
a1715666f0 Resolves StackVisualizer is Obsolete (#13908) 2023-05-18 16:16:53 +10:00
Nemanja
b57717a6cc Make tether guns printable (#16554) 2023-05-18 12:37:09 +10:00
metalgearsloth
3c3762f2ee Add tethergun lathe recipe (#16551) 2023-05-18 12:07:10 +10:00
metalgearsloth
775258be52 Add tether gun (#16430) 2023-05-18 11:36:06 +10:00