Commit Graph

4186 Commits

Author SHA1 Message Date
crazybrain23
bb096b19cc Syndicate pAI upgrade (#19195) 2023-08-16 00:59:41 -06:00
Tollhouse
8dedabbb8f Dan's Soaked Smokes (#19150)
* Added all the basics I think I needed for the basic cigs to show up in vendors and game. Need to implement the randomizer to grab varied chems from a list.

* Forgot a png

* Smokes work just need sprite work and random

* First pass on random cigs

* Cigarettes are named now just randomization left

* Finished on my end.

* Whoops

* Nutrient is not availiable for smokes I guess?

* Testing fixes

* Dunno found this on the filledbookshelf might work here?

* I dont know what Im doing wrong but I think this might work.

* Trying with orgroups in the pack YAML

* It seems to not like the food chems. Commented them out.

* THC is also a no go. Also increased storage size of pack to total pool. Given the low prob should still should never hit max volume.

* I have a sneaky suspicion its the size of the container and pool of fill items.

* Messed with the size of the cigarrettes so they all have a chance to fit and the size of box stays consistent.

* Apparently non whole number size is a no go.

* Cartons were to small and added maxamount on cigarettes.

* Amount: 0 caused odd errors. removed and changed maxamount to 2.

* Reworked randomization system to try and use weightedRandom instead of prob in storageFill

* Wrong weightedRandom

* Rework of a rework. Good on my end. Simplified the randomization to bare minimum.

* Added gas station dick pill vibe to all the names.
2023-08-15 18:27:18 -06:00
Velcroboy
ab3106f18b Adds Directional Switches (#19175)
* Adds directional switches

* Revert unintended line deletion

* Consistent recipes

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-08-15 17:01:50 -06:00
Nemanja
b8250f9601 entity storage tweaks (#19182) 2023-08-15 16:49:30 -06:00
Fahasor
65c7e88c48 Make jugs label deletable (#19082)
* Fix bug with undeletable label on jugs

* Fix label text for jugs

* Documented LabelComponent

* Revert "Fix label text for jugs"

This reverts commit 38b7cc75ca51770b3693d0cef4f0364424619b73.

* make jugs labels names lowercase

* Fix documentation of LabelComponent
2023-08-15 16:41:10 -06:00
Nemanja
3b31e2ce1f borgs are immune to electrocution (#19186) 2023-08-15 16:37:34 -06:00
Velcroboy
75d2c12e65 Add food carts (#19177)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-08-15 15:26:49 -07:00
Kara
2e86f4c556 Portal sprite & behavior tweaks (#19179)
* Portal repalette

* Portal traversal verb + anchoring

* map restriction

* optional max distance checks if we decide to have them later

* lower pointlight energy slightly hopefully makes it less garish
2023-08-15 14:56:14 -06:00
Kara
7db8c781e7 Speech verbs & conditional markup modification (#18980) 2023-08-15 13:03:05 -07:00
Kara
cfccb5959a Lavaland chasms (#19154) 2023-08-15 12:29:24 +10:00
Nemanja
66ad1ff8fa Realign plunger hat (#19147) 2023-08-14 18:26:09 -06:00
Арт
a7583eb525 Construct and upgrade mini gravity generator (#18568)
* Construct and upgrade mini gravity generator

Now the mini gravity generator can be assembled/disassembled, the necessary machine board has been added to ShuttleCraft technology. Now it is possible to destroy the mini gravity generator and improve its components, thereby increasing the maximum charge of the generator.

* Test with empty OnRefreshParts

Perhaps this will help to get rid of the error during the test...

* Revert "Test with empty OnRefreshParts"

This reverts commit 5f32e15d66a4cb0d8df7578593867062be7872d8.

* Test without OnRefreshParts

Let's check if the problem is multiple inheritance.

* Revert "Test without OnRefreshParts"

This reverts commit d319757aa15a8ebec1237e552213e80eb8042790.

* Enabled by default

Maybe this will solve the problem, and maybe not...

* Swapped the components ApcPowerReciver and GravityGenerator

The previous "solution" did not give results, perhaps this time it will work....

* Revert "Swapped the components ApcPowerReciver and GravityGenerator"

This reverts commit 38759ca5a3465908b97d1d7e6ca583f8e9a97afb.

* Brought everything back to the beginning

* One parent in generator prototype, test

* Revert "One parent in generator prototype, test"

This reverts commit f7275b5d53234d9f66e8b4df0692596e14d82c95.

* Test without switchedOn and charge

* Revert "Test without switchedOn and charge"

This reverts commit 3916de8cc68e488098e6adc1e6b13e00d3f0e1a1.

* Revert "Revert "Test without switchedOn and charge""

This reverts commit 3d95efbfd4cb358b5c04a2302a377d51eb5f34cc.

* Update Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-08-14 20:23:40 -04:00
Nemanja
7ddee71379 More borg tweaks (#19143)
* borg tweaks but i'm gonna go code fun stuff first

* werkin' on it

* a ton of tweaks

* fuck everyone and then myself
2023-08-14 18:34:23 -05:00
Gotimanga
8b0eb7e4de Add Mystery Figure Crate (#19134)
* Crate YML Files

* Minor figurine spelling correction

* Removing empty spaces

* Lower Price

* Adding Rare Box
2023-08-14 19:14:05 -04:00
Emisse
d89bc020d0 operating table fix (#19092)
* get real

* fix cluster

* fix omega

* fix origin

* fix core

* fix medium pet hospital

* fix lavabrig
2023-08-14 16:25:05 -06:00
Kara
ec02907446 Various bar-related fixes (#19126)
* Various bar-related fixes

* smartfwidge

* gumbo
2023-08-14 15:03:20 -06:00
Kara
f6f0351487 Fix monkeys not getting rotated on crit/death (#19132) 2023-08-14 15:02:28 -06:00
crazybrain23
bee2768494 add binary to observer (#19141) 2023-08-14 15:00:08 -06:00
mhamster
5ce47fbb03 Add ability to burn papers +Flammable tweaks. (#18955) 2023-08-14 15:45:55 -04:00
Kara
912aba5e8c Fix some non-norot sprites (#19130) 2023-08-14 11:59:14 -04:00
c4llv07e
d7eb3bfb44 Pipe painter (now with airlock painter) (#19031)
* Add a pipe painting function to the airlock painter

Signed-off-by: c4llv07e <kseandi@gmail.com>

* Rename engineer painter to omnipainter

Signed-off-by: c4llv07e <kseandi@gmail.com>

* review changes

Signed-off-by: c4llv07e <kseandi@gmail.com>

* fix migration duplicate

Signed-off-by: c4llv07e <kseandi@gmail.com>

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
2023-08-14 15:06:21 +03:00
chromiumboy
6a41a554e5 Fixed an issue where airlock safeguards could not be applied to glass airlocks (#19110) 2023-08-14 00:42:02 -06:00
crazybrain23
9c5f566154 Added missing chameleon tags (#17655) 2023-08-14 00:03:19 -04:00
Nemanja
6a125b55df Fix various IC states not counting as dead (#19049) 2023-08-13 23:34:18 -04:00
Vordenburg
694a6cfc1c Add Destructible SpawnGasBehavior (#18965) 2023-08-13 21:55:06 -04:00
Sailor
459660ed92 Fix Murdertron 5000 a/k/a Emagged recycler (#18892)
* Fix gibbing humans

* Millions must gib

* Workplace accident

* Everything alive goes into the recycler

* Review
2023-08-13 19:54:52 -04:00
eoineoineoin
4ccc8a04be Improve paper stamping experience (#17135) 2023-08-13 14:28:10 -04:00
Nemanja
2f2df5c74b Fix DNA scrambler (#19079) 2023-08-13 12:56:21 -04:00
deltanedas
8b1af46a2b add throwing star (#18700)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-14 01:18:48 +10:00
Vladislav Kadira
229df7c5ec Add cocoa cultivation (#18366)
* Add cocoa cultivation

* fix

* Fix 2

* fix 3

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-08-13 10:35:58 -04:00
PixelTK
f189b73fe5 Arachnid rework (#18631)
* Merge before I fuck up anything again

* craft whitelist

* Sericulture

* Spider

* gone

* quickly fixed

* and coders taketh away

* And we take more away

* sericulture improvements

* arachnid

* better webbed

* OH WAIT

* test fail
2023-08-13 01:38:05 -06:00
Morb
fb5f8dadbb Wheelchair fixes (#18901)
* Remove netsync

* Replace OnStartup with OnMapInit

* Dont remove component

* Remove component ensure

* Remove using

* Cancel all moving or stand events

* Fix description

* Revert "Replace OnStartup with OnMapInit"

This reverts commit 5b7470d0dfa7a7c127dec6a06534b339f140ffac.

* Remove stand events cancel
2023-08-13 01:29:39 -06:00
Vordenburg
cd80ba392f Specify drawdepth layers for some objects (#18917)
* Specify drawdepth layers for some objects

TV, buttons, timers, levers.

* Fix line placement
2023-08-13 01:27:02 -06:00
CrigCrag
e6b8d18787 Make jugs printable and bigger (#18941)
* Update medfab recipes

add jug

* Update chemical-containers.yml

* Update chemical-containers.yml again

what if it was 25

* Update medical.yml yet again

reduce cost

* Update chemical-containers.yml again

* Update medical.yml

remove name for recipe since it seems redundant as its ID is jug anyways
2023-08-13 01:23:37 -06:00
Errant
7527036cf1 Laser namechange and some buffs (#18951)
* Laser naming

* More laser changes
2023-08-13 01:18:49 -06:00
brainfood1183
ae5dcbabee Holoclown (clown only) syndicate uplink item. (#18966)
* Holoclown (clown only) syndicate uplink item.

* added clumsy to holoclown

* holoclown now uses clown names, holoclown kits box now counts as boxhugs for crafting.

* gibs holoparasite on death if has hands (this will cause the items in hands and pockets to drop.
2023-08-13 01:18:09 -06:00
Ilya246
642d9b021f bloodred magboots buff (#18948)
* bloodred jetboots

* fix actionbar
2023-08-13 01:17:09 -06:00
Errant
bfa6b3bc3d Light laser (#18950)
* Light laser

* Migration
2023-08-13 01:16:25 -06:00
Doru991
a554ad24e1 Vehicle stun/sleep immunity fix (#18962)
* Fix stuns on vehicles

* Unicycle 1984

* Fix sleeping and driving

* Discard that too
2023-08-13 01:13:19 -06:00
Errant
1ff125a240 bola buff (#18998) 2023-08-13 01:11:11 -06:00
Nim
998c6f3d7b Secret door (#19023)
* secret door

* oops
2023-08-13 01:10:45 -06:00
metalgearsloth
8d0d09b343 Fix bolt-open for debug swep (#19057)
Me when I don't run tests on the final commit.
2023-08-13 01:08:08 -06:00
metalgearsloth
8fb38b759a Nerf pickaxe + drill slightly (#19056)
I already nerfed its damage from before (at least non-structural) but this nerfs it slightly more.
2023-08-13 01:07:48 -06:00
TaralGit
8acac895fc (Re)Adds open bolt animations for gun sprites (#17219)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-13 15:58:07 +10:00
RiceMar1244
7de1cedff5 PKA resprite (#19024)
* Changed all PKA sprites, added wield sprites, modified meta.json

* Added animation assets for future yaml'ing. Made changes to existing textures.

* meta.json changes

* Corrected arsenal.yml missing sprite

* Removed unused animation assets.

* Put back the one animation asset I was suppose to keep.
2023-08-13 00:50:41 -04:00
Nemanja
98fa00a21f Borgs (#18136)
* Laws

* positronic brain and PAI rewrite

* MMI

* MMI pt. 2

* borg brain transfer

* Roleban support, Borg job (WIP), the end of mind shenaniganry

* battery drain, item slot cleanup, alerts

* visuals

* fix this pt1

* fix this pt2

* Modules, Lingering Stacks, Better borg flashlight

* Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power.

* sprotes

* no zombie borgs

* oh fuck yeah i love a good relay

* charger

* fix the tiniest of sprite issues

* adjustable names

* a functional UI????

* foobar

* more modules

* this shit for some reason

* upstream

* genericize selectable borg modules

* upstream again

* holy fucking shit

* i love christ

* proper construction

* da job

* AA borgs

* and boom more shit

* admin logs

* laws redux

* ok just do this rq

* oh boy that looks like modules

* oh shit research

* testos passo

* so much shit holy fuck

* fuckit we SHIP

* last minute snags

* should've gotten me on a better day
2023-08-12 16:39:58 -05:00
Pieter-Jan Briers
a242af506e Adds the thermo-electric generator (#18840)
* Basic TEG start.

Connects via node group.

* Basic TEG test map

* Sensor monitoring basics, TEG circulator flow

* Basic power generation (it doesn't work)

* More sensor monitoring work

* Battery (SMES) monitoring system.

* Sensor monitoring fixes

Make it work properly when mapped.

* Test map improvements

* Revise TEG power output mechanism.

Now uses a fixed supplier with a custom ramping system.

* TEG test map fixes

* Make air alarms and pumps open UI on activate.

* Clean up thermo machines power switch.

Removed separate Enabled bool from the component that always matched the power receiver's state.

This enables adding a PowerSwitch component to give us alt click/verb menu.

* TEG but now fancy

* Make sensor monitoring console obviously WiP to mappers.

* Vending machine sound, because of course.

* Terrible, terrible graph background color

* Examine improvements for the TEG.

* Account for electrical power when equalizing gas mixtures.

* Get rid of the TegCirculatorArrow logic.

Use TimedDespawn instead. The "no show in right-click menuu" goes into a new general-purpose component.

Thanks Julian.

* Put big notice of "not ready, here's why" on the sensor monitoring console.

* TryGetComponent -> TryComp

* Lol there's a HideContextMenu tag

* Test fixes

* Guidebook for TEG

Fixed rotation on GuideEntityEmbed not working correctly.

Added Margin property to GuideEntityEmbed

* Make TEG power bar default to invisible.

So it doesn't appear in the guidebook and spawn menu.
2023-08-12 15:41:55 -05:00
potato1234_x
f4bbe3603d Add trash carts and janitorial trash carts (#18996)
* everything

* half loot
2023-08-12 13:05:32 -06:00
deltanedas
a727457281 vim tweaks (#19015)
* smaller mass and radius

* same damage as hamtr

* guide

* remilia and valid dog can pilot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-12 13:03:07 -06:00
deltanedas
85f786099c empty syringe starts on draw, 15u (#19010)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-12 08:19:15 -07:00