Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

reverted illegal code added by oniks

Browse Source
This commit is contained in:
Valtos
2024-09-19 14:23:49 +03:00
parent 17e2020f14
commit ebb15a911b
9 changed files with 79 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -22,7 +22,7 @@
shape:
!type:PhysShapeCircle
radius: 0.25
density: 0.8
density: 10
mask:
- FlyingMobMask
layer:
@@ -89,7 +89,7 @@
shape:
!type:PhysShapeCircle
radius: 0.1
density: 0.1
density: 30
mask:
- FlyingMobMask
layer:
@@ -325,7 +325,7 @@
shape:
!type:PhysShapeCircle
radius: 0.2
density: 0.0007
density: 100
mask:
- SmallMobMask
layer:
@@ -429,7 +429,7 @@
shape:
!type:PhysShapeCircle
radius: 0.2
density: 0.007
density: 100
mask:
- SmallMobMask
layer:
@@ -1565,7 +1565,7 @@
shape:
!type:PhysShapeCircle
radius: 0.2
density: 0.76
density: 100
mask:
- SmallMobMask
layer:
@@ -2532,7 +2532,7 @@
shape:
!type:PhysShapeCircle
radius: 0.35
density: 16.66
density: 50 #They actually are pretty light, I looked it up
mask:
- MobMask
layer:
@@ -2609,7 +2609,7 @@
shape:
!type:PhysShapeCircle
radius: 0.35
density: 25.5
density: 50
mask:
- MobMask
layer:
@@ -2758,7 +2758,7 @@
shape:
!type:PhysShapeCircle
radius: 0.35
density: 9
density: 15
mask:
- MobMask
layer:
@@ -2927,17 +2927,6 @@
Base: caracal_flop
Dead:
Base: caracal_dead
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 30
mask:
- MobMask
layer:
- MobLayer
- type: entity
name: kitten
@@ -2971,17 +2960,6 @@
thresholds:
0: Alive
25: Dead
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 2
mask:
- MobMask
layer:
- MobLayer
- type: entity
name: sloth
@@ -3062,7 +3040,7 @@
shape:
!type:PhysShapeCircle
radius: 0.35
density: 4
density: 5
mask:
- MobMask
layer:
@@ -3141,7 +3119,7 @@
shape:
!type:PhysShapeCircle
radius: 0.2
density: 0.8
density: 120
mask:
- SmallMobMask
layer:
@@ -3263,7 +3241,7 @@
shape:
!type:PhysShapeCircle
radius: 0.35
density: 750
density: 250
mask:
- MobMask
layer:
@@ -3348,7 +3326,7 @@
shape:
!type:PhysShapeCircle
radius: 0.35
density: 15
density: 100 # High, because wood is heavy.
mask:
- MobMask
layer:

103
Resources/Prototypes/Tiles/floors.yml
View File

