Commit Graph

7569 Commits

Author SHA1 Message Date
Ed
6307c1b1b5 add walls 2024-04-24 11:28:25 +03:00
Ed
8ba56847bb add crossBOLT 2024-04-22 22:01:47 +03:00
Ed
39f64dea73 added light crossbow 2024-04-22 21:46:11 +03:00
Ed
43384c1125 weapon rebalance + weapons equipping on move 2024-04-22 20:36:54 +03:00
Ed
1210e1da86 Revert "return maps prototypes"
This reverts commit 894c10c409.
2024-04-22 20:05:14 +03:00
Ed
6185ddc64c Revert "fix"
This reverts commit 132cc73fb7.
2024-04-22 20:05:01 +03:00
Ed
132cc73fb7 fix 2024-04-22 18:32:26 +03:00
Ed
894c10c409 return maps prototypes 2024-04-22 18:09:21 +03:00
Ed
f947f97878 remove oasis 2024-04-21 21:08:56 +03:00
Ed
a899122d1b Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Recipes/Lathes/electronics.yml
#	Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png
2024-04-21 20:54:50 +03:00
Ed
4609079680 balance tweaks 2024-04-21 19:45:00 +03:00
Hannah Giovanna Dawson
f059714a75 SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)
* SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers

Bit of a grab-bag of cleanup of Xenoarchaeology prompted by #26480.

1. Traversal distortion biases are now "up" and "down" instead of "in" and "out".
2. Node generation has been tidied up to make it a little clearer how it works.
3. Traversal Distorters have been removed from the game along with their board.
4. Traversal distortion is now done by the artifact analyzers by default.
5. Some loc strings have been made clearer.
6. The Abnormal Artifact Manipulation tech has been made slightly cheaper.
7. The aformentioned tech is now localized as Artifact Recycling, given all it does is unlock the crusher.
8. The Xenoarchaeology guidebook entry has been given a bit of a rewrite, putting all information into
one page and making sure to cover the basics that otherwise would require someone typing "Liltenhead
artifact tutorial" into Youtube.

* Fix references to deleted guidebook entry

* Add fancy button to console because @EmoGarbage404 asked me to

* migration comprete

* Fixed a goober comment

* maint fails to resolve conflicts: more at 11

* Resolve PR comments

* Make UI nice

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-04-21 12:09:26 -04:00
K-Dynamic
e009a80a8c Removed CC and recall reference in pallet descriptions (#27209)
cleaned pallet descriptions
2024-04-21 11:21:36 -04:00
Ed
b092f190f6 cp14 2024-04-21 17:55:18 +03:00
Ed
b701804836 Merge branch '21-04-2024-deathmatch-gamemode' of https://github.com/crystallpunk-14/crystall-punk-14 into 21-04-2024-deathmatch-gamemode 2024-04-21 17:33:13 +03:00
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
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
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
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
fb96392077 add torch crafting 2024-04-21 13:52:22 +03: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
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
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
Mr. 27
663542b82e belts get their equip sound (#27174)
done
2024-04-20 15:52:02 -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
Ed
f271c8cff0 add aristocratic set 2024-04-20 15:59:15 +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
Ed
4763bffeac locale update 2 2024-04-20 14:16:11 +03:00
Ed
d74a33d46b locale update 2024-04-20 14:10:10 +03:00
Ed
c70b267bbb barrel update 2024-04-20 14:03:06 +03:00
Ed
c3f7ad2fae fix character preview 2024-04-20 13:26:41 +03:00
Ed
5e498f68a6 fixes 2 2024-04-20 13:01:45 +03:00
Ed
af734dc5c2 fixes 2024-04-20 12:45:25 +03:00
Ed
bb24ead3b9 Update barrel.yml 2024-04-20 12:28:33 +03:00
Ed
ca01030da1 Fucking big refactor 2024-04-20 11:51:04 +03:00
MilenVolf
2da53d97e5 Windoors now contain proper electronics (#27133)
* Windoors now contain proper electronics

* weh
2024-04-20 16:26:00 +10:00
MilenVolf
812abd33a0 Fix crates masks (#27137)
Fixes crates masks not allowing them to go under plastic flaps + crates no longer can go trough windoors.
2024-04-20 16:23:20 +10:00
Verm
58e21a8532 Add medical gloves and sterile masks to medical loadouts (#27029)
* Add medical gloves to loadouts

* Realize I don't need to duplicate them

* Re-add extra lines

* I did it wrong...

* Format it back to how it was this time for sure

* For real this time

* ...

* Add sterile masks too

* I can't spell officer apparently

* Standardize order of where gloves are

* Add Nurse Hat to doctors

* Remove duplication of gloves and masks

* Remove extra space

* Name glove protos similiar to other ones

* Remove latex gloves proto from medical (sci has it)
2024-04-20 16:22:48 +10:00
SoulFN
95c66b4f96 Glass shards damage (#26783)
* Update shards.yml

Changed glass shards damage depends on their type, each tier of glass gains 1 more damage, also changed attack rate to 1, because you cant fast swing with weapon that can hurt you

* Oops

Forgot about base shard

* Update shards.yml

Cleanup

* Update shards.yml

Changed damage on step (Attack damage + 1)
2024-04-20 16:21:12 +10:00
Verm
089c9cb967 You can bless more containers with a bible (#26526)
* Made more things blessable

* Removed junk

* Remove whatever that was

* Make bowls blessable

* New mixablesolution component, converted everything to work with it

* Fix minor mishaps

* Fix extra spaces in bottle yml

* Fix last extra space, fix bottle havign the wrong solution name

* Remvoe unneeded event(I think), fix alcohol bottles not being mixable

* I missed cans
2024-04-20 16:16:55 +10:00
Nim
3f2e15896b Floor trap (#26314)
* trap

* without effect
2024-04-20 16:09:00 +10:00