Commit Graph

1511 Commits

Author SHA1 Message Date
themias
87c22a906f List antags in custody in round end screen (#21566)
* List antags in custody in round end screen

* Only show the message for traitors
2023-11-13 03:04:33 -07:00
Nim
9bbdbb9212 Space Sharkminnow (#20658)
* sharkminnow

* fix

* salvage
2023-11-12 17:42:48 -07:00
Whisper
dc4b55f48b update death squad role description for more universal uses. (#21611)
* update death squad role description for more universal uses.

* caps

* replace security glasses with sechud so they can see eachother
2023-11-12 16:24:28 -07:00
Vasilis
1a676bdbfa Puppy Ian. Awwww (And a puppy crate) (#21508)
* Awwww

* May as well add a crate

* forgor

* Im dumb

* Ok im done being dumb

* You monster...
2023-11-12 16:24:07 -07:00
deltanedas
60c19853cd egg rework (#21606)
* egg and raw egg

* add DamageEntity

* boiling and exploding eggs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-12 16:18:48 -07:00
Vasilis
2f2d237f86 LOOC will appear on top of your head (#21514)
* Oh well

* Minor fixing up

* HOLY BINGLE I DID IT

* TOGGLE!
2023-11-09 02:18:58 -07:00
pewter-wiz
e355541c04 Minor: Revert removal of "Oye" from dwarven accent in favour of "Oi" (#21547)
* Remove bad substitutions from dwarf accent

As per discussion in https://discord.com/channels/310555209753690112/1170959598153375815
These phrases are common pain-points
and often don't make gramatical sense
in most conversation

I feel accents (especially ones tied to species)
should favour intelligibility over flavour
where the trade-off arises

* Remove duplicate entry in dwarven accent

For -> fer already exists at accent-dwarf-words-82

* Revert removal of Hey -> Oye, opting for Hey -> Oi instead

* Revert removal of Hey -> Oye, opting for Hey -> Oi instead
2023-11-09 02:18:39 -07:00
pewter-wiz
88a9dce398 Tweak dwarf accent (#21522)
* Remove bad substitutions from dwarf accent

As per discussion in https://discord.com/channels/310555209753690112/1170959598153375815
These phrases are common pain-points
and often don't make gramatical sense
in most conversation

I feel accents (especially ones tied to species)
should favour intelligibility over flavour
where the trade-off arises

* Remove duplicate entry in dwarven accent

For -> fer already exists at accent-dwarf-words-82
2023-11-08 22:12:23 -05:00
DoubleRiceEddiedd
2ef29fb222 New crop: Cotton (#21536)
* Add cotton plant

* Adddescription and tag to cotton bal allow moth eat it

* Fix typo. Add cotton seed into MegaSeed

* Fix typo

* Fix typo

* Fix cottonbol component typo

* Fix the amount of cotton that bol gives

* Adding correct component to make cotton bol edible

* Change cotton bol parent to see if it is edible

* Adding flavor to cotton bol, and fix typo

* Replace image

* fixing plant image position

* Increase the Megaseed restock crate price to avoid money farming loop hole
2023-11-08 18:54:07 -07:00
PixelTK
52af546267 Arachnid 2: Episode 2 (#19984)
* Shield

* minor sprite changes and buffs

* structure buff

* Crafting stuff

* tweaks

* 88-88

* Better web pocket sprites.

* yeah it's fine now.
2023-11-08 12:18:52 -08:00
Nemanja
94368f1f00 Speed Boots [Tier 3 Civ-Service] (#21438)
* Speed Boots

* validate

* monkey
2023-11-07 18:25:43 -07:00
Ed
8b3adf6085 Anomaly Synchronizer (#20945)
* added textures and basic prototype without functionality

* add full functional

* finish work

* fix naming

* reduce random anomaly spawner offset

* Update AnomalySystem.Vessel.cs

* Update SharedAnomalySystem.cs

* Update SharedAnomalySystem.cs

* Update production.yml

* fix errors

* fix?

* Update anomaly_sync.yml

* deltanedas code fixes. Thx, deltanedas!

* git what

* fix yml

* fix yml 2

* meh, try again

* work, work, work

* fix powered checking. now component work also without ApcPowerReceiving

* now supercrit port invoke on start growing, not after explosion
fix errors

* deltanedas fix pack 1

* Update AnomalySynchronizerComponent.cs
2023-11-05 21:02:02 -07:00
Whisper
e0a11f9659 (Reagent) Minor blood and uncooked protein rework (#20891)
* Blood makes non-animals take poison damage, and sates animal hunger at a very low rate

* Only affects humans, animal restrictions also removed

* ignore the other commits, blood and uncooked protein rework!

* Humans recieve a popup when they consume these reagents

* lower the original damage of uncooked proteins

* Change metablizing organs, make blood digest into uncooked protein instead of it having it's own effect
2023-11-05 20:51:32 -07:00
LordEclipse
dd0ab19c96 Freelance Radio Channel and Encryption Key (#20904)
* Freelance Radio Channel

* Freelance Radio Channel
2023-11-05 20:38:00 -07:00
deltanedas
96e27810cf add ied (#20966)
* MinSolution and SolutionEmpty construction conditions

* make ied sprites

* add ied

* ied crafting stuff

* deconstruct give cable yes

* fix

* tags

* tag

* 3x3

* sharing is caring

* buff damage

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-05 20:04:47 -07:00
deltanedas
3be6c5b9d5 Microreactor power cell research (#21473)
* buff microreactor cell and tweak a little

* add portable fission research

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-05 22:00:11 -05:00
RiceMar1244
196be3cba1 Adds more sources for sheet paper material (#21364)
* Moves sheetifier research unlock from civilian services to industrial

* Makes wood insertable into the sheetifier and makes paper a lathable material

* Adds a paper crate to the cargo catalog

* Adds localizations
2023-11-05 19:14:02 -07:00
Ed
aa713ea7e6 Candles (#21087)
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2023-11-03 22:53:51 -07:00
deltanedas
c7f74f79fa fish petting (#21412)
* fish petting

* evil

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-03 13:57:11 -06:00
brainfood1183
15fc7b1e92 blue blood now requires copper instead of iron to cure bloodloss (#20863)
* blue blood now requires copper instead of iron to cure bloodloss

* arachnid species now needs copper to cure bloodloss and copper pills added to medkits.

* fix puddlesystem proto

* remove the cool

* no longer uses hastag, instead uses custom heart organ and hasorgan.

* fix
2023-10-31 13:41:25 -07:00
Psychpsyo
6a18bdc023 Soapy Water & Edible Soap (#20364)
* soap reagent and soapy water

* make soapy water recognizable

* Fix tile cleaning bug

CleanDecalsReaction was able to take more than the reactVolume it was given.

* make soapy water an evaporating reagent

* Tile reactions when mopping

* Fix indescribably soap flavor

* Adjust soap flavours

Soap and soapy water now taste clean and syndie soap tastes like punishment.

* Better soap numbers & DeleteOnSolutionEmpty

* Changed TrashOnEmpty to TrashOnSolutionEmpty

* Last TrashOnSolutionEmpty change

* Fix merged code not compiling

* Requested changes.
2023-10-31 13:39:12 -07:00
potato1234_x
1c604a41a5 Cockroach + Glockroach Admeme + Mothroach (#19752)
* cockroach

* Update Resources/Textures/Mobs/Animals/cockroach.rsi/meta.json

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* parenting fixe

* d

* rsi fail

* mothroach!!!!

* cockroach vent event + critters in trashcart

* linter

* fix

* commit

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2023-10-31 13:28:42 -07:00
ZeroDayDaemon
a302775ac0 Pea Plants (#20504)
* Add Pea Plants

* Pea soup

* Update flavor-profiles.ftl

* Update seeds.yml

* Add seeds to vendors

* Make things more expensive to fix free money exploit

* Update textures

* Revert "Update textures"

This reverts commit b1b7046504afc7468742b0722f601d98684a1c89.

Vines dont grow straight into the air.

* Shift up 4 pixels

* Fuck autofix conflitcs

* Shift up 3 more pizels

* I finally got byond working so I made sure they were EXACTLY the same

* Address Reviews? I think?

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-10-31 00:09:13 -04:00
Nemanja
0c329ed661 Storage Standardization [Take 2] (#21270) 2023-10-30 20:55:55 -07:00
Doru991
e1440cb493 Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176)
* Pumpkin textures

* Pumpkin prototypes

* Jack o lantern prototypes and pumpkin cake

* Finishing touches

* Arbitrageloose

* Restore old pumpkin helmet sprites (God I hope it works)
2023-10-30 23:12:23 -04:00
Leon Friedrich
e792475484 Fix planet command help message (#21312) 2023-10-29 12:51:19 +11:00
Repo
e0f3bf0a06 User accessible playtime (#21242)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-10-28 12:01:11 +00:00
Artjom
6ce75ccec9 Health analyzer UI improve (#17280) 2023-10-28 16:54:18 +11:00
Morb
d27df9705d Fix hijack objective (#21241)
* Fix hijack

* Max difficulty
2023-10-27 22:33:18 -04:00
faint
59176f7613 Fix nukies sound not played (#21268)
* Play sound and sending greeting message works for nukies now!!!!!

* oops

* silly change
2023-10-27 22:28:20 -04:00
Ed
a9fc97a901 rename the rocks (#21275) 2023-10-27 22:27:09 -04:00
Whisper
5585cbf822 ERT Loadout overhaul + Real deathsquad mobs + ERT fixes (#21230)
* "assist with medical efforts"

* CentComm official description change

* give cburn ert mask

* Ert medic hardsuit uses blood-red medic values

* description changes, they all used to use the blood-red description

* ert engineer hardsuit uses cburn values, good for handling all possible engineering problems.

* janitor hardsuit uses cburn values for extreme messes, otherwise we'd send the non eva variant.

* spawn suffix changes

* shorten suffix

* drop armor from ert jumpsuits

* drop armor from DS jumpsuit

* add more armor to death squad to make up for removed armor in the uniform.

* give sec gas masks armor, give syndicate gas masks armor. ERT gas mask uses syndicate mask values

* add nanotrasen

* removed duplicate

* give centcom IDs their hud icon

* replace all ert bulletproof armor with basic universal armor

* replace all oxygen tanks with air tanks; species is random.

* remove gun and meds from ert engineer kit

* give ert engineer materials

* remove weapons and meds from janitor ert

* give ert janitor light replacer

* remove ert sec pulse weapons, admins will assign loadout. Either the lecter or enforcer, probably.

* Give ert sec the security pistol kit

* typo

* give eva ert sec pistol

* give eva janitor ert gas mask

* give jani purple gloves

* medical gloves for medical ert

* replicate security loadout to leader

* quick ert lecter spawns for lazy admins

* better suffixes to find them easier

* add cburn to ertspawn

* Replace "Spawn" with "role"

* Add death squad. Give ert engineer gas analyzer.

* death squad using wrong equipment

* typo

* missing ghost roles on lecter loadouts

* add freedom implanter to deathsquad

* deathsquad ghost role text

* Operative sounds better

* give Ds flashbang box (why isn't it entirely filled?)

* fix typo. add energy shield to DS

* fix typos

* all centcomm roles are now mindshielded. These cannot be removed.

* Rider didnt include some of the changes ?

* give zipties instead of cuffs for mass arrests!

* upgrade ERT survival boxes to extended capacity

* give cburn extended oxygen too
2023-10-27 08:54:43 -05:00
deltanedas
b9af991e04 Ion storm event (#20277)
* ion storm event prototype + locale

* add lawsets

* use lawsets, make borgs ion storm targets

* ion storm rule and ion storm target

* lawset prototype

* use lawsets

* update silicon law system to use lawsets and support ion storm event

* new toys

* fix

* more fix

* fixy

* ion storm admin logging

* assigning laws makes borg provide its own laws, other stuff

* 1h reoccurence

* 50% chance

* better call saul

* emagLaws is required

* add announcment audio

* fixy

* family friendly gaming

* fixy

* address reviews

* fixy

* more fixy and no erp

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 22:40:13 -04:00
deltanedas
bb65818bf3 Implant whitelist/blacklisting (#20678)
* add whitelist and blacklist to implant and implanter components

* handle whitelist and blacklist in systems

* move hardcoded whitelist/blacklist to base implanter + add admeme implanter

* give implants sensible whitelists

* cleaner CheckTarget and fix

* remove unused imports

* network lists

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 22:34:02 -04:00
faint
8891890ad1 Fix missing toggle fullscreen loc string (#21264) 2023-10-26 18:19:37 +03:00
metalgearsloth
c08349a947 Revert "Storage TEST MERGE" (#21258) 2023-10-26 00:46:22 -07:00
Nemanja
41795720da [TEST MERGE] Slot-based Storage (#21212) 2023-10-25 18:53:38 -04:00
Doru991
6b04aaf964 Potato battery update + potato AI (#21142)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-10-26 00:52:49 +11:00
deltanedas
07a956e790 syndicate snack box (#21024)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 00:26:26 +11:00
deltanedas
b6a8f5e780 Power switchable refactor (#20419)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-25 23:57:23 +11:00
Mr. 27
ef7f3b1f64 Remove "mk --> mmm, okay" and "u --> you" to chatsan anti slang (#21177) 2023-10-24 20:56:18 -04:00
Myakot
ed36abcb5f Healing skeletons by pouring milk over them (and clean pie remains off their skulls) (#21231)
* mvp done - skellies can heal by spillink regular milk on themselves and clean themselves off creaming with water

* added other types of healing milk, also made a separate reaction to oat milk - it has almost no calcium in it

* fixed indent error, made a dumb mistake
2023-10-24 16:58:33 -04:00
liltenhead
13c5ac7f62 Add hint for the examine trigger effect (#21166)
* examine locale

* examine trigger desc
2023-10-24 16:37:16 -04:00
Morb
47b244b191 Hijack shuttle objective (#19621)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2023-10-24 18:55:46 +11:00
Vasilis
94796ddeee Slightly better locale for revs (#21168) 2023-10-24 18:47:53 +11:00
Tryded
7073b292c0 Buffs Double bladed energy swords (#21131) 2023-10-23 10:35:32 -04:00
EnDecc
002d3be16b The Quartermaster's Requisition Digi-board (#21023)
* Added sprites

* Added item in game

* Ditched glowing light indicator to simplify implementation

* Added clipboard to locker fill

* Added traitor objective

* forgor meta.json

* forgor clip textures on front-facing in-hand sprites

* lowered concussiveness of bureaucracy

* added remote cargo ordering, paper sucking, and removed paper on spawn

* slightly reduce storage capacity so it can fit in backpacks
2023-10-22 00:34:06 -07:00
DrSmugleaf
b44281a5d4 Fix whitelist commands not giving feedback with 0 arguments, trim names, add [player] completion hint (#21152) 2023-10-21 14:57:51 -07:00
Vasilis
9ea8e03c23 Social a-anxiety/st-st-stuttering t-trait. (#20500)
* This was supposed to be a challenge

* Component magik

* Add documentation
2023-10-21 13:09:54 -07:00
Mr. 27
e2227c6b09 Make common netspeak get replaced in the chat (#20180)
* added more slang to the sanitization manager

* idk why this file is here

* Added new sanitization accent

* No longer is an acccent, instead is a dictionary

* Reverted back to a system similar to before, added the new netspeak from the dictionary

* Added some new words to the chat san

* Added (wdym --> what do you mean) to the chatsan

* merge conflict

* removed boolvalue

* remove space

* Upcoming

* Added MF and ETC to chatsan :))

* upcoming

* added FYI and WYD to speech-chatsan.ftl

* Made the chatsan accent string a const string with [ValidatePrototypeId<AccentPrototype>]

* forgot the ';' :(((

* fixed error throw [AccentPrototype] --> [ReplacementAccentPrototype]
2023-10-21 15:43:11 -04:00