Commit Graph

24720 Commits

Author SHA1 Message Date
Ed
b0a11462d6 cave wall sprite fix 2024-04-24 11:39:05 +03:00
Ed
6307c1b1b5 add walls 2024-04-24 11:28:25 +03:00
Ed
e888747d0c Merge pull request #107 from crystallpunk-14/ed-22-04-2024-weapon-update
Weapon update
2024-04-22 23:55:52 +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
08960fb197 Merge pull request #106 from crystallpunk-14/21-04-2024-cleaning-up
Upstream Sync
2024-04-22 20:22:28 +03:00
Ed
23df20c0fe Update EvacShuttleTest.cs 2024-04-22 20:10:01 +03:00
Ed
1210e1da86 Revert "return maps prototypes"
This reverts commit 894c10c409.
2024-04-22 20:05:14 +03:00
Ed
f94997fe5f Revert "Update PostMapInitTest.cs"
This reverts commit 32bf32d2dc.
2024-04-22 20:05:05 +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
32bf32d2dc Update PostMapInitTest.cs 2024-04-22 18:12:21 +03:00
Ed
894c10c409 return maps prototypes 2024-04-22 18:09:21 +03:00
Ed
f972f3129d update debug walls 2024-04-22 13:37:44 +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
71fae31507 Merge pull request #104 from crystallpunk-14/21-04-2024-deathmatch-gamemode
Deathmatch gamemode
2024-04-21 20:16:34 +03:00
Ed
4609079680 balance tweaks 2024-04-21 19:45:00 +03:00
PJBot
541e87395a Automatic changelog update 2024-04-21 16:10:32 +00: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
Ed
faff0d203a Update cave-arena.yml 2024-04-21 18:31:56 +03:00
Ed
0ca5d5110d Update cave-arena.yml 2024-04-21 18:28:32 +03: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
2c0df7fc72 Update PostMapInitTest.cs 2024-04-21 18:07:55 +03:00
Tayrtahn
50631f430d Add clothing equipped/unequipped events (#27155)
* Added ClothingGotEquipped/ClothingGotUnequipped events

* Better version

* Implemented in a few places

* More implementations

* Add ClothingDidEquipped/ClothingDidUnequipped events
2024-04-21 11:00:50 -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
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