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

3910 Commits

Author SHA1 Message Date
Arendian
3fda7a2751 Adds Bike Horn Implants (#17548) 
* Adds Bike Horn Implants

* Formatting

* Formatting

* Revert "Formatting"
Did an Oopsie
This reverts commit 62d5d87f2de59fbddf1c31db3668b174727eff0a.

* Revert last push

* Revert "Revert last push again!"

This reverts commit f12a0f597cace7fb47454762223468c597796d8d.
 2023-07-09 20:44:18 -06:00
Arendian
b4c251472f Adds Advanced ointment and bruisepack recipes (#17583) 
* Adds Advanced ointment and bruisepack recipes

* Changes the sprites to the ones from /tg

* Changed names and sprites, slight tweaks

* Formatting

* Solve Conflict

* Formatting

* Fix issues found in check

* Fix Oopsie
 2023-07-09 20:22:10 -06:00
Nemanja
716fcaa4a3 Animal Husbandry (#17140) 
* Animal Husbandry

* suffixes and VV

* sanitize

* fix fails
 2023-07-09 16:36:37 -06:00
Maxim T
1aab1ee212 interrogator lamp (#16820) 
* interrogator lamp

Ultra-bright lamp for the bad cop

* interrogator lamp update

-Reduced energy consumption, improved base energy source for extra thorough interrogation
-The Basic Rights of Sentient Beings have been respected by reducing the number of flash charges. Now they slowly regenerate over time.
-The chief engineer fixed the charge indication, although there was a conscript on the shift. It may not work as intended
 2023-07-09 16:35:20 -06:00
LankLTE
9e6bd30aa4 Ambuzol Plus (#17884) 
* Added component and functionality.

* Fixed ZombieImmune.

* Zombies now have zombie blood.

* Ambuzol plus.

* Ambuzol plus spawns in bundle.

* Fine CBURN get one too.

* Reworked the reaction

* No more magic blood refilling.

* ok CE i fixed it

* Component change.
 2023-07-09 16:01:35 -06:00
lzk
8b1af362ee Update jumpskirts.yml (#17908) 2023-07-09 15:57:19 -06:00
Vordenburg
4a093bce6d Align filled gas tanks with intended capacity (#17915) 2023-07-09 13:20:26 -07:00
Arendian
ec58d2e716 Syndicate sponge for uplink (#17841) 
* Syndicate sponge for uplink

* Fix yaml error

* Made changes mentioned in review

* Made changes according to reviews
 2023-07-09 13:24:30 -06:00
metalgearsloth
982e8f3865 Xeno salvage tweaks (#17909) 
- Add turret spawns.
- Mark warding tower as anchored.
 2023-07-09 13:20:30 -06:00
Sailor
e3cef0f86c Deflate the "valid" sticker economy and ward off permahungry sec (#17883) 
* Deflate the valid sticker economy

* Include suggestions

* Hint received

* Replace combat gloves with susbox, add outlaw items to group

* Go back on the rename skit because due to LRP being unsolvable

* Ever forget to mirror a change to both loot pools?

* clarity

* Incorrect toolbox
 2023-07-09 13:20:04 -06:00
Puro
bc79e94682 [VM] SyndieDrobe (#17885) 
* [VM] SyndieDrobe

* "Death to NT"

* Animation update
 2023-07-09 13:19:35 -06:00
c4llv07e
9051470354 Make containment field generator non-rotatable (#17849) 
* Make containment field generator non rotatable

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Change physical shape of the containment field generator to a circle

Signed-off-by: c4llv07e <kseandi@gmail.com>

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
 2023-07-08 13:47:27 -06:00
metalgearsloth
e9d1e5ea1f Remove mob crit states (#17850) 
* Remove mob crit states

At least where it was just a dummy mob state. I'm lazy so this will buff mobs where they will remain active until their death state.

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

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
 2023-07-08 13:44:01 -06:00
Sailor
9d844520be Implement RiggableSystem, stunbatons injectable (#17288) 
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
 2023-07-08 13:32:31 +10:00
metalgearsloth
2d1ac6e01d Revert "add breakers to power batteries" (#17632) 2023-07-08 12:47:38 +10:00
Puro
2cb700bfff [Clothing] Syndicate (#17837) 
* [Clothing] Syndicate

cool.

* s1

* s2

* Update meta.json

* new banner
 2023-07-07 12:40:24 -06:00
metalgearsloth
ee2a3216d6 Self-attack nerfs (#17845) 2023-07-07 18:45:37 +10:00
Emisse
06747e0f7e some silly paintings and posters (#17872) 
* webedit

* Update meta.json

* god is real hes here with us

* so true

* so truers rise

* worst meta.json ive seen in my life

* so true
 2023-07-07 00:23:02 -06:00
Chief-Engineer
1960dd2620 Revert "Add chem solution atmos heating and cooling (#17854)" (#17871) 
This reverts commit 03d6b0ced7.
 2023-07-06 23:53:19 -05:00
Nemanja
e78257419b Zombie chem tweaks (#17870) 
* make romerol cause zombification, make zombrex the cure, nuke corpium

* fix descriptions

* zombrex -> ambuzol
 2023-07-06 22:45:59 -06:00
Velcroboy
8f1294d929 Adds ExaminableSolution to jani trolley (#17856) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2023-07-06 20:55:27 -06:00
Alex
68bd6f63d1 Adding sounds to stamps (#17834) 
* Add sounds

* FixSound

* Delete sound

* hmmmmmm
 2023-07-06 20:53:38 -06:00
Puro
70d6e3dcbd [Fix] Dresser and broken ballistic turret (#17866) 2023-07-06 20:52:09 -06:00
0x6273
03d6b0ced7 Add chem solution atmos heating and cooling (#17854) 2023-07-06 18:18:56 -07:00
metalgearsloth
02db31fdc6 Add smashing to carp NPCs (#17846) 2023-07-06 14:41:53 +10:00
metalgearsloth
3eb93988e5 Disposals refactor (#17803) 2023-07-06 13:39:34 +10:00
Flareguy
763a8af375 Major-ish™ armor rebalance, adds basic security armor and removes Kevlar armor (#17825) 
* adds basic armor vest & changes sec backpack sprites to tg

* el armor de dode

* abcd

* el fixe

* boner balls

* armor rebalance

* dode
 2023-07-05 17:03:15 -06:00
Flareguy
531cbec549 adds the italian moustache (#17830) 2023-07-05 16:59:19 -06:00
DerbyX
b34f24dd0b 6 slices to 8 (#17824) 
Co-authored-by: Derby <Derby@ss14>
 2023-07-04 18:29:35 -06:00
Flareguy
a6475a0077 nukes cev-eris style helmets, adds ERT helmets, eva helmet inhand fix (#17808) 2023-07-03 18:24:28 -05:00
LankLTE
e9665f2a44 Pyroclastic Anomaly Supercrit Buff (#17806) 
* Added random gas, fixed ice anom, added temperature field.

* Revert "Added random gas, fixed ice anom, added temperature field."

This reverts commit ae5eade86d84d6b1341b7b76754b6f0007dbf3ca.

* I pushed master. Oops. Fixed now.

* Fixed behonker, fixed TempChange.

* Fixed tempchange.
 2023-07-03 15:36:22 -06:00
Flareguy
35a2a1478b Adds some outfits for Ship VS. Ship (#17800) 
* Ship Vs. Ship Outfits

* FUCK

* prefix? GONE

* ABCDEFJ PEE PEE PEEING
 2023-07-03 14:50:13 -06:00
brainfood1183
a0a373832c Hamlet error on revival fix. (#17797) 2023-07-03 17:59:29 +10:00
Slava0135
41cf8cc554 add immovable rod event (#17278) 2023-07-02 09:40:07 -04:00
Arendian
bda71dc26d Network bolting for windoors (#17775) 2023-07-01 12:00:53 -07:00
themias
53e9bc8236 Fix metamorphic glass name mispredict (#16550) 2023-06-30 18:57:28 -04:00
Topy
b85c902189 Added sink (#14348) 2023-06-30 18:10:47 -04:00
Jackal298
e79d82e0e1 Fix sprite smg magazine (#17735) 2023-06-30 13:56:34 -06:00
kxv
6d4c4465d6 exploding pen tweak (#17739) 2023-06-30 15:47:47 -04:00
Nairod
3560249f1f Construction Price Adjustments (#17549) 2023-06-30 15:32:03 -04:00
Slava0135
aadcc48ddc Better glue (#17381) 2023-06-30 15:07:44 -04:00
brainfood1183
f2d3ea9117 Hamster resprite by RamZ and hamster can wear some clothing, monkey eva resprite. (#17439) 2023-06-29 18:36:19 -04:00
LankLTE
b10a7da5d8 Guitar Smashing (#17724) 2023-06-29 15:27:08 -04:00
Nemanja
8f5282fb89 make rnd console require science access (#17671) 2023-06-29 14:19:19 -04:00
Errant
872a008a12 Make the remaining masks block identity (#17732) 2023-06-29 12:25:04 -04:00
Errant
62a142b29a Chameleons can mimic clown masks (#17726) 2023-06-29 12:04:47 -04:00
Tom Leys
67df47f553 No atmos stacking (attempt 2) (#16687) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-06-29 22:04:36 +10:00
lzk
1b172861d1 Update toys.yml (#17725) 2023-06-29 03:36:53 -06:00
lzk
9e8c2f27f4 comit (#17532) 2023-06-28 14:13:31 -06:00
Cody ~ Aexxie
af197548b8 Removes all remaining "netsync: false"s (#17543) 
* Removes all remaining "netsync: false"s

* Update dragon.yml

* Update substation.yml

* Update apc.yml

* Update generators.yml

* Update grenades.yml

* Update e_sword.yml

* Update welders.yml

* Update lantern.yml

* Update glowstick.yml

* Update flashlights.yml

* Update flare.yml

* Update torch.yml

* Update fluff_lights.yml

* Update toys.yml

* Update portal.yml

* Update specific.yml

* Update hardhats.yml

* Update base_clothinghead.yml
 2023-06-28 14:13:14 -06:00