Commit Graph

12134 Commits

Author SHA1 Message Date
Emisse
627dd6addd cluster update (#19192) 2023-08-15 18:54:43 -06:00
Emisse
7c04f81a44 marathon update (#19191) 2023-08-15 18:54:36 -06:00
Emisse
1386daaed9 Barratry (#19190)
* barratry update

* Update barratry.yml
2023-08-15 18:37:30 -06:00
PJBot
17cfcbb86f Automatic changelog update 2023-08-15 20:28:22 -04: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
Nemanja
6d8635156f fix BIG storage crates (#19188) 2023-08-15 17:18:31 -06:00
PJBot
57b5addbb8 Automatic changelog update 2023-08-15 19:02:53 -04: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
PJBot
e0ce994d33 Automatic changelog update 2023-08-15 18:50:34 -04:00
Nemanja
b8250f9601 entity storage tweaks (#19182) 2023-08-15 16:49:30 -06:00
PJBot
87b774209f Automatic changelog update 2023-08-15 18:42:14 -04: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
PJBot
623e7b82fc Automatic changelog update 2023-08-15 18:38:38 -04: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
PJBot
5e1576a99a Automatic changelog update 2023-08-15 17:15:29 -04:00
PJBot
d40417a9d7 Automatic changelog update 2023-08-15 17:11:03 -04:00
Nemanja
f3b40197b9 remove "failed to send message" popup from radio (#19184) 2023-08-15 14:56:42 -06: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
PJBot
452f2112e8 Automatic changelog update 2023-08-15 16:51:28 -04:00
Repo
4c2f337c74 Update scrubs crate to have scrubs hats instead of bandanas (#19181) 2023-08-15 16:22:27 -04:00
PJBot
45bc2e835a Automatic changelog update 2023-08-15 16:14:45 -04:00
Kara
7db8c781e7 Speech verbs & conditional markup modification (#18980) 2023-08-15 13:03:05 -07:00
PJBot
5742c4ee11 Automatic changelog update 2023-08-15 10:09:10 -04:00
deltanedas
0f310951b7 remove id computer board objective (#19171)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-15 07:07:56 -07:00
deltanedas
7fda79b475 real cap gun on core (#19172)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-15 05:01:56 -06:00
Emisse
a1e0b5b3c7 packed update (#19166) 2023-08-15 00:59:06 -06:00
Emisse
b8d8045605 omega update (#19164) 2023-08-15 00:58:56 -06:00
Emisse
18636144cd meta update (#19163) 2023-08-15 00:58:46 -06:00
Emisse
16d0c9fd5e marathon update (#19162) 2023-08-15 00:58:40 -06:00
Emisse
62b08dbe35 fland update (#19160) 2023-08-15 00:58:34 -06:00
PJBot
5d4338fba6 Automatic changelog update 2023-08-15 01:12:02 -04:00
PJBot
7e196c5c95 Automatic changelog update 2023-08-15 01:08:58 -04:00
Kara
cfccb5959a Lavaland chasms (#19154) 2023-08-15 12:29:24 +10:00
PJBot
b33aad7a01 Automatic changelog update 2023-08-14 20:27:03 -04:00
Nemanja
66ad1ff8fa Realign plunger hat (#19147) 2023-08-14 18:26:09 -06:00
PJBot
76b0e7f1c8 Automatic changelog update 2023-08-14 20:24:45 -04: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
PJBot
76688c691c Automatic changelog update 2023-08-14 19:41:52 -04:00
mhamster
4470608c64 Add plastic sheets chemical recipe (#18865)
* Plasticchemistry

+ Added new way of getting ash: burn oil at 480k and you will get some (1u oil = 1u ash)
+ Added new way of getting plastic: mix together 5 parts oil, 3 parts ash and 2 parts SulfuricAcid to get plastic (10u of mixture = 1 plastic sheet)

* Remove ash recipe

Removed ash recipe because of it's silliness (and because there should be other way of making it)
(https://github.com/space-wizards/space-station-14/pull/18865#issuecomment-1669191528 and https://github.com/space-wizards/space-station-14/pull/18865#issuecomment-1669187894)
2023-08-14 19:40:48 -04:00
PJBot
b17c107840 Automatic changelog update 2023-08-14 19:35:28 -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
PJBot
1b2f8868fd Automatic changelog update 2023-08-14 18:58:37 -04:00
Artur
10e2e74d27 Ritual chair no longer deletes people when disassembled (#19145) 2023-08-14 15:57:32 -07:00
PJBot
6e6189546c Automatic changelog update 2023-08-14 18:26:10 -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
Emisse
2d9808737d box update (#19144)
* box update

* why does invalid machine link bug still exist
2023-08-14 16:22:28 -06:00
PJBot
088d48949a Automatic changelog update 2023-08-14 17:06:51 -04:00
PJBot
5262ecc606 Automatic changelog update 2023-08-14 17:04:57 -04:00