Commit Graph

8021 Commits

Author SHA1 Message Date
Ed
02b7fe5933 marking update (#254)
* new horny horns

* fuck this horns

* horns and hairs

* glasses resprite

* наращивание волос

* больше наращивания

* Update braid.png
2024-06-17 22:11:22 +03:00
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
2024-06-17 14:20:38 +03:00
Ubaser
5038012b67 Add new lizard horns, Demonic (#29022)
add
2024-06-17 13:53:47 +03:00
deltanedas
c332677971 remove robotics console emag checking, make it a bit fairer (#27876) 2024-06-16 23:30:10 -04:00
Cojoke
390f8d19d1 Makes Eyepatches Flippable (#26277) 2024-06-16 23:21:29 -04:00
Futuristic-OK
1482345330 Delete RandomSentience event (#28982) 2024-06-17 02:24:29 +03:00
Jaraten
2b577ebfbe resprite glasses (#251) 2024-06-17 00:46:02 +03:00
Tayrtahn
89a9f07c3a Add a system for modifying entity names without causing conflicts (#27863) 2024-06-16 15:38:53 -04:00
Nemanja
5e50bd83d6 Missing meteor presets (#29044)
* add meteors into missing game presets

* changes for real

* implement code

* this too
2024-06-16 21:37:43 +02:00
Ed
e4678dc66e Nails, Hammer tool and construction recipe update (#249)
* foundation resprite

* stone material, stack

* nails!

* mini hammer resprite

* hammer tool

* wall building update

* table crafting update

* bonfire craft update

* add wooden wall craft

* chest craft update

* Update attributions.yml

* Update tables.yml

* Update simple.yml
2024-06-16 18:31:47 +03:00
deltanedas
1cb9f5dbed add carp hardsuit for traitors (#25155)
* FactionClothing

* swtich carp to the Dragon faction

* add carp hardsuit

* add carp hardsuit to uplink

* fixes

* webedit ops 1

* why did i name it that wtf

* among

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-16 21:57:57 +10:00
Cojoke
26f809aebf Instruments for Musician lodouts (#29059)
* Musician Instruments to Musician lodouts

* Move instruments to their own file, fix instruments spawning on the floor, Found bug of Loadout dropping items on the floor rather than sorting inventory

* Whoops, I removed bagpipes for some reason
2024-06-16 21:27:35 +10:00
deltanedas
f730d120c7 give spiders unique venom reagent (#29066)
* add mechanotoxin

* make tarantulas use mechanotoxin

* trolled

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-16 21:26:59 +10:00
Nemanja
9348a5cea6 Apc & Substation resprite (#28998)
* substation

* apcs

* top pixels

* new screens
2024-06-16 05:43:22 -05:00
Cojoke
2fde5ac580 Cleans up ClothingShoesBootsMagSyndie in magboots.yml (#28653)
* Remove Explosive Component from ClothingShoesBootsMagSyndie

* Makes BaseJetpack a parent of ClothingShoesBootsMagSyndie

* fix boots in hand looking like jetpack bug

* make syndicate magboots child of magboots
2024-06-15 21:25:51 -04:00
Cojoke
280b0a1c24 Adds New Shoes to Sec loadouts (#29018)
* Adds New Shoes to Sec loadouts

* Remove Cowboy stuff from sec drobe(bye sheriff) + requested changed
2024-06-15 18:38:28 -04:00
lzk
6d3d92cd50 Fix mime mask loadout minlimit (#29056) 2024-06-15 17:32:49 -04:00
BombasterDS
81e41f8e8d Mannequin (#29004)
* Mannequin

* rsi license fix

* damage container fix

* container fix

hope this works

* layers fix + appearance comp (mb it help?)

* maybe fixed?

* one day it will work...

* can't even understand why test failing... (maybe fix?)

* last try?
2024-06-15 13:50:55 -04:00
Ian
ca58811bdb make the donk microwave drop the correct board on normal deconstruction (#29037)
* make the donk microwave drop the correct board on normal deconstruction

* removed the unnecessary SyndicateMicrowaveMachineBoard tag
2024-06-15 11:44:56 -04:00
ShadowCommander
789453adf0 Make firelock warning light not require power and add a PointLight (#29024)
* Add a PointLight to firelocks when warnings are active

* Remove power requirement for lights
2024-06-15 11:17:16 -04:00
Ed
c5a8e96dca Skills system (#247)
* init basic skill system

* add skill requirement to advanced melee weapon

* working hard

* more hard work

* shot skill issue

* Now the skills give you the components

* add job special autolearning skills

* traits recreating

* some tweaks

* remove bg and components for now

* sharpening now require skills

* add alchemist role on maps

* pestle skill issue
2024-06-15 16:55:04 +03:00
Flareguy
7afbe3c98e Adds 2 new space ruins (#28971)
adds 2 new space ruins
2024-06-15 00:02:56 -06:00
Nemanja
d907e4ef57 make pulled uncuffing slower & reduce uncuff spam cooldown (#29008)
* prevent people being pulled from uncuffing themselves

* block -> modify duration
2024-06-14 21:01:22 -07:00
Nemanja
748e5831e8 Add moon boots (#29009) 2024-06-14 20:43:23 -07:00
Nemanja
f136657b38 Revamped Meteor Swarm (#28974)
* meteor code and balanced values

* Meteor Swarms

* Update meteors.yml

* Update meteors.yml

* HOO! (fix overkill bug and buff space dust)

* undo BloodstreamComponent.cs changes

* DamageDistribution -> DamageTypes

* part 2.
2024-06-14 20:38:43 -07:00
Brandon Hu
298de1ba39 fix(uplink): Remove useless gps from death rattle box (#28999) 2024-06-14 23:23:42 -04:00
Verm
41a081d5ef Donk co. microwave + microwave tweaks (#28951)
* THE syndie microwave

* Always burn to explode microwave when copying

* Make it so copying ids stop when the microwave is goign to explode

* Made explosion destroy the board and spit out the machine parts

* Move logic is MicrowaveSystem, make metal cooking use the same logic

* Fix passing the wrong malfunction time

* Shuttle cannot escape aggressive branding

* Always make it explode with an id

* Forgot to invert bool, move it after fry chance
2024-06-14 23:00:00 -04:00
K-Dynamic
e803871172 Adds witch robes (#28965)
* ze

* autodrobe entry

* autodrobe crate cost adjust
2024-06-14 22:19:08 -04:00
Verm
68807cb25e Changes all the uplink ally icons to be a combination of the mob + radio (#28954)
* New Icons!

* Better meta info
2024-06-14 17:44:23 -04:00
Verm
a4ade69640 Move secure crate labels to the left (#28952)
Move secure label to the left
2024-06-14 17:42:58 -04:00
Pieter-Jan Briers
ba6853d386 It is pride month, nukies. You know what that means. (#28992)
* Make the nuke gay

* I forgot to commit the gay

* Add pride month

* Use holiday visualizer for nuke

* Fix pride month

* Trans too
2024-06-14 19:22:01 +02:00
dffdff2423
05cc7541dd Rename generic drugs (#28989)
* Rename generic drugs

Space Drugs and Stimulents cause quite a bit of confusion.

* Ensure everything is updated to the new names.
2024-06-14 12:53:48 -04:00
Ed
39bb249eb3 Alchemy fun mechanics (#246)
* heating solution refactor

* chromium slime effect refactor

* guidebook hint

* hint chance fix

* убираем ненужное
2024-06-14 19:10:16 +03:00
Moomoobeef
adad6b2b04 cargo can now order fax machines (#28968)
* cargo can now order fax machines

* removed fax manual
2024-06-14 16:24:18 +10:00
Killerqu00
4c182298cc uncuffCooldown *= 5 (#28095) 2024-06-14 16:19:47 +10:00
IProduceWidgets
df2c3ec844 Evac shuttle for Oasis (#27998)
* Add robo control comp, also de-reinforce a lot of walls.

* Add Accordia Evac shuttle for Oasis.

* Revert "Add robo control comp, also de-reinforce a lot of walls."

This reverts commit b6be6b616aa9732b81e02bed76e3c9ae103cf7cb.
2024-06-13 23:26:39 -06:00
Tabitha
c52073f542 Add chicken speech sound (#28948) 2024-06-13 19:43:02 -07:00
Boaz1111
8059028015 makes PKA able to mine rocks in one hit (#27476)
gives it gatheringprojectile
2024-06-14 12:40:23 +10:00
crasg
c79849ae29 Remove Rat King from MouseMigration and add it to it's own Event (#28872) 2024-06-14 12:12:24 +10:00
Ghagliiarghii
47bf64b883 Fix no combat knives in sec techfab (#28086) 2024-06-14 11:10:17 +10:00
lzk
ccd402d8d1 Adjust softdrink restock crate name (#28934)
These contain restocks for multiple vendors, so change the name and description to reflect this.
2024-06-13 12:21:24 -08:00
Ed
186f91f1d2 Merge pull request #241 from crystallpunk-14/ed-13-06-2024-upstream2
Ed 13 06 2024 upstream 3
2024-06-13 23:20:26 +03:00
Ed
0211a50581 Energy crystal (#243)
* init magic container system

* charging and discharging

* add energy regenerator

* thaumaturgy glasses, scanning energy

* add energy quartz prorotypes and sprites

* light power controller

* commit special for _des

* simple normalizer crystal slot

* YEEEEEEE BOIII, examined crystalls inside things

* кристал теперь видно, когда он вставлен в стабилизатор

* TryUseCharge приборами

* hello deserty, how are you doing?

* rename regenerator to EnergyDraw, allow draw from slot

* normalizer жрет magic energy файналли

* Update normalizer.yml

* visual polishing

* Update crystal.yml
2024-06-13 22:55:20 +03:00
Ed
791db753fe fuck this test 2024-06-13 22:50:27 +03:00
Doomsdrayk
7f5476b555 Fix Drozd and C-20r unwielding on use-in-hand (#28728)
Make Drozd and C-20r not unwield on use
2024-06-13 10:10:56 -08:00
Ed
898bf1fa8b try fix tests 2024-06-13 14:08:51 +03:00
Deserty0
d1af83c72a fixed ru emote sound v2 (#240)
* ultrafixxxxx

* Update speech_emotes.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-06-13 13:39:55 +03:00
Ed
124f6f3964 Update natural.yml 2024-06-13 13:29:46 +03:00
Ed
720d4ad144 save old grass sprite 2024-06-13 12:59:58 +03:00
Ed
fb7ffc4712 Update arenas.yml 2024-06-13 12:57:19 +03:00