Commit Graph

29142 Commits

Author SHA1 Message Date
Ed
49b39e9535 fixes 2024-04-21 17:32:52 +03:00
Ed
59dc76b423 Merge branch 'master' into 21-04-2024-deathmatch-gamemode 2024-04-21 17:19:26 +03:00
Ed
ba03750394 add map and gamerule 2024-04-21 17:14:03 +03:00
Pieter-Jan Briers
84c3d225ca Buff welding supplies closet (#27212)
In SS13 this closet gives you THREE welding masks and THREE welders. Over here, sometimes it only contained a single mini welding tool.
2024-04-21 09:40:00 -04:00
Ed
cf96612a81 Merge pull request #103 from crystallpunk-14/21-04-2024-species-naming
add species name generation
2024-04-21 16:28:04 +03:00
PJBot
7c07391998 Automatic changelog update 2024-04-21 13:17:29 +00:00
Pieter-Jan Briers
58f025ba80 THE RETURN OF ITEM STATUS (#22986)
* THE RETURN OF ITEM STATUS

Item status is now inline with the hands again. You can now see item status for both hands at once.

If you have more than 2 hands, the last active hand of that side is displayed in the respective item status.

The item status for the active hand is also highlighted.

Item status has been given a new look so it looks unique and matches every UI theme.

* Shrink item status to 125px

This is going to require fixing the existing controls. Do that later.

* New bullet item status rendering

sex

* Make gun item status look just a little bit nicer.

Avoid only one or two bullets ending up on a single row of an item status.

* Delete Eris theme files

* More improvements

Fixed the fact that left/right were flipped around when assigning status panel locations. Involved renaming all the UI textures.

Redid how content margins are set from the theme. Less complex and cleaner now.

Made the item name always left-aligned, just looks better since other UI elements don't adapt anyways.

* Compact down item status text

Now it fits 3 lines of text on one line. Yay.

This is achieved by compacting RichTextLabels by reducing their line height and giving them a negative bottom margin.

* Add item status sprites for Ashen theme.

* Add status control to show beaker/bucket/jug solution/transfer volumes

Also PollingItemStatusControl I'll be using that more.

* Fix welder item status, clean up welder code

The item status control implementation was ancient and bad. That's why it was buggy.

Removed all the complex dated networking stuff for welders, we just sync the solution contents now anyways so none of that is needed anymore. This moves a buncha stuff to shared and just removes code.

Cleanup. The code was doing some really dumb stuff.

* Spray bottles show contents in item status.

* cowtools

* Fix plasmafire and clockwork themes.

Actual git gaslighting wtf.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-21 23:16:23 +10:00
Ed
c156d09081 add comment 2024-04-21 15:46:46 +03:00
Ed
8f135d9745 localize human names 2024-04-21 15:43:26 +03:00
Ed
d342db3d65 Merge branch 'master' into 21-04-2024-species-naming 2024-04-21 15:26:41 +03:00
Ed
b2226cbe16 localized tiefling name 2024-04-21 15:25:22 +03:00
PJBot
ee4ef4b96a Automatic changelog update 2024-04-21 11:54:14 +00:00
Alzore
fb8dcfe6bf Add rainbow jumpsuit to passenger loadout. (#27211)
* Add all colored jumpsuits to passenger loadout

* onlyrainbowiguess
2024-04-21 21:53:08 +10:00
Ed
d29afc0f4c add species name generation 2024-04-21 14:42:12 +03:00
Ed
caf5ca3dc8 Merge pull request #102 from crystallpunk-14/20-04-2024-clothing-pack
Torch + aristocratic clothing set
2024-04-21 14:42:01 +03:00
Ed
fb96392077 add torch crafting 2024-04-21 13:52:22 +03:00
Júlio César Ueti
362033a0c7 Fix ghost prayer interaction (#27199)
fix ghost prayer interaction

Co-authored-by: Júlio César <j.cesarueti@yahoo.com>
2024-04-21 19:01:00 +10:00
Leon Friedrich
8b2179d0ae Update engine to v219.1.2 (#27206) 2024-04-21 19:00:23 +10:00
PJBot
9fa08fe8c2 Automatic changelog update 2024-04-21 06:53:50 +00:00
Leon Friedrich
29302ae6cd Update engine to v219.1.1 (#27201) 2024-04-21 16:52:45 +10:00
PJBot
0526384d16 Automatic changelog update 2024-04-21 06:20:27 +00:00
SpeltIncorrectyl
b6d751eb70 Adds security webbing and security belts to Security Officer loadout (#27189)
* added filled security webbing

* moved sec belt to loadout

* added webbing for head of security and warden
2024-04-21 00:19:20 -06:00
KittenColony
b48d0ddefc Two-Tone lizard snouts (#27143)
snouts
2024-04-21 00:18:33 -06:00
PJBot
2b3076832f Automatic changelog update 2024-04-21 06:00:19 +00:00
IProduceWidgets
7b0b894e44 Add map Oasis (#25736)
* Add map Oasis

* integration test fix

* psych job

* 1984 an invalid component

* address reviews

* address reviews, touch ups.

* tiny feexes

* move a tree

* Actually put it in the active maps pool.

* minor tweeks

* tweek some door accesses.

* add extra lawyer, make evac the right docking arrangement.

* Address the small things, fix cryopods, make perma huge.

* Fix some small things in the new perma.

* Improve perma spacing resiliancy... maybe.

* burn the invalids

* Pray to the Sloth gods that painters arent cooked.

* rearrange some buttons

* fix fax names and add a genedrobe.

* Housekeeping

* fix some stuff I thought I already fixed

* wood benches

* Some under door tiles, a couple missing decals.

* one pipe got brokey. feexit!

* astrograsses and lathe to cargo

* N2 lockers, minor things.

* cap laser to case

* GridFill the briggle so it feels better. Some other minor things

* name the Briggle correctly
2024-04-20 23:59:12 -06:00
Ubaser
01ce407019 Update Core (#27195)
* add

* fix invalid
2024-04-20 23:58:23 -06:00
github-actions[bot]
d2fb5130c9 Update Credits (#27192)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-04-21 04:13:08 +02:00
Leon Friedrich
c4f050259d Try fix random shuttle test failures (#27186) 2024-04-21 08:03:55 +10:00
Tayrtahn
5d80e49d37 Make material arbitrage test ignore price of contained entities (#27182)
Material arbitrage test now ignores price of contained entities
2024-04-21 08:03:11 +10:00
Tayrtahn
f253067a69 Possible fix for evac shuttle test failures (#27175)
It couldn't be this easy, could it?
2024-04-21 07:55:43 +10:00
Ghagliiarghii
380ace4ef0 Fixed potential duplicate engraved lighter steal objective (#27177)
* Fixed potential duplicate engraved lighter steal objective

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Implement pigeonpeas' suggestion

* Also replaced the one if the vending machine, unsure if this vending machine is used or if vended items retain their fills, but figure can't hurt

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-04-21 07:32:24 +10:00
Tayrtahn
1fb7393a1b Make material arbitrage test more verbose (#27180)
List entities spawned by destruction for debugging
2024-04-21 07:23:09 +10:00
Leon Friedrich
3bfd5d2c4e Un-revert #26994 (#27184) 2024-04-21 09:18:09 +12:00
ElectroJr
3a8249e5fd Un-revert #26994 2024-04-20 17:01:15 -04:00
Leon Friedrich
5982007d0e Updatte engine to v219.1.0 (#27183) 2024-04-21 08:54:59 +12:00
ElectroJr
bd63a3f9c1 Updatte engine to v219.1.0 2024-04-20 16:54:04 -04:00
Mr. 27
663542b82e belts get their equip sound (#27174)
done
2024-04-20 15:52:02 -04:00
Plykiya
6ad039d0f9 Fix for inventory and belt not opening (#27179)
Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-20 20:24:52 +02:00
PJBot
ac7842cacd Automatic changelog update 2024-04-20 16:19:32 +00:00
nikthechampiongr
f96f92f54f Make banpanel defaults use cvars (#27168)
* Make banpanel respect CCVars. Add CCVars for default ip/hwid/use last
details checkboxes.

* Move severity handling for server/role ban to another function

* Save sawmill

* Line goofyness

---------

Co-authored-by: Vasilis <vasilis@pikachu.systems>
2024-04-20 18:18:26 +02:00
Ed
c266046cbd nuke it 2024-04-20 18:02:09 +03:00
PJBot
af939af47c Automatic changelog update 2024-04-20 14:45:16 +00:00
Whisper
c7bbaa48a4 fix burning to ash not working on all mobs (#27158) 2024-04-20 10:44:10 -04:00
K-Dynamic
b6781946df Corrected misleading protections in jumpsuit/skirt descriptions (#27160)
removed misleading protections
2024-04-20 10:08:21 -04:00
Ed
966a54fbc6 add torch 2024-04-20 16:54:03 +03:00
deltanedas
9482144a19 disable rehydration prediction (#27166)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-20 09:51:56 -04:00
Ed
f271c8cff0 add aristocratic set 2024-04-20 15:59:15 +03:00
Ed
0b587e9fb9 Merge pull request #101 from crystallpunk-14/20-04-2024-nospawn-global
barrel + CP14 prefix
2024-04-20 15:03:38 +03:00
Ed
bbbf7172a9 fixes 2024-04-20 14:54:01 +03:00
Ed
6db92d86b5 Update walls.yml 2024-04-20 14:43:27 +03:00