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

5131 Commits

Author SHA1 Message Date
KittenColony
0c045f815f Fixed Lizard swipe (#23953) 
* made unarmed lizard / spider melees representative

* Revert Arachnids
 2024-01-12 01:03:30 -07:00
Emisse
e93231ebaa death squad armor tweaks (#23965) 
* death squad resprite

* fix boote
 2024-01-12 00:58:08 -07:00
Justin Pfeifler
43090844cd Fix Floodlight Collision (#23966) 
Update floodlight mask and layer
 2024-01-12 00:42:43 -07:00
themias
8bba4b852b Headphones can be turned on (#23882) 
Toggle headphones
 2024-01-11 16:25:27 -07:00
icekot8
3d9a6f57ac medsec hud is no longer a filler (#23934) 
* medsec hud

* medsec hud

* fix
 2024-01-11 16:22:42 -07:00
Jackal298
13c91c405c (Add) black cap and some contraband (#23933) 
* Add black cap and some contraband

* Bot fix

* bot fix 2

* Price increases
 2024-01-11 16:19:58 -07:00
Jackal298
f9f5db9357 Respite and minor changes to mercenary items (#23783) 
* Respite and minor changes to mercenary items

This is try number three, everything should be fine this time

* Fix meta

* Fix bot

* Fix bot 2

* Fix meta 2

* Fix meta 3
 2024-01-11 17:47:51 -05:00
metalgearsloth
55a60b0fca Split cargo shuttle to its own component (#23926) 
* Split cargo shuttle to its own component

If mappers want 1 morbillion of them this is easier to manage.

* balls
 2024-01-11 10:53:00 -05:00
Nemanja
1886941da6 Add doors to the station map (#23639) 
* Add doors to the navmap

* tweaksies

* gah

* draw primitive

* draw primitive? at least take me out to dinner first!

* Update Content.Client/Pinpointer/UI/NavMapControl.cs

* casualties

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-01-12 00:14:20 +11:00
Emisse
7be42cc97a revert core cargo shuttle for now (#23921) 
* Delete Resources/Maps/Shuttles/cargo_core.yml

* Update core.yml

* Update base.yml

* Update nanotrasen.yml
 2024-01-11 03:54:57 -07:00
Emisse
f9d53525ca crusher rebalanceing (#23916) 
* Update mining.yml

* Update mining.yml

* glaive LS is actually fine

* crusher faster than glaive

* Update mining.yml

* Update mining.yml
 2024-01-11 02:09:33 -07:00
IProduceWidgets
11bbf2b020 Uranium & AP magazine and projectile sprites (#23914) 
Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.
 2024-01-11 01:01:41 -07:00
Nemanja
b3014e6cb3 machine parts + power cell resprite (#23913) 
* machine parts + power cell resprite

* logic fix
 2024-01-10 23:06:01 -07:00
Emisse
c7ad10d0ad make intercoms draw above table (#23897) 
Update intercom.yml
 2024-01-11 10:05:59 +11:00
nikthechampiongr
ef132c8a7b Fix tranquiliser shells not working (#23886) 
* Fix tranquiliser darts not working

Fixes a bug introduced by 9f47079d02 which
was made to stop the fly-by fixture from triggering the system. This was
done by checking whether the fixture was hard. Apparently the
projectile's fixture is never hard as well. The change just makes it so
that check only succeeds when the fixture is a fly-by fixture.

* Remove something that I think is redundant

* Remove random using directive that somehow appeared.

* Address Review

* Adress Review 2

* Put the appropriate fixture ids
 2024-01-10 18:02:37 -05:00
themias
1cf07fadac Fix flippo sprite layer (#23877) 2024-01-10 10:58:01 -05:00
metalgearsloth
a46f6f3f85 Fix ruins being added to station grid (#23865) 2024-01-10 23:44:09 +11:00
Ubaser
e91e746dd3 Moths get insect blood (#23671) 
* ya

* mothroach

* update

* fix

* fixe

* add
 2024-01-10 03:42:20 -08:00
Emisse
b3008ab7c8 Syndie elite uplink (#23859) 
* elite suit store

* eek

* dont drink
 2024-01-10 04:33:10 -07:00
metalgearsloth
b30afb357c Hide ruins spawns (#23857) 
* Hide ruins spawns

* Update count

* Add naming
 2024-01-10 04:15:48 -07:00
Emisse
cfeb431326 Rad suit swag and toggleable now (#23854) 
* troll

* Update hoods.yml

* Update hoods.yml

* Update suits.yml

* Update engineer.yml

* Update migration.yml

* Update emergency.yml

* forgor

* Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-01-10 20:54:29 +11:00
Emisse
04c9d7a5e5 gps can go inm belt (#23853) 
* Update belts.yml

* Update gps.yml

* Update tags.yml

* Update belts.yml
 2024-01-10 20:21:42 +11:00
deathride58
51a2b365cf Adds footstep sounds to tables (#23851) 
adds footstep sounds to tables
 2024-01-10 19:48:38 +11:00
Mr. 27
fcab5407d1 more tarantula changes (#23816) 
word
 2024-01-10 01:30:39 -07:00
Carolyn3114
041ff3c06f bluespace jumper + renames old whiteship (#23841) 
* bluespace jumper + renames old whiteship

* Update Resources/Prototypes/Entities/Stations/base.yml

* Update base.yml

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
 2024-01-10 00:49:02 -07:00
Flareguy
798057e04d Adds the old AI sat ruin from SS13 (#23836) 
adds the old AI sat ruin from ss13
 2024-01-09 22:50:30 -07:00
Vasilis
2fe11e793f Fix test fail from dupe prototypes (#23827) 
remove dupe and fix test fail
 2024-01-09 18:31:50 -05:00
Ilya246
c34e18e4e2 buff syndicate assault borgs (#23797) 
rebalance
 2024-01-09 15:33:12 -07:00
Emisse
59e989a810 ruins (#23767) 
* ruins

* code-side

* round-robin instead

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-01-09 15:29:36 -07:00
themias
4cc3c91805 Wheelchair users can bump open doors (#23806) 2024-01-09 17:06:28 -05:00
degradka
ae59b072cc Adjust prototype names to lowercase (#23810) 2024-01-09 13:25:38 -08:00
lapatison
615330c545 Bunch of slot locales (#23792) 
* locale

* tweaks
 2024-01-09 13:18:04 -05:00
Thom
e622df90eb Make Puddle drawable by syringes and droppers. (#23804) 2024-01-09 13:10:34 -05:00
ninruB
c0df4219b2 Further adjust rigged gloves (#23811) 
* set stamina damage to 25, attack speed to 1.4, remove jank

"jank" is me artificially setting the stamina damage lower so it accounts for blunt damage, now the gloves are pure stamina damage with no blunt conversion

* bump the price to 6 for passengers and 4 for boxers
 2024-01-09 13:05:17 -05:00
metalgearsloth
dfbf47c34a Fix pirate weapons (#23794) 2024-01-09 11:33:42 -04:00
Boaz1111
5fd3d4552c More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408) 
* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-01-09 15:23:11 +03:00
IProduceWidgets
d59e28522a Quick N1984 fix because I goofy (Emisse no kill me please) (#23789) 2024-01-09 05:17:59 -07:00
Ubaser
a01487601e Update Core (#23781) 
add
 2024-01-09 03:47:44 -07:00
IProduceWidgets
f39fbd4800 Add the N1984 pistol (#23775) 2024-01-09 03:17:40 -07:00
lunarcomets
74a0f47074 fixed flippo lighter sprites in vending machines (#23778) 2024-01-09 03:16:32 -07:00
Skye
670db095b8 L shape drill + Surgical Tool Rotation fixes (#23773) 
L shape drill + surgical tool rotation
 2024-01-09 12:06:14 +03:00
Nemanja
fdd18c9ae4 Quantum Spin Inverter (#23756) 2024-01-09 00:37:55 -07:00
Nemanja
5db615af54 Autoattacking weapons (#23765) 
auto attacks
 2024-01-09 00:25:07 -07:00
Kot
e97fd47a87 Powered stasis bed prevents body decay (#23520) 
* Powered stasis bed prevents body decay

* Update following CR comments

* Remove unused import

* Simplify if-statements

* Change implementation following CR suggestions

* Add comment & remove explicit get/set
 2024-01-09 01:40:52 -05:00
Emisse
78442ce4e2 Mining rebalance + seismic charges (#23757) 
* push

* PUSH

* reuse cryo explosion

* minus loud

* ore band + pka

* idk dawg
 2024-01-09 16:27:00 +11:00
ike709
b8e8e6141a Appraisal tools check for cargo bounty completion (#23760) 
Co-authored-by: ike709 <ike709@github.com>
 2024-01-08 23:18:50 -05:00
cool dolphin
a34ee7c300 Add delicious mopwata (#23740) 
* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills
 2024-01-08 19:24:32 -07:00
Mr. 27
b1c7179e78 syndicate monkey changes, new nukeop monkey (#23744) 
* fix

* fix uplink

* add suffix
 2024-01-08 19:22:51 -07:00
Nemanja
efb1c58a13 unique satchel grid (#23724) 
* unique satchel grid

* small tweaksies
 2024-01-08 17:48:45 -07:00
Emisse
df1d8c36e5 kill machine parts + migrate machine part spawners to salvage loot spawner (#23752) 
* kill machine parts

* guidebook and artifact effect

* worst test ive ever seen in my life

* nuke test
 2024-01-08 16:24:36 -07:00