Commit Graph

31842 Commits

Author SHA1 Message Date
Nim
b2095a01cc Trade orders (#1037)
* orders

* sprite

* fix orders

* different

* layers

* scrolls

* flora

* loot

* groups

* entity-group

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-03-24 17:15:44 +03:00
creamybag
b5a2508ebc Maid Update (#1064)
* MaidUpdate

* fix
2025-03-24 17:15:29 +03:00
Nim
44b775b308 Request editing (#1063)
* request editing

* skeleton

* no bank

* job
2025-03-24 17:07:48 +03:00
Ed
2dbc3e7a4d Back to Ru CBT + Bugfixes (#1065)
* Update Dev.toml

* fix #1059

* fix #1061

* fix #1060

* fix #1058
2025-03-24 17:06:09 +03:00
Vortebo
4530749f1d lol im dum 2025-03-23 20:05:55 -05:00
Tayrtahn
7c9e344cd2 Fix changelog entries with brackets crashing the client (#36033) 2025-03-24 00:46:34 +01:00
Vortebo
3e36b2c1f7 more touchups 2025-03-23 18:19:14 -05:00
Vortebo
4f1b8ea65d small touchups 2025-03-23 17:53:04 -05:00
Vortebo
b566eef796 pickup truck and beds 2025-03-23 16:56:30 -05:00
Killerqu00
fbf0679650 Fix admin changelog hard-crash (#36029)
fix changelog
2025-03-23 21:37:58 +01:00
Deserty0
b325a80a61 Фикс гайдбука (#1057)
* Update Alchemy.xml

* Звучит фигово

* Update Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/Alchemy.xml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-03-23 22:32:31 +03:00
ScarKy0
c8f5b480cb Package loot tables part 2: Engineering (#36026)
* MAIL!!!!

* changes
2025-03-23 19:46:58 +01:00
Vortebo
35a619b1d5 aaaa the atmosphere the atmosphere 2025-03-23 13:10:11 -05:00
Myra
f4c5253f9c Increase IPIntel bad rating score & Enable warnings (#36021)
Admin requested change
2025-03-23 17:42:00 +01:00
Ed
4083b79217 Update Dev.toml 2025-03-23 17:07:21 +03:00
ScarKy0
9e1a150829 Package loot tables part 1: Medical (#35895)
* :3

* oops

* moved file, comments
2025-03-23 14:53:02 +01:00
ArZarLordOfMango
28d30571ca locale-fix (#1055) 2025-03-23 16:28:54 +03:00
Myra
57e3f0494e Upgrade GitHub actions in Workfows to node20 (#33668) 2025-03-23 13:54:56 +01:00
Ed
8656a7e1f0 Update floorLava.yml 2025-03-23 15:45:41 +03:00
ScarKy0
1859975ae6 Chemistry bottle cleanup (#35911)
* init

* clean

* god save me

* fuck relic

* i HATE HATE  HATE relic

* make it stop

* please make it stop

* CEASE

* PLEASE

* Revert "PLEASE"

This reverts commit 47d34f3c1e657adf869d84a5349f9c18fc33bfea.

* Revert "CEASE"

This reverts commit 147ab6697807b98e24b0e1ee05571a1995f3c41c.

* Revert "please make it stop"

This reverts commit f2a4f63e5f5b017f2b4ad3511e8c77700abed58b.

* Revert "make it stop"

This reverts commit b10c6344bd9e9e3f1989b29fc46a8de7829e382e.

* Revert "i HATE HATE  HATE relic"

This reverts commit a05d60c0055fa003f7746be7aec2ebf4acd6e136.

* Revert "fuck relic"

This reverts commit e44f3368bc8aa5938095dc5a60e9390fbaf8aba3.
2025-03-23 13:24:55 +01:00
Ed
29278ca98b localization (#1054) 2025-03-23 15:00:18 +03:00
Viator-MV
9c5662d7f5 Skeleton upgrade (#1053)
* skeleton upgrade

* armor upgradde

* skelute

* true, not real

* fix
2025-03-23 14:27:14 +03:00
Ed
eaf9c009c1 Slimes mob (#1049)
* import sprites

* pipia

* 3 slime types

* Delete generic_magic_effects.yml

* Update scrolls.yml

* demiplane integration

* Update fire.yml

* Update crystals.yml

* local

* Update fire.yml

* fix AI stuck

* Update base.yml

* loot

* Update mobs.yml
2025-03-23 14:14:08 +03:00
ArZarLordOfMango
5512e1a665 barrel (#1052) 2025-03-23 13:32:03 +03:00
Tayrtahn
d4c8ddb0ac Fix migrations not being applied to PostMapInitTest (#35933)
* Fix migrations not being applied to PostMapInitTest

* formatting

* Raise the event outside the loop so it only happens once
2025-03-23 21:07:01 +11:00
Emisse
c42d0913cb Fix bagel engineering power (#36018) 2025-03-23 02:26:14 -06:00
ArtisticRoomba
3f2befca9e fix bagel power 2025-03-23 01:04:49 -07:00
github-actions[bot]
dac6c53aa1 Update Credits (#36015)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2025-03-23 01:42:14 +01:00
PJBot
b5f142b568 Automatic changelog update 2025-03-23 00:22:38 +00:00
RedBookcase
64faddf77a Fixed some unintended salvage changes. (#36013)
* Fixed some unintended salvage changes.

* Update Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-03-23 01:21:29 +01:00
Vortebo
7773b77a91 grilles 2025-03-22 18:31:42 -05:00
Vortebo
f2562aad06 mail teleporter 2025-03-22 17:48:55 -05:00
Vortebo
113e335ca8 Merge remote-tracking branch 'upstream/master' into relic-improvements
need to merge
2025-03-22 15:08:21 -05:00
ArZarLordOfMango
42e3f7ce97 bone mask fix (#1050) 2025-03-22 22:52:03 +03:00
github-actions[bot]
8da5776a4e @ArZarLordOfMango has signed the CLA in crystallpunk-14/crystall-punk-14#1050 2025-03-22 19:42:23 +00:00
Vortebo
923f147d9d working, authentic emergency shuttle (no gamekit) 2025-03-22 12:16:57 -05:00
PJBot
17424e2eb6 Automatic changelog update 2025-03-22 14:43:27 +00:00
Boaz1111
559d22c86c unrevivable lets you be cloned again (#36008)
weh
2025-03-22 15:42:20 +01:00
PJBot
38f3238b1d Automatic changelog update 2025-03-22 11:42:23 +00:00
metalgearsloth
a9a6b98f99 Fix alerts mispredict + log spam (#36004)
tstalker alerted me to it and noticed the classic case of shallow copies.
2025-03-22 12:41:16 +01:00
YoungThug
c2963d47a0 Prisoner Jumpsuit Description (#36005)
* PrisonerJumpsuitFix

* Update jumpskirts.yml
2025-03-22 00:39:33 -07:00
SlamBamActionman
71ae9257f7 Remove serverside StandingStateSystem (#35999)
Refactor system
2025-03-22 16:00:21 +11:00
Killerqu00
dacf0d915c Hover examine buttons (#35206)
* hover examine verbs (not aligned to the left yet)

* handle click hovers and align them to the left

* revert contrabandsystem changes (this is for another PR)

* add support for markup tags
2025-03-22 13:22:01 +11:00
PJBot
4027115e0c Automatic changelog update 2025-03-21 23:22:40 +00:00
SlamBamActionman
6856440084 Add antag notice to admin chat alerts (#35994)
Add antag notice to admin chat pop-ups
2025-03-22 00:21:32 +01:00
Vortebo
3f62dfe0b5 technically playable 2025-03-21 17:14:38 -05:00
Viator-MV
dd6d3f8bc7 Factoria upd (#1044)
* Update factoria.yml

* fact_dung

* Update Factoria.yml

* planetarize factoria

* Update factoria.yml

* Update factoria.yml

* Update factoria_d.yml

* meh

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-03-21 22:20:12 +03:00
Vortebo
3d873c6600 the ultimate lifeform, lightswitches 2025-03-21 08:55:40 -05:00
Ed
52e6e9b28f Carcat night vision (#1046)
* carcat night vision

* Update nightVision.yml
2025-03-21 16:53:59 +03:00
YoungThug
1b26a98d7f Arachnid Jensen Googles Fix. (#35987)
pleasespeedmerge
2025-03-21 13:00:23 +01:00