juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,122 Commits 57 Branches 0 Tags
864956c66b671cbfe3a5bbae346d2b5a07b70a2b
Commit Graph

27122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Goldminermac
864956c66b Pancakes Fix (#31123) 
* Edited blueberry pancake textures to seem more blueberry-stained

* Added new blueberry pancake sprites to allow stacking up to 9

* Added more sprites for chocolate pancakes so they can stack up to 9

* Fixed up the blueberry pancake sprites to be more consistent

* Updated the stack components of blueberry and chocolate pancakes in the yml prototype file.

* Updates the stack size in the consumable stacks yaml file.

* Added the new pancake sprites to the sprite meta json file.

* Removed an unnecessary space from the baked food YAML file

* Updated branch and fully resolved merge conflict

* Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive

* Diversified the textures some more for good measure.

* Fixed some missing rims around the pancakes because I'm bored
 2024-08-18 20:42:58 -06:00
PJBot
0754a0fdaf Automatic changelog update 2024-08-19 02:42:33 +00:00
DrSmugleaf
7e3b9fb2fe Allow a specific hand to be passed into TrySpawnVirtualItemInHand (#31124) 2024-08-18 20:42:22 -06:00
slarticodefast
3dcfe0d850 fix mice and revs being able to toggle suit pieces (#31152) 2024-08-18 20:41:27 -06:00
PJBot
c9854c32ba Automatic changelog update 2024-08-19 01:56:55 +00:00
Nemanja
d9e0681a70 make ore indestructible (#31182) 2024-08-18 19:55:49 -06:00
PJBot
03f5bf4c97 Automatic changelog update 2024-08-18 23:42:19 +00:00
Psychpsyo
9a68cf0b0e Re-add improved random sentience event (#29123) 
* Re-add improved random sentience event

* Make randomly sentient PDA more likely

* Make vending machine sentience less likely

* Make requested changes

* Make randomly sentient captain's gear more likely

* Sentient captain sabre has pirate accent

* Tweak new random sentient object a bit more

* Sentient PDA improvements

* Apply recommended fixes

* Add requested changes

* Fix merge conflict
 2024-08-18 17:41:12 -06:00
geraeumig
c48a96ac15 Trim punctuation marks in the chat emote system (#28612) 
Co-authored-by: geraeumig <alfenos@proton.me>
 2024-08-18 16:49:07 -06:00
PJBot
3cb67a3564 Automatic changelog update 2024-08-18 22:35:49 +00:00
deltanedas
ad691931c6 add memory cell and rework logic construction (#24983) 
* rework construction to be deconstructable, add memory cell

* update textures

* add code

* add memory cell and ports, empty circuit

* d

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-08-18 16:34:43 -06:00
PJBot
6cda6c8ba5 Automatic changelog update 2024-08-18 22:29:24 +00:00
potato1234_x
1952618203 Tea Plant and Blue Pumpkin (#25092) 
* tea plant, blumpkin

* fix linter

* fix tests pls

* bloompkin

* forgor rsi

* work please

* WORK PLEASE

* migration of the blumpkins

* it is now glumpkin

* lowercase

* uppercase

* adjust values and fix blorbo

wtf when did blumpkin donut turn into blorbo donut what

* fix test

* update

* fix stupid mistake

* Update meta.json

* totally not a webedit

* not a webedit 2

* nitpicks
 2024-08-18 16:28:18 -06:00
PJBot
7f5c11afaa Automatic changelog update 2024-08-18 22:26:08 +00:00
Preston Smith
900e57c6de Added LV power cables to Marathon library (#31131) 2024-08-18 16:25:42 -06:00
slarticodefast
86b358be4b Fix raditation collectors gaslighting you (#31175) 
fix raditation collectors gaslighting you
 2024-08-18 16:25:02 -06:00
DrSmugleaf
4fcbb99072 Fix collidable held entities blocking themselves while being dropped (#31119) 2024-08-18 16:24:28 -06:00
PJBot
b4ef1e9a0f Automatic changelog update 2024-08-18 22:19:13 +00:00
Deatherd
878384dbb0 Sharks Go RAWR! (#31142) 
shark makes RAWR!
 2024-08-19 01:18:07 +03:00
PJBot
2dfcd5cf73 Automatic changelog update 2024-08-18 21:56:49 +00:00
lzk
8830e26e0e small figurines voicelines update (#31167) 2024-08-18 15:56:35 -06:00
lzk
d0bd26d575 pizza and pizza box tweaks (#31171) 2024-08-18 15:55:41 -06:00
IProduceWidgets
c636b3b25d Update Oasis (#31174) 
golden toiler
 2024-08-18 15:55:11 -06:00
PJBot
d38d497e62 Automatic changelog update 2024-08-18 21:19:28 +00:00
beck-thompson
78b3e3253f Cutting food now moves the food a little bit. (#31166) 
First commit
 2024-08-19 00:18:20 +03:00
Emisse
529f4dae64 bagel update (#31172) 2024-08-18 14:24:15 -06:00
Spessmann
f7fd991bc8 Cog updates (#31169) 
updated cog a ton
 2024-08-18 13:51:46 -06:00
PJBot
0c078f6cc4 Automatic changelog update 2024-08-18 16:23:42 +00:00
Nemanja
a540b8840e Goliath mob (#30839) 
* Goliath mob

* Update asteroid.yml

* mcfuck yourself

* add cloak

* fixes

* Update materials.yml
 2024-08-18 12:22:36 -04:00
PJBot
d673bdfe67 Automatic changelog update 2024-08-18 16:01:49 +00:00
Unkn0wn_Gh0st
73331416e3 Coughing and coughing changes (#30893) 
* Coughing

* Merge branch 'space-wizards:master' into coughing

* Coughing

* Coughing
 2024-08-18 12:00:42 -04:00
SlamBamActionman
7d48cc5e24 Add atmos directional sign (#31155) 
* Xeno walls

* Fix icon smoothing for the walls

* Added a bunch of items, and the map/shuttle

* Fixed construction graphs

* Put the map in the right place gosh

* Fix shuttle walls rusting, invalid IDs, latejoin cryo, deprecated properties

* Fix APC names and stuff

* Updated to v1.1
 2024-08-18 11:44:09 -04:00
PJBot
0d969f61a8 Automatic changelog update 2024-08-18 15:32:58 +00:00
Iztok Bajcar
031ddc0420 Guidebook typo fixes (#31159) 
* Fixed typo: access --> accessed

* Fixed typo: 'access restricted' --> 'access-restricted'

* Fixed typo: added 'be'

* Fixed typo: added 'a'

* Fixed typo: 'Asssistants' --> 'Assistants'

* Fixed typo: 'overpressure' --> 'overpressurize'

* Fixed typo: 'outisde' --> 'outside'

* Fixed typo: added a comma

* Fixed typo: added a comma

* Fixed typo: 'aformentioned' --> 'aforementioned'

* Fixed typo: added a comma

* Fixed typo: added a comma

* Fixed typo: 'radition' --> 'radiation'

* Fixed typo: 'turing' --> 'turning'

* Fixed typo: 'appropiate' --> 'appropriate'

* Fixed typo: added 'the'

* Fixed typo: added a dot to ellipsis

* Fixed typo: 'aswell' --> 'as well'

* Fixed typo: 'permanant' --> 'permanent'

* Fixed typo: 'flammmable' --> 'flammable'

* Fixed typo: 'recommmended' --> 'recommended'

* Fixed typo: 'recipies' --> 'recipes'

* Fixed typo: 'pre-adminsitered' --> 'pre-administered'

* Fixed typo: 'resusitated' --> 'resuscitated'

* Fixed typo: 'types' --> 'type'

* Fixed typo: `someones` --> `someone's`

* Fixed typo: 'appy' --> 'apply'

* Fixed typo: added 'to'

* Fixed typo: 'CentCom' --> 'CentComm' (as per https://github.com/space-wizards/space-station-14/pull/29217)

* Fixed typo: 'emergencys' --> 'emergencies'

* Fixed typo: removed a dash
 2024-08-18 11:31:48 -04:00
TGRCDev
517f7ad344 Fixed IP bans preventing non-banned players from connecting to SQLite-backed servers (#31154) 
Fixed IP bans causing server errors with SQLite DB
 2024-08-18 13:53:09 +02:00
Emisse
77a60bd3b8 bagel update (#31150) 
* bagel update

* variantize

* fix nitrogen room air explosion

* dumb
 2024-08-18 04:10:52 -06:00
Nemanja
047a7a488d fix some salvage spawner oversights (#31114) 
* fix some salvage spawner oversights

* adjust carp rates

* more tweaks and some additions
 2024-08-18 03:55:38 -06:00
Brandon Hu
1545fd5787 fix(fland): Connect the Cell Window Shutters remote signaler to the Cell Window Shutters (#31136) 2024-08-18 03:55:21 -06:00
Spessmann
f09dd465a7 Cog update (#31148) 
added a bunch of air alarms and fixed stuff
 2024-08-18 00:49:36 -06:00
github-actions[bot]
16e1c23ffe Update Credits (#31141) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-08-17 22:09:00 -04:00
Crotalus
9c9bfda4d2 Fix botany bugs (#27210) 
* Fixed bug with missing gas not getting reset

* Fix bug with MutateInt not using min/max in prob calculation

* Add divison by zero check

* Fix styling
 2024-08-18 03:05:26 +02:00
Mervill
ad4d36f34f Replace obsolete map functions in disposals code (#31133) 2024-08-17 23:29:04 +02:00
Spessmann
1f6223229a Cog update (#31129) 
changed all the firelocks to glass firelocks
 2024-08-17 11:49:11 -06:00
PJBot
71ef47fe01 Automatic changelog update 2024-08-17 16:06:24 +00:00
Milon
a4b0bef12c add confirmation to the delete button in objects tab (#30946) 
ui shitcode
 2024-08-17 12:05:17 -04:00
PJBot
c3b3955832 Automatic changelog update 2024-08-17 14:33:10 +00:00
Ubaser
9d62570385 Red crowbars no longer fit in pockets (#30939) 
* small

* update
 2024-08-17 16:32:04 +02:00
PJBot
979661a7b3 Automatic changelog update 2024-08-17 14:10:49 +00:00
themias
ef3de39364 Add croissant recipe (#30825) 
* Add croissant recipe

* comma

* fix description

* fix merge error
 2024-08-18 00:09:42 +10:00
Emisse
f13e4c3c4f derotate train while i work on it (#31121) 
webedit
 2024-08-17 01:01:33 -06:00