Commit Graph

5879 Commits

Author SHA1 Message Date
Nairod
3b10c88c8c Command Styled QM Card (#21368) 2023-10-31 16:42:00 -04: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
deltanedas
49f0b20b0a make bloodred large size (#21362)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-31 15:37:39 -04:00
Bixkitts
74f1098008 Candy Bucket for Halloween (#21257)
* Added candy bucket and component to update appearance of held containers akin to it

* cleanup newline

* newline was load-bearing

* moved component to Shared, cleanup

* newline is spooky

* You build and run without errors, stop pretending otherwise

* Updated for new storage system in master branch
2023-10-31 11:54:41 -04:00
LankLTE
1a9f3bc86b Fix the organtype (#21347) 2023-10-31 06:57:26 -06:00
Nemanja
a05ef80cb0 fix smoke not transferring (#21332) 2023-10-31 06:43:18 -06: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
Nemanja
4f81a561ae Enable skeletons temporarily for Halloween (#21356) 2023-10-30 20:40:11 -07:00
I.K
01d57a0210 fix fireaxe swing (#21346) 2023-10-30 23:30:58 -04:00
Ed
1659a14d5c Update ground_lighting.yml (#21350) 2023-10-30 23:16:28 -04: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
Vasilis
1a45c32355 1984 mouse AI (#21353) 2023-10-30 18:49:05 -07:00
metalgearsloth
b3b0d0c567 Thicken thindow bounds (#21280) 2023-10-30 22:48:11 +11:00
Psychpsyo
e22d3a4cb0 Space Asshole Gear (#21243)
* Add Space Asshole Coat

* Add sledgehammer

* Adjust sledgehammer damage values

* Add copyright string to sledgehammer
2023-10-29 20:09:18 -04:00
nmajask
014d3a36c4 Added thermal insulation to flannel jackets (#21273) 2023-10-29 20:08:06 -04:00
Subversionary
a6448cb87d Fix bola stam damage, bring back old construction requirements (#21340) 2023-10-29 18:27:43 -04:00
brainfood1183
00523b5260 New foam sprites (edge sprites) (#21308)
* New foam sprites (icon smoothing)

* changed to edge sprites for foam

* fix

* edges for metal foams

* fix
2023-10-29 10:13:41 -04:00
Yousifb26
b5c21bcd00 Update belt.yml (#21317)
changes the chief engineer's belt to remove the lv wires (they take up a lot of space and are easy to get anyways) in exchange for a holofan, a t-ray, and a gas analyzer (first time coding ever this might have to be edited)
2023-10-29 10:11:51 -04:00
kerisargit
f2bc0ff128 Atomic bomb add uranium (#21143)
* fix: Incendiary bullets no longer deal cold, acid, or shock damage that ignores all armor.

* Atomic bomb
2023-10-28 23:24:46 -07:00
metalgearsloth
5b8f3c48c4 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed Content audio (#20862) 2023-10-29 14:58:23 +11:00
Whisper
cd280eef6b remove pulse rifle from ert medic (#21310) 2023-10-28 20:56:33 -07:00
Ubaser
d08a9e2b94 Wearable bee plush (#20623)
* add

* fix

* temporary change, needs fixing

* mayb fix

* actually fix FR

* yes
2023-10-28 20:55:15 -07:00
TemporalOroboros
b223e7d6ed Generalizes solution overflow & slightly increases space lube yield (#21094)
* generalize SolutionSpikeOverflowEvent

* let reactions overflow

* spacelube: 3 -> 5

* restore TryMixAndOverflow threshold cap
2023-10-28 12:46:59 -04:00
Whisper
e11d33b68d fix cburn bag issue, make new bag entity for them and filled bag entity (#21295) 2023-10-28 00:30:59 -04:00
Morb
d27df9705d Fix hijack objective (#21241)
* Fix hijack

* Max difficulty
2023-10-27 22:33:18 -04:00
metalgearsloth
1f59770ac1 Make crystals noRot (#21279)
IDK might be better. Ideally the anchoring would be offset 0-0 but this is the world we live in atm.
2023-10-27 22:27:16 -04:00
Ed
a9fc97a901 rename the rocks (#21275) 2023-10-27 22:27:09 -04:00
Leon Friedrich
ecec22faae Bandaid tests (#21292) 2023-10-28 11:43:15 +11: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
Nemanja
7a0759f2c0 Techfab resprite + department fab sprites (#21136) 2023-10-26 22:21:14 -04:00
nmajask
0d5da6c30a fixes and tweaks (#21172) 2023-10-26 22:12:35 -04:00
Ed
354d999c8e Cave Decoration pack (#21265)
* add chromite chasm

* add desert chasm

* snow chasm

* finish
2023-10-26 21:58:27 -04:00
chromiumboy
8fcb20894c BBQ rib sandwich (#21180) 2023-10-26 10:08:24 -04:00
metalgearsloth
c08349a947 Revert "Storage TEST MERGE" (#21258) 2023-10-26 00:46:22 -07:00
Nemanja
81f5e341c0 Some mild item size balancing + fixes (#21250) 2023-10-26 13:47:44 +11: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
Ed
94cda6a253 Shadow Dimension visual pack (#21237)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-10-26 00:36:22 +11:00
deltanedas
07a956e790 syndicate snack box (#21024)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 00:26:26 +11:00
deltanedas
88a29450d9 give roundstart borgs names (#20081)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-26 00:00:08 +11:00
deltanedas
33c82d60c0 simple space mobs cant be flashed (#20784)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-25 23:58:12 +11:00
deltanedas
b6a8f5e780 Power switchable refactor (#20419)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-25 23:57:23 +11: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
Stealthbomber16
b59cc50df0 cornmeal is actually obtainable now (#21162)
* do the thing

* lets find out

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2023-10-24 16:38:43 -04:00