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

15825 Commits

Author SHA1 Message Date
Ubaser
7652cfaa89 Increase minimum requirement for lowpop maps (#23718) 
* add

* add

* yes
 2024-01-07 23:23:08 -07:00
Nemanja
aea68b942a Fix PA particles (#23719) 2024-01-07 23:22:46 -07:00
Arendian
6bf6994298 Incendiary projectiles and lava firestack reduction (#23479) 
* Firestack reduction and FireStackOnHit added

* Slight lava tweak

* Remove component and tweaked incendiary pellets

* Incendiary grenade tweak

* Now ignites on projectile fixture or ignition fixture + incendiary grenade tweak

* flare shells now  ignite entities again

* Comment

* undo flare gun ignite
 2024-01-08 00:41:42 -05:00
Flareguy
81aa5d3a18 Gives engineering and research access to locked gas canisters (#23706) 2024-01-08 00:36:38 -05:00
Mr. 27
3e7ee0c2ca Syndicate cyborg changes/fixes (#23710) 2024-01-07 23:48:57 -04:00
Nemanja
c9b700a2d4 Grappling fixes (#23709) 2024-01-08 12:15:46 +11:00
Errant
c4a99c129b dev_test map update (#23681) 
beacons
 2024-01-07 16:55:33 -07:00
Nairod
6c9c8abb13 Patch Cargo Lathe Abuse (#23698) 
* Reduce Several Prices

* Several Fixes
 2024-01-07 18:51:17 -05:00
Velcroboy
fd3c529717 Adds .001 chance for vending spawners to spawn mimic (#21997) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2024-01-08 01:36:21 +03:00
Ed
1638d52ebf Oneliner (#23700) 
* Update borg_chassis.yml

* Update borg_modules.yml
 2024-01-08 01:33:44 +03:00
Naive817
1b93243bea Adds syndicate cyborgs. Adds Assault cyborgs to nukie uplink (#19733) 
* added syndicate cyborgs

* add assault cyborg to uplink

* updated tags.yml

* changed syndicate cyborgs' hitpoints to 200
fixed NPCfaction

* added noslip and MovementAlwaysTouching component to syndicate cyborgs akin to carps, as a stop gap for no magboots or jetpack. Access component fix.

* fixes nodes

* fixes construction

* fixed typo and intergrationtests

* adds back ammocounter for l6c

* fix lawset

* fix item size

* nono, fix again

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-01-08 01:12:08 +03:00
Arendian
ac1990f290 Prevent ejection of cleaning module's holofan powercell (#23696) 
prevent battery ejection janitor cyborg holofan and make it recharge
 2024-01-07 14:26:15 -07:00
TruePaInt
4c2fd55720 Gun cyborg module (#19629) 
* Update borg_modules.yml

* Update uplink_catalog.yml

* Update uplink-catalog.ftl

* Add files via upload

* Update meta.json

* Update uplink-catalog.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-01-08 00:03:18 +03:00
Ubaser
875f24bfbd Core update (#23690) 
yes
 2024-01-07 13:48:02 -07:00
lzk
ee21939066 Red racoon suit (#22862) 
* comit

* 🚯 🐼

* stupid

* stupid x2

* fix tests

* Update cargo_vending.yml
 2024-01-07 23:37:56 +03:00
GreyMario
19e41011b8 Pies and tarts categorized in meal_recipes.yml, added their recipes where possible (#23266) 
pies and tarts categorized, added recipes where possible
 2024-01-07 23:20:14 +03:00
Adrian16199
7c87ba3b41 Adds ties to the uniform printer. (#23686) 
To not bloat the vendors but to still allow one to be fancy if they bother head of personel enough.
 2024-01-07 22:55:41 +03:00
lapatison
c6e829ca6e Ninja and Syndie reinforcement ghost role locale (#23691) 
ghost role locale
 2024-01-07 14:23:09 -05:00
Ubaser
d9d28627a8 Butcher-able gloves (#23216) 
* ya

* something

* fixe
 2024-01-07 09:54:16 -08:00
Nemanja
a78e9a854e Hellfire Thermomachines (#23543) 
* hellfire thermomachines

* slight nerf? idk

* ilya review

* Improve clarity

* Update Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2024-01-07 08:55:22 -05:00
Aleksander Warzyniak
3e3ff025ed Onion Rings can now be dipped (#23582) 
Updated onion rings

Changed maxVol of onion rings to 4 in order to allow dip
 2024-01-07 12:07:03 +03:00
Ubaser
627aa56551 Tweak vodka martini description (#23669) 
* add

* tweak
 2024-01-07 11:17:16 +03:00
Aexxie
f724291c2a Adds the central commanders cloak. (#23666) 
* Adds the central commanders cloak.

* Adds it to CentDrobe, and also matches it to other naming schemes

* oops fucked up a capital letter. fixed
 2024-01-07 00:12:12 -07:00
Ubaser
93a77e89fe Flower wreaths (#23662) 
* add

* fix
 2024-01-07 00:03:46 -07:00
brainfood1183
bb294a7aa2 Rock Anom effects (#23633) 
* Rock Anom effects

* fix

* fix
 2024-01-06 23:44:04 -07:00
2013HORSEMEATSCANDAL
23ec7d8554 added the pride cloaks to maint spawns (#23658) 2024-01-06 23:40:30 -07:00
Minty642
8fd8ca6a59 Add Food Recipe for food bounty in chef guidebook (#23659) 
add recipe
 2024-01-06 23:39:56 -07:00
Ubaser
1a2c3baf8e Observation kit sunglasses actually look like sunglasses now. (#23621) 
* add

* suffix
 2024-01-07 01:24:35 -05:00
metalgearsloth
fe91132f4e Bump blob asteroid iterations (#23660) 
Occasionally the big blob is too small.
 2024-01-07 15:21:16 +11:00
MaloTV
b85a9d7688 Bullet Type Visual Indicator (#21068) 
* Bullet Class indicators

* New Practice Sprite

* Removed re-specified values

* fixes up whitespace to get this merged

---------

Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
 2024-01-06 21:36:51 -05:00
Ed
d22fe3f921 SyndiCat (#22554) 
* add content

* 4 tk to 8 tk

* replace to autoinject, now cat can explode in any moment. increase cost to 10tk

* Update animals.yml
 2024-01-06 17:52:41 -08:00
github-actions[bot]
5f8eab71ce Update Credits (#23651) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-01-06 18:40:37 -07:00
Ubaser
8b107b5a9f Update tips (#23611) 
* add

* fix
 2024-01-06 20:19:09 -05:00
deathride58
e57b47242f Kobold noises! Gently the kobolds (and monkeys)! Monkey YAML cleanup! 
* modular monkeys - you can now gently the monkeys and kobolds
* kobolds are clumsy critters!!
* that's baseline now
 2024-01-06 17:08:51 -08:00
Ubaser
94d4d22f2d Add trench coats (#23563) 2024-01-06 17:06:15 -08:00
Ubaser
eb46918d7e Remove a couple translations to the archaic accent (#23614) 
add
 2024-01-06 15:42:20 -05:00
metalgearsloth
f5909f68ae Fix more tag ordering (#23634) 2024-01-06 15:16:25 -05:00
Alekshhh
a3f40c239e Ore Visual Change (#23618) 
* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* ore

* banona

* glo

* shadwe
 2024-01-06 14:34:11 -05:00
Ubaser
7858dad9e4 Darken syndicate implanter sprite (#23622) 
add
 2024-01-06 11:10:56 -05:00
Ubaser
172fcaf2d4 Rename Goldschläger to Gildlager (#23223) 
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-01-07 02:34:15 +11:00
Ubaser
1299c81df6 Add Flippo lighter to the cig vend (#23620) 
add
 2024-01-06 17:56:41 +03:00
MACMAN2003
04cf1c3c49 Add hats and berets to the uniform printer (take 2) (#23556) 
* hates and beretes

welcome to team 4tress, after eighteen millennia in development, hopefully it will have been worth the wait

* EEYIKES!! How will I ever "fix" these "typos"???

* SPELL WARS 2: ATTACK OF THE TYPOS

hlep me i catn' stop speeling bad

* put hats above associated uniforms
 2024-01-06 17:54:57 +03:00
Ubaser
17da2f0bee Fix a stray pixel on the large lizard tail (#23619) 
add
 2024-01-07 00:07:34 +11:00
Nairod
d9eaf9f3c3 Snout Fitting Masks (#23545) 
* Snout Fitting Masks

* Line Fix

* Happy Clown
 2024-01-06 05:10:04 -06:00
metalgearsloth
434206c00c Tags fix (#23608) 
* Fix tags

- Boots is redundant and people keep dumping at end of list.

* weh
 2024-01-06 20:30:49 +11:00
Trevor Day
57f245e789 Add whitelist to centrifuge, only allowing vials. (#23538) 
* Add whitelist to centrifuge, only allowing vials.

* Better Tag Name

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-01-06 20:22:35 +11:00
Velcroboy
52aac0ea3b Add Diphenhydramine Recipe (#23006) 
Add Diphenhydramine

Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2024-01-06 00:29:35 -08:00
iacore
d73c7e9a0a more balanced constructing and unscrewing for metal objects (#21051) 
* more balanced constructing and unscrewing for metal objects

- computer frame, machine frame, rack and meatspike can be deconstructed while anchored by screwing
- Computer frames now need time to be constructed.
- it now takes a reasonable time to make a meatspike. If you can construct a machine frame in 2.5, surely you can make a meatspike in 2.

* Fixes test
 2024-01-06 00:28:57 -08:00
Ilya246
154416787e add syndicate singularity beacon (#18486) 
* implement singulo attraction

* add attractor syndie item

* cleanup

* fix name/desc

* actually fix name

* singulo toolbox no longer whitelisted

* add custom sprite, overhaul prototype

* address review

* beacon real

* webedit 1

* webedit 2

* webedit 3

* permalink to copyright

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
 2024-01-06 00:21:24 -08:00
Nim
ea7428cf99 Add medhud to the lockers medics (#23591) 
add medhud to the closets
 2024-01-06 00:35:32 -07:00