Arthur
08c25d5870
Remove clothing component from special operations officer cloak
2022-07-29 18:21:37 +03:00
Arthur
b877259791
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
2022-07-29 17:59:17 +03:00
Rane
47e84d9d54
Make miasma start being visible later ( #10128 )
2022-07-28 20:13:56 -07:00
Leon Friedrich
c7ad6b709e
Audio System Rejig ( #9635 )
2022-07-29 12:13:12 +10:00
corentt
6b8bb10766
allow syringes in medical belts ( #10113 )
2022-07-29 11:23:11 +10:00
Leon Friedrich
d279f6172a
Fix item/clothing visual & networking bugs ( #10116 )
2022-07-28 18:02:09 -07:00
Leon Friedrich
47970f2abb
Fix identity bug ( #10117 )
2022-07-29 09:21:47 +10:00
Leon Friedrich
9020ec6045
yaml linter fix & alert sprite specifier changes ( #10015 )
...
* Sprite specifier/serializer update
* Immume
* Fix tests
* hooray, more bad test prototypes
* add some comments
2022-07-28 09:17:51 +10:00
FunkySphere
862789edab
renamed mime suit to mime jumpskirt ( #9889 )
2022-07-28 09:15:04 +10:00
Peptide90
b85b89bef2
ramen description fix ( #10078 )
2022-07-27 07:18:15 -07:00
metalgearsloth
55692d4d71
Revert map PRs ( #10079 )
...
* Revert "Fix Saltern cvar (#10077 )"
This reverts commit 0f0420eca9#10075 )"
This reverts commit c15e14676d
2022-07-27 22:27:23 +10:00
metalgearsloth
2f883cad6b
Cleanup species prototypes a bit ( #9513 )
...
* Cleanup species prototypes a bit
Skeletons were very stale because they didn't inherit from mobhuman but now they should have similar components as every other species.
I also added a generic abstract base species to make custom species easier (where they may not want to have humans COUGH VILOUS).
* a
* drugs
* gonflicts
* no more conflicts I beg
2022-07-27 20:54:23 +10:00
Kara
258ec0cac1
Clothing/item ECS & cleanup ( #9706 )
2022-07-27 03:53:47 -07:00
Kara
6c30726c7b
freon fixes ( #10076 )
2022-07-27 03:17:33 -07:00
Peptide90
c15e14676d
Map ID fixes (Take 2) ( #10075 )
2022-07-27 03:13:55 -07:00
Kara
7a553781cc
Frezon ( #9980 )
...
* stuff i'll have to fix anyway when n2o gets merged
* everything except the finished reactions
* freon coolant reaction but with bad curve
* miasmic subsumation
* freon production
* nitrogen and diff temp scaling
* uhh meant to change that
* #
* hitting that frezon boof
2022-07-27 04:55:28 -05:00
Kara
ae71b15a7d
Vampire cloak ( #10073 )
2022-07-27 01:15:47 -07:00
Rane
1c8bdaf7c4
Sleeping ( #9793 )
2022-07-26 21:46:24 -07:00
Emisse
3751ff59f8
warden ( #10071 )
2022-07-26 22:22:47 -05:00
Rane
e36b155325
Port boxer from Nyano ( #9080 )
2022-07-26 18:34:19 -07:00
ModeratelyAware
3e28b7f236
Converted FireExtinguisherVisualizer to generic visualizer ( #10058 )
2022-07-26 17:40:13 -07:00
Nemanja
6276bda4f4
Zombie Fixes and Tweaks ( #9940 )
2022-07-26 17:35:34 -07:00
Morber
61951a84f1
[Resprite] Singularity stuff ( #320 )
...
* Update containment field sprite
* Update 1 level singularity sprite
* Update 3 level singularity sprite
* Fix sprite sizes
* Fix sprite state name
* Update 4 level singularity sprite
* Fix sprite size
* Update 5 level singularity sprite
* Update level 6 singularity sprite
* Remove 6 level sprite of singularity
* Remove 6 level meta.json
* Add level 6 singularity custom sprite
* Update containment generator sprites
* Remake emitter with new sprites
* Update collector sprites
* New emitter sprite files
* Update level 6 singularity sprite
* Update license singularity level 6
* Decrease singularity to 20 fps
2022-07-26 20:56:02 +03:00
Leon Friedrich
ce24d16593
Remove more server sprite component uses ( #9963 )
2022-07-27 02:22:49 +10:00
Rane
ba8cab8c3c
Make nuke disk an observer warp point ( #10025 )
2022-07-26 06:55:15 -07:00
Emisse
42b6ea20e1
Box Station ( #10043 )
...
* box
* box
* Update box.yml
* Update box.yml
* emergency lights
2022-07-26 05:26:31 -05:00
T-Stalker
eb52ec1f32
Replace chocolate with tinned meat ( #10037 )
2022-07-26 19:56:55 +10:00
T-Stalker
cadf13320f
Lizz and slime speech ( #10038 )
...
* Lizz speech
* Slime while at it
2022-07-26 19:13:12 +10:00
Moony
21342535c7
Update waystation.yml ( #10024 )
2022-07-25 21:41:05 -05:00
T-Stalker
0b99dc4222
Unplate the bread ( #10035 )
2022-07-26 12:37:51 +10:00
ninruB
d41fbdafcf
fixed misinformation ( #9848 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-07-26 11:38:30 +10:00
Rane
57206eb49c
Port medibot + bot spawners from nyano ( #9854 )
...
* Port medibot + bot spawners from nyano
* Make the injection thresholds constants
* Remove warning
* Check against const in system too
* resolving systems just isn't worth it
* only resolve entity manager once
* Reduceother resolves too
* fix post-merge
* woops
2022-07-25 10:33:31 -05:00
T-Stalker
698976029c
Adds axolotl and snake hood frills for reptilians! ( #10013 )
2022-07-25 15:47:04 +10:00
metalgearsloth
14080c4bcd
Revert parallax ( #10014 )
...
Woops, was using these values for testing scrolling parallax.
2022-07-25 15:42:34 +10:00
metalgearsloth
4a09ef80ad
Scrolling menu parallax + less tiling ( #9764 )
...
* Scrolling parallax
* unnecessary field
* Load fastspace
2022-07-25 15:31:19 +10:00
metalgearsloth
bfac53e7bc
Per-map parallax support ( #9786 )
...
* Per-map parallax support
* Comments for future sloth
* c
* bet
* Fix exception
* VV support
* Fix parallax
* mem
* weightless sounds
* Gravity stuff
* placeholder coz im too lazy to stash don't @ me son
* decent clouds
* sky
* Fast parallax
* Imagine spelling
* Loicense
* perish
* Fix weightless status
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-07-25 00:10:23 -05:00
metalgearsloth
aad6a22a6a
ECS NPCs ( #9941 )
...
* ECS
* A
* parity
* Remove dummy update
* abs
* thanks rider
2022-07-25 14:57:33 +10:00
metalgearsloth
40a7584c2f
Gas tank internals alerts ( #9567 )
2022-07-25 14:42:25 +10:00
Deahaka
5ad3883e62
Update altar.yml ( #10004 )
2022-07-24 15:57:12 -07:00
Level10Cybermancer
01f5bfff5f
added backpacks to the clothesmate ( #10006 )
2022-07-24 15:41:22 -07:00
Leon Friedrich
16a08a60d0
Magboot & Stun visualizers ( #9961 )
2022-07-24 21:39:21 +10:00
Chris
ceecddd445
set canCrush and collision check to false ( #9957 )
2022-07-24 21:35:34 +10:00
Emisse
13b5b576e4
Juggernaut Suit Buff ( #9994 )
...
* lmao
* Update hardsuits.yml
2022-07-24 21:30:06 +10:00
Peptide90
8cb3b9218e
change shotgun shell boxes from 6 to 12 ( #9540 )
2022-07-24 21:09:33 +10:00
Rinkashikachi
6137803891
Various localization fixes ( #9860 )
2022-07-24 04:44:45 +10:00
Myctai
2c56f0a4eb
Fix thrusters using generic Burn damage group instead of Heat type ( #9972 )
...
Getting high temperature, electric and frostbite burns at once is silly.
2022-07-23 07:26:19 -07:00
Morber
91b356952f
Исправление локализации бумаги с целью станции ( #324 )
2022-07-23 12:51:03 +03:00
Morber
31e98277f6
[Resprite] Boxes ( #322 )
...
* Update boxe sprites
* Remove box_id.png & add id icon & use id instead of pda
* Add & use medical box
* Update license.txt
2022-07-23 12:50:42 +03:00
Arthur
075299b54d
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png
2022-07-22 22:45:30 +03:00
Moony
f98df73fae
Adds even more smites and a bunch of tools. ( #9825 )
...
* Adds three new smites, headstand, locker stuff, and reptilian species swap.
* Localize all the smites.
* save work
* More smites...
* Final tweaks.
* oops
* !PLEH
* Adds disarm prone and improved hand removal options.
* fix chances.
* take out the trash.
* Add some admin TRICKS instead of more smites.
* oop
* Implements the admin test arena and associated trick.
* Tricks for granting/revoking access.
* e
* mfw
* Implement quick dialogs, for when you don't want to spend 20 minutes writing a simple dialog prompt.
* Forgot the rejuv icon.
* E
* docs
* augh
* Add rename/redescribe buttons.
* Adds objects menu, implements a couple tricks for stations.
* 1984
* Adds a trick for effectively infinite power.
* fixes some icon uggo.
* a
* HALT!
* Pause/unpause buttons.
* Forgor the textures.
* they broke every bone in their body.
* i added more
* more battery actions, touch up battery icon.
* Address reviews.
2022-07-21 17:30:00 -05:00