@@ -15,7 +15,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelCheckerLight
@@ -34,7 +33,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteelCheckerLight
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelCheckerDark
@@ -53,7 +51,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteelCheckerDark
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelMini
@@ -72,7 +69,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelPavement
@@ -91,7 +87,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelDiagonal
@@ -110,7 +105,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelOffset
@@ -123,7 +117,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelMono
@@ -142,7 +135,6 @@
collection: FootstepTile
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelPavementVertical
@@ -161,7 +153,6 @@
collection: FootstepTile
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelHerringbone
@@ -180,7 +171,6 @@
collection: FootstepTile
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorSteelDiagonalMini
@@ -199,7 +189,6 @@
collection: FootstepTile
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorBrassFilled
@@ -212,7 +201,6 @@
collection: FootstepHull
itemDrop: FloorTileItemBrassFilled
heatCapacity: 10000
tileRipResistance: 220
- type: tile
id: FloorBrassReebe
@@ -225,7 +213,6 @@
collection: FootstepHull
itemDrop: FloorTileItemBrassReebe
heatCapacity: 10000
tileRipResistance: 220
- type: tile
id: FloorPlastic
@@ -244,7 +231,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteel
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWood
@@ -265,7 +251,6 @@
collection: BarestepWood
itemDrop: FloorTileItemWood
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhite
@@ -284,7 +269,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhiteMini
@@ -303,7 +287,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhitePavement
@@ -322,7 +305,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhiteDiagonal
@@ -341,7 +323,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhiteOffset
@@ -354,7 +335,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhiteMono
@@ -373,7 +353,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhitePavementVertical
@@ -392,7 +371,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhiteHerringbone
@@ -411,7 +389,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhiteDiagonalMini
@@ -430,7 +407,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorWhitePlastic
@@ -449,7 +425,6 @@
collection: FootstepTile
itemDrop: FloorTileItemWhite
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorDark
@@ -468,7 +443,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkMini
@@ -487,7 +461,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkPavement
@@ -506,7 +479,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkDiagonal
@@ -525,7 +497,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkOffset
@@ -538,7 +509,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkMono
@@ -557,7 +527,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkPavementVertical
@@ -576,7 +545,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkHerringbone
@@ -595,7 +563,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkDiagonalMini
@@ -614,7 +581,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorDarkPlastic
@@ -633,7 +599,6 @@
collection: FootstepTile
itemDrop: FloorTileItemDark
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorTechMaint
@@ -646,7 +611,6 @@
collection: FootstepHull
itemDrop: FloorTileItemTechmaint
heatCapacity: 10000
tileRipResistance: 250
- type: tile
id: FloorReinforced
@@ -659,7 +623,6 @@
collection: FootstepHull
itemDrop: FloorTileItemReinforced
heatCapacity: 10000
reinforced: true
- type: tile
id: FloorMono
@@ -672,7 +635,6 @@
collection: FootstepTile
itemDrop: FloorTileItemMono
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorLino
@@ -685,7 +647,6 @@
collection: FootstepTile
itemDrop: FloorTileItemLino
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorSteelDirty
@@ -698,7 +659,6 @@
collection: FootstepPlating
itemDrop: FloorTileItemDirty
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorElevatorShaft
@@ -711,7 +671,6 @@
collection: FootstepHull
itemDrop: FloorTileItemElevatorShaft
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorMetalDiamond
@@ -724,7 +683,6 @@
collection: FootstepHull
itemDrop: FloorTileItemMetalDiamond
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorRockVault
@@ -737,7 +695,6 @@
collection: FootstepAsteroid
itemDrop: FloorTileItemRockVault
heatCapacity: 10000
tileRipResistance: 400
- type: tile
id: FloorBlue
@@ -750,7 +707,6 @@
collection: FootstepTile
itemDrop: FloorTileItemBlue
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorSteelLime
@@ -769,7 +725,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemLime
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorMining
@@ -782,7 +737,6 @@
collection: FootstepTile
itemDrop: FloorTileItemMining
heatCapacity: 10000
tileRipResistance: 250
- type: tile
id: FloorMiningDark
@@ -795,7 +749,6 @@
collection: FootstepTile
itemDrop: FloorTileItemMiningDark
heatCapacity: 10000
tileRipResistance: 250
- type: tile
id: FloorMiningLight
@@ -808,7 +761,6 @@
collection: FootstepTile
itemDrop: FloorTileItemMiningLight
heatCapacity: 10000
tileRipResistance: 250
# Departamental
- type: tile
@@ -822,7 +774,6 @@
collection: FootstepHull
itemDrop: FloorTileItemFreezer
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorShowroom
@@ -841,7 +792,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemShowroom
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorHydro
@@ -854,7 +804,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemHydro
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorBar
@@ -873,7 +822,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemBar
heatCapacity: 10000
tileRipResistance: 100
- type: tile
id: FloorClown
@@ -886,7 +834,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemClown
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorMime
@@ -899,7 +846,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemMime
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorKitchen
@@ -912,7 +858,6 @@
collection: FootstepTile
itemDrop: FloorTileItemKitchen
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorLaundry
@@ -925,7 +870,6 @@
collection: FootstepTile
itemDrop: FloorTileItemLaundry
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorSteelDamaged
@@ -945,7 +889,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such, in SS13 prying destroyed tiles wouldn't give you anything.
heatCapacity: 10000
tileRipResistance: 175
- type: tile
id: FloorSteelBurnt
@@ -962,7 +905,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemSteel #Same case as FloorSteelDamaged, make it null when possible
heatCapacity: 10000
tileRipResistance: 175
# Concrete
@@ -984,7 +926,6 @@
itemDrop: FloorTileItemConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
- type: tile
id: FloorConcreteMono
@@ -1004,7 +945,6 @@
itemDrop: FloorTileItemConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
- type: tile
id: FloorConcreteSmooth
@@ -1024,7 +964,6 @@
itemDrop: FloorTileItemConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
- type: tile
id: FloorGrayConcrete
@@ -1044,7 +983,6 @@
itemDrop: FloorTileItemGrayConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
- type: tile
id: FloorGrayConcreteMono
@@ -1064,7 +1002,6 @@
itemDrop: FloorTileItemGrayConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
- type: tile
id: FloorGrayConcreteSmooth
@@ -1084,7 +1021,6 @@
itemDrop: FloorTileItemGrayConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
- type: tile
id: FloorOldConcrete
@@ -1104,7 +1040,6 @@
itemDrop: FloorTileItemOldConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
- type: tile
id: FloorOldConcreteMono
@@ -1124,7 +1059,6 @@
itemDrop: FloorTileItemOldConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
- type: tile
id: FloorOldConcreteSmooth
@@ -1144,7 +1078,6 @@
itemDrop: FloorTileItemOldConcrete
heatCapacity: 10000
weather: true
tileRipResistance: 300
# Carpets (non smoothing)
- type: tile
@@ -1161,7 +1094,6 @@
friction: 0.25
itemDrop: FloorTileItemArcadeBlue
heatCapacity: 10000
tileRipResistance: 75
- type: tile
id: FloorArcadeBlue2
@@ -1177,7 +1109,6 @@
friction: 0.25
itemDrop: FloorTileItemArcadeBlue2
heatCapacity: 10000
tileRipResistance: 75
- type: tile
id: FloorArcadeRed
@@ -1193,7 +1124,6 @@
friction: 0.25
itemDrop: FloorTileItemArcadeRed
heatCapacity: 10000
tileRipResistance: 75
- type: tile
id: FloorEighties
@@ -1209,7 +1139,6 @@
friction: 0.25
itemDrop: FloorTileItemEighties
heatCapacity: 10000
tileRipResistance: 75
- type: tile
id: FloorCarpetClown
@@ -1225,7 +1154,6 @@
friction: 0.25
itemDrop: FloorTileItemCarpetClown
heatCapacity: 10000
tileRipResistance: 75
- type: tile
id: FloorCarpetOffice
@@ -1241,7 +1169,6 @@
friction: 0.25
itemDrop: FloorTileItemCarpetOffice
heatCapacity: 10000
tileRipResistance: 75
- type: tile
id: FloorBoxing
@@ -1261,7 +1188,6 @@
friction: 0.25
itemDrop: FloorTileItemBoxing
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorGym
@@ -1281,7 +1207,6 @@
friction: 0.25
itemDrop: FloorTileItemGym
heatCapacity: 10000
tileRipResistance: 50
# Shuttle
- type: tile
@@ -1300,7 +1225,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemShuttleWhite
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorShuttleGrey
@@ -1319,7 +1243,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemShuttleGrey
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorShuttleBlack
@@ -1338,7 +1261,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemShuttleBlack
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorShuttleBlue
@@ -1356,7 +1278,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemShuttleBlue
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorShuttleOrange
@@ -1374,7 +1295,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemShuttleOrange
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorShuttlePurple
@@ -1392,7 +1312,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemShuttlePurple
heatCapacity: 10000
tileRipResistance: 4500
- type: tile
id: FloorShuttleRed
@@ -1410,7 +1329,6 @@
collection: FootstepFloor
itemDrop: FloorTileItemShuttleRed
heatCapacity: 10000
tileRipResistance: 4500
# Materials
@@ -1425,7 +1343,6 @@
collection: FootstepTile
itemDrop: FloorTileItemGold
heatCapacity: 10000
tileRipResistance: 600
- type: tile
id: FloorSilver
@@ -1438,7 +1355,6 @@
collection: FootstepTile
itemDrop: FloorTileItemSilver
heatCapacity: 10000
tileRipResistance: 500
- type: tile
id: FloorGlass
@@ -1451,7 +1367,6 @@
collection: FootstepTile
itemDrop: SheetGlass1
heatCapacity: 10000
tileRipResistance: 150
- type: tile
id: FloorRGlass
@@ -1470,7 +1385,6 @@
collection: FootstepTile
itemDrop: SheetRGlass1
heatCapacity: 10000
tileRipResistance: 175
# Circuits
- type: tile
@@ -1484,7 +1398,6 @@
collection: FootstepHull
itemDrop: FloorTileItemGCircuit
heatCapacity: 10000
tileRipResistance: 225
- type: tile
id: FloorBlueCircuit
@@ -1497,7 +1410,6 @@
collection: FootstepHull
itemDrop: FloorTileItemBCircuit
heatCapacity: 10000
tileRipResistance: 225
# Terrain
- type: tile
@@ -1783,7 +1695,6 @@
itemDrop: FloorTileItemFlesh
friction: 0.05 #slippy
heatCapacity: 10000
tileRipResistance: 80
- type: tile
id: FloorTechMaint2
@@ -1796,7 +1707,6 @@
collection: FootstepHull
itemDrop: FloorTileItemSteelMaint
heatCapacity: 10000
tileRipResistance: 225
- type: tile
id: FloorTechMaint3
@@ -1815,7 +1725,6 @@
collection: FootstepHull
itemDrop: FloorTileItemGratingMaint
heatCapacity: 10000
tileRipResistance: 225
- type: tile
id: FloorWoodTile
@@ -1836,7 +1745,6 @@
collection: BarestepWood
itemDrop: FloorTileItemWoodPattern
heatCapacity: 10000
tileRipResistance: 75
- type: tile
id: FloorBrokenWood
@@ -1860,7 +1768,6 @@
collection: BarestepWood
itemDrop: MaterialWoodPlank1
heatCapacity: 10000
tileRipResistance: 60
- type: tile
id: FloorWebTile
@@ -1875,7 +1782,6 @@
collection: BarestepCarpet
itemDrop: FloorTileItemWeb
heatCapacity: 10000
tileRipResistance: 30
- type: tile
id: FloorChromite
@@ -1907,7 +1813,6 @@
collection: FootstepHull
itemDrop: FloorTileItemSteel #probably should not be normally obtainable, but the game shits itself and dies when you try to put null here
heatCapacity: 10000
tileRipResistance: 500
- type: tile
id: FloorHullReinforced
@@ -1920,7 +1825,6 @@
itemDrop: FloorTileItemSteel
heatCapacity: 100000 #/tg/ has this set as "INFINITY." I don't know if that exists here so I've just added an extra 0
indestructible: true
reinforced: true
- type: tile
id: FloorReinforcedHardened
@@ -1931,7 +1835,6 @@
footstepSounds:
collection: FootstepHull
itemDrop: FloorTileItemReinforced #same case as FloorHull
reinforced: true
# Faux sci tiles
@@ -1963,7 +1866,6 @@
collection: FootstepGrass
itemDrop: FloorTileItemAstroGrass
heatCapacity: 10000
tileRipResistance: 50
- type: tile
id: FloorMowedAstroGrass
@@ -1973,7 +1875,6 @@
isSubfloor: false
deconstructTools: [ Cutting ]
itemDrop: FloorTileItemMowedAstroGrass
tileRipResistance: 50
- type: tile
id: FloorJungleAstroGrass
@@ -1983,7 +1884,6 @@
isSubfloor: false
deconstructTools: [ Cutting ]
itemDrop: FloorTileItemJungleAstroGrass
tileRipResistance: 50
# Ice
- type: tile
@@ -1999,7 +1899,6 @@
mobFrictionNoInput: 0.05
mobAcceleration: 2
itemDrop: FloorTileItemAstroIce
tileRipResistance: 50
- type: tile
id: FloorAstroSnow
@@ -2009,7 +1908,6 @@
isSubfloor: false
deconstructTools: [ Prying ]
itemDrop: FloorTileItemAstroSnow
tileRipResistance: 50
- type: tile
id: FloorWoodLarge
@@ -2030,4 +1928,3 @@
collection: BarestepWood
itemDrop: FloorTileItemWoodLarge
heatCapacity: 10000
tileRipResistance: 100