juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,693 Commits 57 Branches 0 Tags
14d96e0716378f5dc3d72545fd2b7c25bfc2d60e
Commit Graph

19893 Commits

Author SHA1 Message Date
Spessmann
14d96e0716 Convex fixes (#34934) 
fixed
 2025-02-06 18:31:06 -07:00
PJBot
c5d1aba8f0 Automatic changelog update 2025-02-06 23:08:33 +00:00
themias
ed01ad772d Buff the Combat Bakery Kit uplink item (#34927) 
* Buff the Combat Bakery Kit uplink item

* whitespace
 2025-02-06 15:07:26 -08:00
PJBot
727935c0f7 Automatic changelog update 2025-02-06 19:18:04 +00:00
GrownSamoyedDog
8ff90a6d20 Guide Control Button Now Redirects Properly (#34914) 
fixed control button - a single line of code
 2025-02-06 11:16:57 -08:00
PJBot
d204480be3 Automatic changelog update 2025-02-06 19:11:06 +00:00
lzk
64ebcb5277 cleanup not needed locale string (#34922) 
* cleanup not needed locale string

* Update Resources/Prototypes/Actions/types.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-06 10:42:57 -08:00
PJBot
6c7170e482 Automatic changelog update 2025-02-06 13:46:20 +00:00
PJBot
5020cfac5c Automatic changelog update 2025-02-06 11:46:42 +00:00
SG6732
16aad5a168 Swapped butter w/ olive oil for making spaghetti (#34904) 
* > Swapped the butter in boiled spaghetti with olive oil

* Update meal_recipes.yml

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
 2025-02-06 12:45:33 +01:00
Emisse
4cc5b5bec1 bagel fix hos locker (#34919) 
bagel update
 2025-02-06 01:38:08 -07:00
PJBot
6d2e0f57c1 Automatic changelog update 2025-02-06 05:50:48 +00:00
centcomofficer24
a0fe21ac2f Added Genderqueer pin! (Properly this time.) (#34561) 
* Added Genderqueer pin! (Properly this time.)

* Update meta.json
 2025-02-05 21:49:41 -08:00
PJBot
43da2cc31f Automatic changelog update 2025-02-06 05:11:29 +00:00
Vasilis The Pikachu
36e42fb4b2 Merge branch 'master' of ssh://github.com/space-wizards/space-station-14 into staging 2025-02-06 01:11:50 +01:00
PJBot
3a3268bad3 Automatic changelog update 2025-02-05 23:13:15 +00:00
keronshb
f964908756 Sec Balance Part 1: Buffs Disabler and Disabler SMG (#34890) 
* Increases Disabler Bolt to 47 stamina damage per. Increases fire rate to 3 and lowers shot cost by 50 for practice and disabler

* lowers stam per shot to 40

* increases disabler proj speed to 35

* ACTUALLY 4 shot

* Reverts disabler projectile to be 33 stamina damage per again. decreased disabler fire rate to 2.5 and increased projectile speed to 35. decrease disabler smg fire rate to 3.5

* Fire rate back down to 2
 2025-02-06 00:12:07 +01:00
PJBot
efa067c126 Automatic changelog update 2025-02-05 16:50:11 +00:00
Farrellka
d0bdbc875e Elf Ears (#33572) 
* Elf Supremacy

* Delete old ears

* Review Fix
 2025-02-05 08:49:04 -08:00
PJBot
1e7b4140a4 Automatic changelog update 2025-02-05 14:55:52 +00:00
hyperDelegate
54d5ef93ad Reduce NukeOps Reinforcement price from 35TC to 30TC (#34675) 
* Reduce NukeOps Reinforcement to 25TC from 35TC

* price adjustment to 30

* Revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.

* revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.
submodule?! YAML preserve me...

* Revert "price adjustment to 30"

This reverts commit f337f5a178a344db34a414a47283f43242ea531f.
submodule!?!? yaml save me

* attempt #2 at changing to 30
 2025-02-05 15:54:45 +01:00
PJBot
4964aae503 Automatic changelog update 2025-02-05 14:47:28 +00:00
Booblesnoot42
ded6b46b80 Remove instant cryobed insertion (#34619) 
* added optional delay to DragInsertContainerComponent

* comments

* Change EntryDelay on DragInsertContainerComponent to use TimeSpan + cleanup

* changed drag insert container comp to match naming conventions
 2025-02-05 15:46:21 +01:00
PJBot
214fb2422f Automatic changelog update 2025-02-05 13:09:59 +00:00
Gavin TC
13be8de848 Changed utensil sprites to appear smaller. (#34277) 
* Changed utensil sprites to appear smaller.

* Added self to author section

* Added my name and update to copyright section

* Adjusted plastic spoon sprite

* Adjusted spoon sprite
 2025-02-05 14:08:53 +01:00
K-Dynamic
e9c0338884 Remove Vector assets and renames Vector SMG magazines (#34603) 
* remove vector and assets

* reverts vector magazine removal; vector magazines renamed to SMG magazine (.45 magnum)

* remove vector from suspicion loot table

* vector migration set to null
 2025-02-05 13:39:26 +01:00
PJBot
16b91ce2ec Automatic changelog update 2025-02-05 08:43:33 +00:00
DuckManZach
2cea673610 Expand variety of strange pills (#34843) 
* Added da pills

* Revert "Added da pills"

This reverts commit 3d6b8fce3386107ac4c46543252fc31764a0c1c7.

* Updated to use existing weights, added larger chem variety

* Reweighed charcoal

* Rebalance of certain quantities

* Removed grey matter, weight balancing changes

* corrected comment

* adjusted balance for lead
 2025-02-05 00:42:27 -08:00
PJBot
a725de1477 Automatic changelog update 2025-02-05 03:24:37 +00:00
github-actions[bot]
f52116ba3b Update Credits (#34815) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-02-05 01:58:38 +01:00
PJBot
5b41728863 Automatic changelog update 2025-02-04 23:27:12 +00:00
Winkarst
265de76c9a Add clientside personal pointlight for observers (#33607) 
* Observer personal pointlight

* Bigger light

* combine actions

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-05 00:26:06 +01:00
PJBot
7478af2d2a Automatic changelog update 2025-02-04 22:59:38 +00:00
Spessmann
26d9f222c4 Adds randomized maintenance rooms to convex station (#34866) 
added maints
 2025-02-04 15:58:30 -07:00
ToxicSonicFan04
8482767109 Omega Armory Restock (#34810) 2025-02-04 15:57:47 -07:00
Dinner
d9d451d3d8 Fix Oasis evac timer (#34849) 
fix oasis evac timer
 2025-02-04 15:57:13 -07:00
compilatron
26cff2c980 Plasma evac shuttle timer fix (#34847) 
Update emergency_plasma.yml

Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com>
 2025-02-04 15:56:57 -07:00
Menshin
5af55bbf2b Dehardcoded Space Heaters UI window title (#34884) 2025-02-04 23:56:42 +01:00
SlamBamActionman
e58d031300 Hristov & .60 changes - Hristov Rework, Part 2 (#31662) 
* Initial commit

* Updated values to reflect new resistances

* Review fixes

* Review fixes

* LINQ BEGONETH
 2025-02-04 22:55:09 +01:00
PJBot
b5125f040c Automatic changelog update 2025-02-04 21:47:58 +00:00
slarticodefast
8035455022 Add binoculars (#34687) 
* add binoculars

* tabs evil

* give one to warden

* buff
 2025-02-04 22:46:49 +01:00
ActiveMammmoth
6a017ef17b Mind Swap Fix (#33553) 
* Stores owned by mind instead of body

* Requested changes, traitor uplink fixed

* Store, listings fixed and now use Entity<MindComponent>

* Removed duplicate code

* test change

* test change 2

* back to mind entityuid

* MilonPL requested minor changes

* ScarKy0 requested changes
 2025-02-04 17:25:54 +01:00
PJBot
1d5b01190d Automatic changelog update 2025-02-04 16:12:55 +00:00
pubbi
a71a79d785 Fixed bola effect stacking (#34723) 2025-02-04 11:11:46 -05:00
PJBot
d531a9db9c Automatic changelog update 2025-02-04 07:53:17 +00:00
Ps3Moira
b2a6d5c1b0 Cabinetification (#34293) 
* Resprite Boxes and Icons + Remove Boxes

* Update Meta

* Update Flatpacks

* Update Shotgun Ammo Boxes

* Remove Leftover Ammo Box Icons

* Update Donk Pocket Boxes

* Update Briefcase

* Update Happyhonk + Remove Open Sprites

* Update Medal Case

* Update Cigarette Packs

* Update Cigarette Cartons

* Update Medkits

* fix positioning for medkits

* Update Junk Medkit

* Update Present

* Tweak Rad and Burn Medkits

* Tweak Briefcase

* Update Toolboxes

* Update Decoy Boxes

* Fix Meta for Healing toolbox

* Update Cow tool box

* Update Donut Box

* Removal of left over rubber bullet sprites and duplicate ammo box sprites

* Removal of Duplicate Ammo Boxes

* Update .20 rifle ammo box

* Update .35 ammo box + fix meta

* Update .45 magnum ammo box Sprites

* Update .25 caseless ammo

* Remove leftover box

* Update cargo_service.yml

* Fix Icon Cigs

* fix big .20 ammo box

* Update Black Cigs Pack

* Update Cig Placement

* Update Blue Cigs

* Update Cig Packs

* Re-Add Big Ammo box for the USA guns vending machine lol

* Remove 10x24 mention in migration.yml

* Update Big Cig Cartons

* Remove Toolbox Changes
 2025-02-04 00:52:10 -07:00
PJBot
df56b67ba8 Automatic changelog update 2025-02-03 23:34:21 +00:00
Smith
2ffe539ba2 contrabandInventory Changes (Fixed) (#32934) 
* Reimport of .yml files, edit to medidrobe.yml

* Fixed typo for "Richard" in AutoDrobe contrabandInventory

* contrabandInventory Revision

* Add a spare bible to PietyVend (#32363)

Update chapel.yml

* Bible to normal inventory, not contraband

* Balance changes based on maintainer feedback.

* VendoMat change to Proximity Sensor and Borg Arm.

* Revert "VendoMat change to Proximity Sensor and Borg Arm."

This reverts commit 44c68daaaedeea26f9376db7f65d1e01771a761e.

* PR Rebase, Fixing Reversion

* seeds.yml Bungo Seeds swapped for Tobacco Seeds.

---------

Co-authored-by: Jarmer123 <148848017+Jarmer123@users.noreply.github.com>
 2025-02-03 15:33:14 -08:00
UpAndLeaves
a4599f6d60 fixed effect string typos (#34858) 
fixed typos
 2025-02-03 22:29:43 +01:00
PJBot
4476b1e64b Automatic changelog update 2025-02-03 21:23:30 +00:00